diff options
| author | JinWang An <jinwang.an@samsung.com> | 2022-12-27 12:15:01 +0900 |
|---|---|---|
| committer | JinWang An <jinwang.an@samsung.com> | 2022-12-27 12:15:01 +0900 |
| commit | 02a08acfc3145de1707c7704c566e4401ff5a8de (patch) | |
| tree | 1c41a0a5565eb993984a585a0dd8ef13735ceede | |
| parent | 90dfac14e6a0169336b5b7210e4a160df8b91c68 (diff) | |
| download | diffutils-upstream/3.6.tar.gz diffutils-upstream/3.6.tar.bz2 diffutils-upstream/3.6.zip | |
Imported Upstream version 3.6upstream/3.6
827 files changed, 19764 insertions, 15600 deletions
diff --git a/.tarball-version b/.tarball-version index 5a95802..d70c8f8 100644 --- a/.tarball-version +++ b/.tarball-version @@ -1 +1 @@ -3.5 +3.6 @@ -33,7 +33,7 @@ Patrick D'Cruze Eli Zaretskii -Copyright (C) 2001, 2006, 2009-2013, 2015-2016 Free Software Foundation, Inc. +Copyright (C) 2001, 2006, 2009-2013, 2015-2017 Free Software Foundation, Inc. This file is part of GNU diffutils. @@ -1,5 +1,218 @@ +2017-05-21 Jim Meyering <meyering@fb.com> + + version 3.6 + * NEWS: Record release date. + +2017-05-19 Jim Meyering <meyering@fb.com> + + gnulib: update to latest + +2017-05-18 Jim Meyering <meyering@fb.com> + + maint: update to work with GCC7's -Werror=implicit-fallthrough= + * src/system.h (FALLTHROUGH): Define. + Use new FALLTHROUGH macro in place of comments + * src/cmp.c: FIXME + * src/diff3.c: FIXME + * src/ifdef.c: FIXME + * src/sdiff.c: FIXME + * src/side.c: FIXME + * src/util.c: FIXME + + gnulib: update to latest + +2017-05-09 Jim Meyering <meyering@fb.com> + + tests: new-file: closed-stdin: also ensure stdout was empty + * tests/new-file: Also require that "out" be empty. + +2017-05-06 Jim Meyering <meyering@fb.com> + + maint: stop using @acronym{...} in texinfo sources + * doc/diffutils.texi: Remove all uses of @acronym{...}, + per recommendation by Karl Berry. + * cfg.mk (local-checks-to-skip): Remove exemption, enabling + the @acronym{-prohibiting syntax-check rule. + +2017-05-05 Paul Eggert <eggert@cs.ucla.edu> + + cmp: improve EOF diagnostic + This improves on yesterday's change, following up on a + remark by Jim Meyering (Bug#22816#21). + * doc/diffutils.texi (Invoking cmp, cmp Options): Follow POSIX more + closely in the documentation of the information appended to the EOF + diagnostic. + * src/cmp.c (cmp): Be more specific about the shorter file's length + and fix some off-by-1 issues in reporting line counts. + * tests/cmp: Adjust to match new behavior. + Don't assume internal details about stdio buffering. + +2017-05-04 Benno Schulenberg <bensberg@justemail.net> + + diff: describe each --help option with a single string + * src/diff.c: To ease translating, fuse four description pieces + into two whole ones. Also reword and rewrap one of them to fit + within eighty characters. + +2017-05-04 Paul Eggert <eggert@cs.ucla.edu> + + cmp: report prefix length when one file is shorter + Requested by Dan Jacobson (Bug#22816). + * NEWS: + * doc/diffutils.texi (Invoking cmp, cmp Options): Document this. + * src/cmp.c (cmp): Implement it. + * tests/Makefile.am (TESTS): Add cmp. + * tests/cmp: New file. + +2017-05-02 Jim Meyering <meyering@fb.com> + + tests: add test for latest fix + * NEWS (Bug fixes): Describe it. + * tests/invalid-re: New test for just-fixed bug. + * tests/Makefile.am (TESTS): Add it. + + gnulib: update to latest + +2017-04-27 Paul Eggert <eggert@cs.ucla.edu> + + diff: don't crash if regexp is invalid + Problem reported by Marcel Böhme in: + http://lists.gnu.org/archive/html/bug-diffutils/2017-04/msg00002.html + * src/diff.c (add_regexp): Exit if re_compile_pattern fails. + +2017-03-24 julama <julama@fake-box.com> + + tests: avoid false failure for unreadable /proc/cmdline + * tests/brief-vs-stat-zero-kernel-lies: Use "test -r" rather than + just "test -f". This avoids a false test failure on a linux system + with grsecurity and its GRKERNSEC_PROC_USER option enabled, for which + /proc/cmdline is unreadable. Reported in https://bugs.gnu.org/26155 + +2017-02-01 Jim Meyering <meyering@fb.com> + + tests: avoid false failure with some shells on debian, freebsd + * tests/colors: Move the TERM=dumb setting into the code run by + "returns_", since some shells do not propagate envvar setting through + to a use of a function like this. That would cause this test to fail + because results were colorized when they should not have been. + Reported by Nelson Beebe. + +2017-01-31 Jim Meyering <meyering@fb.com> + + maint: add "introduced in 3.4" in latest NEWS entry + * NEWS: Update. Also, thanks to Nelson Beebe for reporting this. + + diff: avoid UMR with ---presume-output-tty + * src/diff.c (main): Always define presume_output_tty. + Otherwise, it would be read uninitialized. + Introduced in v3.3-45-g17e2698 + * NEWS (Bug fixes): Mention it. + + gnulib: update to latest; and update bootstrap and init.sh + + maint: change "time stamp" to "timestamp" globally + This avoids a new syntax-check failure. + * ChangeLog-2008: Perform that change. + * doc/diffutils.texi: Likewise. + * NEWS: Likewise. + * cfg.mk: Update the old news hash accordingly. + +2017-01-01 Jim Meyering <meyering@fb.com> + + maint: update gnulib and copyright dates for 2017 + * gnulib: Update to latest. + * all files: Run "make update-copyright". + +2016-11-08 Jim Meyering <meyering@fb.com> + + tests: use "returns_" rather than explicit comparison with "$?" + * tests/colors: Use "returns_ 1" rather than testing $? = 1 + * tests/basic: Likewise. + * tests/binary: Likewise. + * tests/filename-quoting: Likewise. + * tests/function-line-vs-leading-space: Likewise. + * tests/ignore-matching-lines: Likewise. + * tests/label-vs-func: Likewise. + * tests/new-file: Likewise. + * tests/no-dereference: Likewise. + * tests/no-newline-at-eof: Likewise. + * tests/stdin: Likewise. + +2016-10-25 Paul Eggert <eggert@cs.ucla.edu> + + diff: fix big performance degradation in 3.4 + * NEWS, doc/diffutils.texi (Overview): Document this. + * src/analyze.c (diff_2_files): Restore too_expensive heuristic, + but this time with a floor that is 16 times the old floor. This + should fix Bug#16848, by generating good-quality output for its + test case, while not introducing Bug#24715, by running nearly as + fast as diff-3.3 for that test case. + + build: update gnulib submodule to latest + +2016-10-16 Jim Meyering <meyering@fb.com> + + maint: use die rather than error + Use "die (N, ..." rather than "error (N, ..." whenever N is a nonzero + constant. That lets the compiler know that control never goes beyond + that point, and thus makes unnecessary the occasional following + "abort ();" or "break;" statement we have historically added to inform + static analysis tools of this aspect of "error" semantics. + * src/die.h: New file. + * src/Makefile.am (noinst_HEADERS): Add it. + * src/cmp.c: Use die in place of error whenever the first + argument is a nonzero constant. Also remove any immediately- + following call to abort, and include "die.h". + * src/diff.c: Likewise. + * src/diff3.c: Likewise. + * src/sdiff.c: Likewise. + * src/util.c: Likewise. + +2016-10-02 Jim Meyering <meyering@fb.com> + + gnulib: update to latest + + build: avoid GCC 7's new warnings + * src/util.c (get_funky_string): Adjust comment so that GCC 7's + -Wimplicit-fallthrough recognizes it. + * src/diff3.c (main): Cast boolean MERGE to "int" to avoid this: + diff3.c:341:25: error: '~' on a boolean expression \ + [-Werror=bool-operation] + +2016-08-30 Jim Meyering <meyering@fb.com> + + gnulib: update to latest + +2016-08-29 Jim Meyering <meyering@fb.com> + + gnulib: update to latest, to port to upcoming GCC 7 + This fixes compilation errors when using gcc-7-to-be that were + due to missing backslashes in gnulib's intprops.h and an API + change in functions like __builtin_add_overflow. This ports + to GCC 7's newer built-in overflow-checking functions. + +2016-08-28 Paul Eggert <eggert@cs.ucla.edu> + + diff: don't assume ptrdiff_t <= long long int + * src/system.h (printint, pI): Port to (theoretical) platforms + where ptrdiff_t is wider than long long int (Bug#24311). + +2016-08-27 Paul Eggert <eggert@cs.ucla.edu> + + diff: port line numbers to mingw64 + Problem reported by Peter Rosin (Bug#24311). + * src/system.h (printint, pI): New typedef and macro. + All uses of 'long int' and "%l" in printf format replaced by + 'printint' and "%"pI respectively. + * src/ifdef.c (do_printf_spec): Don't assume pI is length 1. + 2016-08-20 Jim Meyering <meyering@fb.com> + maint: post-release administrivia + * NEWS: Add header line for next release. + * .prev-version: Record previous version. + * cfg.mk (old_NEWS_hash): Auto-update. + version 3.5 * NEWS: Record release date. diff --git a/ChangeLog-2008 b/ChangeLog-2008 index 7cf442c..714c354 100644 --- a/ChangeLog-2008 +++ b/ChangeLog-2008 @@ -1068,7 +1068,7 @@ (Standards conformance): New chapter. (Binary): Differing binary files are trouble unless the user asked for brief output. - (Detailed Context): Prefer ISO time stamp format in discussion. + (Detailed Context): Prefer ISO timestamp format in discussion. (Detailed Unified, Pagination): Likewise. (Less Context): Likewise. Also use short option. (Alternate Names): Separate option from arg. @@ -1189,7 +1189,7 @@ likewise for -u and -U 3. Use specify_style and specify_value. (SIGCHLD): Do not define; now done in a header. - Use new style time stamp format for -u / -U. + Use new style timestamp format for -u / -U. Reject numeric-string options if operating in POSIX 1003.1-2001 mode. Avoid overflow problems with tab width. Simplify from-file and to-file code. @@ -1956,7 +1956,7 @@ (TIMESPEC_NS): New macro. (nstrftime): New decl. (print_context_label): Use nstrftime and time_format to format times. - Print numeric time stamp value if localtime fails. + Print numeric timestamp value if localtime fails. (print_context_function): New function. (pr_context_hunk, pr_unidiff_hunk): Use it. (find_function): Use size_t for sizes, not int. @@ -2538,7 +2538,7 @@ Thu Sep 22 16:47:00 1994 Paul Eggert <eggert@twinsun.com> (binprefix): Removed. (distfiles): Add stamp-h.in. (clean): Clean stamp-h. - (config.hin, config.h): Use time stamp files. + (config.hin, config.h): Use timestamp files. (cmp_o): Add $(LIBOBJS). (install): Install info files from srcdir if they're not in `.'. @@ -4265,7 +4265,7 @@ Thu Nov 3 16:30:24 1988 Randall Smith (randy at gluteus.ai.mit.edu) ----- - Copyright (C) 1988-1994, 1997-2002, 2004, 2006, 2009-2013, 2015-2016 + Copyright (C) 1988-1994, 1997-2002, 2004, 2006, 2009-2013, 2015-2017 Free Software Foundation, Inc. Copying and distribution of this file, with or without diff --git a/GNUmakefile b/GNUmakefile index a869da5..a2f8111 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-2016 Free Software Foundation, Inc. +# Copyright (C) 2001, 2003, 2006-2017 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/Makefile.am b/Makefile.am index edee5fa..eacce96 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,6 +1,6 @@ # Main Automakefile for GNU diffutils. -# Copyright (C) 2001-2002, 2004, 2006, 2009-2013, 2015-2016 Free Software +# Copyright (C) 2001-2002, 2004, 2006, 2009-2013, 2015-2017 Free Software # Foundation, Inc. # This program is free software: you can redistribute it and/or modify diff --git a/Makefile.in b/Makefile.in index ae71ba1..8ebaf85 100644 --- a/Makefile.in +++ b/Makefile.in @@ -16,7 +16,7 @@ # Main Automakefile for GNU diffutils. -# Copyright (C) 2001-2002, 2004, 2006, 2009-2013, 2015-2016 Free Software +# Copyright (C) 2001-2002, 2004, 2006, 2009-2013, 2015-2017 Free Software # Foundation, Inc. # This program is free software: you can redistribute it and/or modify @@ -109,10 +109,11 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \ $(top_srcdir)/m4/absolute-header.m4 $(top_srcdir)/m4/alloca.m4 \ $(top_srcdir)/m4/arpa_inet_h.m4 $(top_srcdir)/m4/btowc.m4 \ - $(top_srcdir)/m4/c-stack.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/dirname.m4 \ + $(top_srcdir)/m4/builtin-expect.m4 $(top_srcdir)/m4/c-stack.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/dirname.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 \ @@ -125,7 +126,8 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \ $(top_srcdir)/m4/freopen.m4 $(top_srcdir)/m4/fstat.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/gettext.m4 \ + $(top_srcdir)/m4/getpagesize.m4 \ + $(top_srcdir)/m4/getprogname.m4 $(top_srcdir)/m4/gettext.m4 \ $(top_srcdir)/m4/gettime.m4 $(top_srcdir)/m4/gettimeofday.m4 \ $(top_srcdir)/m4/glibc21.m4 $(top_srcdir)/m4/gnu-make.m4 \ $(top_srcdir)/m4/gnulib-common.m4 \ @@ -142,17 +144,19 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \ $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \ $(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libsigsegv.m4 \ $(top_srcdir)/m4/libunistring-base.m4 \ - $(top_srcdir)/m4/localcharset.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/longlong.m4 \ - $(top_srcdir)/m4/lstat.m4 $(top_srcdir)/m4/malloc.m4 \ - $(top_srcdir)/m4/malloca.m4 $(top_srcdir)/m4/manywarnings.m4 \ - $(top_srcdir)/m4/mbchar.m4 $(top_srcdir)/m4/mbiter.m4 \ - $(top_srcdir)/m4/mbrtowc.m4 $(top_srcdir)/m4/mbsinit.m4 \ - $(top_srcdir)/m4/mbslen.m4 $(top_srcdir)/m4/mbsrtowcs.m4 \ - $(top_srcdir)/m4/mbstate_t.m4 $(top_srcdir)/m4/mbtowc.m4 \ - $(top_srcdir)/m4/memchr.m4 $(top_srcdir)/m4/mkstemp.m4 \ + $(top_srcdir)/m4/limits-h.m4 $(top_srcdir)/m4/localcharset.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/localtime-buffer.m4 \ + $(top_srcdir)/m4/longlong.m4 $(top_srcdir)/m4/lstat.m4 \ + $(top_srcdir)/m4/malloc.m4 $(top_srcdir)/m4/malloca.m4 \ + $(top_srcdir)/m4/manywarnings.m4 $(top_srcdir)/m4/mbchar.m4 \ + $(top_srcdir)/m4/mbiter.m4 $(top_srcdir)/m4/mbrtowc.m4 \ + $(top_srcdir)/m4/mbsinit.m4 $(top_srcdir)/m4/mbslen.m4 \ + $(top_srcdir)/m4/mbsrtowcs.m4 $(top_srcdir)/m4/mbstate_t.m4 \ + $(top_srcdir)/m4/mbtowc.m4 $(top_srcdir)/m4/memchr.m4 \ + $(top_srcdir)/m4/minmax.m4 $(top_srcdir)/m4/mkstemp.m4 \ $(top_srcdir)/m4/mktime.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 \ @@ -194,9 +198,10 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \ $(top_srcdir)/m4/time_h.m4 $(top_srcdir)/m4/time_r.m4 \ $(top_srcdir)/m4/time_rz.m4 $(top_srcdir)/m4/timegm.m4 \ $(top_srcdir)/m4/timespec.m4 $(top_srcdir)/m4/tm_gmtoff.m4 \ - $(top_srcdir)/m4/unistd_h.m4 $(top_srcdir)/m4/unlocked-io.m4 \ - $(top_srcdir)/m4/vararrays.m4 $(top_srcdir)/m4/vasnprintf.m4 \ - $(top_srcdir)/m4/vasprintf.m4 $(top_srcdir)/m4/version-etc.m4 \ + $(top_srcdir)/m4/tzset.m4 $(top_srcdir)/m4/unistd_h.m4 \ + $(top_srcdir)/m4/unlocked-io.m4 $(top_srcdir)/m4/vararrays.m4 \ + $(top_srcdir)/m4/vasnprintf.m4 $(top_srcdir)/m4/vasprintf.m4 \ + $(top_srcdir)/m4/version-etc.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 \ @@ -271,7 +276,7 @@ ETAGS = etags CTAGS = ctags CSCOPE = cscope DIST_SUBDIRS = $(SUBDIRS) -am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/build-aux/ar-lib \ +am__DIST_COMMON = $(srcdir)/Makefile.in \ $(top_srcdir)/build-aux/compile \ $(top_srcdir)/build-aux/config.guess \ $(top_srcdir)/build-aux/config.rpath \ @@ -366,6 +371,7 @@ ERRNO_H = @ERRNO_H@ EXEEXT = @EXEEXT@ FLOAT_H = @FLOAT_H@ FNMATCH_H = @FNMATCH_H@ +GETOPT_CDEFS_H = @GETOPT_CDEFS_H@ GETOPT_H = @GETOPT_H@ GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@ GLIBC21 = @GLIBC21@ @@ -382,6 +388,7 @@ GNULIB_CHDIR = @GNULIB_CHDIR@ GNULIB_CHOWN = @GNULIB_CHOWN@ GNULIB_CLOSE = @GNULIB_CLOSE@ GNULIB_CONNECT = @GNULIB_CONNECT@ +GNULIB_CTIME = @GNULIB_CTIME@ GNULIB_DPRINTF = @GNULIB_DPRINTF@ GNULIB_DUP = @GNULIB_DUP@ GNULIB_DUP2 = @GNULIB_DUP2@ @@ -460,6 +467,7 @@ GNULIB_LINK = @GNULIB_LINK@ GNULIB_LINKAT = @GNULIB_LINKAT@ GNULIB_LISTEN = @GNULIB_LISTEN@ GNULIB_LOCALECONV = @GNULIB_LOCALECONV@ +GNULIB_LOCALTIME = @GNULIB_LOCALTIME@ GNULIB_LSEEK = @GNULIB_LSEEK@ GNULIB_LSTAT = @GNULIB_LSTAT@ GNULIB_MALLOC_POSIX = @GNULIB_MALLOC_POSIX@ @@ -505,6 +513,8 @@ GNULIB_OBSTACK_PRINTF = @GNULIB_OBSTACK_PRINTF@ GNULIB_OBSTACK_PRINTF_POSIX = @GNULIB_OBSTACK_PRINTF_POSIX@ GNULIB_OPEN = @GNULIB_OPEN@ GNULIB_OPENAT = @GNULIB_OPENAT@ +GNULIB_OVERRIDES_STRUCT_STAT = @GNULIB_OVERRIDES_STRUCT_STAT@ +GNULIB_OVERRIDES_WINT_T = @GNULIB_OVERRIDES_WINT_T@ GNULIB_PCLOSE = @GNULIB_PCLOSE@ GNULIB_PERROR = @GNULIB_PERROR@ GNULIB_PIPE = @GNULIB_PIPE@ @@ -567,6 +577,7 @@ GNULIB_STRCHRNUL = @GNULIB_STRCHRNUL@ GNULIB_STRDUP = @GNULIB_STRDUP@ GNULIB_STRERROR = @GNULIB_STRERROR@ GNULIB_STRERROR_R = @GNULIB_STRERROR_R@ +GNULIB_STRFTIME = @GNULIB_STRFTIME@ GNULIB_STRNCAT = @GNULIB_STRNCAT@ GNULIB_STRNDUP = @GNULIB_STRNDUP@ GNULIB_STRNLEN = @GNULIB_STRNLEN@ @@ -590,7 +601,9 @@ GNULIB_TIME_R = @GNULIB_TIME_R@ GNULIB_TIME_RZ = @GNULIB_TIME_RZ@ GNULIB_TMPFILE = @GNULIB_TMPFILE@ GNULIB_TOWCTRANS = @GNULIB_TOWCTRANS@ +GNULIB_TRUNCATE = @GNULIB_TRUNCATE@ GNULIB_TTYNAME_R = @GNULIB_TTYNAME_R@ +GNULIB_TZSET = @GNULIB_TZSET@ GNULIB_UNISTD_H_NONBLOCKING = @GNULIB_UNISTD_H_NONBLOCKING@ GNULIB_UNISTD_H_SIGPIPE = @GNULIB_UNISTD_H_SIGPIPE@ GNULIB_UNLINK = @GNULIB_UNLINK@ @@ -622,6 +635,7 @@ GNULIB_WCSCOLL = @GNULIB_WCSCOLL@ GNULIB_WCSCPY = @GNULIB_WCSCPY@ GNULIB_WCSCSPN = @GNULIB_WCSCSPN@ GNULIB_WCSDUP = @GNULIB_WCSDUP@ +GNULIB_WCSFTIME = @GNULIB_WCSFTIME@ GNULIB_WCSLEN = @GNULIB_WCSLEN@ GNULIB_WCSNCASECMP = @GNULIB_WCSNCASECMP@ GNULIB_WCSNCAT = @GNULIB_WCSNCAT@ @@ -654,8 +668,10 @@ HAVE_ACCEPT4 = @HAVE_ACCEPT4@ HAVE_ARPA_INET_H = @HAVE_ARPA_INET_H@ HAVE_ATOLL = @HAVE_ATOLL@ HAVE_BTOWC = @HAVE_BTOWC@ +HAVE_C99_STDINT_H = @HAVE_C99_STDINT_H@ HAVE_CANONICALIZE_FILE_NAME = @HAVE_CANONICALIZE_FILE_NAME@ HAVE_CHOWN = @HAVE_CHOWN@ +HAVE_CRTDEFS_H = @HAVE_CRTDEFS_H@ HAVE_DECL_ENVIRON = @HAVE_DECL_ENVIRON@ HAVE_DECL_FCHDIR = @HAVE_DECL_FCHDIR@ HAVE_DECL_FDATASYNC = @HAVE_DECL_FDATASYNC@ @@ -666,6 +682,7 @@ HAVE_DECL_GETDELIM = @HAVE_DECL_GETDELIM@ HAVE_DECL_GETDOMAINNAME = @HAVE_DECL_GETDOMAINNAME@ HAVE_DECL_GETLINE = @HAVE_DECL_GETLINE@ HAVE_DECL_GETLOADAVG = @HAVE_DECL_GETLOADAVG@ +HAVE_DECL_GETLOGIN = @HAVE_DECL_GETLOGIN@ HAVE_DECL_GETLOGIN_R = @HAVE_DECL_GETLOGIN_R@ HAVE_DECL_GETPAGESIZE = @HAVE_DECL_GETPAGESIZE@ HAVE_DECL_GETUSERSHELL = @HAVE_DECL_GETUSERSHELL@ @@ -778,6 +795,7 @@ HAVE_PTHREAD_SIGMASK = @HAVE_PTHREAD_SIGMASK@ HAVE_PTSNAME = @HAVE_PTSNAME@ HAVE_PTSNAME_R = @HAVE_PTSNAME_R@ HAVE_PWRITE = @HAVE_PWRITE@ +HAVE_QSORT_R = @HAVE_QSORT_R@ HAVE_RAISE = @HAVE_RAISE@ HAVE_RANDOM = @HAVE_RANDOM@ HAVE_RANDOM_H = @HAVE_RANDOM_H@ @@ -822,6 +840,7 @@ HAVE_STRVERSCMP = @HAVE_STRVERSCMP@ HAVE_SYMLINK = @HAVE_SYMLINK@ HAVE_SYMLINKAT = @HAVE_SYMLINKAT@ HAVE_SYS_BITYPES_H = @HAVE_SYS_BITYPES_H@ +HAVE_SYS_CDEFS_H = @HAVE_SYS_CDEFS_H@ HAVE_SYS_INTTYPES_H = @HAVE_SYS_INTTYPES_H@ HAVE_SYS_IOCTL_H = @HAVE_SYS_IOCTL_H@ HAVE_SYS_LOADAVG_H = @HAVE_SYS_LOADAVG_H@ @@ -833,7 +852,9 @@ HAVE_SYS_TYPES_H = @HAVE_SYS_TYPES_H@ HAVE_SYS_UIO_H = @HAVE_SYS_UIO_H@ HAVE_TIMEGM = @HAVE_TIMEGM@ HAVE_TIMEZONE_T = @HAVE_TIMEZONE_T@ +HAVE_TRUNCATE = @HAVE_TRUNCATE@ HAVE_TYPE_VOLATILE_SIG_ATOMIC_T = @HAVE_TYPE_VOLATILE_SIG_ATOMIC_T@ +HAVE_TZSET = @HAVE_TZSET@ HAVE_UNISTD_H = @HAVE_UNISTD_H@ HAVE_UNLINKAT = @HAVE_UNLINKAT@ HAVE_UNLOCKPT = @HAVE_UNLOCKPT@ @@ -855,6 +876,7 @@ HAVE_WCSCOLL = @HAVE_WCSCOLL@ HAVE_WCSCPY = @HAVE_WCSCPY@ HAVE_WCSCSPN = @HAVE_WCSCSPN@ HAVE_WCSDUP = @HAVE_WCSDUP@ +HAVE_WCSFTIME = @HAVE_WCSFTIME@ HAVE_WCSLEN = @HAVE_WCSLEN@ HAVE_WCSNCASECMP = @HAVE_WCSNCASECMP@ HAVE_WCSNCAT = @HAVE_WCSNCAT@ @@ -917,6 +939,7 @@ LIBUNISTRING_UNIWIDTH_H = @LIBUNISTRING_UNIWIDTH_H@ LIB_CLOCK_GETTIME = @LIB_CLOCK_GETTIME@ LIB_NANOSLEEP = @LIB_NANOSLEEP@ LIB_SELECT = @LIB_SELECT@ +LIMITS_H = @LIMITS_H@ LOCALCHARSET_TESTS_ENVIRONMENT = @LOCALCHARSET_TESTS_ENVIRONMENT@ LOCALE_FR = @LOCALE_FR@ LOCALE_FR_UTF8 = @LOCALE_FR_UTF8@ @@ -944,6 +967,7 @@ NEXT_AS_FIRST_DIRECTIVE_GETOPT_H = @NEXT_AS_FIRST_DIRECTIVE_GETOPT_H@ NEXT_AS_FIRST_DIRECTIVE_ICONV_H = @NEXT_AS_FIRST_DIRECTIVE_ICONV_H@ NEXT_AS_FIRST_DIRECTIVE_INTTYPES_H = @NEXT_AS_FIRST_DIRECTIVE_INTTYPES_H@ NEXT_AS_FIRST_DIRECTIVE_LANGINFO_H = @NEXT_AS_FIRST_DIRECTIVE_LANGINFO_H@ +NEXT_AS_FIRST_DIRECTIVE_LIMITS_H = @NEXT_AS_FIRST_DIRECTIVE_LIMITS_H@ NEXT_AS_FIRST_DIRECTIVE_LOCALE_H = @NEXT_AS_FIRST_DIRECTIVE_LOCALE_H@ NEXT_AS_FIRST_DIRECTIVE_NETINET_IN_H = @NEXT_AS_FIRST_DIRECTIVE_NETINET_IN_H@ NEXT_AS_FIRST_DIRECTIVE_SIGNAL_H = @NEXT_AS_FIRST_DIRECTIVE_SIGNAL_H@ @@ -974,6 +998,7 @@ NEXT_GETOPT_H = @NEXT_GETOPT_H@ NEXT_ICONV_H = @NEXT_ICONV_H@ NEXT_INTTYPES_H = @NEXT_INTTYPES_H@ NEXT_LANGINFO_H = @NEXT_LANGINFO_H@ +NEXT_LIMITS_H = @NEXT_LIMITS_H@ NEXT_LOCALE_H = @NEXT_LOCALE_H@ NEXT_NETINET_IN_H = @NEXT_NETINET_IN_H@ NEXT_SIGNAL_H = @NEXT_SIGNAL_H@ @@ -1019,6 +1044,7 @@ REPLACE_CALLOC = @REPLACE_CALLOC@ REPLACE_CANONICALIZE_FILE_NAME = @REPLACE_CANONICALIZE_FILE_NAME@ REPLACE_CHOWN = @REPLACE_CHOWN@ REPLACE_CLOSE = @REPLACE_CLOSE@ +REPLACE_CTIME = @REPLACE_CTIME@ REPLACE_DPRINTF = @REPLACE_DPRINTF@ REPLACE_DUP = @REPLACE_DUP@ REPLACE_DUP2 = @REPLACE_DUP2@ @@ -1126,6 +1152,7 @@ REPLACE_STRCHRNUL = @REPLACE_STRCHRNUL@ REPLACE_STRDUP = @REPLACE_STRDUP@ REPLACE_STRERROR = @REPLACE_STRERROR@ REPLACE_STRERROR_R = @REPLACE_STRERROR_R@ +REPLACE_STRFTIME = @REPLACE_STRFTIME@ REPLACE_STRNCAT = @REPLACE_STRNCAT@ REPLACE_STRNDUP = @REPLACE_STRNDUP@ REPLACE_STRNLEN = @REPLACE_STRNLEN@ @@ -1142,7 +1169,9 @@ REPLACE_SYMLINKAT = @REPLACE_SYMLINKAT@ REPLACE_TIMEGM = @REPLACE_TIMEGM@ REPLACE_TMPFILE = @REPLACE_TMPFILE@ REPLACE_TOWLOWER = @REPLACE_TOWLOWER@ +REPLACE_TRUNCATE = @REPLACE_TRUNCATE@ REPLACE_TTYNAME_R = @REPLACE_TTYNAME_R@ +REPLACE_TZSET = @REPLACE_TZSET@ REPLACE_UNLINK = @REPLACE_UNLINK@ REPLACE_UNLINKAT = @REPLACE_UNLINKAT@ REPLACE_UNSETENV = @REPLACE_UNSETENV@ @@ -1155,6 +1184,7 @@ REPLACE_VPRINTF = @REPLACE_VPRINTF@ REPLACE_VSNPRINTF = @REPLACE_VSNPRINTF@ REPLACE_VSPRINTF = @REPLACE_VSPRINTF@ REPLACE_WCRTOMB = @REPLACE_WCRTOMB@ +REPLACE_WCSFTIME = @REPLACE_WCSFTIME@ REPLACE_WCSNRTOMBS = @REPLACE_WCSNRTOMBS@ REPLACE_WCSRTOMBS = @REPLACE_WCSRTOMBS@ REPLACE_WCSWIDTH = @REPLACE_WCSWIDTH@ @@ -1191,6 +1221,8 @@ WCHAR_T_SUFFIX = @WCHAR_T_SUFFIX@ WERROR_CFLAGS = @WERROR_CFLAGS@ WINDOWS_64_BIT_OFF_T = @WINDOWS_64_BIT_OFF_T@ WINDOWS_64_BIT_ST_SIZE = @WINDOWS_64_BIT_ST_SIZE@ +WINDOWS_STAT_INODES = @WINDOWS_STAT_INODES@ +WINDOWS_STAT_TIMESPEC = @WINDOWS_STAT_TIMESPEC@ WINT_T_SUFFIX = @WINT_T_SUFFIX@ XGETTEXT = @XGETTEXT@ XGETTEXT_015 = @XGETTEXT_015@ @@ -1200,7 +1232,6 @@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ abs_top_srcdir = @abs_top_srcdir@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ am__include = @am__include@ am__quote = @am__quote@ @@ -1,5 +1,32 @@ GNU diffutils NEWS -*- outline -*- +* Noteworthy changes in release 3.6 (2017-05-21) [stable] + +** New features + + When one file is a prefix of the other, cmp now appends the shorter + file's size to the EOF diagnostic. + +** Bug fixes + + Using an invalid regular expression with --ignore-matching-lines=RE (-I) + no longer causes stack overflow. Before, with an invocation like the + following, diff would diagnose the error, but would still proceed to + blow the stack: diff -Ia -I\\ <(echo) <(echo b) + [bug introduced in 2.9] + + diff no longer mishandles line numbers exceeding 2**31 on Mingw-w64. + + the ---presume-output-tty (ostensibly test-only) option would cause + diff --color to read an uninitialized variable + [bug introduced in 3.4] + +** Performance changes + + diff's default algorithm has been tweaked to deal better with larger + files, reversing some of the changes made in diffutils-3.4. + + * Noteworthy changes in release 3.5 (2016-08-20) [stable] ** Bug fixes @@ -166,7 +193,7 @@ User-visible changes in version 2.8.6: cmp now uses the maximal value instead of the last one. * diff now omits the ".000000000" on hosts that do not support - fractional time stamps. + fractional timestamps. Version 2.8.5 was not publicly released. @@ -211,7 +238,7 @@ User-visible changes in version 2.8: * cmp now outputs "byte" rather than "char" outside the POSIX locale. * cmp -l's index column width now adjusts to fit larger (or smaller) files. * cmp -l -s and cmp -s -l are not allowed. Use cmp -s or cmp -l instead. -* diff uses ISO 8601 style time stamps for output times (e.g. "2001-11-23 +* diff uses ISO 8601 style timestamps for output times (e.g. "2001-11-23 16:44:36.875702460 -0800") unless in the C or POSIX locale and the -c style is specified. * diff's -I and -F options use the regexp syntax of grep, not of Emacs. @@ -377,7 +404,7 @@ User-visible changes in version 2.0: -Copyright (C) 1993-1994, 1998, 2001-2002, 2004, 2006, 2009-2013, 2015-2016 Free +Copyright (C) 1993-1994, 1998, 2001-2002, 2004, 2006, 2009-2013, 2015-2017 Free Software Foundation, Inc. This file is part of GNU Diffutils. @@ -51,7 +51,7 @@ Please report bugs to <bug-diffutils@gnu.org>. ----- -Copyright (C) 1992, 1998, 2001-2002, 2004, 2009-2013, 2015-2016 Free Software +Copyright (C) 1992, 1998, 2001-2002, 2004, 2009-2013, 2015-2017 Free Software Foundation, Inc. This file is part of GNU Diffutils. diff --git a/README-release b/README-release deleted file mode 100644 index 713d77d..0000000 --- a/README-release +++ /dev/null @@ -1,100 +0,0 @@ -Here are most of the steps we (maintainers) follow when making a release. - -* Start from a clean, up-to-date git directory on "master": - - make -k maintainer-clean || { ./configure && make maintainer-clean; } - git checkout master - git pull origin master - -* Ensure that the latest stable versions of autoconf, automake, etc. - are in your PATH. See the buildreq list in bootstrap.conf for - the complete list of tools. - -* Ensure that you have no uncommitted diffs. This should produce no - output: - - git diff - -* Ensure that you've pushed all changes that belong in the release: - - git push origin master - -* Check that the NixOS/Hydra autobuilder is reporting all is well: - - http://hydra.nixos.org/jobset/gnu/diffutils-master - -* Run the following command to download any new translations: - - ./bootstrap && ./configure - -* Pre-release testing: ensure that the following command succeeds: - - make check syntax-check distcheck - -* To (i) set the date, version number, and release TYPE on line 3 of - NEWS, (ii) commit that, and (iii) tag the release, run - - # "TYPE" must be stable, beta or alpha - make release-commit RELEASE='X.Y TYPE' - -* Run the following to create release tarballs. Your choice selects the - corresponding upload-to destination in the emitted gnupload command. - The different destinations are specified in cfg.mk. See the definitions - of gnu_ftp_host-{alpha,beta,stable}. - - make release RELEASE='X.Y TYPE' - -* Test the tarball. Copy it to a few odd-ball systems and ensure that - it builds and passes all tests. - -* While that's happening, write the release announcement that you will - soon post. Start with the template, $HOME/announce-diffutils-X.Y - that was just created by that "make" command. - -Once all the builds and tests have passed, - -* Run the gnupload command that was suggested by your "make release" - run above, or run - - make upload RELEASE='X.Y TYPE' - -* Wait a few minutes (maybe up to 30?) and then use the release URLs to - download all tarball/signature pairs and use gpg --verify to ensure - that they're all valid. - -* Push the NEWS-updating changes and the new tag: - - v=$(cat .prev-version) - git push origin master tag v$v - -* Announce it on Savannah first, so you can include the savannah.org - announcement link in the email message. - - Go to the news-submission form: - - https://savannah.gnu.org/news/submit.php?group=diffutils - - If it does not work, then enable "News" for the project via this link: - - https://savannah.gnu.org/project/admin/editgroupfeatures.php?group=diffutils - - Write something like the following: - - Subject: diffutils-X.Y released [stable] - +verbatim+ - ...paste the announcement here... - -verbatim- - - Then go here to approve it: - - https://savannah.gnu.org/news/approve.php?group=diffutils - -* Send the announcement email message. - -* After each non-alpha release, run - - make web-manual-update - - to update the on-line manual accessible at - - http://www.gnu.org/software/diffutils/manual/ @@ -14,8 +14,8 @@ m4_ifndef([AC_CONFIG_MACRO_DIRS], [m4_defun([_AM_CONFIG_MACRO_DIRS], [])m4_defun([AC_CONFIG_MACRO_DIRS], [_AM_CONFIG_MACRO_DIRS($@)])]) m4_ifndef([AC_AUTOCONF_VERSION], [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl -m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.69.147-5ad35],, -[m4_warning([this file was generated for autoconf 2.69.147-5ad35. +m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.69.185-b502e],, +[m4_warning([this file was generated for autoconf 2.69.185-b502e. You have another version of autoconf. It may work, but is not guaranteed to. If you have problems, you may need to regenerate the build system entirely. To do so, use the procedure documented by the package, typically 'autoreconf'.])]) @@ -56,66 +56,6 @@ m4_ifndef([AC_AUTOCONF_VERSION], [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))]) -# Copyright (C) 2011-2015 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. - -# AM_PROG_AR([ACT-IF-FAIL]) -# ------------------------- -# Try to determine the archiver interface, and trigger the ar-lib wrapper -# if it is needed. If the detection of archiver interface fails, run -# ACT-IF-FAIL (default is to abort configure with a proper error message). -AC_DEFUN([AM_PROG_AR], -[AC_BEFORE([$0], [LT_INIT])dnl -AC_BEFORE([$0], [AC_PROG_LIBTOOL])dnl -AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl -AC_REQUIRE_AUX_FILE([ar-lib])dnl -AC_CHECK_TOOLS([AR], [ar lib "link -lib"], [false]) -: ${AR=ar} - -AC_CACHE_CHECK([the archiver ($AR) interface], [am_cv_ar_interface], - [AC_LANG_PUSH([C]) - am_cv_ar_interface=ar - AC_COMPILE_IFELSE([AC_LANG_SOURCE([[int some_variable = 0;]])], - [am_ar_try='$AR cru libconftest.a conftest.$ac_objext >&AS_MESSAGE_LOG_FD' - AC_TRY_EVAL([am_ar_try]) - if test "$ac_status" -eq 0; then - am_cv_ar_interface=ar - else - am_ar_try='$AR -NOLOGO -OUT:conftest.lib conftest.$ac_objext >&AS_MESSAGE_LOG_FD' - AC_TRY_EVAL([am_ar_try]) - if test "$ac_status" -eq 0; then - am_cv_ar_interface=lib - else - am_cv_ar_interface=unknown - fi - fi - rm -f conftest.lib libconftest.a - ]) - AC_LANG_POP([C])]) - -case $am_cv_ar_interface in -ar) - ;; -lib) - # Microsoft lib, so override with the ar-lib wrapper script. - # FIXME: It is wrong to rewrite AR. - # But if we don't then we get into trouble of one sort or another. - # A longer-term fix would be to have automake use am__AR in this case, - # and then we could set am__AR="$am_aux_dir/ar-lib \$(AR)" or something - # similar. - AR="$am_aux_dir/ar-lib $AR" - ;; -unknown) - m4_default([$1], - [AC_MSG_ERROR([could not determine $AR interface])]) - ;; -esac -AC_SUBST([AR])dnl -]) - # AM_AUX_DIR_EXPAND -*- Autoconf -*- # Copyright (C) 2001-2015 Free Software Foundation, Inc. @@ -1172,6 +1112,7 @@ m4_include([m4/absolute-header.m4]) m4_include([m4/alloca.m4]) m4_include([m4/arpa_inet_h.m4]) m4_include([m4/btowc.m4]) +m4_include([m4/builtin-expect.m4]) m4_include([m4/c-stack.m4]) m4_include([m4/clock_time.m4]) m4_include([m4/close.m4]) @@ -1205,6 +1146,7 @@ m4_include([m4/getcwd.m4]) m4_include([m4/getdtablesize.m4]) m4_include([m4/getopt.m4]) m4_include([m4/getpagesize.m4]) +m4_include([m4/getprogname.m4]) m4_include([m4/gettext.m4]) m4_include([m4/gettime.m4]) m4_include([m4/gettimeofday.m4]) @@ -1235,6 +1177,7 @@ m4_include([m4/lib-link.m4]) m4_include([m4/lib-prefix.m4]) m4_include([m4/libsigsegv.m4]) m4_include([m4/libunistring-base.m4]) +m4_include([m4/limits-h.m4]) m4_include([m4/localcharset.m4]) m4_include([m4/locale-fr.m4]) m4_include([m4/locale-ja.m4]) @@ -1242,6 +1185,7 @@ m4_include([m4/locale-tr.m4]) m4_include([m4/locale-zh.m4]) m4_include([m4/locale_h.m4]) m4_include([m4/localeconv.m4]) +m4_include([m4/localtime-buffer.m4]) m4_include([m4/longlong.m4]) m4_include([m4/lstat.m4]) m4_include([m4/malloc.m4]) @@ -1256,6 +1200,7 @@ m4_include([m4/mbsrtowcs.m4]) m4_include([m4/mbstate_t.m4]) m4_include([m4/mbtowc.m4]) m4_include([m4/memchr.m4]) +m4_include([m4/minmax.m4]) m4_include([m4/mkstemp.m4]) m4_include([m4/mktime.m4]) m4_include([m4/mmap-anon.m4]) @@ -1335,6 +1280,7 @@ m4_include([m4/time_rz.m4]) m4_include([m4/timegm.m4]) m4_include([m4/timespec.m4]) m4_include([m4/tm_gmtoff.m4]) +m4_include([m4/tzset.m4]) m4_include([m4/unistd_h.m4]) m4_include([m4/unlocked-io.m4]) m4_include([m4/vararrays.m4]) @@ -1,10 +1,10 @@ #! /bin/sh # Print a version string. -scriptversion=2016-01-24.06; # UTC +scriptversion=2017-01-09.19; # UTC # Bootstrap this package from checked-out sources. -# Copyright (C) 2003-2016 Free Software Foundation, Inc. +# Copyright (C) 2003-2017 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -418,28 +418,30 @@ sort_ver() { # sort -V is not generally available done } -get_version() { - app=$1 +get_version_sed=' +# Move version to start of line. +s/.*[v ]\([0-9]\)/\1/ - $app --version >/dev/null 2>&1 || { $app --version; return 1; } +# Skip lines that do not start with version. +/^[0-9]/!d - $app --version 2>&1 | - sed -n '# Move version to start of line. - s/.*[v ]\([0-9]\)/\1/ +# Remove characters after the version. +s/[^.a-z0-9-].*// - # Skip lines that do not start with version. - /^[0-9]/!d +# The first component must be digits only. +s/^\([0-9]*\)[a-z-].*/\1/ - # Remove characters after the version. - s/[^.a-z0-9-].*// +#the following essentially does s/5.005/5.5/ +s/\.0*\([1-9]\)/.\1/g +p +q' - # The first component must be digits only. - s/^\([0-9]*\)[a-z-].*/\1/ +get_version() { + app=$1 + + $app --version >/dev/null 2>&1 || { $app --version; return 1; } - #the following essentially does s/5.005/5.5/ - s/\.0*\([1-9]\)/.\1/g - p - q' + $app --version 2>&1 | sed -n "$get_version_sed" } check_versions() { @@ -788,7 +790,7 @@ symlink_to_dir() # Leave any existing symlink alone, if it already points to the source, # so that broken build tools that care about symlink times # aren't confused into doing unnecessary builds. Conversely, if the - # existing symlink's time stamp is older than the source, make it afresh, + # existing symlink's timestamp is older than the source, make it afresh, # so that broken tools aren't confused into skipping needed builds. See # <http://lists.gnu.org/archive/html/bug-gnulib/2011-05/msg00326.html>. test -h "$dst" && diff --git a/build-aux/announce-gen b/build-aux/announce-gen index b461174..e789b13 100755 --- a/build-aux/announce-gen +++ b/build-aux/announce-gen @@ -9,7 +9,7 @@ my $VERSION = '2016-01-12 23:09'; # UTC # If you change this file with Emacs, please let the write hook # do its job. Otherwise, update this string manually. -# Copyright (C) 2002-2016 Free Software Foundation, Inc. +# Copyright (C) 2002-2017 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/build-aux/config.guess b/build-aux/config.guess index c4bd827..faa63aa 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-2016 Free Software Foundation, Inc. +# Copyright 1992-2017 Free Software Foundation, Inc. -timestamp='2016-05-15' +timestamp='2017-05-11' # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by @@ -50,7 +50,7 @@ version="\ GNU config.guess ($timestamp) Originally written by Per Bothner. -Copyright 1992-2016 Free Software Foundation, Inc. +Copyright 1992-2017 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." @@ -837,10 +837,11 @@ EOF UNAME_PROCESSOR=`/usr/bin/uname -p` case ${UNAME_PROCESSOR} in amd64) - echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; - *) - echo ${UNAME_PROCESSOR}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; + UNAME_PROCESSOR=x86_64 ;; + i386) + UNAME_PROCESSOR=i586 ;; esac + echo ${UNAME_PROCESSOR}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` exit ;; i*:CYGWIN*:*) echo ${UNAME_MACHINE}-pc-cygwin @@ -1000,6 +1001,9 @@ EOF eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'` test x"${CPU}" != x && { echo "${CPU}-unknown-linux-${LIBC}"; exit; } ;; + mips64el:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + exit ;; openrisc*:Linux:*:*) echo or1k-unknown-linux-${LIBC} exit ;; @@ -1032,6 +1036,9 @@ EOF ppcle:Linux:*:*) echo powerpcle-unknown-linux-${LIBC} exit ;; + riscv32:Linux:*:* | riscv64:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + exit ;; s390:Linux:*:* | s390x:Linux:*:*) echo ${UNAME_MACHINE}-ibm-linux-${LIBC} exit ;; @@ -1328,15 +1335,18 @@ EOF *:QNX:*:4*) echo i386-pc-qnx exit ;; - NEO-?:NONSTOP_KERNEL:*:*) + NEO-*:NONSTOP_KERNEL:*:*) echo neo-tandem-nsk${UNAME_RELEASE} exit ;; NSE-*:NONSTOP_KERNEL:*:*) echo nse-tandem-nsk${UNAME_RELEASE} exit ;; - NSR-?:NONSTOP_KERNEL:*:*) + NSR-*:NONSTOP_KERNEL:*:*) echo nsr-tandem-nsk${UNAME_RELEASE} exit ;; + NSX-*:NONSTOP_KERNEL:*:*) + echo nsx-tandem-nsk${UNAME_RELEASE} + exit ;; *:NonStop-UX:*:*) echo mips-compaq-nonstopux exit ;; diff --git a/build-aux/config.rpath b/build-aux/config.rpath index 98183ff..af3c415 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-2016 Free Software Foundation, Inc. +# Copyright 1996-2017 Free Software Foundation, Inc. # Taken from GNU libtool, 2001 # Originally by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996 # diff --git a/build-aux/config.sub b/build-aux/config.sub index 9feb73b..40ea5df 100755 --- a/build-aux/config.sub +++ b/build-aux/config.sub @@ -1,8 +1,8 @@ #! /bin/sh # Configuration validation subroutine script. -# Copyright 1992-2016 Free Software Foundation, Inc. +# Copyright 1992-2017 Free Software Foundation, Inc. -timestamp='2016-06-20' +timestamp='2017-04-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 @@ -67,7 +67,7 @@ Report bugs and patches to <config-patches@gnu.org>." version="\ GNU config.sub ($timestamp) -Copyright 1992-2016 Free Software Foundation, Inc. +Copyright 1992-2017 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." @@ -117,7 +117,7 @@ case $maybe_os in nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \ linux-musl* | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \ knetbsd*-gnu* | netbsd*-gnu* | netbsd*-eabi* | \ - kopensolaris*-gnu* | \ + kopensolaris*-gnu* | cloudabi*-eabi* | \ storm-chaos* | os2-emx* | rtmk-nova*) os=-$maybe_os basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'` @@ -263,7 +263,7 @@ case $basic_machine in | fido | fr30 | frv | ft32 \ | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \ | hexagon \ - | i370 | i860 | i960 | ia64 \ + | i370 | i860 | i960 | ia16 | ia64 \ | ip2k | iq2000 \ | k1om \ | le32 | le64 \ @@ -301,6 +301,7 @@ case $basic_machine in | open8 | or1k | or1knd | or32 \ | pdp10 | pdp11 | pj | pjl \ | powerpc | powerpc64 | powerpc64le | powerpcle \ + | pru \ | pyramid \ | riscv32 | riscv64 \ | rl78 | rx \ @@ -314,6 +315,7 @@ case $basic_machine in | ubicom32 \ | v850 | v850e | v850e1 | v850e2 | v850es | v850e2v3 \ | visium \ + | wasm32 \ | we32k \ | x86 | xc16x | xstormy16 | xtensa \ | z8k | z80) @@ -387,7 +389,7 @@ case $basic_machine in | h8300-* | h8500-* \ | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \ | hexagon-* \ - | i*86-* | i860-* | i960-* | ia64-* \ + | i*86-* | i860-* | i960-* | ia16-* | ia64-* \ | ip2k-* | iq2000-* \ | k1om-* \ | le32-* | le64-* \ @@ -428,6 +430,7 @@ case $basic_machine in | orion-* \ | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \ | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \ + | pru-* \ | pyramid-* \ | riscv32-* | riscv64-* \ | rl78-* | romp-* | rs6000-* | rx-* \ @@ -444,6 +447,7 @@ case $basic_machine in | v850-* | v850e-* | v850e1-* | v850es-* | v850e2-* | v850e2v3-* \ | vax-* \ | visium-* \ + | wasm32-* \ | we32k-* \ | x86-* | x86_64-* | xc16x-* | xps100-* \ | xstormy16-* | xtensa*-* \ @@ -946,6 +950,9 @@ case $basic_machine in nsr-tandem) basic_machine=nsr-tandem ;; + nsx-tandem) + basic_machine=nsx-tandem + ;; op50n-* | op60c-*) basic_machine=hppa1.1-oki os=-proelf @@ -1030,7 +1037,7 @@ case $basic_machine in ppc-* | ppcbe-*) basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'` ;; - ppcle | powerpclittle | ppc-le | powerpc-little) + ppcle | powerpclittle) basic_machine=powerpcle-unknown ;; ppcle-* | powerpclittle-*) @@ -1040,7 +1047,7 @@ case $basic_machine in ;; ppc64-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'` ;; - ppc64le | powerpc64little | ppc64-le | powerpc64-little) + ppc64le | powerpc64little) basic_machine=powerpc64le-unknown ;; ppc64le-* | powerpc64little-*) @@ -1241,6 +1248,9 @@ case $basic_machine in basic_machine=a29k-wrs os=-vxworks ;; + wasm32) + basic_machine=wasm32-unknown + ;; w65*) basic_machine=w65-wdc os=-none @@ -1395,7 +1405,7 @@ case $os in | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \ | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \ | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \ - | -chorusos* | -chorusrdb* | -cegcc* \ + | -chorusos* | -chorusrdb* | -cegcc* | -glidix* \ | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ | -midipix* | -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \ | -linux-newlib* | -linux-musl* | -linux-uclibc* \ @@ -1407,7 +1417,7 @@ case $os in | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \ | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \ | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es* \ - | -onefs* | -tirtos* | -phoenix*) + | -onefs* | -tirtos* | -phoenix* | -fuchsia* | -redox*) # Remember, each alternative MUST END IN *, to match a version number. ;; -qnx*) @@ -1636,6 +1646,9 @@ case $basic_machine in sparc-* | *-sun) os=-sunos4.1.1 ;; + pru-*) + os=-elf + ;; *-be) os=-beos ;; diff --git a/build-aux/depcomp b/build-aux/depcomp index 28ce42a..b687232 100755 --- a/build-aux/depcomp +++ b/build-aux/depcomp @@ -3,7 +3,7 @@ scriptversion=2016-01-11.22; # UTC -# Copyright (C) 1999-2015 Free Software Foundation, Inc. +# Copyright (C) 1999-2017 Free Software Foundation, Inc. # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/build-aux/do-release-commit-and-tag b/build-aux/do-release-commit-and-tag index b4f3251..b72b15c 100755 --- a/build-aux/do-release-commit-and-tag +++ b/build-aux/do-release-commit-and-tag @@ -3,11 +3,11 @@ # controlled .prev-version file, automate the procedure by which we record # the date, release-type and version string in the NEWS file. That commit # will serve to identify the release, so apply a signed tag to it as well. -VERSION=2016-01-12.23 # UTC +VERSION=2016-12-31.14 # UTC # Note: this is a bash script (could be zsh or dash) -# Copyright (C) 2009-2016 Free Software Foundation, Inc. +# Copyright (C) 2009-2017 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -143,7 +143,7 @@ esac # Ensure the current branch name is correct: curr_br=$(git rev-parse --symbolic-full-name HEAD) -test "$curr_br" = refs/heads/$branch || die not on branch $branch +test "$curr_br" = "refs/heads/$branch" || die not on branch $branch # Extract package name from Makefile. Makefile=$builddir/Makefile diff --git a/build-aux/gendocs.sh b/build-aux/gendocs.sh index fef6280..3b71b36 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=2016-05-20.09 +scriptversion=2016-12-31.18 -# Copyright 2003-2016 Free Software Foundation, Inc. +# Copyright 2003-2017 Free Software Foundation, Inc. # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -72,7 +72,7 @@ texarg="-t @finalout" version="gendocs.sh $scriptversion -Copyright 2016 Free Software Foundation, Inc. +Copyright 2017 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 bd2c4b6..079849d 100755 --- a/build-aux/git-version-gen +++ b/build-aux/git-version-gen @@ -1,8 +1,8 @@ #!/bin/sh # Print a version string. -scriptversion=2016-05-08.18; # UTC +scriptversion=2017-01-09.19; # UTC -# Copyright (C) 2007-2016 Free Software Foundation, Inc. +# Copyright (C) 2007-2017 Free Software Foundation, Inc. # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -200,7 +200,7 @@ v=`echo "$v" |sed "s/^$prefix//"` # string we're using came from git. I.e., skip the test if it's "UNKNOWN" # or if it came from .tarball-version. if test "x$v_from_git" != x; then - # Don't declare a version "dirty" merely because a time stamp has changed. + # Don't declare a version "dirty" merely because a timestamp has changed. git update-index --refresh > /dev/null 2>&1 dirty=`exec 2>/dev/null;git diff-index --name-only HEAD` || dirty= diff --git a/build-aux/gitlog-to-changelog b/build-aux/gitlog-to-changelog index 83bafdf..cf16425 100755 --- a/build-aux/gitlog-to-changelog +++ b/build-aux/gitlog-to-changelog @@ -9,7 +9,7 @@ my $VERSION = '2016-03-22 21:49'; # UTC # If you change this file with Emacs, please let the write hook # do its job. Otherwise, update this string manually. -# Copyright (C) 2008-2016 Free Software Foundation, Inc. +# Copyright (C) 2008-2017 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/build-aux/gnu-web-doc-update b/build-aux/gnu-web-doc-update index 271e693..a8ed609 100755 --- a/build-aux/gnu-web-doc-update +++ b/build-aux/gnu-web-doc-update @@ -4,7 +4,7 @@ VERSION=2016-01-12.23; # UTC -# Copyright (C) 2009-2016 Free Software Foundation, Inc. +# Copyright (C) 2009-2017 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/build-aux/gnupload b/build-aux/gnupload index 8d0299d..d4d95ee 100755 --- a/build-aux/gnupload +++ b/build-aux/gnupload @@ -3,7 +3,7 @@ scriptversion=2016-01-11.22; # UTC -# Copyright (C) 2004-2016 Free Software Foundation, Inc. +# Copyright (C) 2004-2017 Free Software Foundation, Inc. # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/build-aux/mdate-sh b/build-aux/mdate-sh index 6022eff..f80075c 100755 --- a/build-aux/mdate-sh +++ b/build-aux/mdate-sh @@ -3,7 +3,7 @@ scriptversion=2016-01-11.22; # UTC -# Copyright (C) 1995-2015 Free Software Foundation, Inc. +# Copyright (C) 1995-2017 Free Software Foundation, Inc. # written by Ulrich Drepper <drepper@gnu.ai.mit.edu>, June 1995 # # This program is free software; you can redistribute it and/or modify diff --git a/build-aux/texinfo.tex b/build-aux/texinfo.tex index 65425d1..8204f3e 100644 --- a/build-aux/texinfo.tex +++ b/build-aux/texinfo.tex @@ -3,11 +3,11 @@ % Load plain if necessary, i.e., if running under initex. \expandafter\ifx\csname fmtname\endcsname\relax\input plain\fi % -\def\texinfoversion{2016-08-09.22} +\def\texinfoversion{2017-05-14.14} % % Copyright 1985, 1986, 1988, 1990, 1991, 1992, 1993, 1994, 1995, % 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, -% 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016 +% 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017 % Free Software Foundation, Inc. % % This texinfo.tex file is free software: you can redistribute it and/or @@ -165,6 +165,9 @@ % Give the space character the catcode for a space. \def\spaceisspace{\catcode`\ =10\relax} +% Likewise for ^^M, the end of line character. +\def\endlineisspace{\catcode13=10\relax} + \chardef\dashChar = `\- \chardef\slashChar = `\/ \chardef\underChar = `\_ @@ -862,36 +865,6 @@ where each line of input produces a line of output.} \temp } -% @| inserts a changebar to the left of the current line. It should -% surround any changed text. This approach does *not* work if the -% change spans more than two lines of output. To handle that, we would -% have adopt a much more difficult approach (putting marks into the main -% vertical list for the beginning and end of each change). This command -% is not documented, not supported, and doesn't work. -% -\def\|{% - % \vadjust can only be used in horizontal mode. - \leavevmode - % - % Append this vertical mode material after the current line in the output. - \vadjust{% - % We want to insert a rule with the height and depth of the current - % leading; that is exactly what \strutbox is supposed to record. - \vskip-\baselineskip - % - % \vadjust-items are inserted at the left edge of the type. So - % the \llap here moves out into the left-hand margin. - \llap{% - % - % For a thicker or thinner bar, change the `1pt'. - \vrule height\baselineskip width1pt - % - % This is the space between the bar and the text. - \hskip 12pt - }% - }% -} - % @include FILE -- \input text of FILE. % \def\include{\parseargusing\filenamecatcodes\includezzz} @@ -980,21 +953,14 @@ where each line of input produces a line of output.} % @comment ...line which is ignored... % @c is the same as @comment % @ignore ... @end ignore is another way to write a comment -% -\def\comment{\begingroup \catcode`\^^M=\active% -\catcode`\@=\other \catcode`\{=\other \catcode`\}=\other\commentxxx}% -{\catcode`\^^M=\active% -\gdef\commentxxx#1^^M{\endgroup% -\futurelet\nexttoken\commentxxxx}% -\gdef\commentxxxx{\ifx\nexttoken\aftermacro\expandafter\comment\fi}% -} \def\c{\begingroup \catcode`\^^M=\active% \catcode`\@=\other \catcode`\{=\other \catcode`\}=\other% \cxxx} {\catcode`\^^M=\active \gdef\cxxx#1^^M{\endgroup}} -% See comment in \scanmacro about why the definitions of @c and @comment differ +% +\let\comment\c % @paragraphindent NCHARS % We'll use ems for NCHARS, close enough. @@ -1885,40 +1851,9 @@ output) for that.)} } \fi -\message{fonts,} - -% Change the current font style to #1, remembering it in \curfontstyle. -% For now, we do not accumulate font styles: @b{@i{foo}} prints foo in -% italics, not bold italics. -% -\def\setfontstyle#1{% - \def\curfontstyle{#1}% not as a control sequence, because we are \edef'd. - \csname ten#1\endcsname % change the current font -} -% Select #1 fonts with the current style. % -\def\selectfonts#1{\csname #1fonts\endcsname \csname\curfontstyle\endcsname} - -\def\rm{\fam=0 \setfontstyle{rm}} -\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}} - -% Unfortunately, we have to override this for titles and the like, since -% in those cases "rm" is bold. Sigh. -\def\rmisbold{\rm\def\curfontstyle{bf}} - -% Texinfo sort of supports the sans serif font style, which plain TeX does not. -% So we set up a \sf. -\newfam\sffam -\def\sf{\fam=\sffam \setfontstyle{sf}} -\let\li = \sf % Sometimes we call it \li, not \sf. - -% We don't need math for this font style. -\def\ttsl{\setfontstyle{ttsl}} - +\message{fonts,} % Set the baselineskip to #1, and the lineskip and strut size % correspondingly. There is no deep meaning behind these magic numbers @@ -2269,8 +2204,8 @@ end \setfont\deftt\ttshape{10}{\magstep1}{OT1TT} \setfont\defsl\slshape{10}{\magstep1}{OT1TT} \setfont\defttsl\ttslshape{10}{\magstep1}{OT1TT} -\def\df{\let\tentt=\deftt \let\tenbf = \defbf -\let\tenttsl=\defttsl \let\tensl=\defsl \bf} +\def\df{\let\ttfont=\deftt \let\bffont = \defbf +\let\ttslfont=\defttsl \let\slfont=\defsl \bf} % Fonts for indices, footnotes, small examples (9pt). \def\smallnominalsize{9pt} @@ -2357,7 +2292,7 @@ end \font\ssecsy=cmsy10 scaled 1315 \def\ssececsize{1200} -% Reduced fonts for @acro in text (10pt). +% Reduced fonts for @acronym in text (10pt). \def\reducednominalsize{10pt} \setfont\reducedrm\rmshape{10}{1000}{OT1} \setfont\reducedtt\ttshape{10}{1000}{OT1TT} @@ -2403,8 +2338,8 @@ end \setfont\deftt\ttshape{10}{\magstephalf}{OT1TT} \setfont\defsl\slshape{10}{\magstephalf}{OT1TT} \setfont\defttsl\ttslshape{10}{\magstephalf}{OT1TT} -\def\df{\let\tentt=\deftt \let\tenbf = \defbf -\let\tensl=\defsl \let\tenttsl=\defttsl \bf} +\def\df{\let\ttfont=\deftt \let\bffont = \defbf +\let\slfont=\defsl \let\ttslfont=\defttsl \bf} % Fonts for indices, footnotes, small examples (9pt). \def\smallnominalsize{9pt} @@ -2490,7 +2425,7 @@ end \font\ssecsy=cmsy10 \def\ssececsize{1000} -% Reduced fonts for @acro in text (9pt). +% Reduced fonts for @acronym in text (9pt). \def\reducednominalsize{9pt} \setfont\reducedrm\rmshape{9}{1000}{OT1} \setfont\reducedtt\ttshape{9}{1000}{OT1TT} @@ -2510,6 +2445,12 @@ end \rm } % end of 10pt text font size definitions, \definetextfontsizex +% Fonts for short table of contents. +\setfont\shortcontrm\rmshape{12}{1000}{OT1} +\setfont\shortcontbf\bfshape{10}{\magstep1}{OT1} % no cmb12 +\setfont\shortcontsl\slshape{12}{1000}{OT1} +\setfont\shortconttt\ttshape{12}{1000}{OT1TT} + % We provide the user-level command % @fonttextsize 10 @@ -2536,20 +2477,47 @@ end \endgroup } +% +% Change the current font style to #1, remembering it in \curfontstyle. +% For now, we do not accumulate font styles: @b{@i{foo}} prints foo in +% italics, not bold italics. +% +\def\setfontstyle#1{% + \def\curfontstyle{#1}% not as a control sequence, because we are \edef'd. + \csname #1font\endcsname % change the current font +} + +\def\rm{\fam=0 \setfontstyle{rm}} +\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}} + +% Texinfo sort of supports the sans serif font style, which plain TeX does not. +% So we set up a \sf. +\newfam\sffam +\def\sf{\fam=\sffam \setfontstyle{sf}} + +% We don't need math for this font style. +\def\ttsl{\setfontstyle{ttsl}} + + % In order for the font changes to affect most math symbols and letters, % we have to define the \textfont of the standard families. We don't % bother to reset \scriptfont and \scriptscriptfont; awaiting user need. % \def\resetmathfonts{% - \textfont0=\tenrm \textfont1=\teni \textfont2=\tensy - \textfont\itfam=\tenit \textfont\slfam=\tensl \textfont\bffam=\tenbf - \textfont\ttfam=\tentt \textfont\sffam=\tensf + \textfont0=\rmfont \textfont1=\ifont \textfont2=\syfont + \textfont\itfam=\itfont \textfont\slfam=\slfont \textfont\bffam=\bffont + \textfont\ttfam=\ttfont \textfont\sffam=\sffont } -% The font-changing commands redefine the meanings of \tenSTYLE, instead -% of just \STYLE. We do this because \STYLE needs to also set the -% current \fam for math mode. Our \STYLE (e.g., \rm) commands hardwire -% \tenSTYLE to set the current font. +% + +% The font-changing commands (all called \...fonts) redefine the meanings +% of \STYLEfont, instead of just \STYLE. We do this because \STYLE needs +% to also set the current \fam for math mode. Our \STYLE (e.g., \rm) +% commands hardwire \STYLEfont to set the current font. % % Each font-changing command also sets the names \lsize (one size lower) % and \lllsize (three sizes lower). These relative commands are used @@ -2557,78 +2525,63 @@ end % % This all needs generalizing, badly. % -\def\textfonts{% - \let\tenrm=\textrm \let\tenit=\textit \let\tensl=\textsl - \let\tenbf=\textbf \let\tentt=\texttt \let\smallcaps=\textsc - \let\tensf=\textsf \let\teni=\texti \let\tensy=\textsy - \let\tenttsl=\textttsl - \def\curfontsize{text}% - \def\lsize{reduced}\def\lllsize{smaller}% - \resetmathfonts \setleading{\textleading}} -\def\titlefonts{% - \let\tenrm=\titlerm \let\tenit=\titleit \let\tensl=\titlesl - \let\tenbf=\titlebf \let\tentt=\titlett \let\smallcaps=\titlesc - \let\tensf=\titlesf \let\teni=\titlei \let\tensy=\titlesy - \let\tenttsl=\titlettsl - \def\curfontsize{title}% - \def\lsize{chap}\def\lllsize{subsec}% - \resetmathfonts \setleading{27pt}} -\def\titlefont#1{{\titlefonts\rmisbold #1}} -\def\chapfonts{% - \let\tenrm=\chaprm \let\tenit=\chapit \let\tensl=\chapsl - \let\tenbf=\chapbf \let\tentt=\chaptt \let\smallcaps=\chapsc - \let\tensf=\chapsf \let\teni=\chapi \let\tensy=\chapsy - \let\tenttsl=\chapttsl - \def\curfontsize{chap}% - \def\lsize{sec}\def\lllsize{text}% - \resetmathfonts \setleading{19pt}} -\def\secfonts{% - \let\tenrm=\secrm \let\tenit=\secit \let\tensl=\secsl - \let\tenbf=\secbf \let\tentt=\sectt \let\smallcaps=\secsc - \let\tensf=\secsf \let\teni=\seci \let\tensy=\secsy - \let\tenttsl=\secttsl - \def\curfontsize{sec}% - \def\lsize{subsec}\def\lllsize{reduced}% - \resetmathfonts \setleading{17pt}} -\def\subsecfonts{% - \let\tenrm=\ssecrm \let\tenit=\ssecit \let\tensl=\ssecsl - \let\tenbf=\ssecbf \let\tentt=\ssectt \let\smallcaps=\ssecsc - \let\tensf=\ssecsf \let\teni=\sseci \let\tensy=\ssecsy - \let\tenttsl=\ssecttsl - \def\curfontsize{ssec}% - \def\lsize{text}\def\lllsize{small}% - \resetmathfonts \setleading{15pt}} -\let\subsubsecfonts = \subsecfonts -\def\reducedfonts{% - \let\tenrm=\reducedrm \let\tenit=\reducedit \let\tensl=\reducedsl - \let\tenbf=\reducedbf \let\tentt=\reducedtt \let\reducedcaps=\reducedsc - \let\tensf=\reducedsf \let\teni=\reducedi \let\tensy=\reducedsy - \let\tenttsl=\reducedttsl - \def\curfontsize{reduced}% - \def\lsize{small}\def\lllsize{smaller}% - \resetmathfonts \setleading{10.5pt}} -\def\smallfonts{% - \let\tenrm=\smallrm \let\tenit=\smallit \let\tensl=\smallsl - \let\tenbf=\smallbf \let\tentt=\smalltt \let\smallcaps=\smallsc - \let\tensf=\smallsf \let\teni=\smalli \let\tensy=\smallsy - \let\tenttsl=\smallttsl - \def\curfontsize{small}% - \def\lsize{smaller}\def\lllsize{smaller}% - \resetmathfonts \setleading{10.5pt}} -\def\smallerfonts{% - \let\tenrm=\smallerrm \let\tenit=\smallerit \let\tensl=\smallersl - \let\tenbf=\smallerbf \let\tentt=\smallertt \let\smallcaps=\smallersc - \let\tensf=\smallersf \let\teni=\smalleri \let\tensy=\smallersy - \let\tenttsl=\smallerttsl - \def\curfontsize{smaller}% - \def\lsize{smaller}\def\lllsize{smaller}% - \resetmathfonts \setleading{9.5pt}} -% Fonts for short table of contents. -\setfont\shortcontrm\rmshape{12}{1000}{OT1} -\setfont\shortcontbf\bfshape{10}{\magstep1}{OT1} % no cmb12 -\setfont\shortcontsl\slshape{12}{1000}{OT1} -\setfont\shortconttt\ttshape{12}{1000}{OT1TT} +\def\assignfonts#1{% + \expandafter\let\expandafter\rmfont\csname #1rm\endcsname + \expandafter\let\expandafter\itfont\csname #1it\endcsname + \expandafter\let\expandafter\slfont\csname #1sl\endcsname + \expandafter\let\expandafter\bffont\csname #1bf\endcsname + \expandafter\let\expandafter\ttfont\csname #1tt\endcsname + \expandafter\let\expandafter\smallcaps\csname #1sc\endcsname + \expandafter\let\expandafter\sffont \csname #1sf\endcsname + \expandafter\let\expandafter\ifont \csname #1i\endcsname + \expandafter\let\expandafter\syfont \csname #1sy\endcsname + \expandafter\let\expandafter\ttslfont\csname #1ttsl\endcsname +} + +\newif\ifrmisbold + +% Select smaller font size with the current style. Used to change font size +% in, e.g., the LaTeX logo and acronyms. If we are using bold fonts for +% normal roman text, also use bold fonts for roman text in the smaller size. +\def\switchtolllsize{% + \expandafter\assignfonts\expandafter{\lllsize}% + \ifrmisbold + \let\rmfont\bffont + \fi + \csname\curfontstyle\endcsname +}% + +\def\switchtolsize{% + \expandafter\assignfonts\expandafter{\lsize}% + \ifrmisbold + \let\rmfont\bffont + \fi + \csname\curfontstyle\endcsname +}% + +\def\definefontsetatsize#1#2#3#4#5{% +\expandafter\def\csname #1fonts\endcsname{% + \def\curfontsize{#1}% + \def\lsize{#2}\def\lllsize{#3}% + \csname rmisbold#5\endcsname + \assignfonts{#1}% + \resetmathfonts + \setleading{#4}% +}} + +\definefontsetatsize{text} {reduced}{smaller}{\textleading}{false} +\definefontsetatsize{title} {chap} {subsec} {27pt} {true} +\definefontsetatsize{chap} {sec} {text} {19pt} {true} +\definefontsetatsize{sec} {subsec} {reduced}{17pt} {true} +\definefontsetatsize{ssec} {text} {small} {15pt} {true} +\definefontsetatsize{reduced}{small} {smaller}{10.5pt}{false} +\definefontsetatsize{small} {smaller}{smaller}{10.5pt}{false} +\definefontsetatsize{smaller}{smaller}{smaller}{9.5pt} {false} + +\def\titlefont#1{{\titlefonts\rm #1}} +\let\subsecfonts = \ssecfonts +\let\subsubsecfonts = \ssecfonts % Define these just so they can be easily changed for other fonts. \def\angleleft{$\langle$} @@ -3253,7 +3206,7 @@ end % \def\acronym#1{\doacronym #1,,\finish} \def\doacronym#1,#2,#3\finish{% - {\selectfonts\lsize #1}% + {\switchtolsize #1}% \def\temp{#2}% \ifx\temp\empty \else \space ({\unsepspaces \ignorespaces \temp \unskip})% @@ -3346,10 +3299,10 @@ end % fix it (significant additions to font machinery) until someone notices. % \def\sub{\ifmmode \expandafter\sb \else \expandafter\finishsub\fi} -\def\finishsub#1{$\sb{\hbox{\selectfonts\lllsize #1}}$}% +\def\finishsub#1{$\sb{\hbox{\switchtolllsize #1}}$}% % \def\sup{\ifmmode \expandafter\ptexsp \else \expandafter\finishsup\fi} -\def\finishsup#1{$\ptexsp{\hbox{\selectfonts\lllsize #1}}$}% +\def\finishsup#1{$\ptexsp{\hbox{\switchtolllsize #1}}$}% % @inlinefmt{FMTNAME,PROCESSED-TEXT} and @inlineraw{FMTNAME,RAW-TEXT}. % Ignore unless FMTNAME == tex; then it is like @iftex and @tex, @@ -3434,8 +3387,8 @@ end % Plain TeX defines: @AA @AE @O @OE @L (plus lowercase versions) @ss. \def\questiondown{?`} \def\exclamdown{!`} -\def\ordf{\leavevmode\raise1ex\hbox{\selectfonts\lllsize \underbar{a}}} -\def\ordm{\leavevmode\raise1ex\hbox{\selectfonts\lllsize \underbar{o}}} +\def\ordf{\leavevmode\raise1ex\hbox{\switchtolllsize \underbar{a}}} +\def\ordm{\leavevmode\raise1ex\hbox{\switchtolllsize \underbar{o}}} % Dotless i and dotless j, used for accents. \def\imacro{i} @@ -3464,12 +3417,12 @@ end {\setbox0=\hbox{T}% \vbox to \ht0{\hbox{% \ifx\textnominalsize\xwordpt - % for 10pt running text, \lllsize (8pt) is too small for the A in LaTeX. + % for 10pt running text, lllsize (8pt) is too small for the A in LaTeX. % Revert to plain's \scriptsize, which is 7pt. \count255=\the\fam $\fam\count255 \scriptstyle A$% \else % For 11pt, we can use our lllsize. - \selectfonts\lllsize A% + \switchtolllsize A% \fi }% \vss @@ -3535,7 +3488,7 @@ end % \newbox\errorbox % -{\tentt \global\dimen0 = 3em}% Width of the box. +{\ttfont \global\dimen0 = 3em}% Width of the box. \dimen2 = .55pt % Thickness of rules % The text. (`r' is open on the right, `e' somewhat less so on the left.) \setbox0 = \hbox{\kern-.75pt \reducedsf \putworderror\kern-1.5pt} @@ -3686,7 +3639,7 @@ end % Adapted from the plain.tex definition of \copyright. % \def\registeredsymbol{% - $^{{\ooalign{\hfil\raise.07ex\hbox{\selectfonts\lllsize R}% + $^{{\ooalign{\hfil\raise.07ex\hbox{\switchtolllsize R}% \hfil\crcr\Orb}}% }$% } @@ -3780,12 +3733,11 @@ end % Settings used for typesetting titles: no hyphenation, no indentation, % don't worry much about spacing, ragged right. This should be used -% inside a \vbox, and fonts need to be set appropriately first. Because -% it is always used for titles, nothing else, we call \rmisbold. \par -% should be specified before the end of the \vbox, since a vbox is a group. +% 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{% - \rmisbold + \rm \hyphenpenalty=10000 \parindent=0pt \tolerance=5000 @@ -3794,7 +3746,7 @@ end % Macros to be used within @titlepage: -\let\subtitlerm=\tenrm +\let\subtitlerm=\rmfont \def\subtitlefont{\subtitlerm \normalbaselineskip = 13pt \normalbaselines} \parseargdef\title{% @@ -3820,7 +3772,7 @@ end \else \checkenv\titlepage \ifseenauthor\else \vskip 0pt plus 1filll \seenauthortrue \fi - {\secfonts\rmisbold \leftline{#1}}% + {\secfonts\rm \leftline{#1}}% \fi } @@ -5642,6 +5594,12 @@ end \def\entry{% \begingroup % + % For pdfTeX and XeTeX. + % The redefinition of \domark stops marks being added in \pdflink to + % preserve coloured links across page boundaries. Otherwise the marks + % would get in the way of \lastbox in \insertindexentrybox. + \let\domark\relax + % % Start a new paragraph if necessary, so our assignments below can't % affect previous text. \par @@ -5688,20 +5646,13 @@ end % \ifpdf \pdfgettoks#1.% - \bgroup\let\domark\relax - \hskip\skip\thinshrinkable\the\toksA - \egroup - % The redefinion of \domark stops marks being added in \pdflink to - % preserve coloured links across page boundaries. Otherwise the marks - % would get in the way of \lastbox in \insertindexentrybox. + \hskip\skip\thinshrinkable\the\toksA \else \ifx\XeTeXrevision\thisisundefined \hskip\skip\thinshrinkable #1% \else \pdfgettoks#1.% - \bgroup\let\domark\relax - \hskip\skip\thinshrinkable\the\toksA - \egroup + \hskip\skip\thinshrinkable\the\toksA \fi \fi \fi @@ -5937,8 +5888,8 @@ end \divide\doublecolumnhsize by 2 \hsize = \doublecolumnhsize % - % Double the \vsize as well. (We don't need a separate register here, - % since nobody clobbers \vsize.) + % Double the \vsize as well. + \advance\vsize by -\ht\partialpage \vsize = 2\vsize % % For the benefit of balancing columns @@ -5956,12 +5907,12 @@ end % previous page. \dimen@ = \vsize \divide\dimen@ by 2 - \advance\dimen@ by -\ht\partialpage % % box0 will be the left-hand column, box2 the right. - \setbox0=\vsplit255 to\dimen@ \setbox2=\vsplit255 to\dimen@ + \setbox0=\vsplit\PAGE to\dimen@ \setbox2=\vsplit\PAGE to\dimen@ + \global\advance\vsize by 2\ht\partialpage \onepageout\pagesofar - \unvbox255 + \unvbox\PAGE \penalty\outputpenalty } % @@ -6025,9 +5976,9 @@ end % % \pagegoal was set to the doubled \vsize above, since we restarted % the current page. We're now back to normal single-column - % typesetting, so reset \pagegoal to the normal \vsize (after the - % \endgroup where \vsize got restored). - \pagegoal = \vsize + % typesetting, so reset \pagegoal to the normal \vsize. + \global\vsize = \txipageheight % + \pagegoal = \txipageheight % } \newbox\balancedcolumns \setbox\balancedcolumns=\vbox{shouldnt see this}% @@ -6035,7 +5986,7 @@ end % Only called for the last of the double column material. \doublecolumnout % does the others. \def\balancecolumns{% - \setbox0 = \vbox{\unvbox255}% like \box255 but more efficient, see p.120. + \setbox0 = \vbox{\unvbox\PAGE}% like \box255 but more efficient, see p.120. \dimen@ = \ht0 \advance\dimen@ by \topskip \advance\dimen@ by-\baselineskip @@ -6096,7 +6047,7 @@ end \null \vskip.3\vsize % move it down on the page a bit \begingroup - \noindent \titlefonts\rmisbold #1\par % the text + \noindent \titlefonts\rm #1\par % the text \let\lastnode=\empty % no node to associate with \writetocentry{part}{#1}{}% but put it in the toc \headingsoff % no headline or footline on the part page @@ -6582,7 +6533,7 @@ end \domark % {% - \chapfonts \rmisbold + \chapfonts \rm \let\footnote=\errfootnoteheading % give better error message % % Have to define \lastsection before calling \donoderef, because the @@ -6674,7 +6625,7 @@ end \let\footnote=\errfootnoteheading % % Switch to the right set of fonts. - \csname #2fonts\endcsname \rmisbold + \csname #2fonts\endcsname \rm % % Insert first mark before the heading break (see notes for \domark). \let\prevsectiondefs=\lastsectiondefs @@ -7947,7 +7898,7 @@ end \fi % no return type #3% output function name }% - {\rm\enskip}% hskip 0.5 em of \tenrm + {\rm\enskip}% hskip 0.5 em of \rmfont % \boldbrax % arguments will be output next, if any. @@ -8076,9 +8027,6 @@ end } \fi -\let\aftermacroxxx\relax -\def\aftermacro{\aftermacroxxx} - % alias because \c means cedilla in @tex or @math \let\texinfoc=\c @@ -8100,18 +8048,13 @@ end \catcode`\\=\active % % Process the macro body under the current catcode regime. - \scantokens{#1@texinfoc}\aftermacro% + \scantokens{#1@texinfoc}% % \catcode`\@=\savedcatcodeone \catcode`\\=\savedcatcodetwo % % The \texinfoc is to remove the \newlinechar added by \scantokens, and % can be noticed by \parsearg. - % The \aftermacro allows a \comment at the end of the macro definition - % to duplicate itself past the final \newlinechar added by \scantokens: - % this is used in the definition of \group to comment out a newline. We - % don't do the same for \c to support Texinfo files with macros that ended - % with a @c, which should no longer be necessary. % We avoid surrounding the call to \scantokens with \bgroup and \egroup % to allow macros to open or close groups themselves. } @@ -8583,6 +8526,13 @@ end \ifcase\paramno % 0 \expandafter\xdef\csname\the\macname\endcsname{% + \bgroup + \noexpand\spaceisspace + \noexpand\endlineisspace + \noexpand\expandafter % skip any whitespace after the macro name. + \expandafter\noexpand\csname\the\macname @@@\endcsname}% + \expandafter\xdef\csname\the\macname @@@\endcsname{% + \egroup \noexpand\scanmacro{\macrobody}}% \or % 1 \expandafter\xdef\csname\the\macname\endcsname{% @@ -9168,7 +9118,13 @@ end \xdef\safexrefname{#1}% }% % - \expandafter\gdef\csname XR\safexrefname\endcsname{#2}% remember this xref + \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 + % thousands of lines. \gdef doesn't use the save stack, but \csname does + % 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 @@ -10064,18 +10020,18 @@ directory should work if nowhere else does.} \gdefchar^^a0{\tie} \gdefchar^^a1{\exclamdown} \gdefchar^^a2{{\tcfont \char162}} % cent - \gdefchar^^a3{\pounds} + \gdefchar^^a3{\pounds{}} \gdefchar^^a4{{\tcfont \char164}} % currency \gdefchar^^a5{{\tcfont \char165}} % yen \gdefchar^^a6{{\tcfont \char166}} % broken bar \gdefchar^^a7{\S} \gdefchar^^a8{\"{}} - \gdefchar^^a9{\copyright} + \gdefchar^^a9{\copyright{}} \gdefchar^^aa{\ordf} - \gdefchar^^ab{\guillemetleft} + \gdefchar^^ab{\guillemetleft{}} \gdefchar^^ac{\ensuremath\lnot} \gdefchar^^ad{\-} - \gdefchar^^ae{\registeredsymbol} + \gdefchar^^ae{\registeredsymbol{}} \gdefchar^^af{\={}} % \gdefchar^^b0{\textdegree} @@ -10089,7 +10045,7 @@ directory should work if nowhere else does.} \gdefchar^^b8{\cedilla\ } \gdefchar^^b9{$^1$} \gdefchar^^ba{\ordm} - \gdefchar^^bb{\guillemetright} + \gdefchar^^bb{\guillemetright{}} \gdefchar^^bc{$1\over4$} \gdefchar^^bd{$1\over2$} \gdefchar^^be{$3\over4$} @@ -10169,7 +10125,7 @@ directory should work if nowhere else does.} % Encoding is almost identical to Latin1. \latonechardefs % - \gdefchar^^a4{\euro} + \gdefchar^^a4{\euro{}} \gdefchar^^a6{\v S} \gdefchar^^a8{\v s} \gdefchar^^b4{\v Z} @@ -10198,7 +10154,7 @@ directory should work if nowhere else does.} \gdefchar^^ae{\v Z} \gdefchar^^af{\dotaccent Z} % - \gdefchar^^b0{\textdegree} + \gdefchar^^b0{\textdegree{}} \gdefchar^^b1{\ogonek{a}} \gdefchar^^b2{\ogonek{ }} \gdefchar^^b3{\l} @@ -10510,18 +10466,18 @@ directory should work if nowhere else does.} \DeclareUnicodeCharacter{00A0}{\tie}% \DeclareUnicodeCharacter{00A1}{\exclamdown}% \DeclareUnicodeCharacter{00A2}{{\tcfont \char162}}% 0242=cent - \DeclareUnicodeCharacter{00A3}{\pounds}% + \DeclareUnicodeCharacter{00A3}{\pounds{}}% \DeclareUnicodeCharacter{00A4}{{\tcfont \char164}}% 0244=currency \DeclareUnicodeCharacter{00A5}{{\tcfont \char165}}% 0245=yen \DeclareUnicodeCharacter{00A6}{{\tcfont \char166}}% 0246=brokenbar \DeclareUnicodeCharacter{00A7}{\S}% \DeclareUnicodeCharacter{00A8}{\"{ }}% - \DeclareUnicodeCharacter{00A9}{\copyright}% + \DeclareUnicodeCharacter{00A9}{\copyright{}}% \DeclareUnicodeCharacter{00AA}{\ordf}% - \DeclareUnicodeCharacter{00AB}{\guillemetleft}% + \DeclareUnicodeCharacter{00AB}{\guillemetleft{}}% \DeclareUnicodeCharacter{00AC}{\ensuremath\lnot}% \DeclareUnicodeCharacter{00AD}{\-}% - \DeclareUnicodeCharacter{00AE}{\registeredsymbol}% + \DeclareUnicodeCharacter{00AE}{\registeredsymbol{}}% \DeclareUnicodeCharacter{00AF}{\={ }}% % \DeclareUnicodeCharacter{00B0}{\ringaccent{ }}% @@ -10535,7 +10491,7 @@ directory should work if nowhere else does.} \DeclareUnicodeCharacter{00B8}{\cedilla{ }}% \DeclareUnicodeCharacter{00B9}{$^1$}% \DeclareUnicodeCharacter{00BA}{\ordm}% - \DeclareUnicodeCharacter{00BB}{\guillemetright}% + \DeclareUnicodeCharacter{00BB}{\guillemetright{}}% \DeclareUnicodeCharacter{00BC}{$1\over4$}% \DeclareUnicodeCharacter{00BD}{$1\over2$}% \DeclareUnicodeCharacter{00BE}{$3\over4$}% @@ -11007,36 +10963,36 @@ directory should work if nowhere else does.} % Punctuation \DeclareUnicodeCharacter{2013}{--}% \DeclareUnicodeCharacter{2014}{---}% - \DeclareUnicodeCharacter{2018}{\quoteleft}% - \DeclareUnicodeCharacter{2019}{\quoteright}% - \DeclareUnicodeCharacter{201A}{\quotesinglbase}% - \DeclareUnicodeCharacter{201C}{\quotedblleft}% - \DeclareUnicodeCharacter{201D}{\quotedblright}% - \DeclareUnicodeCharacter{201E}{\quotedblbase}% + \DeclareUnicodeCharacter{2018}{\quoteleft{}}% + \DeclareUnicodeCharacter{2019}{\quoteright{}}% + \DeclareUnicodeCharacter{201A}{\quotesinglbase{}}% + \DeclareUnicodeCharacter{201C}{\quotedblleft{}}% + \DeclareUnicodeCharacter{201D}{\quotedblright{}}% + \DeclareUnicodeCharacter{201E}{\quotedblbase{}}% \DeclareUnicodeCharacter{2020}{\ensuremath\dagger}% \DeclareUnicodeCharacter{2021}{\ensuremath\ddagger}% - \DeclareUnicodeCharacter{2022}{\bullet}% + \DeclareUnicodeCharacter{2022}{\bullet{}}% \DeclareUnicodeCharacter{202F}{\thinspace}% - \DeclareUnicodeCharacter{2026}{\dots}% - \DeclareUnicodeCharacter{2039}{\guilsinglleft}% - \DeclareUnicodeCharacter{203A}{\guilsinglright}% + \DeclareUnicodeCharacter{2026}{\dots{}}% + \DeclareUnicodeCharacter{2039}{\guilsinglleft{}}% + \DeclareUnicodeCharacter{203A}{\guilsinglright{}}% % - \DeclareUnicodeCharacter{20AC}{\euro}% + \DeclareUnicodeCharacter{20AC}{\euro{}}% % - \DeclareUnicodeCharacter{2192}{\expansion}% - \DeclareUnicodeCharacter{21D2}{\result}% + \DeclareUnicodeCharacter{2192}{\expansion{}}% + \DeclareUnicodeCharacter{21D2}{\result{}}% % % Mathematical symbols \DeclareUnicodeCharacter{2200}{\ensuremath\forall}% \DeclareUnicodeCharacter{2203}{\ensuremath\exists}% \DeclareUnicodeCharacter{2208}{\ensuremath\in}% - \DeclareUnicodeCharacter{2212}{\minus}% + \DeclareUnicodeCharacter{2212}{\minus{}}% \DeclareUnicodeCharacter{2217}{\ast}% \DeclareUnicodeCharacter{221E}{\ensuremath\infty}% \DeclareUnicodeCharacter{2225}{\ensuremath\parallel}% \DeclareUnicodeCharacter{2227}{\ensuremath\wedge}% \DeclareUnicodeCharacter{2229}{\ensuremath\cap}% - \DeclareUnicodeCharacter{2261}{\equiv}% + \DeclareUnicodeCharacter{2261}{\equiv{}}% \DeclareUnicodeCharacter{2264}{\ensuremath\leq}% \DeclareUnicodeCharacter{2265}{\ensuremath\geq}% \DeclareUnicodeCharacter{2282}{\ensuremath\subset}% @@ -11324,6 +11280,7 @@ directory should work if nowhere else does.} \pdfvorigin = 1 true in \else \ifx\XeTeXrevision\thisisundefined + \special{papersize=#8,#7}% \else \pdfpageheight #7\relax \pdfpagewidth #8\relax @@ -11361,7 +11318,6 @@ directory should work if nowhere else does.} % \lispnarrowing = 0.3in \tolerance = 700 - \hfuzz = 1pt \contentsrightmargin = 0pt \defbodyindent = .5cm }} @@ -11379,7 +11335,6 @@ directory should work if nowhere else does.} % \lispnarrowing = 0.25in \tolerance = 700 - \hfuzz = 1pt \contentsrightmargin = 0pt \defbodyindent = .4cm }} @@ -11405,7 +11360,6 @@ directory should work if nowhere else does.} {297mm}{210mm}% % \tolerance = 700 - \hfuzz = 1pt \contentsrightmargin = 0pt \defbodyindent = 5mm }} @@ -11424,7 +11378,6 @@ directory should work if nowhere else does.} % \lispnarrowing = 0.2in \tolerance = 800 - \hfuzz = 1.2pt \contentsrightmargin = 0pt \defbodyindent = 2mm \tableindent = 12mm @@ -11480,6 +11433,9 @@ directory should work if nowhere else does.} % \letterpaper +% Default value of \hfuzz, for suppressing warnings about overfull hboxes. +\hfuzz = 1pt + \message{and turning on texinfo input format.} @@ -11645,6 +11601,9 @@ directory should work if nowhere else does.} @def ^^M{@let^^M@secondlinenl}% % Definition for a newline in the main Texinfo file. @gdef @secondlinenl{@fixbackslash}% + % In case the first line has a whole-line command on it + @let@originalparsearg@parsearg + @def@parsearg{@fixbackslash@originalparsearg} }} {@catcode`@^=7 @catcode`@^^M=13% @@ -11665,6 +11624,7 @@ directory should work if nowhere else does.} @catcode13=5 % regular end of line @enableemergencynewline @let@c=@texinfoc + @let@parsearg@originalparsearg % Also turn back on active characters that might appear in the input % file name, in case not using a pre-dumped format. @catcode`+=@active @@ -11718,7 +11678,4 @@ directory should work if nowhere else does.} @c vim:sw=2: -@ignore - arch-tag: e1b36e32-c96e-4135-a41a-0b2efa2ea115 -@end ignore @enablebackslashhack diff --git a/build-aux/update-copyright b/build-aux/update-copyright index 17ee6b1..2d20d21 100755 --- a/build-aux/update-copyright +++ b/build-aux/update-copyright @@ -5,7 +5,7 @@ eval '(exit $?0)' && eval 'exec perl -wS -0777 -pi "$0" "$@"' my $VERSION = '2016-01-12.23:13'; # UTC -# Copyright (C) 2009-2016 Free Software Foundation, Inc. +# Copyright (C) 2009-2017 Free Software Foundation, Inc. # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/build-aux/useless-if-before-free b/build-aux/useless-if-before-free index d7a8c0d..4e3f3a2 100755 --- a/build-aux/useless-if-before-free +++ b/build-aux/useless-if-before-free @@ -10,7 +10,7 @@ my $VERSION = '2016-08-01 17:47'; # UTC # If you change this file with Emacs, please let the write hook # do its job. Otherwise, update this string manually. -# Copyright (C) 2008-2016 Free Software Foundation, Inc. +# Copyright (C) 2008-2017 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/build-aux/vc-list-files b/build-aux/vc-list-files index c5c420a..2d17eaf 100755 --- a/build-aux/vc-list-files +++ b/build-aux/vc-list-files @@ -4,7 +4,7 @@ # Print a version string. scriptversion=2016-01-11.22; # UTC -# Copyright (C) 2006-2016 Free Software Foundation, Inc. +# Copyright (C) 2006-2017 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -1,5 +1,5 @@ # Customize maint.mk -*- makefile -*- -# Copyright (C) 2003-2013, 2015-2016 Free Software Foundation, Inc. +# Copyright (C) 2003-2013, 2015-2017 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -24,8 +24,7 @@ manual_title = Comparing and Merging Files # Tests not to run as part of "make distcheck". local-checks-to-skip = \ sc_error_message_period \ - sc_error_message_uppercase \ - sc_texinfo_acronym + sc_error_message_uppercase # Tools used to bootstrap this package, used for "announcement". bootstrap-tools = autoconf,automake,gnulib @@ -33,7 +32,7 @@ bootstrap-tools = autoconf,automake,gnulib # Now that we have better tests, make this the default. export VERBOSE = yes -old_NEWS_hash = 69329628b612be7ab46517bbf067c85f +old_NEWS_hash = 0216ec3bf3e3322f33afd4e949a9a29b # Tell maint.mk's syntax-check rules that diff gets config.h directly or # via diff.h or system.h. @@ -1,11 +1,11 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69.147-5ad35 for GNU diffutils 3.5. +# Generated by GNU Autoconf 2.69.185-b502e for GNU diffutils 3.6. # # Report bugs to <bug-diffutils@gnu.org>. # # -# Copyright (C) 1992-1996, 1998-2015 Free Software Foundation, Inc. +# Copyright (C) 1992-1996, 1998-2017 Free Software Foundation, Inc. # # # This configure script is free software; the Free Software Foundation @@ -565,8 +565,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='GNU diffutils' PACKAGE_TARNAME='diffutils' -PACKAGE_VERSION='3.5' -PACKAGE_STRING='GNU diffutils 3.5' +PACKAGE_VERSION='3.6' +PACKAGE_STRING='GNU diffutils 3.6' PACKAGE_BUGREPORT='bug-diffutils@gnu.org' PACKAGE_URL='http://www.gnu.org/software/diffutils/' @@ -596,11 +596,10 @@ ac_includes_default="\ # include <unistd.h> #endif" -ac_header_list= -ac_func_list= +ac_header_c_list= +ac_func_c_list= gl_fnmatch_required=POSIX gl_getopt_required=POSIX -gl_getopt_required=POSIX gt_needs= ac_subst_vars='gltests_LTLIBOBJS gltests_LIBOBJS @@ -718,6 +717,7 @@ NEXT_TIME_H NEXT_AS_FIRST_DIRECTIVE_SYS_WAIT_H NEXT_SYS_WAIT_H GNULIB_WAITPID +WINDOWS_STAT_INODES WINDOWS_64_BIT_OFF_T NEXT_AS_FIRST_DIRECTIVE_SYS_TYPES_H NEXT_SYS_TYPES_H @@ -761,22 +761,6 @@ GNULIB_SIGPROCMASK GNULIB_SIGNAL_H_SIGPIPE GNULIB_RAISE GNULIB_PTHREAD_SIGMASK -REPLACE_LOCALTIME -REPLACE_GMTIME -REPLACE_TIMEGM -REPLACE_NANOSLEEP -REPLACE_MKTIME -REPLACE_LOCALTIME_R -HAVE_TIMEGM -HAVE_STRPTIME -HAVE_NANOSLEEP -HAVE_DECL_LOCALTIME_R -GNULIB_TIME_RZ -GNULIB_TIME_R -GNULIB_TIMEGM -GNULIB_STRPTIME -GNULIB_NANOSLEEP -GNULIB_MKTIME UNDEFINE_STRTOK_R REPLACE_STRTOK_R REPLACE_STRSIGNAL @@ -884,6 +868,7 @@ HAVE_REALPATH HAVE_RANDOM_R HAVE_RANDOM_H HAVE_RANDOM +HAVE_QSORT_R HAVE_PTSNAME_R HAVE_PTSNAME HAVE_POSIX_OPENPT @@ -968,6 +953,7 @@ REPLACE_ISWCNTRL HAVE_WCTYPE_H NEXT_AS_FIRST_DIRECTIVE_WCTYPE_H NEXT_WCTYPE_H +HAVE_CRTDEFS_H HAVE_WINT_T HAVE_ISWCNTRL REPLACE_ISWBLANK @@ -1000,6 +986,9 @@ GNULIB_IMAXABS GL_GENERATE_STDINT_H_FALSE GL_GENERATE_STDINT_H_TRUE STDINT_H +HAVE_SYS_INTTYPES_H +HAVE_SYS_BITYPES_H +HAVE_C99_STDINT_H WINT_T_SUFFIX WCHAR_T_SUFFIX SIG_ATOMIC_T_SUFFIX @@ -1014,8 +1003,6 @@ BITSIZEOF_SIG_ATOMIC_T BITSIZEOF_SIZE_T BITSIZEOF_PTRDIFF_T APPLE_UNIVERSAL_BUILD -HAVE_SYS_BITYPES_H -HAVE_SYS_INTTYPES_H HAVE_STDINT_H NEXT_AS_FIRST_DIRECTIVE_STDINT_H NEXT_STDINT_H @@ -1024,6 +1011,12 @@ 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 NEXT_AS_FIRST_DIRECTIVE_ICONV_H NEXT_ICONV_H GL_GENERATE_ICONV_H_FALSE @@ -1038,11 +1031,35 @@ LTLIBICONV LIBICONV GNU_MAKE_FALSE GNU_MAKE_TRUE +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_TIMEZONE_T HAVE_SYS_TIME_H HAVE_STRUCT_TIMEVAL HAVE_GETTIMEOFDAY @@ -1050,11 +1067,14 @@ GNULIB_GETTIMEOFDAY LTLIBINTL LIBINTL GNULIB_GL_UNISTD_H_GETOPT +GETOPT_CDEFS_H GETOPT_H +HAVE_SYS_CDEFS_H HAVE_GETOPT_H NEXT_AS_FIRST_DIRECTIVE_GETOPT_H NEXT_GETOPT_H WINDOWS_64_BIT_ST_SIZE +WINDOWS_STAT_TIMESPEC NEXT_AS_FIRST_DIRECTIVE_SYS_STAT_H NEXT_SYS_STAT_H REPLACE_UTIMENSAT @@ -1077,6 +1097,7 @@ HAVE_LCHMOD HAVE_FUTIMENS HAVE_FSTATAT HAVE_FCHMODAT +GNULIB_OVERRIDES_STRUCT_STAT GNULIB_UTIMENSAT GNULIB_STAT GNULIB_MKNODAT @@ -1245,6 +1266,7 @@ REPLACE_USLEEP REPLACE_UNLINKAT REPLACE_UNLINK REPLACE_TTYNAME_R +REPLACE_TRUNCATE REPLACE_SYMLINKAT REPLACE_SYMLINK REPLACE_SLEEP @@ -1278,12 +1300,14 @@ HAVE_DECL_SETHOSTNAME HAVE_DECL_GETUSERSHELL HAVE_DECL_GETPAGESIZE HAVE_DECL_GETLOGIN_R +HAVE_DECL_GETLOGIN HAVE_DECL_GETDOMAINNAME HAVE_DECL_FDATASYNC HAVE_DECL_FCHDIR HAVE_DECL_ENVIRON HAVE_USLEEP HAVE_UNLINKAT +HAVE_TRUNCATE HAVE_SYMLINKAT HAVE_SYMLINK HAVE_SLEEP @@ -1320,6 +1344,7 @@ GNULIB_UNLINK GNULIB_UNISTD_H_SIGPIPE GNULIB_UNISTD_H_NONBLOCKING GNULIB_TTYNAME_R +GNULIB_TRUNCATE GNULIB_SYMLINKAT GNULIB_SYMLINK GNULIB_SLEEP @@ -1369,6 +1394,7 @@ LTLIBSIGSEGV LIBSIGSEGV HAVE_LIBSIGSEGV LOCALE_FR +REPLACE_WCSFTIME REPLACE_WCSWIDTH REPLACE_WCWIDTH REPLACE_WCSNRTOMBS @@ -1384,6 +1410,7 @@ REPLACE_BTOWC REPLACE_MBSTATE_T HAVE_DECL_WCWIDTH HAVE_DECL_WCTOB +HAVE_WCSFTIME HAVE_WCSWIDTH HAVE_WCSTOK HAVE_WCSSTR @@ -1421,6 +1448,7 @@ HAVE_MBRLEN HAVE_MBRTOWC HAVE_MBSINIT HAVE_BTOWC +GNULIB_WCSFTIME GNULIB_WCSWIDTH GNULIB_WCSTOK GNULIB_WCSSTR @@ -1475,7 +1503,6 @@ build_vendor build_cpu build ARFLAGS -ac_ct_AR AR EGREP GREP @@ -2141,7 +2168,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 diffutils 3.5 to adapt to many kinds of systems. +\`configure' configures GNU diffutils 3.6 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -2212,7 +2239,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of GNU diffutils 3.5:";; + short | recursive ) echo "Configuration of GNU diffutils 3.6:";; esac cat <<\_ACEOF @@ -2328,10 +2355,10 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -GNU diffutils configure 3.5 -generated by GNU Autoconf 2.69.147-5ad35 +GNU diffutils configure 3.6 +generated by GNU Autoconf 2.69.185-b502e -Copyright (C) 2015 Free Software Foundation, Inc. +Copyright (C) 2017 Free Software Foundation, Inc. This configure script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it. _ACEOF @@ -2965,8 +2992,8 @@ 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 diffutils $as_me 3.5, which was -generated by GNU Autoconf 2.69.147-5ad35. Invocation command line was +It was created by GNU diffutils $as_me 3.6, which was +generated by GNU Autoconf 2.69.185-b502e. Invocation command line was $ $0 $@ @@ -3176,29 +3203,17 @@ printf "%s\n" "/* confdefs.h */" > confdefs.h # Predefined preprocessor variables. -cat >>confdefs.h <<_ACEOF -#define PACKAGE_NAME "$PACKAGE_NAME" -_ACEOF +printf "%s\n" "#define PACKAGE_NAME \"$PACKAGE_NAME\"" >>confdefs.h -cat >>confdefs.h <<_ACEOF -#define PACKAGE_TARNAME "$PACKAGE_TARNAME" -_ACEOF +printf "%s\n" "#define PACKAGE_TARNAME \"$PACKAGE_TARNAME\"" >>confdefs.h -cat >>confdefs.h <<_ACEOF -#define PACKAGE_VERSION "$PACKAGE_VERSION" -_ACEOF +printf "%s\n" "#define PACKAGE_VERSION \"$PACKAGE_VERSION\"" >>confdefs.h -cat >>confdefs.h <<_ACEOF -#define PACKAGE_STRING "$PACKAGE_STRING" -_ACEOF +printf "%s\n" "#define PACKAGE_STRING \"$PACKAGE_STRING\"" >>confdefs.h -cat >>confdefs.h <<_ACEOF -#define PACKAGE_BUGREPORT "$PACKAGE_BUGREPORT" -_ACEOF +printf "%s\n" "#define PACKAGE_BUGREPORT \"$PACKAGE_BUGREPORT\"" >>confdefs.h -cat >>confdefs.h <<_ACEOF -#define PACKAGE_URL "$PACKAGE_URL" -_ACEOF +printf "%s\n" "#define PACKAGE_URL \"$PACKAGE_URL\"" >>confdefs.h # Let the site file select an alternate cache file if it wants to. @@ -3251,94 +3266,99 @@ printf "%s\n" "$as_me: creating cache $cache_file" >&6;} >$cache_file fi -as_fn_append ac_header_list " sys/types.h" -as_fn_append ac_header_list " sys/stat.h" -as_fn_append ac_header_list " strings.h" -as_fn_append ac_header_list " inttypes.h" -as_fn_append ac_header_list " stdint.h" -as_fn_append ac_header_list " unistd.h" -as_fn_append ac_func_list " btowc" -as_fn_append ac_func_list " setrlimit" -as_fn_append ac_header_list " ucontext.h" -as_fn_append ac_func_list " sigaltstack" -as_fn_append ac_func_list " readlinkat" -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 " strerror_r" -as_fn_append ac_func_list " fcntl" -as_fn_append ac_func_list " symlink" -as_fn_append ac_func_list " mempcpy" -as_fn_append ac_func_list " isblank" -as_fn_append ac_func_list " iswctype" -as_fn_append ac_func_list " mbsrtowcs" -as_fn_append ac_func_list " wmemchr" -as_fn_append ac_func_list " wmemcpy" -as_fn_append ac_func_list " wmempcpy" -as_fn_append ac_header_list " wctype.h" +as_fn_append ac_header_c_list " sys/types.h sys_types_h HAVE_SYS_TYPES_H" +as_fn_append ac_header_c_list " sys/stat.h sys_stat_h HAVE_SYS_STAT_H" +as_fn_append ac_header_c_list " strings.h strings_h HAVE_STRINGS_H" +as_fn_append ac_header_c_list " inttypes.h inttypes_h HAVE_INTTYPES_H" +as_fn_append ac_header_c_list " stdint.h stdint_h HAVE_STDINT_H" +as_fn_append ac_header_c_list " unistd.h unistd_h HAVE_UNISTD_H" +as_fn_append ac_func_c_list " btowc HAVE_BTOWC" +as_fn_append ac_func_c_list " setrlimit HAVE_SETRLIMIT" +as_fn_append ac_header_c_list " ucontext.h ucontext_h HAVE_UCONTEXT_H" +as_fn_append ac_func_c_list " sigaltstack HAVE_SIGALTSTACK" +as_fn_append ac_func_c_list " readlinkat HAVE_READLINKAT" +as_fn_append ac_func_c_list " _set_invalid_parameter_handler HAVE__SET_INVALID_PARAMETER_HANDLER" +as_fn_append ac_header_c_list " sys/socket.h sys_socket_h HAVE_SYS_SOCKET_H" +as_fn_append ac_func_c_list " strerror_r HAVE_STRERROR_R" +as_fn_append ac_func_c_list " fcntl HAVE_FCNTL" +as_fn_append ac_func_c_list " symlink HAVE_SYMLINK" +as_fn_append ac_func_c_list " mempcpy HAVE_MEMPCPY" +as_fn_append ac_func_c_list " isblank HAVE_ISBLANK" +as_fn_append ac_func_c_list " iswctype HAVE_ISWCTYPE" +as_fn_append ac_func_c_list " mbsrtowcs HAVE_MBSRTOWCS" +as_fn_append ac_func_c_list " wmemchr HAVE_WMEMCHR" +as_fn_append ac_func_c_list " wmemcpy HAVE_WMEMCPY" +as_fn_append ac_func_c_list " wmempcpy HAVE_WMEMPCPY" +as_fn_append ac_header_c_list " wctype.h wctype_h HAVE_WCTYPE_H" gl_fnmatch_required=GNU -as_fn_append ac_func_list " getdtablesize" +as_fn_append ac_func_c_list " getdtablesize HAVE_GETDTABLESIZE" gl_getopt_required=GNU -as_fn_append ac_header_list " getopt.h" -as_fn_append ac_func_list " gettimeofday" -as_fn_append ac_func_list " nanotime" -as_fn_append ac_header_list " sys/time.h" -as_fn_append ac_header_list " iconv.h" -as_fn_append ac_header_list " wchar.h" -as_fn_append ac_func_list " iswcntrl" -as_fn_append ac_func_list " iswblank" -as_fn_append ac_header_list " langinfo.h" -as_fn_append ac_header_list " xlocale.h" -as_fn_append ac_func_list " lstat" -as_fn_append ac_func_list " mbsinit" -as_fn_append ac_func_list " mbrtowc" -as_fn_append ac_func_list " mbslen" -as_fn_append ac_header_list " sys/mman.h" -as_fn_append ac_func_list " mprotect" -as_fn_append ac_func_list " mkstemp" -as_fn_append ac_func_list " tzset" -as_fn_append ac_func_list " nl_langinfo" -as_fn_append ac_header_list " sys/param.h" -as_fn_append ac_func_list " readlink" -as_fn_append ac_header_list " malloc.h" -as_fn_append ac_func_list " secure_getenv" -as_fn_append ac_func_list " getuid" -as_fn_append ac_func_list " geteuid" -as_fn_append ac_func_list " getgid" -as_fn_append ac_func_list " getegid" -as_fn_append ac_func_list " setenv" -as_fn_append ac_func_list " sigaction" -as_fn_append ac_func_list " siginterrupt" -as_fn_append ac_func_list " __xpg_strerror_r" -as_fn_append ac_func_list " strndup" -as_fn_append ac_func_list " strptime" -as_fn_append ac_func_list " strtoumax" -as_fn_append ac_header_list " sys/wait.h" -as_fn_append ac_func_list " localtime_r" -as_fn_append ac_func_list " timegm" -as_fn_append ac_func_list " vasnprintf" -as_fn_append ac_header_list " features.h" -as_fn_append ac_func_list " snprintf" -as_fn_append ac_func_list " wcrtomb" -as_fn_append ac_func_list " wcwidth" -as_fn_append ac_header_list " arpa/inet.h" -as_fn_append ac_func_list " ftruncate" -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_header_list " sys/select.h" -as_fn_append ac_func_list " pipe" -as_fn_append ac_func_list " sleep" -as_fn_append ac_func_list " catgets" -as_fn_append ac_header_list " sys/ioctl.h" -as_fn_append ac_func_list " shutdown" -as_fn_append ac_header_list " sys/uio.h" -as_fn_append ac_func_list " wctob" -as_fn_append ac_func_list " sigprocmask" -as_fn_append ac_func_list " strcasecoll" -as_fn_append ac_func_list " stricoll" -as_fn_append ac_header_list " vfork.h" -as_fn_append ac_func_list " fork" -as_fn_append ac_func_list " vfork" +as_fn_append ac_header_c_list " getopt.h getopt_h HAVE_GETOPT_H" +as_fn_append ac_header_c_list " sys/cdefs.h sys_cdefs_h HAVE_SYS_CDEFS_H" +as_fn_append ac_func_c_list " getprogname HAVE_GETPROGNAME" +as_fn_append ac_func_c_list " getexecname HAVE_GETEXECNAME" +as_fn_append ac_func_c_list " gettimeofday HAVE_GETTIMEOFDAY" +as_fn_append ac_func_c_list " nanotime HAVE_NANOTIME" +as_fn_append ac_header_c_list " sys/time.h sys_time_h HAVE_SYS_TIME_H" +as_fn_append ac_header_c_list " iconv.h iconv_h HAVE_ICONV_H" +as_fn_append ac_header_c_list " limits.h limits_h HAVE_LIMITS_H" +as_fn_append ac_header_c_list " wchar.h wchar_h HAVE_WCHAR_H" +as_fn_append ac_func_c_list " iswcntrl HAVE_ISWCNTRL" +as_fn_append ac_header_c_list " crtdefs.h crtdefs_h HAVE_CRTDEFS_H" +as_fn_append ac_func_c_list " iswblank HAVE_ISWBLANK" +as_fn_append ac_header_c_list " langinfo.h langinfo_h HAVE_LANGINFO_H" +as_fn_append ac_header_c_list " xlocale.h xlocale_h HAVE_XLOCALE_H" +as_fn_append ac_func_c_list " lstat HAVE_LSTAT" +as_fn_append ac_func_c_list " mbsinit HAVE_MBSINIT" +as_fn_append ac_func_c_list " mbrtowc HAVE_MBRTOWC" +as_fn_append ac_func_c_list " mbslen HAVE_MBSLEN" +as_fn_append ac_header_c_list " sys/mman.h sys_mman_h HAVE_SYS_MMAN_H" +as_fn_append ac_func_c_list " mprotect HAVE_MPROTECT" +as_fn_append ac_func_c_list " mkstemp HAVE_MKSTEMP" +as_fn_append ac_func_c_list " tzset HAVE_TZSET" +as_fn_append ac_func_c_list " nl_langinfo HAVE_NL_LANGINFO" +as_fn_append ac_header_c_list " sys/param.h sys_param_h HAVE_SYS_PARAM_H" +as_fn_append ac_func_c_list " readlink HAVE_READLINK" +as_fn_append ac_header_c_list " malloc.h malloc_h HAVE_MALLOC_H" +as_fn_append ac_func_c_list " secure_getenv HAVE_SECURE_GETENV" +as_fn_append ac_func_c_list " getuid HAVE_GETUID" +as_fn_append ac_func_c_list " geteuid HAVE_GETEUID" +as_fn_append ac_func_c_list " getgid HAVE_GETGID" +as_fn_append ac_func_c_list " getegid HAVE_GETEGID" +as_fn_append ac_func_c_list " setenv HAVE_SETENV" +as_fn_append ac_func_c_list " sigaction HAVE_SIGACTION" +as_fn_append ac_func_c_list " siginterrupt HAVE_SIGINTERRUPT" +as_fn_append ac_func_c_list " __xpg_strerror_r HAVE___XPG_STRERROR_R" +as_fn_append ac_func_c_list " strndup HAVE_STRNDUP" +as_fn_append ac_func_c_list " strptime HAVE_STRPTIME" +as_fn_append ac_func_c_list " strtoumax HAVE_STRTOUMAX" +as_fn_append ac_header_c_list " sys/wait.h sys_wait_h HAVE_SYS_WAIT_H" +as_fn_append ac_func_c_list " localtime_r HAVE_LOCALTIME_R" +as_fn_append ac_func_c_list " timegm HAVE_TIMEGM" +as_fn_append ac_func_c_list " vasnprintf HAVE_VASNPRINTF" +as_fn_append ac_header_c_list " features.h features_h HAVE_FEATURES_H" +as_fn_append ac_func_c_list " snprintf HAVE_SNPRINTF" +as_fn_append ac_func_c_list " wcrtomb HAVE_WCRTOMB" +as_fn_append ac_func_c_list " wcwidth HAVE_WCWIDTH" +as_fn_append ac_header_c_list " arpa/inet.h arpa_inet_h HAVE_ARPA_INET_H" +as_fn_append ac_func_c_list " ftruncate HAVE_FTRUNCATE" +as_fn_append ac_header_c_list " netdb.h netdb_h HAVE_NETDB_H" +as_fn_append ac_header_c_list " netinet/in.h netinet_in_h HAVE_NETINET_IN_H" +as_fn_append ac_func_c_list " newlocale HAVE_NEWLOCALE" +as_fn_append ac_header_c_list " sys/select.h sys_select_h HAVE_SYS_SELECT_H" +as_fn_append ac_func_c_list " pipe HAVE_PIPE" +as_fn_append ac_func_c_list " sleep HAVE_SLEEP" +as_fn_append ac_func_c_list " catgets HAVE_CATGETS" +as_fn_append ac_header_c_list " sys/ioctl.h sys_ioctl_h HAVE_SYS_IOCTL_H" +as_fn_append ac_func_c_list " shutdown HAVE_SHUTDOWN" +as_fn_append ac_header_c_list " sys/uio.h sys_uio_h HAVE_SYS_UIO_H" +as_fn_append ac_func_c_list " wctob HAVE_WCTOB" +as_fn_append ac_func_c_list " sigprocmask HAVE_SIGPROCMASK" +as_fn_append ac_func_c_list " strcasecoll HAVE_STRCASECOLL" +as_fn_append ac_func_c_list " stricoll HAVE_STRICOLL" +as_fn_append ac_header_c_list " vfork.h vfork_h HAVE_VFORK_H" +as_fn_append ac_func_c_list " fork HAVE_FORK" +as_fn_append ac_func_c_list " vfork HAVE_VFORK" gt_needs="$gt_needs need-ngettext" # Check that the precious variables saved in the cache have kept the same # value. @@ -3948,17 +3968,13 @@ fi # Define the identity of the package. PACKAGE='diffutils' - VERSION='3.5' + VERSION='3.6' -cat >>confdefs.h <<_ACEOF -#define PACKAGE "$PACKAGE" -_ACEOF +printf "%s\n" "#define PACKAGE \"$PACKAGE\"" >>confdefs.h -cat >>confdefs.h <<_ACEOF -#define VERSION "$VERSION" -_ACEOF +printf "%s\n" "#define VERSION \"$VERSION\"" >>confdefs.h # Some tools Automake needs. @@ -4453,6 +4469,110 @@ esac fi fi +if test -z "$CC"; then + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}clang", so it can be a program name with args. +set dummy ${ac_tool_prefix}clang; ac_word=$2 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_CC+y} +then : + printf %s "(cached) " >&6 +else + if test -n "$CC"; then + ac_cv_prog_CC="$CC" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + ac_cv_prog_CC="${ac_tool_prefix}clang" + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi +fi +CC=$ac_cv_prog_CC +if test -n "$CC"; then + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 +printf "%s\n" "$CC" >&6; } +else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } +fi + + +fi +if test -z "$ac_cv_prog_CC"; then + ac_ct_CC=$CC + # Extract the first word of "clang", so it can be a program name with args. +set dummy clang; ac_word=$2 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_ac_ct_CC+y} +then : + printf %s "(cached) " >&6 +else + if test -n "$ac_ct_CC"; then + ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + ac_cv_prog_ac_ct_CC="clang" + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi +fi +ac_ct_CC=$ac_cv_prog_ac_ct_CC +if test -n "$ac_ct_CC"; then + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5 +printf "%s\n" "$ac_ct_CC" >&6; } +else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } +fi + + if test "x$ac_ct_CC" = x; then + CC="" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +ac_tool_warned=yes ;; +esac + CC=$ac_ct_CC + fi +else + CC="$ac_cv_prog_CC" +fi + +fi test -z "$CC" && { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 @@ -4875,6 +4995,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include <stdarg.h> #include <stdbool.h> +#include <stddef.h> #include <stdlib.h> #include <wchar.h> #include <stdio.h> @@ -5055,7 +5176,9 @@ main (void) v1.i = 2; v1.w.k = 5; - _Static_assert (&v1.i == &v1.w.k, "Anonymous union alignment botch"); + _Static_assert ((offsetof (struct anonymous, i) + == offsetof (struct anonymous, w.k)), + "Anonymous union alignment botch"); ; return 0; @@ -5107,6 +5230,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include <stdarg.h> #include <stdbool.h> +#include <stddef.h> #include <stdlib.h> #include <wchar.h> #include <stdio.h> @@ -5746,19 +5870,20 @@ else fi - - for ac_header in $ac_header_list -do : - as_ac_Header=`printf "%s\n" "ac_cv_header_$ac_header" | $as_tr_sh` -ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default -" -if eval test \"x\$"$as_ac_Header"\" = x"yes" -then : - cat >>confdefs.h <<_ACEOF -#define `printf "%s\n" "HAVE_$ac_header" | $as_tr_cpp` 1 -_ACEOF - -fi +ac_header= ac_cache= +for ac_item in $ac_header_c_list +do + if test $ac_cache; then + ac_fn_c_check_header_compile "$LINENO" $ac_header ac_cv_header_$ac_cache "$ac_includes_default" + if eval test \"x\$ac_cv_header_$ac_cache\" = xyes; then + printf "%s\n" "#define $ac_item 1" >> confdefs.h + fi + ac_header= ac_cache= + elif test $ac_header; then + ac_cache=$ac_item + else + ac_header=$ac_item + fi done @@ -5766,12 +5891,6 @@ done - - - - - - printf "%s\n" "#define HAVE_STDLIB_H 1" >>confdefs.h printf "%s\n" "#define HAVE_STRING_H 1" >>confdefs.h @@ -5841,10 +5960,22 @@ printf "%s\n" "$ac_cv_safe_to_define___extensions__" >&6; } printf "%s\n" "#define _GNU_SOURCE 1" >>confdefs.h - printf "%s\n" "#define __USE_MINGW_ANSI_STDIO 1" >>confdefs.h - printf "%s\n" "#define _POSIX_PTHREAD_SEMANTICS 1" >>confdefs.h + printf "%s\n" "#define __STDC_WANT_IEC_60559_ATTRIBS_EXT__ 1" >>confdefs.h + + printf "%s\n" "#define __STDC_WANT_IEC_60559_BFP_EXT__ 1" >>confdefs.h + + printf "%s\n" "#define __STDC_WANT_IEC_60559_DFP_EXT__ 1" >>confdefs.h + + printf "%s\n" "#define __STDC_WANT_IEC_60559_FUNCS_EXT__ 1" >>confdefs.h + + printf "%s\n" "#define __STDC_WANT_IEC_60559_TYPES_EXT__ 1" >>confdefs.h + + printf "%s\n" "#define __STDC_WANT_LIB_EXT2__ 1" >>confdefs.h + + printf "%s\n" "#define __STDC_WANT_MATH_SPEC_FUNCS__ 1" >>confdefs.h + printf "%s\n" "#define _TANDEM_SOURCE 1" >>confdefs.h { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether _XOPEN_SOURCE should be defined" >&5 @@ -6220,189 +6351,7 @@ printf "%s\n" "$gl_cv_c_amsterdam_compiler" >&6; } ARFLAGS='-o' fi else - if test -n "$ac_tool_prefix"; then - for ac_prog in ar lib "link -lib" - do - # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. -set dummy $ac_tool_prefix$ac_prog; ac_word=$2 -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -printf %s "checking for $ac_word... " >&6; } -if test ${ac_cv_prog_AR+y} -then : - printf %s "(cached) " >&6 -else - if test -n "$AR"; then - ac_cv_prog_AR="$AR" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - case $as_dir in #((( - '') as_dir=./ ;; - */) ;; - *) as_dir=$as_dir/ ;; - esac - for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then - ac_cv_prog_AR="$ac_tool_prefix$ac_prog" - printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - -fi -fi -AR=$ac_cv_prog_AR -if test -n "$AR"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $AR" >&5 -printf "%s\n" "$AR" >&6; } -else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } -fi - - - test -n "$AR" && break - done -fi -if test -z "$AR"; then - ac_ct_AR=$AR - for ac_prog in ar lib "link -lib" -do - # Extract the first word of "$ac_prog", so it can be a program name with args. -set dummy $ac_prog; ac_word=$2 -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -printf %s "checking for $ac_word... " >&6; } -if test ${ac_cv_prog_ac_ct_AR+y} -then : - printf %s "(cached) " >&6 -else - if test -n "$ac_ct_AR"; then - ac_cv_prog_ac_ct_AR="$ac_ct_AR" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - case $as_dir in #((( - '') as_dir=./ ;; - */) ;; - *) as_dir=$as_dir/ ;; - esac - for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then - ac_cv_prog_ac_ct_AR="$ac_prog" - printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - -fi -fi -ac_ct_AR=$ac_cv_prog_ac_ct_AR -if test -n "$ac_ct_AR"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_AR" >&5 -printf "%s\n" "$ac_ct_AR" >&6; } -else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } -fi - - - test -n "$ac_ct_AR" && break -done - - if test "x$ac_ct_AR" = x; then - AR="false" - else - case $cross_compiling:$ac_tool_warned in -yes:) -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} -ac_tool_warned=yes ;; -esac - AR=$ac_ct_AR - fi -fi - -: ${AR=ar} - -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking the archiver ($AR) interface" >&5 -printf %s "checking the archiver ($AR) interface... " >&6; } -if test ${am_cv_ar_interface+y} -then : - printf %s "(cached) " >&6 -else - ac_ext=c -ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu - - am_cv_ar_interface=ar - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -int some_variable = 0; -_ACEOF -if ac_fn_c_try_compile "$LINENO" -then : - am_ar_try='$AR cru libconftest.a conftest.$ac_objext >&5' - { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$am_ar_try\""; } >&5 - (eval $am_ar_try) 2>&5 - ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; } - if test "$ac_status" -eq 0; then - am_cv_ar_interface=ar - else - am_ar_try='$AR -NOLOGO -OUT:conftest.lib conftest.$ac_objext >&5' - { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$am_ar_try\""; } >&5 - (eval $am_ar_try) 2>&5 - ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; } - if test "$ac_status" -eq 0; then - am_cv_ar_interface=lib - else - am_cv_ar_interface=unknown - fi - fi - rm -f conftest.lib libconftest.a - -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - ac_ext=c -ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu - -fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $am_cv_ar_interface" >&5 -printf "%s\n" "$am_cv_ar_interface" >&6; } - -case $am_cv_ar_interface in -ar) - ;; -lib) - # Microsoft lib, so override with the ar-lib wrapper script. - # FIXME: It is wrong to rewrite AR. - # But if we don't then we get into trouble of one sort or another. - # A longer-term fix would be to have automake use am__AR in this case, - # and then we could set am__AR="$am_aux_dir/ar-lib \$(AR)" or something - # similar. - AR="$am_aux_dir/ar-lib $AR" - ;; -unknown) - as_fn_error $? "could not determine $AR interface" "$LINENO" 5 - ;; -esac - + : fi if test -n "$ac_tool_prefix"; then @@ -6852,9 +6801,7 @@ printf "%s\n" "$ac_cv_sys_file_offset_bits" >&6; } case $ac_cv_sys_file_offset_bits in #( no | unknown) ;; *) -cat >>confdefs.h <<_ACEOF -#define _FILE_OFFSET_BITS $ac_cv_sys_file_offset_bits -_ACEOF +printf "%s\n" "#define _FILE_OFFSET_BITS $ac_cv_sys_file_offset_bits" >>confdefs.h ;; esac rm -rf conftest* @@ -6924,9 +6871,7 @@ printf "%s\n" "$ac_cv_sys_large_files" >&6; } case $ac_cv_sys_large_files in #( no | unknown) ;; *) -cat >>confdefs.h <<_ACEOF -#define _LARGE_FILES $ac_cv_sys_large_files -_ACEOF +printf "%s\n" "#define _LARGE_FILES $ac_cv_sys_large_files" >>confdefs.h ;; esac rm -rf conftest* @@ -6968,6 +6913,7 @@ fi # Code from module bitrotate-tests: # Code from module btowc: # Code from module btowc-tests: + # Code from module builtin-expect: # Code from module c-ctype: # Code from module c-ctype-tests: # Code from module c-stack: @@ -7046,9 +6992,12 @@ fi # Code from module getdtablesize-tests: # Code from module getopt: # Code from module getopt-gnu: + # Code from module getopt-gnu-tests: # Code from module getopt-posix: # Code from module getopt-posix-tests: # Code from module getpagesize: + # Code from module getprogname: + # Code from module getprogname-tests: # Code from module gettext-h: # Code from module gettime: # Code from module gettimeofday: @@ -7094,6 +7043,8 @@ fi # Code from module largefile: # Code from module libsigsegv: + # Code from module limits-h: + # Code from module limits-h-tests: # Code from module listen: # Code from module listen-tests: # Code from module localcharset: @@ -7101,6 +7052,7 @@ fi # Code from module locale-tests: # Code from module localeconv: # Code from module localeconv-tests: + # Code from module localtime-buffer: # Code from module lstat: # Code from module lstat-tests: # Code from module maintainer-makefile: @@ -7125,6 +7077,7 @@ fi # Code from module mbuiter: # Code from module memchr: # Code from module memchr-tests: + # Code from module minmax: # Code from module mkstemp: # Code from module mktime: # Code from module mktime-internal: @@ -7274,6 +7227,7 @@ fi # Code from module timespec-sub: # Code from module timespec-tests: # Code from module trim: + # Code from module tzset: # Code from module unistd: # Code from module unistd-tests: # Code from module unistr/base: @@ -7345,9 +7299,7 @@ then : else -cat >>confdefs.h <<_ACEOF -#define size_t unsigned int -_ACEOF +printf "%s\n" "#define size_t unsigned int" >>confdefs.h fi @@ -7490,9 +7442,7 @@ 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 +printf "%s\n" "#define CRAY_STACKSEG_END $ac_func" >>confdefs.h break fi @@ -7543,9 +7493,7 @@ fi fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_stack_direction" >&5 printf "%s\n" "$ac_cv_c_stack_direction" >&6; } -cat >>confdefs.h <<_ACEOF -#define STACK_DIRECTION $ac_cv_c_stack_direction -_ACEOF +printf "%s\n" "#define STACK_DIRECTION $ac_cv_c_stack_direction" >>confdefs.h fi @@ -7590,6 +7538,7 @@ fi GNULIB_WCSSTR=0; GNULIB_WCSTOK=0; GNULIB_WCSWIDTH=0; + GNULIB_WCSFTIME=0; HAVE_BTOWC=1; HAVE_MBSINIT=1; HAVE_MBRTOWC=1; @@ -7627,6 +7576,7 @@ fi HAVE_WCSSTR=1; HAVE_WCSTOK=1; HAVE_WCSWIDTH=1; + HAVE_WCSFTIME=1; HAVE_DECL_WCTOB=1; HAVE_DECL_WCWIDTH=1; REPLACE_MBSTATE_T=0; @@ -7642,6 +7592,7 @@ fi REPLACE_WCSNRTOMBS=0; REPLACE_WCWIDTH=0; REPLACE_WCSWIDTH=0; + REPLACE_WCSFTIME=0; { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether <wchar.h> uses 'inline' correctly" >&5 @@ -7667,12 +7618,13 @@ 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 { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 (eval $ac_compile) 2>&5 ac_status=$? printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then - mv conftest.$ac_objext conftest1.$ac_objext cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -7688,12 +7640,12 @@ _ACEOF int zero (void) { return 0; } _ACEOF + ac_compile=`echo "$save_ac_compile" | sed s/conftest/conftest2/` if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 (eval $ac_compile) 2>&5 ac_status=$? printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then - mv conftest.$ac_objext conftest2.$ac_objext if $CC -o conftest$ac_exeext $CFLAGS $LDFLAGS conftest1.$ac_objext conftest2.$ac_objext $LIBS >&5 2>&1; then : else @@ -7701,6 +7653,7 @@ _ACEOF fi fi fi + ac_compile="$save_ac_compile" rm -f conftest1.$ac_objext conftest2.$ac_objext conftest$ac_exeext fi @@ -7718,25 +7671,20 @@ C99 mode. You have four options: Configuration aborted." "$LINENO" 5 fi - - - - for ac_func in $ac_func_list -do : - as_ac_var=`printf "%s\n" "ac_cv_func_$ac_func" | $as_tr_sh` -ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" -if eval test \"x\$"$as_ac_var"\" = x"yes" -then : - cat >>confdefs.h <<_ACEOF -#define `printf "%s\n" "HAVE_$ac_func" | $as_tr_cpp` 1 -_ACEOF - -fi +ac_func= +for ac_item in $ac_func_c_list +do + if test $ac_func; then + ac_fn_c_check_func "$LINENO" $ac_func ac_cv_func_$ac_func + if eval test \"x\$ac_cv_func_$ac_func\" = xyes; then + echo "#define $ac_item 1" >> confdefs.h + fi + ac_func= + else + ac_func=$ac_item + fi done - - - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for nl_langinfo and CODESET" >&5 printf %s "checking for nl_langinfo and CODESET... " >&6; } if test ${am_cv_langinfo_codeset+y} @@ -7915,8 +7863,6 @@ printf "%s\n" "$gt_cv_locale_fr" >&6; } - - case "$host_os" in sunos4* | freebsd* | dragonfly* | openbsd* | mirbsd* | netbsd* | kfreebsd* | knetbsd*) # BSD systems FAULT_YIELDS_SIGBUS=1 ;; @@ -7930,9 +7876,7 @@ printf "%s\n" "$gt_cv_locale_fr" >&6; } FAULT_YIELDS_SIGBUS=0 ;; esac -cat >>confdefs.h <<_ACEOF -#define FAULT_YIELDS_SIGBUS $FAULT_YIELDS_SIGBUS -_ACEOF +printf "%s\n" "#define FAULT_YIELDS_SIGBUS $FAULT_YIELDS_SIGBUS" >>confdefs.h { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for working C stack overflow detection" >&5 @@ -8321,38 +8265,12 @@ if test "${PATH_SEPARATOR+set}" != set; then } fi -ac_prog=ld -if test "$GCC" = yes; then - # Check if gcc -print-prog-name=ld gives a path. +if test -n "$LD"; then + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for ld" >&5 +printf %s "checking for ld... " >&6; } +elif test "$GCC" = yes; then { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for ld used by $CC" >&5 printf %s "checking for ld used by $CC... " >&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. - [\\/]* | ?:[\\/]*) - re_direlt='/[^/][^/]*/\.\./' - # Canonicalize the pathname 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 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for GNU ld" >&5 printf %s "checking for GNU ld... " >&6; } @@ -8360,45 +8278,108 @@ else { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for non-GNU ld" >&5 printf %s "checking for non-GNU ld... " >&6; } fi -if test ${acl_cv_path_LD+y} +if test -n "$LD"; then + # Let the user override the test with a path. + : +else + if test ${acl_cv_path_LD+y} then : printf %s "(cached) " >&6 else - if test -z "$LD"; then - 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 </dev/null` in - *GNU* | *'with BFD'*) - test "$with_gnu_ld" != no && break - ;; - *) - test "$with_gnu_ld" != yes && break - ;; + + 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 + ;; esac fi - done - IFS="$acl_save_ifs" -else - acl_cv_path_LD="$LD" # Let the user override the test with a path. + 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 </dev/null` in + *GNU* | *'with BFD'*) + test "$with_gnu_ld" != no && break + ;; + *) + test "$with_gnu_ld" != yes && break + ;; + esac + fi + done + IFS="$acl_save_ifs" + fi + case $host in + *-*-aix*) + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#if defined __powerpc64__ || defined _ARCH_PPC64 + yes + #endif + +_ACEOF +if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | + $EGREP "yes" >/dev/null 2>&1 +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 -rf conftest* + + ;; + esac + fi -LD="$acl_cv_path_LD" + LD="$acl_cv_path_LD" +fi if test -n "$LD"; then { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $LD" >&5 printf "%s\n" "$LD" >&6; } else { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "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 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if the linker ($LD) is GNU ld" >&5 printf %s "checking if the linker ($LD) is GNU ld... " >&6; } if test ${acl_cv_prog_gnu_ld+y} @@ -8458,11 +8439,17 @@ fi + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for the common suffixes of directories in the library search path" >&5 +printf %s "checking for the common suffixes of directories in the library search path... " >&6; } +if test ${acl_cv_libdirstems+y} +then : + printf %s "(cached) " >&6 +else acl_libdirstem=lib - acl_libdirstem2= - case "$host_os" in - solaris*) - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for 64-bit host" >&5 + acl_libdirstem2= + case "$host_os" in + solaris*) + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for 64-bit host" >&5 printf %s "checking for 64-bit host... " >&6; } if test ${gl_cv_solaris_64bit+y} then : @@ -8489,37 +8476,51 @@ rm -rf conftest* fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_solaris_64bit" >&5 printf "%s\n" "$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 ) acl_libdirstem=lib64 ;; - esac ;; - esac - fi - done - IFS="$acl_save_IFS" - fi - ;; - esac - test -n "$acl_libdirstem2" || acl_libdirstem2="$acl_libdirstem" + 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=`(if test -f /usr/bin/gcc \ + && LC_ALL=C /usr/bin/gcc -print-search-dirs >/dev/null 2>/dev/null; then \ + LC_ALL=C /usr/bin/gcc -print-search-dirs; \ + else \ + LC_ALL=C $CC -print-search-dirs; \ + fi) 2>/dev/null \ + | sed -n -e 's,^libraries: ,,p' | sed -e 's,^=,,'` + if test -n "$searchpath"; then + acl_save_IFS="${IFS= }"; IFS=":" + for searchdir in $searchpath; do + if test -d "$searchdir"; then + case "$searchdir" in + */lib64/ | */lib64 ) acl_libdirstem=lib64 ;; + */../ | */.. ) + # Better ignore directories of this form. They are misleading. + ;; + *) searchdir=`cd "$searchdir" && pwd` + case "$searchdir" in + */lib64 ) acl_libdirstem=lib64 ;; + esac ;; + esac + fi + done + IFS="$acl_save_IFS" + fi + ;; + esac + test -n "$acl_libdirstem2" || acl_libdirstem2="$acl_libdirstem" + acl_cv_libdirstems="$acl_libdirstem,$acl_libdirstem2" + +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $acl_cv_libdirstems" >&5 +printf "%s\n" "$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/.*,//'` @@ -9078,7 +9079,6 @@ printf "%s\n" "$LIBSIGSEGV" >&6; } gl_cv_lib_sigsegv="$ac_cv_libsigsegv" - # The Clang compiler raises a warning for an undeclared identifier that matches # a compiler builtin function. All extant Clang versions are affected, as of # Clang 3.6.0. Test a builtin known to every version. This problem affects the @@ -9174,7 +9174,6 @@ esac - GNULIB_CHDIR=0; GNULIB_CHOWN=0; GNULIB_CLOSE=0; @@ -9216,6 +9215,7 @@ esac GNULIB_SLEEP=0; GNULIB_SYMLINK=0; GNULIB_SYMLINKAT=0; + GNULIB_TRUNCATE=0; GNULIB_TTYNAME_R=0; GNULIB_UNISTD_H_NONBLOCKING=0; GNULIB_UNISTD_H_SIGPIPE=0; @@ -9252,12 +9252,14 @@ esac HAVE_SLEEP=1; HAVE_SYMLINK=1; HAVE_SYMLINKAT=1; + HAVE_TRUNCATE=1; HAVE_UNLINKAT=1; HAVE_USLEEP=1; HAVE_DECL_ENVIRON=1; HAVE_DECL_FCHDIR=1; HAVE_DECL_FDATASYNC=1; HAVE_DECL_GETDOMAINNAME=1; + HAVE_DECL_GETLOGIN=1; HAVE_DECL_GETLOGIN_R=1; HAVE_DECL_GETPAGESIZE=1; HAVE_DECL_GETUSERSHELL=1; @@ -9291,6 +9293,7 @@ esac REPLACE_SLEEP=0; REPLACE_SYMLINK=0; REPLACE_SYMLINKAT=0; + REPLACE_TRUNCATE=0; REPLACE_TTYNAME_R=0; REPLACE_UNLINK=0; REPLACE_UNLINKAT=0; @@ -9303,7 +9306,6 @@ esac - if test $ac_cv_func__set_invalid_parameter_handler = yes; then HAVE_MSVC_INVALID_PARAMETER_HANDLER=1 @@ -9323,7 +9325,6 @@ printf "%s\n" "#define HAVE_MSVC_INVALID_PARAMETER_HANDLER 1" >>confdefs.h - GNULIB_ISBLANK=0; HAVE_ISBLANK=1; @@ -9942,10 +9943,7 @@ else ac_have_decl=0 fi -cat >>confdefs.h <<_ACEOF -#define HAVE_DECL_STRERROR_R $ac_have_decl -_ACEOF - +printf "%s\n" "#define HAVE_DECL_STRERROR_R $ac_have_decl" >>confdefs.h @@ -10048,8 +10046,6 @@ fi - - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for working fcntl.h" >&5 printf %s "checking for working fcntl.h... " >&6; } if test ${gl_cv_header_working_fcntl_h+y} @@ -10179,9 +10175,7 @@ printf "%s\n" "$gl_cv_header_working_fcntl_h" >&6; } *) ac_val=1;; esac -cat >>confdefs.h <<_ACEOF -#define HAVE_WORKING_O_NOATIME $ac_val -_ACEOF +printf "%s\n" "#define HAVE_WORKING_O_NOATIME $ac_val" >>confdefs.h case $gl_cv_header_working_fcntl_h in #( @@ -10189,9 +10183,7 @@ _ACEOF *) ac_val=1;; esac -cat >>confdefs.h <<_ACEOF -#define HAVE_WORKING_O_NOFOLLOW $ac_val -_ACEOF +printf "%s\n" "#define HAVE_WORKING_O_NOFOLLOW $ac_val" >>confdefs.h ac_fn_c_check_type "$LINENO" "pid_t" "ac_cv_type_pid_t" "$ac_includes_default" @@ -10200,9 +10192,7 @@ then : else -cat >>confdefs.h <<_ACEOF -#define pid_t int -_ACEOF +printf "%s\n" "#define pid_t int" >>confdefs.h fi @@ -10212,9 +10202,7 @@ then : else -cat >>confdefs.h <<_ACEOF -#define mode_t int -_ACEOF +printf "%s\n" "#define mode_t int" >>confdefs.h fi @@ -10224,7 +10212,6 @@ fi - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for mbstate_t" >&5 printf %s "checking for mbstate_t... " >&6; } if test ${ac_cv_type_mbstate_t+y} @@ -10278,13 +10265,6 @@ printf "%s\n" "#define mbstate_t int" >>confdefs.h - - - - - - - GNULIB_DPRINTF=0; GNULIB_FCLOSE=0; GNULIB_FDOPEN=0; @@ -10401,6 +10381,7 @@ printf "%s\n" "#define mbstate_t int" >>confdefs.h GNULIB_MKNODAT=0; GNULIB_STAT=0; GNULIB_UTIMENSAT=0; + GNULIB_OVERRIDES_STRUCT_STAT=0; HAVE_FCHMODAT=1; HAVE_FSTATAT=1; HAVE_FUTIMENS=1; @@ -10505,7 +10486,42 @@ printf "%s\n" "$gl_cv_type_off_t_64" >&6; } else WINDOWS_64_BIT_OFF_T=0 fi - WINDOWS_64_BIT_ST_SIZE=1 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for 64-bit st_size" >&5 +printf %s "checking for 64-bit st_size... " >&6; } +if test ${gl_cv_member_st_size_64+y} +then : + printf %s "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include <sys/types.h> + struct stat buf; + int verify_st_size_size[sizeof (buf.st_size) >= 8 ? 1 : -1]; + +int +main (void) +{ + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO" +then : + gl_cv_member_st_size_64=yes +else + gl_cv_member_st_size_64=no +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_member_st_size_64" >&5 +printf "%s\n" "$gl_cv_member_st_size_64" >&6; } + if test $gl_cv_member_st_size_64 = no; then + WINDOWS_64_BIT_ST_SIZE=1 + else + WINDOWS_64_BIT_ST_SIZE=0 + fi ;; *) WINDOWS_64_BIT_OFF_T=0 @@ -10601,14 +10617,14 @@ printf "%s\n" "$gl_cv_next_sys_stat_h" >&6; } + WINDOWS_STAT_TIMESPEC=0 + + - if test $WINDOWS_64_BIT_ST_SIZE = 1; then -printf "%s\n" "#define _GL_WINDOWS_64_BIT_ST_SIZE 1" >>confdefs.h - fi ac_fn_c_check_type "$LINENO" "nlink_t" "ac_cv_type_nlink_t" "#include <sys/types.h> #include <sys/stat.h> @@ -10668,7 +10684,6 @@ fi - 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 : @@ -10677,10 +10692,7 @@ else ac_have_decl=0 fi -cat >>confdefs.h <<_ACEOF -#define HAVE_DECL_GETDTABLESIZE $ac_have_decl -_ACEOF - +printf "%s\n" "#define HAVE_DECL_GETDTABLESIZE $ac_have_decl" >>confdefs.h @@ -10781,15 +10793,13 @@ do : ac_fn_c_check_header_compile "$LINENO" "getopt.h" "ac_cv_header_getopt_h" "$ac_includes_default" if test "x$ac_cv_header_getopt_h" = xyes then : - cat >>confdefs.h <<_ACEOF -#define HAVE_GETOPT_H 1 -_ACEOF + printf "%s\n" "#define HAVE_GETOPT_H 1" >>confdefs.h else gl_replace_getopt=yes fi -done +done fi if test -z "$gl_replace_getopt" && test $gl_getopt_required = GNU; then @@ -10798,15 +10808,13 @@ do : ac_fn_c_check_func "$LINENO" "getopt_long_only" "ac_cv_func_getopt_long_only" if test "x$ac_cv_func_getopt_long_only" = xyes then : - cat >>confdefs.h <<_ACEOF -#define HAVE_GETOPT_LONG_ONLY 1 -_ACEOF + printf "%s\n" "#define HAVE_GETOPT_LONG_ONLY 1" >>confdefs.h else gl_replace_getopt=yes fi -done +done fi if test -z "$gl_replace_getopt"; then @@ -11303,39 +11311,16 @@ printf "%s\n" "$gl_cv_func_getopt_long_gnu" >&6; } - - - REPLACE_GETOPT=0 - if test -n "$gl_replace_getopt"; then - REPLACE_GETOPT=1 - fi - - if test $REPLACE_GETOPT = 1; then - - GETOPT_H=getopt.h - -printf "%s\n" "#define __GETOPT_PREFIX rpl_" >>confdefs.h - - - - fi - -ac_fn_c_check_decl "$LINENO" "getenv" "ac_cv_have_decl_getenv" "$ac_includes_default" -if test "x$ac_cv_have_decl_getenv" = xyes -then : - ac_have_decl=1 -else - ac_have_decl=0 -fi - -cat >>confdefs.h <<_ACEOF -#define HAVE_DECL_GETENV $ac_have_decl -_ACEOF - : + GNULIB_GETTIMEOFDAY=0; + HAVE_GETTIMEOFDAY=1; + HAVE_STRUCT_TIMEVAL=1; + HAVE_SYS_TIME_H=1; + REPLACE_GETTIMEOFDAY=0; + REPLACE_STRUCT_TIMEVAL=0; { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for C/C++ restrict keyword" >&5 printf %s "checking for C/C++ restrict keyword... " >&6; } @@ -11381,23 +11366,11 @@ printf "%s\n" "$ac_cv_c_restrict" >&6; } restrict) ;; no) printf "%s\n" "#define restrict /**/" >>confdefs.h ;; - *) cat >>confdefs.h <<_ACEOF -#define restrict $ac_cv_c_restrict -_ACEOF + *) printf "%s\n" "#define restrict $ac_cv_c_restrict" >>confdefs.h ;; esac - GNULIB_GETTIMEOFDAY=0; - HAVE_GETTIMEOFDAY=1; - HAVE_STRUCT_TIMEVAL=1; - HAVE_SYS_TIME_H=1; - HAVE_TIMEZONE_T=0; - REPLACE_GETTIMEOFDAY=0; - REPLACE_STRUCT_TIMEVAL=0; - - - @@ -11491,17 +11464,12 @@ printf "%s\n" "$gl_cv_next_sys_time_h" >&6; } if test $ac_cv_header_sys_socket_h != yes; then - for ac_header in winsock2.h -do : - ac_fn_c_check_header_compile "$LINENO" "winsock2.h" "ac_cv_header_winsock2_h" "$ac_includes_default" + ac_fn_c_check_header_compile "$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 + printf "%s\n" "#define HAVE_WINSOCK2_H 1" >>confdefs.h fi -done fi if test "$ac_cv_header_winsock2_h" = yes; then @@ -11647,6 +11615,38 @@ 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; + + @@ -12440,17 +12440,16 @@ fi $am_cv_proto_iconv" >&5 printf "%s\n" " $am_cv_proto_iconv" >&6; } + else + am_cv_proto_iconv_arg1="" + fi -cat >>confdefs.h <<_ACEOF -#define ICONV_CONST $am_cv_proto_iconv_arg1 -_ACEOF - +printf "%s\n" "#define ICONV_CONST $am_cv_proto_iconv_arg1" >>confdefs.h - if test -n "$am_cv_proto_iconv_arg1"; then - ICONV_CONST="const" - fi - fi + if test -n "$am_cv_proto_iconv_arg1"; then + ICONV_CONST="const" + fi @@ -12504,11 +12503,228 @@ then : else -cat >>confdefs.h <<_ACEOF -#define off_t long int +printf "%s\n" "#define off_t long int" >>confdefs.h + +fi + + + + + + + + + + + + + if test $gl_cv_have_include_next = yes; then + gl_cv_next_limits_h='<'limits.h'>' + else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking absolute name of <limits.h>" >&5 +printf %s "checking absolute name of <limits.h>... " >&6; } +if test ${gl_cv_next_limits_h+y} +then : + printf %s "(cached) " >&6 +else + + if test $ac_cv_header_limits_h = yes; then + + + + + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include <limits.h> +_ACEOF + case "$host_os" in + aix*) gl_absname_cpp="$ac_cpp -C" ;; + *) gl_absname_cpp="$ac_cpp" ;; + esac + + case "$host_os" in + mingw*) + gl_dirsep_regex='[/\\]' + ;; + *) + gl_dirsep_regex='\/' + ;; + esac + gl_make_literal_regex_sed='s,[]$^\\.*/[],\\&,g' + gl_header_literal_regex=`echo 'limits.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_limits_h=`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&5 | + sed -n "$gl_absolute_header_sed"` + + gl_header=$gl_cv_absolute_limits_h + gl_cv_next_limits_h='"'$gl_header'"' + else + gl_cv_next_limits_h='<'limits.h'>' + fi + + +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_next_limits_h" >&5 +printf "%s\n" "$gl_cv_next_limits_h" >&6; } + fi + NEXT_LIMITS_H=$gl_cv_next_limits_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='<'limits.h'>' + else + # INCLUDE_NEXT_AS_FIRST_DIRECTIVE='include' + gl_next_as_first_directive=$gl_cv_next_limits_h + fi + NEXT_AS_FIRST_DIRECTIVE_LIMITS_H=$gl_next_as_first_directive + + + + + + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether limits.h has ULLONG_WIDTH etc." >&5 +printf %s "checking whether limits.h has ULLONG_WIDTH etc.... " >&6; } +if test ${gl_cv_header_limits_width+y} +then : + printf %s "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#ifndef __STDC_WANT_IEC_60559_BFP_EXT__ + #define __STDC_WANT_IEC_60559_BFP_EXT__ 1 + #endif + #include <limits.h> + int ullw = ULLONG_WIDTH; +int +main (void) +{ + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO" +then : + gl_cv_header_limits_width=yes +else + gl_cv_header_limits_width=no +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_header_limits_width" >&5 +printf "%s\n" "$gl_cv_header_limits_width" >&6; } + if test "$gl_cv_header_limits_width" = yes; then + LIMITS_H= + else + LIMITS_H=limits.h + fi + + if test -n "$LIMITS_H"; then + GL_GENERATE_LIMITS_H_TRUE= + GL_GENERATE_LIMITS_H_FALSE='#' +else + GL_GENERATE_LIMITS_H_TRUE='#' + GL_GENERATE_LIMITS_H_FALSE= +fi + + + + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for wint_t" >&5 +printf %s "checking for wint_t... " >&6; } +if test ${gt_cv_c_wint_t+y} +then : + printf %s "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +/* Tru64 with Desktop Toolkit C has a bug: <stdio.h> must be included before + <wchar.h>. + BSD/OS 4.0.1 has a bug: <stddef.h>, <stdio.h> and <time.h> must be included + before <wchar.h>. */ +#include <stddef.h> +#include <stdio.h> +#include <time.h> +#include <wchar.h> + wint_t foo = (wchar_t)'\0'; +int +main (void) +{ + + ; + return 0; +} _ACEOF +if ac_fn_c_try_compile "$LINENO" +then : + gt_cv_c_wint_t=yes +else + gt_cv_c_wint_t=no +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gt_cv_c_wint_t" >&5 +printf "%s\n" "$gt_cv_c_wint_t" >&6; } + if test $gt_cv_c_wint_t = yes; then +printf "%s\n" "#define HAVE_WINT_T 1" >>confdefs.h + + + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether wint_t is too small" >&5 +printf %s "checking whether wint_t is too small... " >&6; } +if test ${gl_cv_type_wint_t_too_small+y} +then : + printf %s "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +/* Tru64 with Desktop Toolkit C has a bug: <stdio.h> must be included before + <wchar.h>. + BSD/OS 4.0.1 has a bug: <stddef.h>, <stdio.h> and <time.h> must be + included before <wchar.h>. */ +#if !(defined __GLIBC__ && !defined __UCLIBC__) +# include <stddef.h> +# include <stdio.h> +# include <time.h> +#endif +#include <wchar.h> + int verify[sizeof (wint_t) < sizeof (int) ? -1 : 1]; + +int +main (void) +{ + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO" +then : + gl_cv_type_wint_t_too_small=no +else + gl_cv_type_wint_t_too_small=yes +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_type_wint_t_too_small" >&5 +printf "%s\n" "$gl_cv_type_wint_t_too_small" >&6; } + if test $gl_cv_type_wint_t_too_small = yes; then + GNULIB_OVERRIDES_WINT_T=1 + else + GNULIB_OVERRIDES_WINT_T=0 + fi + else + GNULIB_OVERRIDES_WINT_T=0 + fi + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for unsigned long long int" >&5 @@ -12634,7 +12850,6 @@ printf "%s\n" "#define HAVE_LONG_LONG_INT 1" >>confdefs.h - gl_cv_c_multiarch=no cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -12680,6 +12895,9 @@ 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 @@ -12907,6 +13125,15 @@ uintptr_t h = UINTPTR_MAX; intmax_t i = INTMAX_MAX; 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__ \ + || (0x5110 <= __SUNPRO_C && !__STDC__)) +extern size_t k; +extern __typeof__ (SIZE_MAX) k; +#endif + #include <limits.h> /* for CHAR_BIT */ #define TYPE_MINIMUM(t) \ ((t) ((t) 0 < (t) -1 ? (t) 0 : ~ TYPE_MAXIMUM (t))) @@ -13075,7 +13302,13 @@ fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_header_working_stdint_h" >&5 printf "%s\n" "$gl_cv_header_working_stdint_h" >&6; } fi + + HAVE_C99_STDINT_H=0 + HAVE_SYS_BITYPES_H=0 + HAVE_SYS_INTTYPES_H=0 + STDINT_H=stdint.h if test "$gl_cv_header_working_stdint_h" = yes; then + HAVE_C99_STDINT_H=1 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether stdint.h predates C++11" >&5 printf %s "checking whether stdint.h predates C++11... " >&6; } if test ${gl_cv_header_stdint_predates_cxx11_h+y} @@ -13130,36 +13363,76 @@ printf "%s\n" "#define __STDC_CONSTANT_MACROS 1" >>confdefs.h printf "%s\n" "#define __STDC_LIMIT_MACROS 1" >>confdefs.h fi - STDINT_H= - else - for ac_header in sys/inttypes.h sys/bitypes.h -do : - as_ac_Header=`printf "%s\n" "ac_cv_header_$ac_header" | $as_tr_sh` -ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default" -if eval test \"x\$"$as_ac_Header"\" = x"yes" + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether stdint.h has UINTMAX_WIDTH etc." >&5 +printf %s "checking whether stdint.h has UINTMAX_WIDTH etc.... " >&6; } +if test ${gl_cv_header_stdint_width+y} then : - cat >>confdefs.h <<_ACEOF -#define `printf "%s\n" "HAVE_$ac_header" | $as_tr_cpp` 1 + printf %s "(cached) " >&6 +else + gl_cv_header_stdint_width=no + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + + /* Work if build is not clean. */ + #define _GL_JUST_INCLUDE_SYSTEM_STDINT_H 1 + #ifndef __STDC_WANT_IEC_60559_BFP_EXT__ + #define __STDC_WANT_IEC_60559_BFP_EXT__ 1 + #endif + #include <stdint.h> + + /* BSD/OS 4.0.1 has a bug: <stddef.h>, <stdio.h> and <time.h> must be + included before <wchar.h>. */ + #include <stddef.h> + #include <signal.h> + #if HAVE_WCHAR_H + # include <stdio.h> + # include <time.h> + # include <wchar.h> + #endif + + int iw = UINTMAX_WIDTH; + +int +main (void) +{ + + ; + return 0; +} _ACEOF +if ac_fn_c_try_compile "$LINENO" +then : + gl_cv_header_stdint_width=yes +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_header_stdint_width" >&5 +printf "%s\n" "$gl_cv_header_stdint_width" >&6; } + if test "$gl_cv_header_stdint_width" = yes; then + STDINT_H= + fi + else + ac_fn_c_check_header_compile "$LINENO" "sys/inttypes.h" "ac_cv_header_sys_inttypes_h" "$ac_includes_default" +if test "x$ac_cv_header_sys_inttypes_h" = xyes +then : + printf "%s\n" "#define HAVE_SYS_INTTYPES_H 1" >>confdefs.h + +fi +ac_fn_c_check_header_compile "$LINENO" "sys/bitypes.h" "ac_cv_header_sys_bitypes_h" "$ac_includes_default" +if test "x$ac_cv_header_sys_bitypes_h" = xyes +then : + printf "%s\n" "#define HAVE_SYS_BITYPES_H 1" >>confdefs.h fi -done if test $ac_cv_header_sys_inttypes_h = yes; then HAVE_SYS_INTTYPES_H=1 - else - HAVE_SYS_INTTYPES_H=0 fi - if test $ac_cv_header_sys_bitypes_h = yes; then HAVE_SYS_BITYPES_H=1 - else - HAVE_SYS_BITYPES_H=0 fi - - if test $APPLE_UNIVERSAL_BUILD = 0; then @@ -13199,9 +13472,7 @@ printf "%s\n" "$ac_res" >&6; } result=0 fi GLTYPE=`echo "$gltype" | tr 'abcdefghijklmnopqrstuvwxyz ' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ_'` - cat >>confdefs.h <<_ACEOF -#define BITSIZEOF_${GLTYPE} $result -_ACEOF + printf "%s\n" "#define BITSIZEOF_${GLTYPE} $result" >>confdefs.h eval BITSIZEOF_${GLTYPE}=\$result done @@ -13246,9 +13517,7 @@ printf "%s\n" "$ac_res" >&6; } result=0 fi GLTYPE=`echo "$gltype" | tr 'abcdefghijklmnopqrstuvwxyz ' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ_'` - cat >>confdefs.h <<_ACEOF -#define BITSIZEOF_${GLTYPE} $result -_ACEOF + printf "%s\n" "#define BITSIZEOF_${GLTYPE} $result" >>confdefs.h eval BITSIZEOF_${GLTYPE}=\$result done @@ -13301,9 +13570,7 @@ printf "%s\n" "$ac_res" >&6; } eval result=\$gl_cv_type_${gltype}_signed GLTYPE=`echo $gltype | tr 'abcdefghijklmnopqrstuvwxyz ' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ_'` if test "$result" = yes; then - cat >>confdefs.h <<_ACEOF -#define HAVE_SIGNED_${GLTYPE} 1 -_ACEOF + printf "%s\n" "#define HAVE_SIGNED_${GLTYPE} 1" >>confdefs.h eval HAVE_SIGNED_${GLTYPE}=1 else @@ -13381,9 +13648,7 @@ printf "%s\n" "$ac_res" >&6; } eval result=\$gl_cv_type_${gltype}_suffix test "$result" = no && result= eval ${GLTYPE}_SUFFIX=\$result - cat >>confdefs.h <<_ACEOF -#define ${GLTYPE}_SUFFIX $result -_ACEOF + printf "%s\n" "#define ${GLTYPE}_SUFFIX $result" >>confdefs.h done @@ -13455,21 +13720,32 @@ printf "%s\n" "$ac_res" >&6; } eval result=\$gl_cv_type_${gltype}_suffix test "$result" = no && result= eval ${GLTYPE}_SUFFIX=\$result - cat >>confdefs.h <<_ACEOF -#define ${GLTYPE}_SUFFIX $result -_ACEOF + printf "%s\n" "#define ${GLTYPE}_SUFFIX $result" >>confdefs.h done - if test $BITSIZEOF_WINT_T -lt 32; then + if test $GNULIB_OVERRIDES_WINT_T = 1; then BITSIZEOF_WINT_T=32 fi - STDINT_H=stdint.h fi + LIMITS_H=limits.h + if test -n "$LIMITS_H"; then + GL_GENERATE_LIMITS_H_TRUE= + GL_GENERATE_LIMITS_H_FALSE='#' +else + GL_GENERATE_LIMITS_H_TRUE='#' + GL_GENERATE_LIMITS_H_FALSE= +fi + + + + + + if test -n "$STDINT_H"; then GL_GENERATE_STDINT_H_TRUE= GL_GENERATE_STDINT_H_FALSE='#' @@ -13629,17 +13905,12 @@ fi - for ac_header in inttypes.h -do : ac_fn_c_check_header_compile "$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 + printf "%s\n" "#define HAVE_INTTYPES_H 1" >>confdefs.h fi -done if test $ac_cv_header_inttypes_h = yes; then { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the inttypes.h PRIxNN macros are broken" >&5 @@ -13679,9 +13950,7 @@ printf "%s\n" "$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 +printf "%s\n" "#define PRI_MACROS_BROKEN 1" >>confdefs.h PRI_MACROS_BROKEN=1 else @@ -13703,46 +13972,11 @@ _ACEOF - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for wint_t" >&5 -printf %s "checking for wint_t... " >&6; } -if test ${gt_cv_c_wint_t+y} -then : - printf %s "(cached) " >&6 -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -/* Tru64 with Desktop Toolkit C has a bug: <stdio.h> must be included before - <wchar.h>. - BSD/OS 4.0.1 has a bug: <stddef.h>, <stdio.h> and <time.h> must be included - before <wchar.h>. */ -#include <stddef.h> -#include <stdio.h> -#include <time.h> -#include <wchar.h> - wint_t foo = (wchar_t)'\0'; -int -main (void) -{ - - ; - return 0; -} -_ACEOF -if ac_fn_c_try_compile "$LINENO" -then : - gt_cv_c_wint_t=yes -else - gt_cv_c_wint_t=no -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gt_cv_c_wint_t" >&5 -printf "%s\n" "$gt_cv_c_wint_t" >&6; } - if test $gt_cv_c_wint_t = yes; then - -printf "%s\n" "#define HAVE_WINT_T 1" >>confdefs.h + if test $ac_cv_header_crtdefs_h = yes; then + HAVE_CRTDEFS_H=1 + else + HAVE_CRTDEFS_H=0 fi @@ -13750,6 +13984,7 @@ printf "%s\n" "#define HAVE_WINT_T 1" >>confdefs.h + if test $ac_cv_func_iswcntrl = yes; then HAVE_ISWCNTRL=1 else @@ -13774,6 +14009,8 @@ printf "%s\n" "#define HAVE_WINT_T 1" >>confdefs.h + + if test $gl_cv_have_include_next = yes; then gl_cv_next_wctype_h='<'wctype.h'>' else @@ -13927,17 +14164,12 @@ printf "%s\n" "$gl_cv_func_iswcntrl_works" >&6; } if test $REPLACE_ISWCNTRL = 1; then REPLACE_TOWLOWER=1 else - for ac_func in towlower -do : - ac_fn_c_check_func "$LINENO" "towlower" "ac_cv_func_towlower" + ac_fn_c_check_func "$LINENO" "towlower" "ac_cv_func_towlower" if test "x$ac_cv_func_towlower" = xyes then : - cat >>confdefs.h <<_ACEOF -#define HAVE_TOWLOWER 1 -_ACEOF + printf "%s\n" "#define HAVE_TOWLOWER 1" >>confdefs.h fi -done if test $ac_cv_func_towlower = yes; then REPLACE_TOWLOWER=0 @@ -13962,9 +14194,7 @@ else ac_have_decl=0 fi -cat >>confdefs.h <<_ACEOF -#define HAVE_DECL_TOWLOWER $ac_have_decl -_ACEOF +printf "%s\n" "#define HAVE_DECL_TOWLOWER $ac_have_decl" >>confdefs.h if test $ac_cv_have_decl_towlower = yes; then REPLACE_TOWLOWER=1 @@ -14122,13 +14352,11 @@ fi - GNULIB_NL_LANGINFO=0; HAVE_NL_LANGINFO=1; REPLACE_NL_LANGINFO=0; - ac_fn_c_check_decl "$LINENO" "getc_unlocked" "ac_cv_have_decl_getc_unlocked" "$ac_includes_default" if test "x$ac_cv_have_decl_getc_unlocked" = xyes then : @@ -14137,9 +14365,7 @@ else ac_have_decl=0 fi -cat >>confdefs.h <<_ACEOF -#define HAVE_DECL_GETC_UNLOCKED $ac_have_decl -_ACEOF +printf "%s\n" "#define HAVE_DECL_GETC_UNLOCKED $ac_have_decl" >>confdefs.h { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C Library >= 2.1 or uClibc" >&5 @@ -14368,8 +14594,6 @@ printf "%s\n" "$gl_cv_next_stddef_h" >&6; } - - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether lstat correctly handles trailing slash" >&5 printf %s "checking whether lstat correctly handles trailing slash... " >&6; } if test ${gl_cv_func_lstat_dereferences_slashed_symlink+y} @@ -14426,9 +14650,7 @@ printf "%s\n" "$gl_cv_func_lstat_dereferences_slashed_symlink" >&6; } case "$gl_cv_func_lstat_dereferences_slashed_symlink" in *yes) -cat >>confdefs.h <<_ACEOF -#define LSTAT_FOLLOWS_SLASHED_SYMLINK 1 -_ACEOF +printf "%s\n" "#define LSTAT_FOLLOWS_SLASHED_SYMLINK 1" >>confdefs.h ;; esac @@ -14556,6 +14778,7 @@ printf "%s\n" "$ac_cv_path_SED" >&6; } HAVE_POSIX_OPENPT=1; HAVE_PTSNAME=1; HAVE_PTSNAME_R=1; + HAVE_QSORT_R=1; HAVE_RANDOM=1; HAVE_RANDOM_H=1; HAVE_RANDOM_R=1; @@ -14627,17 +14850,12 @@ printf "%s\n" "$gl_cv_func_malloc_posix" >&6; } - for ac_header in stdlib.h -do : - ac_fn_c_check_header_compile "$LINENO" "stdlib.h" "ac_cv_header_stdlib_h" "$ac_includes_default" + ac_fn_c_check_header_compile "$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 + printf "%s\n" "#define HAVE_STDLIB_H 1" >>confdefs.h fi -done { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for GNU libc compatible malloc" >&5 printf %s "checking for GNU libc compatible malloc... " >&6; } @@ -14699,11 +14917,7 @@ else fi -cat >>confdefs.h <<_ACEOF -#define MALLOC_0_IS_NONNULL $gl_cv_func_malloc_0_nonnull -_ACEOF - - +printf "%s\n" "#define MALLOC_0_IS_NONNULL $gl_cv_func_malloc_0_nonnull" >>confdefs.h @@ -15193,9 +15407,6 @@ printf "%s\n" "$gt_cv_locale_fr_utf8" >&6; } - - - # Check for mmap(). Don't use AC_FUNC_MMAP, because it checks too much: it # fails on HP-UX 11, because MAP_FIXED mappings do not work. But this is # irrelevant for anonymous mappings. @@ -15358,24 +15569,83 @@ printf "%s\n" "$gl_cv_func_memchr_works" >&6; } - GNULIB_MKTIME=0; - GNULIB_NANOSLEEP=0; - GNULIB_STRPTIME=0; - GNULIB_TIMEGM=0; - GNULIB_TIME_R=0; - GNULIB_TIME_RZ=0; - HAVE_DECL_LOCALTIME_R=1; - HAVE_NANOSLEEP=1; - HAVE_STRPTIME=1; - HAVE_TIMEGM=1; - REPLACE_LOCALTIME_R=GNULIB_PORTCHECK; - REPLACE_MKTIME=GNULIB_PORTCHECK; - REPLACE_NANOSLEEP=GNULIB_PORTCHECK; - REPLACE_TIMEGM=GNULIB_PORTCHECK; - : ${GNULIB_GETTIMEOFDAY=0}; - REPLACE_GMTIME=0; - REPLACE_LOCALTIME=0; + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether <limits.h> defines MIN and MAX" >&5 +printf %s "checking whether <limits.h> defines MIN and MAX... " >&6; } +if test ${gl_cv_minmax_in_limits_h+y} +then : + printf %s "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include <limits.h> + int x = MIN (42, 17); +int +main (void) +{ + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO" +then : + gl_cv_minmax_in_limits_h=yes +else + gl_cv_minmax_in_limits_h=no +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_minmax_in_limits_h" >&5 +printf "%s\n" "$gl_cv_minmax_in_limits_h" >&6; } + if test $gl_cv_minmax_in_limits_h = yes; then + +printf "%s\n" "#define HAVE_MINMAX_IN_LIMITS_H 1" >>confdefs.h + + fi + + + + + + + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether <sys/param.h> defines MIN and MAX" >&5 +printf %s "checking whether <sys/param.h> defines MIN and MAX... " >&6; } +if test ${gl_cv_minmax_in_sys_param_h+y} +then : + printf %s "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include <sys/param.h> + int x = MIN (42, 17); +int +main (void) +{ + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO" +then : + gl_cv_minmax_in_sys_param_h=yes +else + gl_cv_minmax_in_sys_param_h=no +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_minmax_in_sys_param_h" >&5 +printf "%s\n" "$gl_cv_minmax_in_sys_param_h" >&6; } + if test $gl_cv_minmax_in_sys_param_h = yes; then + +printf "%s\n" "#define HAVE_MINMAX_IN_SYS_PARAM_H 1" >>confdefs.h + + fi + + + + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether time_t is signed" >&5 @@ -15420,12 +15690,245 @@ else ac_have_decl=0 fi -cat >>confdefs.h <<_ACEOF -#define HAVE_DECL_ALARM $ac_have_decl -_ACEOF +printf "%s\n" "#define HAVE_DECL_ALARM $ac_have_decl" >>confdefs.h + + + + + + + + + + if test $APPLE_UNIVERSAL_BUILD = 1; then + # A universal build on Apple Mac OS X platforms. + # The test result would be 'yes' in 32-bit mode and 'no' in 64-bit mode. + # But we need a configuration result that is valid in both modes. + gl_cv_func_working_mktime=no + fi + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for working mktime" >&5 +printf %s "checking for working mktime... " >&6; } +if test ${gl_cv_func_working_mktime+y} +then : + printf %s "(cached) " >&6 +else + if test "$cross_compiling" = yes +then : + gl_cv_func_working_mktime="guessing no" +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +/* Test program from Paul Eggert and Tony Leneis. */ +#include <limits.h> +#include <stdlib.h> +#include <time.h> + +#ifdef HAVE_UNISTD_H +# include <unistd.h> +#endif + +#if HAVE_DECL_ALARM +# include <signal.h> +#endif +/* Work around redefinition to rpl_putenv by other config tests. */ +#undef putenv +static time_t time_t_max; +static time_t time_t_min; +/* Values we'll use to set the TZ environment variable. */ +static char *tz_strings[] = { + (char *) 0, "TZ=GMT0", "TZ=JST-9", + "TZ=EST+3EDT+2,M10.1.0/00:00:00,M2.3.0/00:00:00" +}; +#define N_STRINGS (sizeof (tz_strings) / sizeof (tz_strings[0])) + +/* Return 0 if mktime fails to convert a date in the spring-forward gap. + Based on a problem report from Andreas Jaeger. */ +static int +spring_forward_gap () +{ + /* glibc (up to about 1998-10-07) failed this test. */ + struct tm tm; + + /* Use the portable POSIX.1 specification "TZ=PST8PDT,M4.1.0,M10.5.0" + instead of "TZ=America/Vancouver" in order to detect the bug even + on systems that don't support the Olson extension, or don't have the + full zoneinfo tables installed. */ + putenv ("TZ=PST8PDT,M4.1.0,M10.5.0"); + + tm.tm_year = 98; + tm.tm_mon = 3; + tm.tm_mday = 5; + tm.tm_hour = 2; + tm.tm_min = 0; + tm.tm_sec = 0; + tm.tm_isdst = -1; + return mktime (&tm) != (time_t) -1; +} + +static int +mktime_test1 (time_t now) +{ + struct tm *lt; + return ! (lt = localtime (&now)) || mktime (lt) == now; +} + +static int +mktime_test (time_t now) +{ + return (mktime_test1 (now) + && mktime_test1 ((time_t) (time_t_max - now)) + && mktime_test1 ((time_t) (time_t_min + now))); +} + +static int +irix_6_4_bug () +{ + /* Based on code from Ariel Faigon. */ + struct tm tm; + tm.tm_year = 96; + tm.tm_mon = 3; + tm.tm_mday = 0; + tm.tm_hour = 0; + tm.tm_min = 0; + tm.tm_sec = 0; + tm.tm_isdst = -1; + mktime (&tm); + return tm.tm_mon == 2 && tm.tm_mday == 31; +} + +static int +bigtime_test (int j) +{ + struct tm tm; + time_t now; + tm.tm_year = tm.tm_mon = tm.tm_mday = tm.tm_hour = tm.tm_min = tm.tm_sec = j; + now = mktime (&tm); + if (now != (time_t) -1) + { + struct tm *lt = localtime (&now); + if (! (lt + && lt->tm_year == tm.tm_year + && lt->tm_mon == tm.tm_mon + && lt->tm_mday == tm.tm_mday + && lt->tm_hour == tm.tm_hour + && lt->tm_min == tm.tm_min + && lt->tm_sec == tm.tm_sec + && lt->tm_yday == tm.tm_yday + && lt->tm_wday == tm.tm_wday + && ((lt->tm_isdst < 0 ? -1 : 0 < lt->tm_isdst) + == (tm.tm_isdst < 0 ? -1 : 0 < tm.tm_isdst)))) + return 0; + } + return 1; +} + +static int +year_2050_test () +{ + /* The correct answer for 2050-02-01 00:00:00 in Pacific time, + ignoring leap seconds. */ + unsigned long int answer = 2527315200UL; + + struct tm tm; + time_t t; + tm.tm_year = 2050 - 1900; + tm.tm_mon = 2 - 1; + tm.tm_mday = 1; + tm.tm_hour = tm.tm_min = tm.tm_sec = 0; + tm.tm_isdst = -1; + + /* Use the portable POSIX.1 specification "TZ=PST8PDT,M4.1.0,M10.5.0" + instead of "TZ=America/Vancouver" in order to detect the bug even + on systems that don't support the Olson extension, or don't have the + full zoneinfo tables installed. */ + putenv ("TZ=PST8PDT,M4.1.0,M10.5.0"); + + t = mktime (&tm); + + /* Check that the result is either a failure, or close enough + to the correct answer that we can assume the discrepancy is + due to leap seconds. */ + return (t == (time_t) -1 + || (0 < t && answer - 120 <= t && t <= answer + 120)); +} + +int +main () +{ + int result = 0; + time_t t, delta; + int i, j; + int time_t_signed_magnitude = (time_t) ~ (time_t) 0 < (time_t) -1; + +#if HAVE_DECL_ALARM + /* This test makes some buggy mktime implementations loop. + Give up after 60 seconds; a mktime slower than that + isn't worth using anyway. */ + signal (SIGALRM, SIG_DFL); + alarm (60); +#endif + + time_t_max = (! TIME_T_IS_SIGNED + ? (time_t) -1 + : ((((time_t) 1 << (sizeof (time_t) * CHAR_BIT - 2)) - 1) + * 2 + 1)); + time_t_min = (! TIME_T_IS_SIGNED + ? (time_t) 0 + : time_t_signed_magnitude + ? ~ (time_t) 0 + : ~ time_t_max); + + delta = time_t_max / 997; /* a suitable prime number */ + for (i = 0; i < N_STRINGS; i++) + { + if (tz_strings[i]) + putenv (tz_strings[i]); + + for (t = 0; t <= time_t_max - delta && (result & 1) == 0; t += delta) + if (! mktime_test (t)) + result |= 1; + if ((result & 2) == 0 + && ! (mktime_test ((time_t) 1) + && mktime_test ((time_t) (60 * 60)) + && mktime_test ((time_t) (60 * 60 * 24)))) + result |= 2; + + for (j = 1; (result & 4) == 0; j <<= 1) + { + if (! bigtime_test (j)) + result |= 4; + if (INT_MAX / 2 < j) + break; + } + if ((result & 8) == 0 && ! bigtime_test (INT_MAX)) + result |= 8; + } + if (! irix_6_4_bug ()) + result |= 16; + if (! spring_forward_gap ()) + result |= 32; + if (! year_2050_test ()) + result |= 64; + return result; +} +_ACEOF +if ac_fn_c_try_run "$LINENO" +then : + gl_cv_func_working_mktime=yes +else + gl_cv_func_working_mktime=no +fi +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ + conftest.$ac_objext conftest.beam conftest.$ac_ext +fi + + +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_working_mktime" >&5 +printf "%s\n" "$gl_cv_func_working_mktime" >&6; } @@ -15463,10 +15966,7 @@ fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_promoted_mode_t" >&5 printf "%s\n" "$gl_cv_promoted_mode_t" >&6; } -cat >>confdefs.h <<_ACEOF -#define PROMOTED_MODE_T $gl_cv_promoted_mode_t -_ACEOF - +printf "%s\n" "#define PROMOTED_MODE_T $gl_cv_promoted_mode_t" >>confdefs.h @@ -15500,9 +16000,7 @@ _ACEOF if test "x$ac_cv_type_sigset_t" = xyes then : -cat >>confdefs.h <<_ACEOF -#define HAVE_SIGSET_T 1 -_ACEOF +printf "%s\n" "#define HAVE_SIGSET_T 1" >>confdefs.h gl_cv_type_sigset_t=yes else @@ -15520,13 +16018,6 @@ fi - - - - - - - ac_fn_c_check_decl "$LINENO" "setenv" "ac_cv_have_decl_setenv" "$ac_includes_default" if test "x$ac_cv_have_decl_setenv" = xyes then : @@ -15535,10 +16026,7 @@ else ac_have_decl=0 fi -cat >>confdefs.h <<_ACEOF -#define HAVE_DECL_SETENV $ac_have_decl -_ACEOF - +printf "%s\n" "#define HAVE_DECL_SETENV $ac_have_decl" >>confdefs.h @@ -15552,30 +16040,19 @@ _ACEOF - for ac_header in search.h -do : ac_fn_c_check_header_compile "$LINENO" "search.h" "ac_cv_header_search_h" "$ac_includes_default" if test "x$ac_cv_header_search_h" = xyes then : - cat >>confdefs.h <<_ACEOF -#define HAVE_SEARCH_H 1 -_ACEOF + printf "%s\n" "#define HAVE_SEARCH_H 1" >>confdefs.h fi -done - for ac_func in tsearch -do : ac_fn_c_check_func "$LINENO" "tsearch" "ac_cv_func_tsearch" if test "x$ac_cv_func_tsearch" = xyes then : - cat >>confdefs.h <<_ACEOF -#define HAVE_TSEARCH 1 -_ACEOF + printf "%s\n" "#define HAVE_TSEARCH 1" >>confdefs.h fi -done - @@ -15614,7 +16091,6 @@ fi : - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for stdbool.h that conforms to C99" >&5 printf %s "checking for stdbool.h that conforms to C99... " >&6; } if test ${ac_cv_header_stdbool_h+y} @@ -15626,7 +16102,10 @@ else #include <stdbool.h> - #if __cplusplus < 201103 + #ifdef __cplusplus + typedef bool Bool; + #else + typedef _Bool Bool; #ifndef bool "error: bool is not defined" #endif @@ -15648,40 +16127,41 @@ else "error: __bool_true_false_are_defined is not defined" #endif - struct s { _Bool s: 1; _Bool t; } s; + struct s { Bool s: 1; Bool t; bool u: 1; bool v; } s; char a[true == 1 ? 1 : -1]; char b[false == 0 ? 1 : -1]; char c[__bool_true_false_are_defined == 1 ? 1 : -1]; char d[(bool) 0.5 == true ? 1 : -1]; /* See body of main program for 'e'. */ - char f[(_Bool) 0.0 == false ? 1 : -1]; + char f[(Bool) 0.0 == false ? 1 : -1]; char g[true]; - char h[sizeof (_Bool)]; + char h[sizeof (Bool)]; char i[sizeof s.t]; enum { j = false, k = true, l = false * true, m = true * 256 }; /* The following fails for HP aC++/ANSI C B3910B A.05.55 [Dec 04 2003]. */ - _Bool n[m]; + Bool n[m]; char o[sizeof n == m * sizeof n[0] ? 1 : -1]; - char p[-1 - (_Bool) 0 < 0 && -1 - (bool) 0 < 0 ? 1 : -1]; + char p[-1 - (Bool) 0 < 0 && -1 - (bool) 0 < 0 ? 1 : -1]; /* Catch a bug in an HP-UX C compiler. See http://gcc.gnu.org/ml/gcc-patches/2003-12/msg02303.html http://lists.gnu.org/archive/html/bug-coreutils/2005-11/msg00161.html */ - _Bool q = true; - _Bool *pq = &q; + Bool q = true; + Bool *pq = &q; + bool *qq = &q; int main (void) { bool e = &s; - *pq |= q; - *pq |= ! q; + *pq |= q; *pq |= ! q; + *qq |= q; *qq |= ! q; /* Refer to every declared value, to avoid compiler optimizations. */ return (!a + !b + !c + !d + !e + !f + !g + !h + !i + !!j + !k + !!l - + !m + !n + !o + !p + !q + !pq); + + !m + !n + !o + !p + !q + !pq + !qq); ; return 0; @@ -15701,9 +16181,7 @@ printf "%s\n" "$ac_cv_header_stdbool_h" >&6; } if test "x$ac_cv_type__Bool" = xyes then : -cat >>confdefs.h <<_ACEOF -#define HAVE__BOOL 1 -_ACEOF +printf "%s\n" "#define HAVE__BOOL 1" >>confdefs.h fi @@ -15784,7 +16262,6 @@ printf "%s\n" "#define REPLACE_STRERROR_0 1" >>confdefs.h - if test $ac_cv_func_strerror_r = yes; then if test "$ERRNO_H:$REPLACE_STRERROR_0" = :0; then { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for strerror_r with POSIX signature" >&5 @@ -15997,9 +16474,7 @@ ac_fn_c_check_member "$LINENO" "struct tm" "tm_zone" "ac_cv_member_struct_tm_tm_ if test "x$ac_cv_member_struct_tm_tm_zone" = xyes then : -cat >>confdefs.h <<_ACEOF -#define HAVE_STRUCT_TM_TM_ZONE 1 -_ACEOF +printf "%s\n" "#define HAVE_STRUCT_TM_TM_ZONE 1" >>confdefs.h fi @@ -16018,9 +16493,7 @@ else ac_have_decl=0 fi -cat >>confdefs.h <<_ACEOF -#define HAVE_DECL_TZNAME $ac_have_decl -_ACEOF +printf "%s\n" "#define HAVE_DECL_TZNAME $ac_have_decl" >>confdefs.h { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for tzname" >&5 printf %s "checking for tzname... " >&6; } @@ -16337,10 +16810,7 @@ else ac_have_decl=0 fi -cat >>confdefs.h <<_ACEOF -#define HAVE_DECL_STRNDUP $ac_have_decl -_ACEOF - +printf "%s\n" "#define HAVE_DECL_STRNDUP $ac_have_decl" >>confdefs.h ac_fn_c_check_decl "$LINENO" "strnlen" "ac_cv_have_decl_strnlen" "$ac_includes_default" @@ -16351,11 +16821,7 @@ else ac_have_decl=0 fi -cat >>confdefs.h <<_ACEOF -#define HAVE_DECL_STRNLEN $ac_have_decl -_ACEOF - - +printf "%s\n" "#define HAVE_DECL_STRNLEN $ac_have_decl" >>confdefs.h @@ -16367,9 +16833,7 @@ else ac_have_decl=0 fi -cat >>confdefs.h <<_ACEOF -#define HAVE_DECL_STRTOUMAX $ac_have_decl -_ACEOF +printf "%s\n" "#define HAVE_DECL_STRTOUMAX $ac_have_decl" >>confdefs.h @@ -16461,11 +16925,15 @@ printf "%s\n" "$gl_cv_next_sys_types_h" >&6; } - GNULIB_WAITPID=0; + WINDOWS_STAT_INODES=0 + GNULIB_WAITPID=0; + + + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for struct timespec in <time.h>" >&5 printf %s "checking for struct timespec in <time.h>... " >&6; } @@ -16689,8 +17157,6 @@ printf "%s\n" "$gl_cv_next_time_h" >&6; } - - gl_libunistring_sed_extract_major='/^[0-9]/{s/^\([0-9]*\).*/\1/p;q;} i\ 0 @@ -16722,9 +17188,7 @@ else ac_have_decl=0 fi -cat >>confdefs.h <<_ACEOF -#define HAVE_DECL_CLEARERR_UNLOCKED $ac_have_decl -_ACEOF +printf "%s\n" "#define HAVE_DECL_CLEARERR_UNLOCKED $ac_have_decl" >>confdefs.h ac_fn_c_check_decl "$LINENO" "feof_unlocked" "ac_cv_have_decl_feof_unlocked" "$ac_includes_default" if test "x$ac_cv_have_decl_feof_unlocked" = xyes @@ -16734,9 +17198,7 @@ else ac_have_decl=0 fi -cat >>confdefs.h <<_ACEOF -#define HAVE_DECL_FEOF_UNLOCKED $ac_have_decl -_ACEOF +printf "%s\n" "#define HAVE_DECL_FEOF_UNLOCKED $ac_have_decl" >>confdefs.h ac_fn_c_check_decl "$LINENO" "ferror_unlocked" "ac_cv_have_decl_ferror_unlocked" "$ac_includes_default" if test "x$ac_cv_have_decl_ferror_unlocked" = xyes @@ -16746,9 +17208,7 @@ else ac_have_decl=0 fi -cat >>confdefs.h <<_ACEOF -#define HAVE_DECL_FERROR_UNLOCKED $ac_have_decl -_ACEOF +printf "%s\n" "#define HAVE_DECL_FERROR_UNLOCKED $ac_have_decl" >>confdefs.h ac_fn_c_check_decl "$LINENO" "fflush_unlocked" "ac_cv_have_decl_fflush_unlocked" "$ac_includes_default" if test "x$ac_cv_have_decl_fflush_unlocked" = xyes @@ -16758,9 +17218,7 @@ else ac_have_decl=0 fi -cat >>confdefs.h <<_ACEOF -#define HAVE_DECL_FFLUSH_UNLOCKED $ac_have_decl -_ACEOF +printf "%s\n" "#define HAVE_DECL_FFLUSH_UNLOCKED $ac_have_decl" >>confdefs.h ac_fn_c_check_decl "$LINENO" "fgets_unlocked" "ac_cv_have_decl_fgets_unlocked" "$ac_includes_default" if test "x$ac_cv_have_decl_fgets_unlocked" = xyes @@ -16770,9 +17228,7 @@ else ac_have_decl=0 fi -cat >>confdefs.h <<_ACEOF -#define HAVE_DECL_FGETS_UNLOCKED $ac_have_decl -_ACEOF +printf "%s\n" "#define HAVE_DECL_FGETS_UNLOCKED $ac_have_decl" >>confdefs.h ac_fn_c_check_decl "$LINENO" "fputc_unlocked" "ac_cv_have_decl_fputc_unlocked" "$ac_includes_default" if test "x$ac_cv_have_decl_fputc_unlocked" = xyes @@ -16782,9 +17238,7 @@ else ac_have_decl=0 fi -cat >>confdefs.h <<_ACEOF -#define HAVE_DECL_FPUTC_UNLOCKED $ac_have_decl -_ACEOF +printf "%s\n" "#define HAVE_DECL_FPUTC_UNLOCKED $ac_have_decl" >>confdefs.h ac_fn_c_check_decl "$LINENO" "fputs_unlocked" "ac_cv_have_decl_fputs_unlocked" "$ac_includes_default" if test "x$ac_cv_have_decl_fputs_unlocked" = xyes @@ -16794,9 +17248,7 @@ else ac_have_decl=0 fi -cat >>confdefs.h <<_ACEOF -#define HAVE_DECL_FPUTS_UNLOCKED $ac_have_decl -_ACEOF +printf "%s\n" "#define HAVE_DECL_FPUTS_UNLOCKED $ac_have_decl" >>confdefs.h ac_fn_c_check_decl "$LINENO" "fread_unlocked" "ac_cv_have_decl_fread_unlocked" "$ac_includes_default" if test "x$ac_cv_have_decl_fread_unlocked" = xyes @@ -16806,9 +17258,7 @@ else ac_have_decl=0 fi -cat >>confdefs.h <<_ACEOF -#define HAVE_DECL_FREAD_UNLOCKED $ac_have_decl -_ACEOF +printf "%s\n" "#define HAVE_DECL_FREAD_UNLOCKED $ac_have_decl" >>confdefs.h ac_fn_c_check_decl "$LINENO" "fwrite_unlocked" "ac_cv_have_decl_fwrite_unlocked" "$ac_includes_default" if test "x$ac_cv_have_decl_fwrite_unlocked" = xyes @@ -16818,9 +17268,7 @@ else ac_have_decl=0 fi -cat >>confdefs.h <<_ACEOF -#define HAVE_DECL_FWRITE_UNLOCKED $ac_have_decl -_ACEOF +printf "%s\n" "#define HAVE_DECL_FWRITE_UNLOCKED $ac_have_decl" >>confdefs.h ac_fn_c_check_decl "$LINENO" "getchar_unlocked" "ac_cv_have_decl_getchar_unlocked" "$ac_includes_default" if test "x$ac_cv_have_decl_getchar_unlocked" = xyes @@ -16830,9 +17278,7 @@ else ac_have_decl=0 fi -cat >>confdefs.h <<_ACEOF -#define HAVE_DECL_GETCHAR_UNLOCKED $ac_have_decl -_ACEOF +printf "%s\n" "#define HAVE_DECL_GETCHAR_UNLOCKED $ac_have_decl" >>confdefs.h ac_fn_c_check_decl "$LINENO" "putc_unlocked" "ac_cv_have_decl_putc_unlocked" "$ac_includes_default" if test "x$ac_cv_have_decl_putc_unlocked" = xyes @@ -16842,9 +17288,7 @@ else ac_have_decl=0 fi -cat >>confdefs.h <<_ACEOF -#define HAVE_DECL_PUTC_UNLOCKED $ac_have_decl -_ACEOF +printf "%s\n" "#define HAVE_DECL_PUTC_UNLOCKED $ac_have_decl" >>confdefs.h ac_fn_c_check_decl "$LINENO" "putchar_unlocked" "ac_cv_have_decl_putchar_unlocked" "$ac_includes_default" if test "x$ac_cv_have_decl_putchar_unlocked" = xyes @@ -16854,9 +17298,7 @@ else ac_have_decl=0 fi -cat >>confdefs.h <<_ACEOF -#define HAVE_DECL_PUTCHAR_UNLOCKED $ac_have_decl -_ACEOF +printf "%s\n" "#define HAVE_DECL_PUTCHAR_UNLOCKED $ac_have_decl" >>confdefs.h ac_fn_c_check_decl "$LINENO" "unsetenv" "ac_cv_have_decl_unsetenv" "$ac_includes_default" if test "x$ac_cv_have_decl_unsetenv" = xyes @@ -16866,11 +17308,7 @@ else ac_have_decl=0 fi -cat >>confdefs.h <<_ACEOF -#define HAVE_DECL_UNSETENV $ac_have_decl -_ACEOF - - +printf "%s\n" "#define HAVE_DECL_UNSETENV $ac_have_decl" >>confdefs.h @@ -16916,9 +17354,7 @@ fi printf "%s\n" "$gl_cv_header_inttypes_h" >&6; } if test $gl_cv_header_inttypes_h = yes; then -cat >>confdefs.h <<_ACEOF -#define HAVE_INTTYPES_H_WITH_UINTMAX 1 -_ACEOF +printf "%s\n" "#define HAVE_INTTYPES_H_WITH_UINTMAX 1" >>confdefs.h fi @@ -16953,9 +17389,7 @@ fi printf "%s\n" "$gl_cv_header_stdint_h" >&6; } if test $gl_cv_header_stdint_h = yes; then -cat >>confdefs.h <<_ACEOF -#define HAVE_STDINT_H_WITH_UINTMAX 1 -_ACEOF +printf "%s\n" "#define HAVE_STDINT_H_WITH_UINTMAX 1" >>confdefs.h fi @@ -17008,9 +17442,7 @@ printf "%s\n" "#define HAVE_INTMAX_T 1" >>confdefs.h && ac_type='long long' \ || ac_type='long' -cat >>confdefs.h <<_ACEOF -#define intmax_t $ac_type -_ACEOF +printf "%s\n" "#define intmax_t $ac_type" >>confdefs.h fi @@ -17361,14 +17793,10 @@ printf "%s\n" "$gl_cv_cc_double_expbit0" >&6; } word=`echo "$gl_cv_cc_double_expbit0" | sed -e 's/word //' -e 's/ bit.*//'` bit=`echo "$gl_cv_cc_double_expbit0" | sed -e 's/word.*bit //'` -cat >>confdefs.h <<_ACEOF -#define DBL_EXPBIT0_WORD $word -_ACEOF +printf "%s\n" "#define DBL_EXPBIT0_WORD $word" >>confdefs.h -cat >>confdefs.h <<_ACEOF -#define DBL_EXPBIT0_BIT $bit -_ACEOF +printf "%s\n" "#define DBL_EXPBIT0_BIT $bit" >>confdefs.h ;; esac @@ -17380,7 +17808,6 @@ _ACEOF - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether snprintf returns a byte count as in C99" >&5 printf %s "checking whether snprintf returns a byte count as in C99... " >&6; } if test ${gl_cv_func_snprintf_retval_c99+y} @@ -17473,18 +17900,42 @@ printf "%s\n" "$gl_cv_func_snprintf_retval_c99" >&6; } - for ac_func in snprintf strnlen wcslen wcsnlen mbrtowc wcrtomb -do : - as_ac_var=`printf "%s\n" "ac_cv_func_$ac_func" | $as_tr_sh` -ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" -if eval test \"x\$"$as_ac_var"\" = x"yes" + ac_fn_c_check_func "$LINENO" "snprintf" "ac_cv_func_snprintf" +if test "x$ac_cv_func_snprintf" = xyes then : - cat >>confdefs.h <<_ACEOF -#define `printf "%s\n" "HAVE_$ac_func" | $as_tr_cpp` 1 -_ACEOF + printf "%s\n" "#define HAVE_SNPRINTF 1" >>confdefs.h + +fi +ac_fn_c_check_func "$LINENO" "strnlen" "ac_cv_func_strnlen" +if test "x$ac_cv_func_strnlen" = xyes +then : + printf "%s\n" "#define HAVE_STRNLEN 1" >>confdefs.h + +fi +ac_fn_c_check_func "$LINENO" "wcslen" "ac_cv_func_wcslen" +if test "x$ac_cv_func_wcslen" = xyes +then : + printf "%s\n" "#define HAVE_WCSLEN 1" >>confdefs.h + +fi +ac_fn_c_check_func "$LINENO" "wcsnlen" "ac_cv_func_wcsnlen" +if test "x$ac_cv_func_wcsnlen" = xyes +then : + printf "%s\n" "#define HAVE_WCSNLEN 1" >>confdefs.h + +fi +ac_fn_c_check_func "$LINENO" "mbrtowc" "ac_cv_func_mbrtowc" +if test "x$ac_cv_func_mbrtowc" = xyes +then : + printf "%s\n" "#define HAVE_MBRTOWC 1" >>confdefs.h + +fi +ac_fn_c_check_func "$LINENO" "wcrtomb" "ac_cv_func_wcrtomb" +if test "x$ac_cv_func_wcrtomb" = xyes +then : + printf "%s\n" "#define HAVE_WCRTOMB 1" >>confdefs.h fi -done ac_fn_c_check_decl "$LINENO" "_snprintf" "ac_cv_have_decl__snprintf" "#include <stdio.h> " @@ -17495,9 +17946,7 @@ else ac_have_decl=0 fi -cat >>confdefs.h <<_ACEOF -#define HAVE_DECL__SNPRINTF $ac_have_decl -_ACEOF +printf "%s\n" "#define HAVE_DECL__SNPRINTF $ac_have_decl" >>confdefs.h @@ -17512,8 +17961,6 @@ printf "%s\n" "#define HAVE_SNPRINTF_RETVAL_C99 1" >>confdefs.h - - GNULIB_SOCKET=0; GNULIB_CONNECT=0; GNULIB_ACCEPT=0; @@ -17537,17 +17984,12 @@ printf "%s\n" "#define HAVE_SNPRINTF_RETVAL_C99 1" >>confdefs.h if test $ac_cv_header_sys_socket_h = no; then - for ac_header in ws2tcpip.h -do : - ac_fn_c_check_header_compile "$LINENO" "ws2tcpip.h" "ac_cv_header_ws2tcpip_h" "$ac_includes_default" + ac_fn_c_check_header_compile "$LINENO" "ws2tcpip.h" "ac_cv_header_ws2tcpip_h" "$ac_includes_default" if test "x$ac_cv_header_ws2tcpip_h" = xyes then : - cat >>confdefs.h <<_ACEOF -#define HAVE_WS2TCPIP_H 1 -_ACEOF + printf "%s\n" "#define HAVE_WS2TCPIP_H 1" >>confdefs.h fi -done fi @@ -17593,17 +18035,12 @@ fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_header_sys_socket_h_selfcontained" >&5 printf "%s\n" "$gl_cv_header_sys_socket_h_selfcontained" >&6; } if test $gl_cv_header_sys_socket_h_selfcontained = yes; then - for ac_func in shutdown -do : - ac_fn_c_check_func "$LINENO" "shutdown" "ac_cv_func_shutdown" + ac_fn_c_check_func "$LINENO" "shutdown" "ac_cv_func_shutdown" if test "x$ac_cv_func_shutdown" = xyes then : - cat >>confdefs.h <<_ACEOF -#define HAVE_SHUTDOWN 1 -_ACEOF + printf "%s\n" "#define HAVE_SHUTDOWN 1" >>confdefs.h fi -done if test $ac_cv_func_shutdown = yes; then { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether <sys/socket.h> defines the SHUT_* macros" >&5 @@ -17752,9 +18189,7 @@ printf "%s\n" "$gl_cv_next_sys_socket_h" >&6; } if test "x$ac_cv_type_struct_sockaddr_storage" = xyes then : -cat >>confdefs.h <<_ACEOF -#define HAVE_STRUCT_SOCKADDR_STORAGE 1 -_ACEOF +printf "%s\n" "#define HAVE_STRUCT_SOCKADDR_STORAGE 1" >>confdefs.h fi @@ -17774,9 +18209,7 @@ ac_fn_c_check_type "$LINENO" "sa_family_t" "ac_cv_type_sa_family_t" " if test "x$ac_cv_type_sa_family_t" = xyes then : -cat >>confdefs.h <<_ACEOF -#define HAVE_SA_FAMILY_T 1 -_ACEOF +printf "%s\n" "#define HAVE_SA_FAMILY_T 1" >>confdefs.h fi @@ -17800,9 +18233,7 @@ fi if test "x$ac_cv_member_struct_sockaddr_storage_ss_family" = xyes then : -cat >>confdefs.h <<_ACEOF -#define HAVE_STRUCT_SOCKADDR_STORAGE_SS_FAMILY 1 -_ACEOF +printf "%s\n" "#define HAVE_STRUCT_SOCKADDR_STORAGE_SS_FAMILY 1" >>confdefs.h else @@ -17819,17 +18250,12 @@ fi if test $ac_cv_header_sys_socket_h != yes; then - for ac_header in winsock2.h -do : - ac_fn_c_check_header_compile "$LINENO" "winsock2.h" "ac_cv_header_winsock2_h" "$ac_includes_default" + ac_fn_c_check_header_compile "$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 + printf "%s\n" "#define HAVE_WINSOCK2_H 1" >>confdefs.h fi -done fi if test "$ac_cv_header_winsock2_h" = yes; then @@ -17901,8 +18327,6 @@ fi - - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether getcwd (NULL, 0) allocates memory for result" >&5 printf %s "checking whether getcwd (NULL, 0) allocates memory for result... " >&6; } if test ${gl_cv_func_getcwd_null+y} @@ -18018,8 +18442,6 @@ printf "%s\n" "$gl_cv_func_getcwd_posix_signature" >&6; } - - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for IPv4 sockets" >&5 printf %s "checking for IPv4 sockets... " >&6; } if test ${gl_cv_socket_ipv4+y} @@ -18113,7 +18535,6 @@ printf "%s\n" "#define HAVE_IPV6 1" >>confdefs.h - GNULIB_PSELECT=0; GNULIB_SELECT=0; HAVE_PSELECT=1; @@ -18124,7 +18545,6 @@ printf "%s\n" "#define HAVE_IPV6 1" >>confdefs.h - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether <sys/select.h> is self-contained" >&5 printf %s "checking whether <sys/select.h> is self-contained... " >&6; } if test ${gl_cv_header_sys_select_h_selfcontained+y} @@ -18300,17 +18720,12 @@ printf "%s\n" "$gl_cv_next_sys_select_h" >&6; } if test $ac_cv_header_sys_socket_h != yes; then - for ac_header in winsock2.h -do : - ac_fn_c_check_header_compile "$LINENO" "winsock2.h" "ac_cv_header_winsock2_h" "$ac_includes_default" + ac_fn_c_check_header_compile "$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 + printf "%s\n" "#define HAVE_WINSOCK2_H 1" >>confdefs.h fi -done fi if test "$ac_cv_header_winsock2_h" = yes; then @@ -18379,17 +18794,12 @@ fi if test $ac_cv_header_sys_socket_h != yes; then - for ac_header in winsock2.h -do : - ac_fn_c_check_header_compile "$LINENO" "winsock2.h" "ac_cv_header_winsock2_h" "$ac_includes_default" + ac_fn_c_check_header_compile "$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 + printf "%s\n" "#define HAVE_WINSOCK2_H 1" >>confdefs.h fi -done fi if test "$ac_cv_header_winsock2_h" = yes; then @@ -18756,8 +19166,6 @@ rm -f core conftest.err conftest.$ac_objext \ - - ac_fn_c_check_decl "$LINENO" "snprintf" "ac_cv_have_decl_snprintf" "$ac_includes_default" if test "x$ac_cv_have_decl_snprintf" = xyes then : @@ -18766,14 +19174,7 @@ else ac_have_decl=0 fi -cat >>confdefs.h <<_ACEOF -#define HAVE_DECL_SNPRINTF $ac_have_decl -_ACEOF - - - - - +printf "%s\n" "#define HAVE_DECL_SNPRINTF $ac_have_decl" >>confdefs.h @@ -19025,6 +19426,61 @@ printf "%s\n" "#define GNULIB_TEST_BTOWC 1" >>confdefs.h + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for __builtin_expect" >&5 +printf %s "checking for __builtin_expect... " >&6; } +if test ${gl_cv___builtin_expect+y} +then : + printf %s "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + + int + main (int argc, char **argv) + { + argc = __builtin_expect (argc, 100); + return argv[argc != 100][0]; + } +_ACEOF +if ac_fn_c_try_link "$LINENO" +then : + gl_cv___builtin_expect=yes +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + + #include <builtins.h> + int + main (int argc, char **argv) + { + argc = __builtin_expect (argc, 100); + return argv[argc != 100][0]; + } +_ACEOF +if ac_fn_c_try_link "$LINENO" +then : + gl_cv___builtin_expect="in <builtins.h>" +else + gl_cv___builtin_expect=no +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 +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv___builtin_expect" >&5 +printf "%s\n" "$gl_cv___builtin_expect" >&6; } + if test "$gl_cv___builtin_expect" = yes; then + printf "%s\n" "#define HAVE___BUILTIN_EXPECT 1" >>confdefs.h + + elif test "$gl_cv___builtin_expect" = "in <builtins.h>"; then + printf "%s\n" "#define HAVE___BUILTIN_EXPECT 2" >>confdefs.h + + fi + + + @@ -19041,9 +19497,7 @@ else ac_have_decl=0 fi -cat >>confdefs.h <<_ACEOF -#define HAVE_DECL_SIGALTSTACK $ac_have_decl -_ACEOF +printf "%s\n" "#define HAVE_DECL_SIGALTSTACK $ac_have_decl" >>confdefs.h @@ -19053,9 +19507,7 @@ _ACEOF if test "x$ac_cv_type_stack_t" = xyes then : -cat >>confdefs.h <<_ACEOF -#define HAVE_STACK_T 1 -_ACEOF +printf "%s\n" "#define HAVE_STACK_T 1" >>confdefs.h fi @@ -19146,44 +19598,41 @@ then : LIB_CLOCK_GETTIME=$ac_cv_search_clock_gettime fi - for ac_func in clock_gettime clock_settime -do : - as_ac_var=`printf "%s\n" "ac_cv_func_$ac_func" | $as_tr_sh` -ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" -if eval test \"x\$"$as_ac_var"\" = x"yes" + ac_fn_c_check_func "$LINENO" "clock_gettime" "ac_cv_func_clock_gettime" +if test "x$ac_cv_func_clock_gettime" = xyes then : - cat >>confdefs.h <<_ACEOF -#define `printf "%s\n" "HAVE_$ac_func" | $as_tr_cpp` 1 -_ACEOF + printf "%s\n" "#define HAVE_CLOCK_GETTIME 1" >>confdefs.h + +fi +ac_fn_c_check_func "$LINENO" "clock_settime" "ac_cv_func_clock_settime" +if test "x$ac_cv_func_clock_settime" = xyes +then : + printf "%s\n" "#define HAVE_CLOCK_SETTIME 1" >>confdefs.h fi -done LIBS=$gl_saved_libs - if test $HAVE_MSVC_INVALID_PARAMETER_HANDLER = 1; then - REPLACE_CLOSE=1 - fi + + if test $HAVE_MSVC_INVALID_PARAMETER_HANDLER = 1; then + REPLACE_CLOSE=1 + fi + if test $ac_cv_header_sys_socket_h != yes; then - for ac_header in winsock2.h -do : - ac_fn_c_check_header_compile "$LINENO" "winsock2.h" "ac_cv_header_winsock2_h" "$ac_includes_default" + ac_fn_c_check_header_compile "$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 + printf "%s\n" "#define HAVE_WINSOCK2_H 1" >>confdefs.h fi -done fi if test "$ac_cv_header_winsock2_h" = yes; then @@ -19395,9 +19844,7 @@ fi -cat >>confdefs.h <<_ACEOF -#define GNULIB_DIRNAME 1 -_ACEOF +printf "%s\n" "#define GNULIB_DIRNAME 1" >>confdefs.h @@ -19561,17 +20008,12 @@ printf "%s\n" "$gl_cv_func_dup2_works" >&6; } *yes) ;; *) REPLACE_DUP2=1 - for ac_func in setdtablesize -do : - ac_fn_c_check_func "$LINENO" "setdtablesize" "ac_cv_func_setdtablesize" + 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 + printf "%s\n" "#define HAVE_SETDTABLESIZE 1" >>confdefs.h fi -done ;; esac @@ -20008,9 +20450,7 @@ fi -cat >>confdefs.h <<_ACEOF -#define GNULIB_FILENAMECAT 1 -_ACEOF +printf "%s\n" "#define GNULIB_FILENAMECAT 1" >>confdefs.h @@ -20028,13 +20468,18 @@ else #include <stdlib.h> #include <stdio.h> #include <stddef.h> - struct s { int n; double d[]; }; + struct m { struct m *next, **list; char name[]; }; + struct s { struct s *p; struct m *m; int n; double d[]; }; int main (void) { int m = getchar (); - struct s *p = malloc (offsetof (struct s, d) - + m * sizeof (double)); + size_t nbytes = offsetof (struct s, d) + m * sizeof (double); + nbytes += sizeof (struct s) - 1; + nbytes -= nbytes % sizeof (struct s); + struct s *p = malloc (nbytes); + p->p = p; + p->m = NULL; p->d[0] = 0.0; return p->d != (double *) NULL; ; @@ -20443,9 +20888,7 @@ fi -cat >>confdefs.h <<_ACEOF -#define fnmatch ${gl_fnmatch_required_lowercase}_fnmatch -_ACEOF +printf "%s\n" "#define fnmatch ${gl_fnmatch_required_lowercase}_fnmatch" >>confdefs.h ac_fn_c_check_decl "$LINENO" "isblank" "ac_cv_have_decl_isblank" "#include <ctype.h> @@ -20457,9 +20900,7 @@ else ac_have_decl=0 fi -cat >>confdefs.h <<_ACEOF -#define HAVE_DECL_ISBLANK $ac_have_decl -_ACEOF +printf "%s\n" "#define HAVE_DECL_ISBLANK $ac_have_decl" >>confdefs.h @@ -20483,9 +20924,7 @@ _ACEOF -cat >>confdefs.h <<_ACEOF -#define fnmatch ${gl_fnmatch_required_lowercase}_fnmatch -_ACEOF +printf "%s\n" "#define fnmatch ${gl_fnmatch_required_lowercase}_fnmatch" >>confdefs.h ac_fn_c_check_decl "$LINENO" "isblank" "ac_cv_have_decl_isblank" "#include <ctype.h> @@ -20497,9 +20936,7 @@ else ac_have_decl=0 fi -cat >>confdefs.h <<_ACEOF -#define HAVE_DECL_ISBLANK $ac_have_decl -_ACEOF +printf "%s\n" "#define HAVE_DECL_ISBLANK $ac_have_decl" >>confdefs.h @@ -20512,6 +20949,52 @@ _ACEOF mingw* | pw* | os2*) REPLACE_FREOPEN=1 ;; + *) + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether freopen works on closed fds" >&5 +printf %s "checking whether freopen works on closed fds... " >&6; } +if test ${gl_cv_func_freopen_works_on_closed+y} +then : + printf %s "(cached) " >&6 +else + if test "$cross_compiling" = yes +then : + case $host_os in + *gnu*) gl_cv_func_freopen_works_on_closed="guessing no" ;; + *) gl_cv_func_freopen_works_on_closed="guessing yes";; + esac +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include <stdio.h> + #include <unistd.h> + +int +main (void) +{ +close (0); + return !(freopen ("/dev/null", "r", stdin) + && getchar () == EOF + && !ferror (stdin) && feof (stdin)); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_run "$LINENO" +then : + gl_cv_func_freopen_works_on_closed=yes +else + gl_cv_func_freopen_works_on_closed=no +fi +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ + conftest.$ac_objext conftest.beam conftest.$ac_ext +fi + +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_freopen_works_on_closed" >&5 +printf "%s\n" "$gl_cv_func_freopen_works_on_closed" >&6; } + case $gl_cv_func_freopen_works_on_closed in + *no) REPLACE_FREOPEN=1;; + esac esac if test $REPLACE_FREOPEN = 1; then @@ -20544,23 +21027,18 @@ printf "%s\n" "#define GNULIB_TEST_FREOPEN 1" >>confdefs.h -cat >>confdefs.h <<_ACEOF -#define GNULIB_FREOPEN_SAFER 1 -_ACEOF +printf "%s\n" "#define GNULIB_FREOPEN_SAFER 1" >>confdefs.h - if test $HAVE_MSVC_INVALID_PARAMETER_HANDLER = 1; then - REPLACE_FSTAT=1 - fi - - - if test $WINDOWS_64_BIT_ST_SIZE = 1; then - REPLACE_FSTAT=1 - fi + case "$host_os" in + mingw*) + REPLACE_FSTAT=1 + ;; + esac @@ -20575,7 +21053,20 @@ _ACEOF gl_LIBOBJS="$gl_LIBOBJS fstat.$ac_objext" - : + + + + + + + + + gl_LIBOBJS="$gl_LIBOBJS stat-w32.$ac_objext" + + + + : + fi @@ -20688,83 +21179,150 @@ printf "%s\n" "#define GNULIB_TEST_GETDTABLESIZE 1" >>confdefs.h - if test $REPLACE_GETOPT = 1; then - - - - - - - gl_LIBOBJS="$gl_LIBOBJS getopt.$ac_objext" - + REPLACE_GETOPT=0 + if test -n "$gl_replace_getopt"; then + REPLACE_GETOPT=1 + fi + if test $REPLACE_GETOPT = 1; then + if test $ac_cv_header_sys_cdefs_h = yes; then + HAVE_SYS_CDEFS_H=1 + else + HAVE_SYS_CDEFS_H=0 + fi - gl_LIBOBJS="$gl_LIBOBJS getopt1.$ac_objext" +printf "%s\n" "#define __GETOPT_PREFIX rpl_" >>confdefs.h + GETOPT_H=getopt.h + GETOPT_CDEFS_H=getopt-cdefs.h - GNULIB_GL_UNISTD_H_GETOPT=1 fi + if test $REPLACE_GETOPT = 1; then -printf "%s\n" "#define GNULIB_TEST_GETOPT_GNU 1" >>confdefs.h - - REPLACE_GETOPT=0 - if test -n "$gl_replace_getopt"; then - REPLACE_GETOPT=1 - fi + gl_LIBOBJS="$gl_LIBOBJS getopt.$ac_objext" - if test $REPLACE_GETOPT = 1; then - GETOPT_H=getopt.h -printf "%s\n" "#define __GETOPT_PREFIX rpl_" >>confdefs.h - fi - if test $REPLACE_GETOPT = 1; then + gl_LIBOBJS="$gl_LIBOBJS getopt1.$ac_objext" + GNULIB_GL_UNISTD_H_GETOPT=1 + fi + ac_found=0 + ac_fn_c_check_decl "$LINENO" "program_invocation_name" "ac_cv_have_decl_program_invocation_name" "#include <errno.h> +" +if test "x$ac_cv_have_decl_program_invocation_name" = xyes +then : + ac_have_decl=1 +else + ac_have_decl=0 +fi - gl_LIBOBJS="$gl_LIBOBJS getopt.$ac_objext" +printf "%s\n" "#define HAVE_DECL_PROGRAM_INVOCATION_NAME $ac_have_decl" >>confdefs.h +if test $ac_have_decl = 1 +then : + ac_found=1 +fi + ac_fn_c_check_decl "$LINENO" "program_invocation_short_name" "ac_cv_have_decl_program_invocation_short_name" "#include <errno.h> +" +if test "x$ac_cv_have_decl_program_invocation_short_name" = xyes +then : + ac_have_decl=1 +else + ac_have_decl=0 +fi +printf "%s\n" "#define HAVE_DECL_PROGRAM_INVOCATION_SHORT_NAME $ac_have_decl" >>confdefs.h +if test $ac_have_decl = 1 +then : + ac_found=1 +fi + ac_fn_c_check_decl "$LINENO" "__argv" "ac_cv_have_decl___argv" "#include <stdlib.h> +" +if test "x$ac_cv_have_decl___argv" = xyes +then : + ac_have_decl=1 +else + ac_have_decl=0 +fi +printf "%s\n" "#define HAVE_DECL___ARGV $ac_have_decl" >>confdefs.h +if test $ac_have_decl = 1 +then : + ac_found=1 +fi + # Incur the cost of this test only if none of the above worked. + if test $ac_found = 0; then + # On OpenBSD 5.1, using the global __progname variable appears to be + # the only way to implement getprogname. + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether __progname is defined in default libraries" >&5 +printf %s "checking whether __progname is defined in default libraries... " >&6; } +if test ${gl_cv_var___progname+y} +then : + printf %s "(cached) " >&6 +else + gl_cv_var___progname= + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +extern char *__progname; +int +main (void) +{ +return *__progname; + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO" +then : + gl_cv_var___progname=yes - gl_LIBOBJS="$gl_LIBOBJS getopt1.$ac_objext" +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_var___progname" >&5 +printf "%s\n" "$gl_cv_var___progname" >&6; } + if test "$gl_cv_var___progname" = yes; then +printf "%s\n" "#define HAVE_VAR___PROGNAME 1" >>confdefs.h - GNULIB_GL_UNISTD_H_GETOPT=1 + fi fi @@ -20780,6 +21338,7 @@ printf "%s\n" "#define __GETOPT_PREFIX rpl_" >>confdefs.h + gl_gettimeofday_timezone=void if test $ac_cv_func_gettimeofday != yes; then HAVE_GETTIMEOFDAY=0 @@ -20787,6 +21346,7 @@ printf "%s\n" "#define __GETOPT_PREFIX rpl_" >>confdefs.h + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether gettimeofday clobbers localtime buffer" >&5 printf %s "checking whether gettimeofday clobbers localtime buffer... " >&6; } if test ${gl_cv_func_gettimeofday_clobber+y} @@ -20846,11 +21406,14 @@ printf "%s\n" "$gl_cv_func_gettimeofday_clobber" >&6; } *yes) REPLACE_GETTIMEOFDAY=1 - REPLACE_GMTIME=1 - REPLACE_LOCALTIME=1 +printf "%s\n" "#define GETTIMEOFDAY_CLOBBERS_LOCALTIME 1" >>confdefs.h + -printf "%s\n" "#define GETTIMEOFDAY_CLOBBERS_LOCALTIME 1" >>confdefs.h + + NEED_LOCALTIME_BUFFER=1 + REPLACE_GMTIME=1 + REPLACE_LOCALTIME=1 ;; esac @@ -20921,12 +21484,12 @@ printf "%s\n" "$gl_cv_func_gettimeofday_posix_signature" >&6; } 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 +printf "%s\n" "#define GETTIMEOFDAY_TIMEZONE $gl_gettimeofday_timezone" >>confdefs.h if test $HAVE_GETTIMEOFDAY = 0 || test $REPLACE_GETTIMEOFDAY = 1; then @@ -20940,32 +21503,7 @@ _ACEOF gl_LIBOBJS="$gl_LIBOBJS gettimeofday.$ac_objext" - - for ac_header in sys/timeb.h -do : - ac_fn_c_check_header_compile "$LINENO" "sys/timeb.h" "ac_cv_header_sys_timeb_h" "$ac_includes_default" -if test "x$ac_cv_header_sys_timeb_h" = xyes -then : - cat >>confdefs.h <<_ACEOF -#define HAVE_SYS_TIMEB_H 1 -_ACEOF - -fi -done - - for ac_func in _ftime -do : - ac_fn_c_check_func "$LINENO" "_ftime" "ac_cv_func__ftime" -if test "x$ac_cv_func__ftime" = xyes -then : - cat >>confdefs.h <<_ACEOF -#define HAVE__FTIME 1 -_ACEOF - -fi -done - - + : fi @@ -21143,9 +21681,7 @@ rm -rf conftest* esac if test -n "$iconv_flavor"; then -cat >>confdefs.h <<_ACEOF -#define ICONV_FLAVOR $iconv_flavor -_ACEOF +printf "%s\n" "#define ICONV_FLAVOR $iconv_flavor" >>confdefs.h @@ -21570,9 +22106,7 @@ else ac_have_decl=0 fi -cat >>confdefs.h <<_ACEOF -#define HAVE_DECL_ISWBLANK $ac_have_decl -_ACEOF +printf "%s\n" "#define HAVE_DECL_ISWBLANK $ac_have_decl" >>confdefs.h if test $ac_cv_func_iswblank = no; then HAVE_ISWBLANK=0 @@ -22462,6 +22996,7 @@ printf "%s\n" "$LIBSIGSEGV" >&6; } + LOCALCHARSET_TESTS_ENVIRONMENT="CHARSETALIASDIR=\"\$(abs_top_builddir)/$gl_source_base\"" @@ -22734,9 +23269,7 @@ fi if test "x$ac_cv_member_struct_lconv_decimal_point" = xyes then : -cat >>confdefs.h <<_ACEOF -#define HAVE_STRUCT_LCONV_DECIMAL_POINT 1 -_ACEOF +printf "%s\n" "#define HAVE_STRUCT_LCONV_DECIMAL_POINT 1" >>confdefs.h fi @@ -22761,6 +23294,17 @@ printf "%s\n" "#define GNULIB_TEST_LOCALECONV 1" >>confdefs.h + + + + + + + gl_LIBOBJS="$gl_LIBOBJS localtime-buffer.$ac_objext" + + + + if test $ac_cv_func_lstat = yes; then case "$gl_cv_func_lstat_dereferences_slashed_symlink" in @@ -22907,7 +23451,7 @@ int main () memset (&state, '\0', sizeof (mbstate_t)); if (mbrtowc (&wc, input + 1, 1, &state) == (size_t)(-2)) if (mbsinit (&state)) - return 1; + return 2; } return 0; } @@ -22977,7 +23521,7 @@ int main () memset (&state, '\0', sizeof (mbstate_t)); if (mbrtowc (&wc, input + 3, 6, &state) != 4 && mbtowc (&wc, input + 3, 6) == 4) - return 1; + return 2; } return 0; } @@ -23033,9 +23577,7 @@ else ac_have_decl=0 fi -cat >>confdefs.h <<_ACEOF -#define HAVE_DECL_MBRTOWC $ac_have_decl -_ACEOF +printf "%s\n" "#define HAVE_DECL_MBRTOWC $ac_have_decl" >>confdefs.h if test $ac_cv_have_decl_mbrtowc = yes; then REPLACE_MBRTOWC=1 @@ -23171,7 +23713,7 @@ int main () mbrtowc (&wc, NULL, 5, &state); /* Check that wc was not modified. */ if (wc != (wchar_t) 0xBADFACE) - return 1; + return 2; } return 0; } @@ -23377,7 +23919,7 @@ int main () memset (&state, '\0', sizeof (mbstate_t)); if (mbrtowc (&wc, "", 1, &state) != 0) - return 1; + return 2; } return 0; } @@ -23471,7 +24013,7 @@ main (void) int i; char *locale = setlocale (LC_ALL, "C"); if (! locale) - return 1; + return 2; for (i = CHAR_MIN; i <= CHAR_MAX; i++) { char c = i; @@ -23479,7 +24021,7 @@ main (void) mbstate_t mbs = { 0, }; size_t ss = mbrtowc (&wc, &c, 1, &mbs); if (1 < ss) - return 1; + return 3; } return 0; @@ -23654,7 +24196,7 @@ int main () memset (&state, '\0', sizeof (mbstate_t)); if (mbrtowc (&wc, input + 1, 1, &state) == (size_t)(-2)) if (mbsinit (&state)) - return 1; + return 2; } return 0; } @@ -23724,7 +24266,7 @@ int main () memset (&state, '\0', sizeof (mbstate_t)); if (mbrtowc (&wc, input + 3, 6, &state) != 4 && mbtowc (&wc, input + 3, 6) == 4) - return 1; + return 2; } return 0; } @@ -23780,9 +24322,7 @@ else ac_have_decl=0 fi -cat >>confdefs.h <<_ACEOF -#define HAVE_DECL_MBSINIT $ac_have_decl -_ACEOF +printf "%s\n" "#define HAVE_DECL_MBSINIT $ac_have_decl" >>confdefs.h if test $ac_cv_have_decl_mbsinit = yes; then REPLACE_MBSINIT=1 @@ -23907,7 +24447,7 @@ int main () memset (&state, '\0', sizeof (mbstate_t)); if (mbrtowc (&wc, input + 1, 1, &state) == (size_t)(-2)) if (mbsinit (&state)) - return 1; + return 2; } return 0; } @@ -23977,7 +24517,7 @@ int main () memset (&state, '\0', sizeof (mbstate_t)); if (mbrtowc (&wc, input + 3, 6, &state) != 4 && mbtowc (&wc, input + 3, 6) == 4) - return 1; + return 2; } return 0; } @@ -24033,9 +24573,7 @@ else ac_have_decl=0 fi -cat >>confdefs.h <<_ACEOF -#define HAVE_DECL_MBSRTOWCS $ac_have_decl -_ACEOF +printf "%s\n" "#define HAVE_DECL_MBSRTOWCS $ac_have_decl" >>confdefs.h if test $ac_cv_have_decl_mbsrtowcs = yes; then REPLACE_MBSRTOWCS=1 @@ -24276,17 +24814,12 @@ printf "%s\n" "#define GNULIB_TEST_MBTOWC 1" >>confdefs.h gl_LIBOBJS="$gl_LIBOBJS memchr.$ac_objext" - for ac_header in bp-sym.h -do : ac_fn_c_check_header_compile "$LINENO" "bp-sym.h" "ac_cv_header_bp_sym_h" "$ac_includes_default" if test "x$ac_cv_header_bp_sym_h" = xyes then : - cat >>confdefs.h <<_ACEOF -#define HAVE_BP_SYM_H 1 -_ACEOF + printf "%s\n" "#define HAVE_BP_SYM_H 1" >>confdefs.h fi -done fi @@ -24309,6 +24842,9 @@ printf "%s\n" "#define GNULIB_TEST_MEMCHR 1" >>confdefs.h + + + if test $ac_cv_func_mkstemp = yes; then { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for working mkstemp" >&5 printf %s "checking for working mkstemp... " >&6; } @@ -24424,244 +24960,21 @@ printf "%s\n" "#define GNULIB_TEST_MKSTEMP 1" >>confdefs.h + REPLACE_MKTIME=0 + if test "$gl_cv_func_working_mktime" != yes; then + REPLACE_MKTIME=1 +printf "%s\n" "#define NEED_MKTIME_WORKING 1" >>confdefs.h - - if test $APPLE_UNIVERSAL_BUILD = 1; then - # A universal build on Apple Mac OS X platforms. - # The test result would be 'yes' in 32-bit mode and 'no' in 64-bit mode. - # But we need a configuration result that is valid in both modes. - gl_cv_func_working_mktime=no fi - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for working mktime" >&5 -printf %s "checking for working mktime... " >&6; } -if test ${gl_cv_func_working_mktime+y} -then : - printf %s "(cached) " >&6 -else - if test "$cross_compiling" = yes -then : - gl_cv_func_working_mktime=no -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -/* Test program from Paul Eggert and Tony Leneis. */ -#include <limits.h> -#include <stdlib.h> -#include <time.h> - -#ifdef HAVE_UNISTD_H -# include <unistd.h> -#endif - -#if HAVE_DECL_ALARM -# include <signal.h> -#endif - -/* Work around redefinition to rpl_putenv by other config tests. */ -#undef putenv - -static time_t time_t_max; -static time_t time_t_min; - -/* Values we'll use to set the TZ environment variable. */ -static char *tz_strings[] = { - (char *) 0, "TZ=GMT0", "TZ=JST-9", - "TZ=EST+3EDT+2,M10.1.0/00:00:00,M2.3.0/00:00:00" -}; -#define N_STRINGS (sizeof (tz_strings) / sizeof (tz_strings[0])) - -/* Return 0 if mktime fails to convert a date in the spring-forward gap. - Based on a problem report from Andreas Jaeger. */ -static int -spring_forward_gap () -{ - /* glibc (up to about 1998-10-07) failed this test. */ - struct tm tm; - - /* Use the portable POSIX.1 specification "TZ=PST8PDT,M4.1.0,M10.5.0" - instead of "TZ=America/Vancouver" in order to detect the bug even - on systems that don't support the Olson extension, or don't have the - full zoneinfo tables installed. */ - putenv ("TZ=PST8PDT,M4.1.0,M10.5.0"); - - tm.tm_year = 98; - tm.tm_mon = 3; - tm.tm_mday = 5; - tm.tm_hour = 2; - tm.tm_min = 0; - tm.tm_sec = 0; - tm.tm_isdst = -1; - return mktime (&tm) != (time_t) -1; -} - -static int -mktime_test1 (time_t now) -{ - struct tm *lt; - return ! (lt = localtime (&now)) || mktime (lt) == now; -} - -static int -mktime_test (time_t now) -{ - return (mktime_test1 (now) - && mktime_test1 ((time_t) (time_t_max - now)) - && mktime_test1 ((time_t) (time_t_min + now))); -} - -static int -irix_6_4_bug () -{ - /* Based on code from Ariel Faigon. */ - struct tm tm; - tm.tm_year = 96; - tm.tm_mon = 3; - tm.tm_mday = 0; - tm.tm_hour = 0; - tm.tm_min = 0; - tm.tm_sec = 0; - tm.tm_isdst = -1; - mktime (&tm); - return tm.tm_mon == 2 && tm.tm_mday == 31; -} - -static int -bigtime_test (int j) -{ - struct tm tm; - time_t now; - tm.tm_year = tm.tm_mon = tm.tm_mday = tm.tm_hour = tm.tm_min = tm.tm_sec = j; - now = mktime (&tm); - if (now != (time_t) -1) - { - struct tm *lt = localtime (&now); - if (! (lt - && lt->tm_year == tm.tm_year - && lt->tm_mon == tm.tm_mon - && lt->tm_mday == tm.tm_mday - && lt->tm_hour == tm.tm_hour - && lt->tm_min == tm.tm_min - && lt->tm_sec == tm.tm_sec - && lt->tm_yday == tm.tm_yday - && lt->tm_wday == tm.tm_wday - && ((lt->tm_isdst < 0 ? -1 : 0 < lt->tm_isdst) - == (tm.tm_isdst < 0 ? -1 : 0 < tm.tm_isdst)))) - return 0; - } - return 1; -} - -static int -year_2050_test () -{ - /* The correct answer for 2050-02-01 00:00:00 in Pacific time, - ignoring leap seconds. */ - unsigned long int answer = 2527315200UL; - - struct tm tm; - time_t t; - tm.tm_year = 2050 - 1900; - tm.tm_mon = 2 - 1; - tm.tm_mday = 1; - tm.tm_hour = tm.tm_min = tm.tm_sec = 0; - tm.tm_isdst = -1; - - /* Use the portable POSIX.1 specification "TZ=PST8PDT,M4.1.0,M10.5.0" - instead of "TZ=America/Vancouver" in order to detect the bug even - on systems that don't support the Olson extension, or don't have the - full zoneinfo tables installed. */ - putenv ("TZ=PST8PDT,M4.1.0,M10.5.0"); - - t = mktime (&tm); - - /* Check that the result is either a failure, or close enough - to the correct answer that we can assume the discrepancy is - due to leap seconds. */ - return (t == (time_t) -1 - || (0 < t && answer - 120 <= t && t <= answer + 120)); -} - -int -main () -{ - int result = 0; - time_t t, delta; - int i, j; - int time_t_signed_magnitude = (time_t) ~ (time_t) 0 < (time_t) -1; - -#if HAVE_DECL_ALARM - /* This test makes some buggy mktime implementations loop. - Give up after 60 seconds; a mktime slower than that - isn't worth using anyway. */ - signal (SIGALRM, SIG_DFL); - alarm (60); -#endif - - time_t_max = (! TIME_T_IS_SIGNED - ? (time_t) -1 - : ((((time_t) 1 << (sizeof (time_t) * CHAR_BIT - 2)) - 1) - * 2 + 1)); - time_t_min = (! TIME_T_IS_SIGNED - ? (time_t) 0 - : time_t_signed_magnitude - ? ~ (time_t) 0 - : ~ time_t_max); - - delta = time_t_max / 997; /* a suitable prime number */ - for (i = 0; i < N_STRINGS; i++) - { - if (tz_strings[i]) - putenv (tz_strings[i]); - - for (t = 0; t <= time_t_max - delta && (result & 1) == 0; t += delta) - if (! mktime_test (t)) - result |= 1; - if ((result & 2) == 0 - && ! (mktime_test ((time_t) 1) - && mktime_test ((time_t) (60 * 60)) - && mktime_test ((time_t) (60 * 60 * 24)))) - result |= 2; - - for (j = 1; (result & 4) == 0; j <<= 1) - { - if (! bigtime_test (j)) - result |= 4; - if (INT_MAX / 2 < j) - break; - } - if ((result & 8) == 0 && ! bigtime_test (INT_MAX)) - result |= 8; - } - if (! irix_6_4_bug ()) - result |= 16; - if (! spring_forward_gap ()) - result |= 32; - if (! year_2050_test ()) - result |= 64; - return result; -} -_ACEOF -if ac_fn_c_try_run "$LINENO" -then : - gl_cv_func_working_mktime=yes -else - gl_cv_func_working_mktime=no -fi -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ - conftest.$ac_objext conftest.beam conftest.$ac_ext -fi - + case "$host_os" in + mingw*) + REPLACE_MKTIME=1 -fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_working_mktime" >&5 -printf "%s\n" "$gl_cv_func_working_mktime" >&6; } +printf "%s\n" "#define NEED_MKTIME_WINDOWS 1" >>confdefs.h - if test $gl_cv_func_working_mktime = no; then - REPLACE_MKTIME=1 - else - REPLACE_MKTIME=0 - fi + ;; + esac if test $REPLACE_MKTIME = 1; then @@ -24693,8 +25006,9 @@ printf "%s\n" "#define GNULIB_TEST_MKTIME 1" >>confdefs.h - if test $REPLACE_MKTIME = 0; then - ac_fn_c_check_func "$LINENO" "__mktime_internal" "ac_cv_func___mktime_internal" + + WANT_MKTIME_INTERNAL=0 + ac_fn_c_check_func "$LINENO" "__mktime_internal" "ac_cv_func___mktime_internal" if test "x$ac_cv_func___mktime_internal" = xyes then : @@ -24702,13 +25016,15 @@ printf "%s\n" "#define mktime_internal __mktime_internal" >>confdefs.h else - REPLACE_MKTIME=1 + WANT_MKTIME_INTERNAL=1 + +printf "%s\n" "#define NEED_MKTIME_INTERNAL 1" >>confdefs.h + fi - fi - if test $REPLACE_MKTIME = 1; then + if test $WANT_MKTIME_INTERNAL = 1; then @@ -24749,6 +25065,11 @@ fi fi +printf "%s\n" "#define GNULIB_MSVC_NOTHROW 1" >>confdefs.h + + + + @@ -24803,9 +25124,7 @@ printf "%s\n" "$gl_cv_func_nl_langinfo_yesexpr_works" >&6; } *) FUNC_NL_LANGINFO_YESEXPR_WORKS=0 ;; esac -cat >>confdefs.h <<_ACEOF -#define FUNC_NL_LANGINFO_YESEXPR_WORKS $FUNC_NL_LANGINFO_YESEXPR_WORKS -_ACEOF +printf "%s\n" "#define FUNC_NL_LANGINFO_YESEXPR_WORKS $FUNC_NL_LANGINFO_YESEXPR_WORKS" >>confdefs.h if test $HAVE_LANGINFO_CODESET = 1 && test $HAVE_LANGINFO_ERA = 1 \ && test $FUNC_NL_LANGINFO_YESEXPR_WORKS = 1; then @@ -24967,9 +25286,7 @@ else ac_have_decl=0 fi -cat >>confdefs.h <<_ACEOF -#define HAVE_DECL_PROGRAM_INVOCATION_NAME $ac_have_decl -_ACEOF +printf "%s\n" "#define HAVE_DECL_PROGRAM_INVOCATION_NAME $ac_have_decl" >>confdefs.h ac_fn_c_check_decl "$LINENO" "program_invocation_short_name" "ac_cv_have_decl_program_invocation_short_name" "#include <errno.h> " @@ -24980,9 +25297,7 @@ else ac_have_decl=0 fi -cat >>confdefs.h <<_ACEOF -#define HAVE_DECL_PROGRAM_INVOCATION_SHORT_NAME $ac_have_decl -_ACEOF +printf "%s\n" "#define HAVE_DECL_PROGRAM_INVOCATION_SHORT_NAME $ac_have_decl" >>confdefs.h @@ -25001,25 +25316,22 @@ _ACEOF - - for ac_func in raise -do : ac_fn_c_check_func "$LINENO" "raise" "ac_cv_func_raise" if test "x$ac_cv_func_raise" = xyes then : - cat >>confdefs.h <<_ACEOF -#define HAVE_RAISE 1 -_ACEOF + printf "%s\n" "#define HAVE_RAISE 1" >>confdefs.h fi -done if test $ac_cv_func_raise = no; then HAVE_RAISE=0 else - if test $HAVE_MSVC_INVALID_PARAMETER_HANDLER = 1; then - REPLACE_RAISE=1 - fi + + + if test $HAVE_MSVC_INVALID_PARAMETER_HANDLER = 1; then + REPLACE_RAISE=1 + fi + @@ -25074,17 +25386,12 @@ printf "%s\n" "#define GNULIB_TEST_RAISE 1" >>confdefs.h - for ac_func in rawmemchr -do : ac_fn_c_check_func "$LINENO" "rawmemchr" "ac_cv_func_rawmemchr" if test "x$ac_cv_func_rawmemchr" = xyes then : - cat >>confdefs.h <<_ACEOF -#define HAVE_RAWMEMCHR 1 -_ACEOF + printf "%s\n" "#define HAVE_RAWMEMCHR 1" >>confdefs.h fi -done if test $ac_cv_func_rawmemchr = no; then HAVE_RAWMEMCHR=0 @@ -25569,17 +25876,12 @@ printf "%s\n" "#define regfree rpl_regfree" >>confdefs.h - for ac_header in libintl.h -do : ac_fn_c_check_header_compile "$LINENO" "libintl.h" "ac_cv_header_libintl_h" "$ac_includes_default" if test "x$ac_cv_header_libintl_h" = xyes then : - cat >>confdefs.h <<_ACEOF -#define HAVE_LIBINTL_H 1 -_ACEOF + printf "%s\n" "#define HAVE_LIBINTL_H 1" >>confdefs.h fi -done ac_fn_c_check_decl "$LINENO" "isblank" "ac_cv_have_decl_isblank" "#include <ctype.h> @@ -25591,9 +25893,7 @@ else ac_have_decl=0 fi -cat >>confdefs.h <<_ACEOF -#define HAVE_DECL_ISBLANK $ac_have_decl -_ACEOF +printf "%s\n" "#define HAVE_DECL_ISBLANK $ac_have_decl" >>confdefs.h fi @@ -25618,30 +25918,20 @@ _ACEOF gl_LIBOBJS="$gl_LIBOBJS secure_getenv.$ac_objext" - for ac_func in __secure_getenv -do : ac_fn_c_check_func "$LINENO" "__secure_getenv" "ac_cv_func___secure_getenv" if test "x$ac_cv_func___secure_getenv" = xyes then : - cat >>confdefs.h <<_ACEOF -#define HAVE___SECURE_GETENV 1 -_ACEOF + printf "%s\n" "#define HAVE___SECURE_GETENV 1" >>confdefs.h fi -done if test $ac_cv_func___secure_getenv = no; then - for ac_func in issetugid -do : - ac_fn_c_check_func "$LINENO" "issetugid" "ac_cv_func_issetugid" + ac_fn_c_check_func "$LINENO" "issetugid" "ac_cv_func_issetugid" if test "x$ac_cv_func_issetugid" = xyes then : - cat >>confdefs.h <<_ACEOF -#define HAVE_ISSETUGID 1 -_ACEOF + printf "%s\n" "#define HAVE_ISSETUGID 1" >>confdefs.h fi -done fi @@ -25770,9 +26060,7 @@ printf "%s\n" "#define GNULIB_TEST_SETENV 1" >>confdefs.h if test "x$ac_cv_member_struct_sigaction_sa_sigaction" = xyes then : -cat >>confdefs.h <<_ACEOF -#define HAVE_STRUCT_SIGACTION_SA_SIGACTION 1 -_ACEOF +printf "%s\n" "#define HAVE_STRUCT_SIGACTION_SA_SIGACTION 1" >>confdefs.h fi @@ -25808,9 +26096,7 @@ fi if test "x$ac_cv_type_siginfo_t" = xyes then : -cat >>confdefs.h <<_ACEOF -#define HAVE_SIGINFO_T 1 -_ACEOF +printf "%s\n" "#define HAVE_SIGINFO_T 1" >>confdefs.h fi @@ -26030,17 +26316,12 @@ printf "%s\n" "#define GNULIB_TEST_SIGPROCMASK 1" >>confdefs.h - for ac_header in stdint.h -do : ac_fn_c_check_header_compile "$LINENO" "stdint.h" "ac_cv_header_stdint_h" "$ac_includes_default" if test "x$ac_cv_header_stdint_h" = xyes then : - cat >>confdefs.h <<_ACEOF -#define HAVE_STDINT_H 1 -_ACEOF + printf "%s\n" "#define HAVE_STDINT_H 1" >>confdefs.h fi -done { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for SIZE_MAX" >&5 printf %s "checking for SIZE_MAX... " >&6; } @@ -26122,9 +26403,7 @@ fi printf "%s\n" "$gl_cv_size_max" >&6; } if test "$gl_cv_size_max" != yes; then -cat >>confdefs.h <<_ACEOF -#define SIZE_MAX $gl_cv_size_max -_ACEOF +printf "%s\n" "#define SIZE_MAX $gl_cv_size_max" >>confdefs.h fi @@ -26167,63 +26446,31 @@ printf "%s\n" "#define ssize_t int" >>confdefs.h - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether stat handles trailing slashes on directories" >&5 -printf %s "checking whether stat handles trailing slashes on directories... " >&6; } -if test ${gl_cv_func_stat_dir_slash+y} -then : - printf %s "(cached) " >&6 -else - if test "$cross_compiling" = yes -then : - case $host_os in - mingw*) gl_cv_func_stat_dir_slash="guessing no";; - *) gl_cv_func_stat_dir_slash="guessing yes";; - esac -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include <sys/stat.h> - -int -main (void) -{ -struct stat st; return stat (".", &st) != stat ("./", &st); - ; - return 0; -} -_ACEOF -if ac_fn_c_try_run "$LINENO" -then : - gl_cv_func_stat_dir_slash=yes -else - gl_cv_func_stat_dir_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 -fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_stat_dir_slash" >&5 -printf "%s\n" "$gl_cv_func_stat_dir_slash" >&6; } - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether stat handles trailing slashes on files" >&5 + case "$host_os" in + mingw*) + REPLACE_STAT=1 + ;; + *) + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether stat handles trailing slashes on files" >&5 printf %s "checking whether stat handles trailing slashes on files... " >&6; } if test ${gl_cv_func_stat_file_slash+y} then : printf %s "(cached) " >&6 else touch conftest.tmp - # Assume that if we have lstat, we can also check symlinks. - if test $ac_cv_func_lstat = yes; then - ln -s conftest.tmp conftest.lnk - fi - if test "$cross_compiling" = yes + # Assume that if we have lstat, we can also check symlinks. + if test $ac_cv_func_lstat = yes; then + ln -s conftest.tmp conftest.lnk + fi + if test "$cross_compiling" = yes then : case "$host_os" in - # Guess yes on glibc systems. - *-gnu*) gl_cv_func_stat_file_slash="guessing yes" ;; - # If we don't know, assume the worst. - *) gl_cv_func_stat_file_slash="guessing no" ;; - esac + # Guess yes on glibc systems. + *-gnu*) gl_cv_func_stat_file_slash="guessing yes" ;; + # If we don't know, assume the worst. + *) gl_cv_func_stat_file_slash="guessing no" ;; + esac else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -26234,14 +26481,14 @@ int main (void) { int result = 0; - struct stat st; - if (!stat ("conftest.tmp/", &st)) - result |= 1; + struct stat st; + if (!stat ("conftest.tmp/", &st)) + result |= 1; #if HAVE_LSTAT - if (!stat ("conftest.lnk/", &st)) - result |= 2; + if (!stat ("conftest.lnk/", &st)) + result |= 2; #endif - return result; + return result; ; return 0; @@ -26257,21 +26504,18 @@ 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.tmp conftest.lnk + rm -f conftest.tmp conftest.lnk fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_stat_file_slash" >&5 printf "%s\n" "$gl_cv_func_stat_file_slash" >&6; } - case $gl_cv_func_stat_dir_slash in - *no) REPLACE_STAT=1 - -printf "%s\n" "#define REPLACE_FUNC_STAT_DIR 1" >>confdefs.h -;; - esac - case $gl_cv_func_stat_file_slash in - *no) REPLACE_STAT=1 + case $gl_cv_func_stat_file_slash in + *no) + REPLACE_STAT=1 printf "%s\n" "#define REPLACE_FUNC_STAT_FILE 1" >>confdefs.h ;; + esac + ;; esac if test $REPLACE_STAT = 1; then @@ -26285,7 +26529,20 @@ printf "%s\n" "#define REPLACE_FUNC_STAT_FILE 1" >>confdefs.h gl_LIBOBJS="$gl_LIBOBJS stat.$ac_objext" - : + + + + + + + + + gl_LIBOBJS="$gl_LIBOBJS stat-w32.$ac_objext" + + + + : + fi @@ -26312,9 +26569,7 @@ printf "%s\n" "#define GNULIB_TEST_STAT 1" >>confdefs.h if test "x$ac_cv_member_struct_stat_st_atim_tv_nsec" = xyes then : -cat >>confdefs.h <<_ACEOF -#define HAVE_STRUCT_STAT_ST_ATIM_TV_NSEC 1 -_ACEOF +printf "%s\n" "#define HAVE_STRUCT_STAT_ST_ATIM_TV_NSEC 1" >>confdefs.h { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether struct stat.st_atim is of type struct timespec" >&5 printf %s "checking whether struct stat.st_atim is of type struct timespec... " >&6; } @@ -26366,9 +26621,7 @@ else if test "x$ac_cv_member_struct_stat_st_atimespec_tv_nsec" = xyes then : -cat >>confdefs.h <<_ACEOF -#define HAVE_STRUCT_STAT_ST_ATIMESPEC_TV_NSEC 1 -_ACEOF +printf "%s\n" "#define HAVE_STRUCT_STAT_ST_ATIMESPEC_TV_NSEC 1" >>confdefs.h else @@ -26378,9 +26631,7 @@ else if test "x$ac_cv_member_struct_stat_st_atimensec" = xyes then : -cat >>confdefs.h <<_ACEOF -#define HAVE_STRUCT_STAT_ST_ATIMENSEC 1 -_ACEOF +printf "%s\n" "#define HAVE_STRUCT_STAT_ST_ATIMENSEC 1" >>confdefs.h else @@ -26390,9 +26641,7 @@ else if test "x$ac_cv_member_struct_stat_st_atim_st__tim_tv_nsec" = xyes then : -cat >>confdefs.h <<_ACEOF -#define HAVE_STRUCT_STAT_ST_ATIM_ST__TIM_TV_NSEC 1 -_ACEOF +printf "%s\n" "#define HAVE_STRUCT_STAT_ST_ATIM_ST__TIM_TV_NSEC 1" >>confdefs.h fi @@ -26413,9 +26662,7 @@ fi if test "x$ac_cv_member_struct_stat_st_birthtimespec_tv_nsec" = xyes then : -cat >>confdefs.h <<_ACEOF -#define HAVE_STRUCT_STAT_ST_BIRTHTIMESPEC_TV_NSEC 1 -_ACEOF +printf "%s\n" "#define HAVE_STRUCT_STAT_ST_BIRTHTIMESPEC_TV_NSEC 1" >>confdefs.h else @@ -26425,9 +26672,7 @@ else if test "x$ac_cv_member_struct_stat_st_birthtimensec" = xyes then : -cat >>confdefs.h <<_ACEOF -#define HAVE_STRUCT_STAT_ST_BIRTHTIMENSEC 1 -_ACEOF +printf "%s\n" "#define HAVE_STRUCT_STAT_ST_BIRTHTIMENSEC 1" >>confdefs.h else @@ -26437,9 +26682,7 @@ else if test "x$ac_cv_member_struct_stat_st_birthtim_tv_nsec" = xyes then : -cat >>confdefs.h <<_ACEOF -#define HAVE_STRUCT_STAT_ST_BIRTHTIM_TV_NSEC 1 -_ACEOF +printf "%s\n" "#define HAVE_STRUCT_STAT_ST_BIRTHTIM_TV_NSEC 1" >>confdefs.h fi @@ -26803,6 +27046,7 @@ printf "%s\n" "$gl_cv_next_stddef_h" >&6; } + printf "%s\n" "#define __USE_MINGW_ANSI_STDIO 1" >>confdefs.h @@ -26925,17 +27169,13 @@ printf "%s\n" "#define GNULIB_PRINTF_ATTRIBUTE_FLAVOR_GNU 1" >>confdefs.h GNULIB_FSCANF=1 -cat >>confdefs.h <<_ACEOF -#define GNULIB_FSCANF 1 -_ACEOF +printf "%s\n" "#define GNULIB_FSCANF 1" >>confdefs.h GNULIB_SCANF=1 -cat >>confdefs.h <<_ACEOF -#define GNULIB_SCANF 1 -_ACEOF +printf "%s\n" "#define GNULIB_SCANF 1" >>confdefs.h GNULIB_FGETC=1 @@ -27078,7 +27318,7 @@ printf "%s\n" "$gl_cv_next_stdlib_h" >&6; } - for gl_func in _Exit atoll canonicalize_file_name getloadavg getsubopt grantpt initstate initstate_r mkdtemp mkostemp mkostemps mkstemp mkstemps posix_openpt ptsname ptsname_r random random_r realpath rpmatch secure_getenv setenv setstate setstate_r srandom srandom_r strtod strtoll strtoull unlockpt unsetenv; do + for gl_func in _Exit atoll canonicalize_file_name getloadavg getsubopt grantpt initstate initstate_r mkdtemp mkostemp mkostemps mkstemp mkstemps posix_openpt ptsname ptsname_r qsort_r random random_r realpath rpmatch secure_getenv setenv setstate setstate_r srandom srandom_r strtod strtoll strtoull unlockpt unsetenv; do as_gl_Symbol=`printf "%s\n" "gl_cv_have_raw_decl_$gl_func" | $as_tr_sh` { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $gl_func is declared without a macro" >&5 printf %s "checking whether $gl_func is declared without a macro... " >&6; } @@ -27130,17 +27370,12 @@ fi - for ac_func in strcasecmp -do : ac_fn_c_check_func "$LINENO" "strcasecmp" "ac_cv_func_strcasecmp" if test "x$ac_cv_func_strcasecmp" = xyes then : - cat >>confdefs.h <<_ACEOF -#define HAVE_STRCASECMP 1 -_ACEOF + printf "%s\n" "#define HAVE_STRCASECMP 1" >>confdefs.h fi -done if test $ac_cv_func_strcasecmp = no; then HAVE_STRCASECMP=0 @@ -27148,17 +27383,12 @@ done - for ac_func in strncasecmp -do : ac_fn_c_check_func "$LINENO" "strncasecmp" "ac_cv_func_strncasecmp" if test "x$ac_cv_func_strncasecmp" = xyes then : - cat >>confdefs.h <<_ACEOF -#define HAVE_STRNCASECMP 1 -_ACEOF + printf "%s\n" "#define HAVE_STRNCASECMP 1" >>confdefs.h fi -done if test $ac_cv_func_strncasecmp = yes; then HAVE_STRNCASECMP=1 @@ -27173,9 +27403,7 @@ else ac_have_decl=0 fi -cat >>confdefs.h <<_ACEOF -#define HAVE_DECL_STRNCASECMP $ac_have_decl -_ACEOF +printf "%s\n" "#define HAVE_DECL_STRNCASECMP $ac_have_decl" >>confdefs.h if test $ac_cv_have_decl_strncasecmp = no; then HAVE_DECL_STRNCASECMP=0 @@ -27291,9 +27519,7 @@ printf "%s\n" "$gl_cv_func_working_strerror" >&6; } fi -cat >>confdefs.h <<_ACEOF -#define GNULIB_STRERROR 1 -_ACEOF +printf "%s\n" "#define GNULIB_STRERROR 1" >>confdefs.h @@ -27329,17 +27555,12 @@ printf "%s\n" "#define GNULIB_TEST_STRERROR 1" >>confdefs.h if test $ac_cv_header_sys_socket_h != yes; then - for ac_header in winsock2.h -do : - ac_fn_c_check_header_compile "$LINENO" "winsock2.h" "ac_cv_header_winsock2_h" "$ac_includes_default" + ac_fn_c_check_header_compile "$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 + printf "%s\n" "#define HAVE_WINSOCK2_H 1" >>confdefs.h fi -done fi if test "$ac_cv_header_winsock2_h" = yes; then @@ -27353,7 +27574,6 @@ done fi - # This defines (or not) HAVE_TZNAME and HAVE_TM_ZONE. @@ -27365,7 +27585,6 @@ done printf "%s\n" "#define my_strftime nstrftime" >>confdefs.h - if test $gl_cond_libtool = false; then gl_ltlibdeps="$gl_ltlibdeps $LTLIBICONV" gl_libdeps="$gl_libdeps $LIBICONV" @@ -27621,17 +27840,12 @@ printf "%s\n" "#define GNULIB_TEST_STRPTIME 1" >>confdefs.h if test "$ac_cv_type_unsigned_long_long_int" = yes; then - for ac_func in strtoull -do : - ac_fn_c_check_func "$LINENO" "strtoull" "ac_cv_func_strtoull" + ac_fn_c_check_func "$LINENO" "strtoull" "ac_cv_func_strtoull" if test "x$ac_cv_func_strtoull" = xyes then : - cat >>confdefs.h <<_ACEOF -#define HAVE_STRTOULL 1 -_ACEOF + printf "%s\n" "#define HAVE_STRTOULL 1" >>confdefs.h fi -done if test $ac_cv_func_strtoull = no; then HAVE_STRTOULL=0 @@ -27702,9 +27916,7 @@ else ac_have_decl=0 fi -cat >>confdefs.h <<_ACEOF -#define HAVE_DECL_STRTOULL $ac_have_decl -_ACEOF +printf "%s\n" "#define HAVE_DECL_STRTOULL $ac_have_decl" >>confdefs.h @@ -27807,14 +28019,14 @@ printf "%s\n" "$gl_cv_next_sys_stat_h" >&6; } + WINDOWS_STAT_TIMESPEC=0 + + - if test $WINDOWS_64_BIT_ST_SIZE = 1; then -printf "%s\n" "#define _GL_WINDOWS_64_BIT_ST_SIZE 1" >>confdefs.h - fi ac_fn_c_check_type "$LINENO" "nlink_t" "ac_cv_type_nlink_t" "#include <sys/types.h> #include <sys/stat.h> @@ -28032,9 +28244,7 @@ else ac_have_decl=0 fi -cat >>confdefs.h <<_ACEOF -#define HAVE_DECL_LOCALTIME_R $ac_have_decl -_ACEOF +printf "%s\n" "#define HAVE_DECL_LOCALTIME_R $ac_have_decl" >>confdefs.h if test $ac_cv_have_decl_localtime_r = no; then HAVE_DECL_LOCALTIME_R=0 @@ -28123,15 +28333,12 @@ printf "%s\n" "#define GNULIB_TEST_TIME_R 1" >>confdefs.h - ac_fn_c_check_type "$LINENO" "timezone_t" "ac_cv_type_timezone_t" "#include <time.h> " if test "x$ac_cv_type_timezone_t" = xyes then : -cat >>confdefs.h <<_ACEOF -#define HAVE_TIMEZONE_T 1 -_ACEOF +printf "%s\n" "#define HAVE_TIMEZONE_T 1" >>confdefs.h fi @@ -28140,7 +28347,7 @@ fi HAVE_TIMEZONE_T=1 fi - if test "$HAVE_TIMEZONE_T" = 0; then + if test $HAVE_TIMEZONE_T = 0; then @@ -28173,7 +28380,7 @@ printf "%s\n" "#define GNULIB_TEST_TIME_RZ 1" >>confdefs.h REPLACE_TIMEGM=0 if test $ac_cv_func_timegm = yes; then - if test $gl_cv_func_working_mktime = no; then + if test "$gl_cv_func_working_mktime" != yes; then # Assume that timegm is buggy if mktime is. REPLACE_TIMEGM=1 fi @@ -28217,6 +28424,122 @@ printf "%s\n" "#define GNULIB_TEST_TIMEGM 1" >>confdefs.h + if test $ac_cv_func_tzset = no; then + HAVE_TZSET=0 + fi + + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether tzset clobbers localtime buffer" >&5 +printf %s "checking whether tzset clobbers localtime buffer... " >&6; } +if test ${gl_cv_func_tzset_clobber+y} +then : + printf %s "(cached) " >&6 +else + + if test "$cross_compiling" = yes +then : + case "$host_os" in + # Guess all is fine on glibc systems. + *-gnu*) gl_cv_func_tzset_clobber="guessing no" ;; + # If we don't know, assume the worst. + *) gl_cv_func_tzset_clobber="guessing yes" ;; + esac + +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +#include <time.h> +#include <stdlib.h> + +int +main () +{ + time_t t1 = 853958121; + struct tm *p, s; + putenv ("TZ=GMT0"); + p = localtime (&t1); + s = *p; + putenv ("TZ=EST+3EDT+2,M10.1.0/00:00:00,M2.3.0/00:00:00"); + tzset (); + return (p->tm_year != s.tm_year + || p->tm_mon != s.tm_mon + || p->tm_mday != s.tm_mday + || p->tm_hour != s.tm_hour + || p->tm_min != s.tm_min + || p->tm_sec != s.tm_sec); +} + +_ACEOF +if ac_fn_c_try_run "$LINENO" +then : + gl_cv_func_tzset_clobber=no +else + gl_cv_func_tzset_clobber=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 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_tzset_clobber" >&5 +printf "%s\n" "$gl_cv_func_tzset_clobber" >&6; } + + +printf "%s\n" "#define HAVE_RUN_TZSET_TEST 1" >>confdefs.h + + + REPLACE_TZSET=0 + case "$gl_cv_func_tzset_clobber" in + *yes) + REPLACE_TZSET=1 + +printf "%s\n" "#define TZSET_CLOBBERS_LOCALTIME 1" >>confdefs.h + + + + + NEED_LOCALTIME_BUFFER=1 + REPLACE_GMTIME=1 + REPLACE_LOCALTIME=1 + + ;; + esac + case "$host_os" in + mingw*) REPLACE_TZSET=1 ;; + esac + + if test $HAVE_TZSET = 0 || test $REPLACE_TZSET = 1; then + + + + + + + + + gl_LIBOBJS="$gl_LIBOBJS tzset.$ac_objext" + + fi + + + + + + GNULIB_TZSET=1 + + + + + +printf "%s\n" "#define GNULIB_TEST_TZSET 1" >>confdefs.h + + + + + + + + @@ -28306,7 +28629,7 @@ printf "%s\n" "$gl_cv_next_unistd_h" >&6; } - for gl_func in chdir chown dup dup2 dup3 environ euidaccess faccessat fchdir fchownat fdatasync fsync ftruncate getcwd getdomainname getdtablesize getgroups gethostname getlogin getlogin_r getpagesize getusershell setusershell endusershell group_member isatty lchown link linkat lseek pipe pipe2 pread pwrite readlink readlinkat rmdir sethostname sleep symlink symlinkat ttyname_r unlink unlinkat usleep; do + for gl_func in chdir chown dup dup2 dup3 environ euidaccess faccessat fchdir fchownat fdatasync fsync ftruncate getcwd getdomainname getdtablesize getgroups gethostname getlogin getlogin_r getpagesize getusershell setusershell endusershell group_member isatty lchown link linkat lseek pipe pipe2 pread pwrite readlink readlinkat rmdir sethostname sleep symlink symlinkat truncate ttyname_r unlink unlinkat usleep; do as_gl_Symbol=`printf "%s\n" "gl_cv_have_raw_decl_$gl_func" | $as_tr_sh` { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $gl_func is declared without a macro" >&5 printf %s "checking whether $gl_func is declared without a macro... " >&6; } @@ -28390,9 +28713,7 @@ fi -cat >>confdefs.h <<_ACEOF -#define GNULIB_UNISTR_U8_MBTOUCR 1 -_ACEOF +printf "%s\n" "#define GNULIB_UNISTR_U8_MBTOUCR 1" >>confdefs.h @@ -28426,9 +28747,7 @@ fi -cat >>confdefs.h <<_ACEOF -#define GNULIB_UNISTR_U8_UCTOMB 1 -_ACEOF +printf "%s\n" "#define GNULIB_UNISTR_U8_UCTOMB 1" >>confdefs.h @@ -28570,17 +28889,12 @@ printf "%s\n" "#define USE_UNLOCKED_IO 1" >>confdefs.h if test $ac_cv_have_decl_unsetenv = no; then HAVE_DECL_UNSETENV=0 fi - for ac_func in unsetenv -do : ac_fn_c_check_func "$LINENO" "unsetenv" "ac_cv_func_unsetenv" if test "x$ac_cv_func_unsetenv" = xyes then : - cat >>confdefs.h <<_ACEOF -#define HAVE_UNSETENV 1 -_ACEOF + printf "%s\n" "#define HAVE_UNSETENV 1" >>confdefs.h fi -done if test $ac_cv_func_unsetenv = no; then HAVE_UNSETENV=0 @@ -28891,17 +29205,12 @@ fi fi - for ac_func in vasprintf -do : ac_fn_c_check_func "$LINENO" "vasprintf" "ac_cv_func_vasprintf" if test "x$ac_cv_func_vasprintf" = xyes then : - cat >>confdefs.h <<_ACEOF -#define HAVE_VASPRINTF 1 -_ACEOF + printf "%s\n" "#define HAVE_VASPRINTF 1" >>confdefs.h fi -done if test $ac_cv_func_vasprintf = no; then @@ -28971,9 +29280,7 @@ then : withval=$with_packager; case $withval in yes|no) ;; *) -cat >>confdefs.h <<_ACEOF -#define PACKAGE_PACKAGER "$withval" -_ACEOF +printf "%s\n" "#define PACKAGE_PACKAGER \"$withval\"" >>confdefs.h ;; esac @@ -28987,9 +29294,7 @@ then : withval=$with_packager_version; case $withval in yes|no) ;; *) -cat >>confdefs.h <<_ACEOF -#define PACKAGE_PACKAGER_VERSION "$withval" -_ACEOF +printf "%s\n" "#define PACKAGE_PACKAGER_VERSION \"$withval\"" >>confdefs.h ;; esac @@ -29003,9 +29308,7 @@ then : withval=$with_packager_bug_reports; case $withval in yes|no) ;; *) -cat >>confdefs.h <<_ACEOF -#define PACKAGE_PACKAGER_BUG_REPORTS "$withval" -_ACEOF +printf "%s\n" "#define PACKAGE_PACKAGER_BUG_REPORTS \"$withval\"" >>confdefs.h ;; esac @@ -29118,7 +29421,9 @@ printf "%s\n" "$gl_cv_next_wchar_h" >&6; } - for gl_func in btowc wctob mbsinit mbrtowc mbrlen mbsrtowcs mbsnrtowcs wcrtomb wcsrtombs wcsnrtombs wcwidth wmemchr wmemcmp wmemcpy wmemmove wmemset wcslen wcsnlen wcscpy wcpcpy wcsncpy wcpncpy wcscat wcsncat wcscmp wcsncmp wcscasecmp wcsncasecmp wcscoll wcsxfrm wcsdup wcschr wcsrchr wcscspn wcsspn wcspbrk wcsstr wcstok wcswidth ; do + + + for gl_func in btowc wctob mbsinit mbrtowc mbrlen mbsrtowcs mbsnrtowcs wcrtomb wcsrtombs wcsnrtombs wcwidth wmemchr wmemcmp wmemcpy wmemmove wmemset wcslen wcsnlen wcscpy wcpcpy wcsncpy wcpncpy wcscat wcsncat wcscmp wcsncmp wcscasecmp wcsncasecmp wcscoll wcsxfrm wcsdup wcschr wcsrchr wcscspn wcsspn wcspbrk wcsstr wcstok wcswidth wcsftime ; do as_gl_Symbol=`printf "%s\n" "gl_cv_have_raw_decl_$gl_func" | $as_tr_sh` { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $gl_func is declared without a macro" >&5 printf %s "checking whether $gl_func is declared without a macro... " >&6; } @@ -29227,7 +29532,7 @@ int main () memset (&state, '\0', sizeof (mbstate_t)); if (mbrtowc (&wc, input + 1, 1, &state) == (size_t)(-2)) if (mbsinit (&state)) - return 1; + return 2; } return 0; } @@ -29297,7 +29602,7 @@ int main () memset (&state, '\0', sizeof (mbstate_t)); if (mbrtowc (&wc, input + 3, 6, &state) != 4 && mbtowc (&wc, input + 3, 6) == 4) - return 1; + return 2; } return 0; } @@ -29353,9 +29658,7 @@ else ac_have_decl=0 fi -cat >>confdefs.h <<_ACEOF -#define HAVE_DECL_WCRTOMB $ac_have_decl -_ACEOF +printf "%s\n" "#define HAVE_DECL_WCRTOMB $ac_have_decl" >>confdefs.h if test $ac_cv_have_decl_wcrtomb = yes; then REPLACE_WCRTOMB=1 @@ -29507,6 +29810,8 @@ printf "%s\n" "#define GNULIB_TEST_WCRTOMB 1" >>confdefs.h + + if test $gl_cv_have_include_next = yes; then gl_cv_next_wctype_h='<'wctype.h'>' else @@ -29660,17 +29965,12 @@ printf "%s\n" "$gl_cv_func_iswcntrl_works" >&6; } if test $REPLACE_ISWCNTRL = 1; then REPLACE_TOWLOWER=1 else - for ac_func in towlower -do : - ac_fn_c_check_func "$LINENO" "towlower" "ac_cv_func_towlower" + ac_fn_c_check_func "$LINENO" "towlower" "ac_cv_func_towlower" if test "x$ac_cv_func_towlower" = xyes then : - cat >>confdefs.h <<_ACEOF -#define HAVE_TOWLOWER 1 -_ACEOF + printf "%s\n" "#define HAVE_TOWLOWER 1" >>confdefs.h fi -done if test $ac_cv_func_towlower = yes; then REPLACE_TOWLOWER=0 @@ -29695,9 +29995,7 @@ else ac_have_decl=0 fi -cat >>confdefs.h <<_ACEOF -#define HAVE_DECL_TOWLOWER $ac_have_decl -_ACEOF +printf "%s\n" "#define HAVE_DECL_TOWLOWER $ac_have_decl" >>confdefs.h if test $ac_cv_have_decl_towlower = yes; then REPLACE_TOWLOWER=1 @@ -29884,9 +30182,7 @@ else ac_have_decl=0 fi -cat >>confdefs.h <<_ACEOF -#define HAVE_DECL_WCWIDTH $ac_have_decl -_ACEOF +printf "%s\n" "#define HAVE_DECL_WCWIDTH $ac_have_decl" >>confdefs.h if test $ac_cv_have_decl_wcwidth != yes; then HAVE_DECL_WCWIDTH=0 @@ -30001,17 +30297,12 @@ printf "%s\n" "#define GNULIB_TEST_WCWIDTH 1" >>confdefs.h : - for ac_header in stdint.h -do : ac_fn_c_check_header_compile "$LINENO" "stdint.h" "ac_cv_header_stdint_h" "$ac_includes_default" if test "x$ac_cv_header_stdint_h" = xyes then : - cat >>confdefs.h <<_ACEOF -#define HAVE_STDINT_H 1 -_ACEOF + printf "%s\n" "#define HAVE_STDINT_H 1" >>confdefs.h fi -done @@ -30835,9 +31126,12 @@ printf "%s\n" "#define GNULIB_TEST_CONNECT 1" >>confdefs.h - if test $HAVE_MSVC_INVALID_PARAMETER_HANDLER = 1; then - REPLACE_FDOPEN=1 - else + + if test $HAVE_MSVC_INVALID_PARAMETER_HANDLER = 1; then + REPLACE_FDOPEN=1 + fi + + if test $REPLACE_FDOPEN = 0; then { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether fdopen sets errno" >&5 printf %s "checking whether fdopen sets errno... " >&6; } if test ${gl_cv_func_fdopen_works+y} @@ -30950,17 +31244,12 @@ printf "%s\n" "#define GNULIB_TEST_FDOPEN 1" >>confdefs.h gltests_LIBOBJS="$gltests_LIBOBJS ftruncate.$ac_objext" - 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 : - cat >>confdefs.h <<_ACEOF -#define HAVE_CHSIZE 1 -_ACEOF + printf "%s\n" "#define HAVE_CHSIZE 1" >>confdefs.h fi -done fi @@ -31033,46 +31322,31 @@ printf "%s\n" "#define GNULIB_TEST_GETCWD 1" >>confdefs.h - for ac_func in getpagesize -do : ac_fn_c_check_func "$LINENO" "getpagesize" "ac_cv_func_getpagesize" if test "x$ac_cv_func_getpagesize" = xyes then : - cat >>confdefs.h <<_ACEOF -#define HAVE_GETPAGESIZE 1 -_ACEOF + printf "%s\n" "#define HAVE_GETPAGESIZE 1" >>confdefs.h fi -done if test $ac_cv_func_getpagesize = no; then HAVE_GETPAGESIZE=0 - for ac_header in OS.h -do : - ac_fn_c_check_header_compile "$LINENO" "OS.h" "ac_cv_header_OS_h" "$ac_includes_default" + ac_fn_c_check_header_compile "$LINENO" "OS.h" "ac_cv_header_OS_h" "$ac_includes_default" if test "x$ac_cv_header_OS_h" = xyes then : - cat >>confdefs.h <<_ACEOF -#define HAVE_OS_H 1 -_ACEOF + printf "%s\n" "#define HAVE_OS_H 1" >>confdefs.h fi -done if test $ac_cv_header_OS_h = yes; then HAVE_OS_H=1 fi - for ac_header in sys/param.h -do : - ac_fn_c_check_header_compile "$LINENO" "sys/param.h" "ac_cv_header_sys_param_h" "$ac_includes_default" + ac_fn_c_check_header_compile "$LINENO" "sys/param.h" "ac_cv_header_sys_param_h" "$ac_includes_default" if test "x$ac_cv_header_sys_param_h" = xyes then : - cat >>confdefs.h <<_ACEOF -#define HAVE_SYS_PARAM_H 1 -_ACEOF + printf "%s\n" "#define HAVE_SYS_PARAM_H 1" >>confdefs.h fi -done if test $ac_cv_header_sys_param_h = yes; then HAVE_SYS_PARAM_H=1 @@ -31139,17 +31413,12 @@ printf "%s\n" "#define GNULIB_TEST_GETPAGESIZE 1" >>confdefs.h if test $ac_cv_header_sys_socket_h != yes; then - for ac_header in winsock2.h -do : - ac_fn_c_check_header_compile "$LINENO" "winsock2.h" "ac_cv_header_winsock2_h" "$ac_includes_default" + ac_fn_c_check_header_compile "$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 + printf "%s\n" "#define HAVE_WINSOCK2_H 1" >>confdefs.h fi -done fi if test "$ac_cv_header_winsock2_h" = yes; then @@ -31171,9 +31440,7 @@ else ac_have_decl=0 fi -cat >>confdefs.h <<_ACEOF -#define HAVE_DECL_INET_PTON $ac_have_decl -_ACEOF +printf "%s\n" "#define HAVE_DECL_INET_PTON $ac_have_decl" >>confdefs.h if test $ac_cv_have_decl_inet_pton = yes; then REPLACE_INET_PTON=1 @@ -31245,17 +31512,12 @@ then : test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" else - for ac_func in inet_pton -do : ac_fn_c_check_func "$LINENO" "inet_pton" "ac_cv_func_inet_pton" if test "x$ac_cv_func_inet_pton" = xyes then : - cat >>confdefs.h <<_ACEOF -#define HAVE_INET_PTON 1 -_ACEOF + printf "%s\n" "#define HAVE_INET_PTON 1" >>confdefs.h fi -done if test $ac_cv_func_inet_pton = no; then HAVE_INET_PTON=0 @@ -31284,9 +31546,7 @@ else ac_have_decl=0 fi -cat >>confdefs.h <<_ACEOF -#define HAVE_DECL_INET_PTON $ac_have_decl -_ACEOF +printf "%s\n" "#define HAVE_DECL_INET_PTON $ac_have_decl" >>confdefs.h if test $ac_cv_have_decl_inet_pton = no; then HAVE_DECL_INET_PTON=0 @@ -31565,17 +31825,12 @@ printf "%s\n" "#define AC_APPLE_UNIVERSAL_BUILD 1" >>confdefs.h if test "$ac_cv_header_winsock2_h" = yes; then HAVE_IOCTL=0 else - for ac_func in ioctl -do : - ac_fn_c_check_func "$LINENO" "ioctl" "ac_cv_func_ioctl" + ac_fn_c_check_func "$LINENO" "ioctl" "ac_cv_func_ioctl" if test "x$ac_cv_func_ioctl" = xyes then : - cat >>confdefs.h <<_ACEOF -#define HAVE_IOCTL 1 -_ACEOF + printf "%s\n" "#define HAVE_IOCTL 1" >>confdefs.h fi -done { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for ioctl with POSIX signature" >&5 printf %s "checking for ioctl with POSIX signature... " >&6; } @@ -33627,17 +33882,12 @@ printf "%s\n" "$gl_cv_header_netinet_in_h_selfcontained" >&6; } NETINET_IN_H='' else NETINET_IN_H='netinet/in.h' - for ac_header in netinet/in.h -do : - ac_fn_c_check_header_compile "$LINENO" "netinet/in.h" "ac_cv_header_netinet_in_h" "$ac_includes_default" + ac_fn_c_check_header_compile "$LINENO" "netinet/in.h" "ac_cv_header_netinet_in_h" "$ac_includes_default" if test "x$ac_cv_header_netinet_in_h" = xyes then : - cat >>confdefs.h <<_ACEOF -#define HAVE_NETINET_IN_H 1 -_ACEOF + printf "%s\n" "#define HAVE_NETINET_IN_H 1" >>confdefs.h fi -done @@ -34231,9 +34481,7 @@ else ac_have_decl=0 fi -cat >>confdefs.h <<_ACEOF -#define HAVE_DECL__PUTENV $ac_have_decl -_ACEOF +printf "%s\n" "#define HAVE_DECL__PUTENV $ac_have_decl" >>confdefs.h fi @@ -35217,9 +35465,7 @@ else ac_have_decl=0 fi -cat >>confdefs.h <<_ACEOF -#define HAVE_DECL_SLEEP $ac_have_decl -_ACEOF +printf "%s\n" "#define HAVE_DECL_SLEEP $ac_have_decl" >>confdefs.h if test $ac_cv_have_decl_sleep != yes; then @@ -35333,17 +35579,12 @@ printf "%s\n" "#define GNULIB_TEST_SLEEP 1" >>confdefs.h gl_cv_func_snprintf_usable=no - for ac_func in snprintf -do : ac_fn_c_check_func "$LINENO" "snprintf" "ac_cv_func_snprintf" if test "x$ac_cv_func_snprintf" = xyes then : - cat >>confdefs.h <<_ACEOF -#define HAVE_SNPRINTF 1 -_ACEOF + printf "%s\n" "#define HAVE_SNPRINTF 1" >>confdefs.h fi -done if test $ac_cv_func_snprintf = yes; then @@ -35481,6 +35722,11 @@ printf "%s\n" "$gl_cv_func_printf_positions" >&6; } if test $ac_cv_func_snprintf = yes; then REPLACE_SNPRINTF=1 + else + + if test $ac_cv_have_decl_snprintf = yes; then + REPLACE_SNPRINTF=1 + fi fi : @@ -35513,9 +35759,7 @@ printf "%s\n" "#define GNULIB_TEST_SNPRINTF 1" >>confdefs.h -cat >>confdefs.h <<_ACEOF -#define GNULIB_SNPRINTF $gl_module_indicator_condition -_ACEOF +printf "%s\n" "#define GNULIB_SNPRINTF $gl_module_indicator_condition" >>confdefs.h @@ -35623,9 +35867,7 @@ fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_socklen_t_equiv" >&5 printf "%s\n" "$gl_cv_socklen_t_equiv" >&6; } -cat >>confdefs.h <<_ACEOF -#define socklen_t $gl_cv_socklen_t_equiv -_ACEOF +printf "%s\n" "#define socklen_t $gl_cv_socklen_t_equiv" >>confdefs.h fi @@ -35660,8 +35902,8 @@ else || (defined __APPLE__ && defined __MACH__ \ ? 4 < __GNUC__ + (1 <= __GNUC_MINOR__) \ : __GNUC__) \ - || __HP_cc || __HP_aCC || __IBMC__ || __IBMCPP__ \ - || __ICC || 0x5110 <= __SUNPRO_C \ + || (__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 @@ -35770,6 +36012,11 @@ printf "%s\n" "#define GNULIB_TEST_STRERROR_R 1" >>confdefs.h +printf "%s\n" "#define GNULIB_STRERROR_R_POSIX $gl_module_indicator_condition" >>confdefs.h + + + + # Check for mmap(). Don't use AC_FUNC_MMAP, because it checks too much: it # fails on HP-UX 11, because MAP_FIXED mappings do not work. But this is @@ -36104,256 +36351,6 @@ fi - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether <sys/select.h> is self-contained" >&5 -printf %s "checking whether <sys/select.h> is self-contained... " >&6; } -if test ${gl_cv_header_sys_select_h_selfcontained+y} -then : - printf %s "(cached) " >&6 -else - - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include <sys/select.h> -int -main (void) -{ -struct timeval b; - ; - return 0; -} -_ACEOF -if ac_fn_c_try_compile "$LINENO" -then : - gl_cv_header_sys_select_h_selfcontained=yes -else - gl_cv_header_sys_select_h_selfcontained=no -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - if test $gl_cv_header_sys_select_h_selfcontained = yes; then - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include <sys/select.h> -int -main (void) -{ -int memset; int bzero; - ; - return 0; -} - -_ACEOF -if ac_fn_c_try_compile "$LINENO" -then : - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include <sys/select.h> -int -main (void) -{ - - #undef memset - #define memset nonexistent_memset - extern - #ifdef __cplusplus - "C" - #endif - void *memset (void *, int, unsigned long); - #undef bzero - #define bzero nonexistent_bzero - extern - #ifdef __cplusplus - "C" - #endif - void bzero (void *, unsigned long); - fd_set fds; - FD_ZERO (&fds); - - ; - return 0; -} - -_ACEOF -if ac_fn_c_try_link "$LINENO" -then : - -else - gl_cv_header_sys_select_h_selfcontained=no -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_ext - fi - -fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_header_sys_select_h_selfcontained" >&5 -printf "%s\n" "$gl_cv_header_sys_select_h_selfcontained" >&6; } - - - - - - - - - - if test $gl_cv_have_include_next = yes; then - gl_cv_next_sys_select_h='<'sys/select.h'>' - else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking absolute name of <sys/select.h>" >&5 -printf %s "checking absolute name of <sys/select.h>... " >&6; } -if test ${gl_cv_next_sys_select_h+y} -then : - printf %s "(cached) " >&6 -else - - if test $ac_cv_header_sys_select_h = yes; then - - - - - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include <sys/select.h> -_ACEOF - case "$host_os" in - aix*) gl_absname_cpp="$ac_cpp -C" ;; - *) gl_absname_cpp="$ac_cpp" ;; - esac - - case "$host_os" in - mingw*) - gl_dirsep_regex='[/\\]' - ;; - *) - gl_dirsep_regex='\/' - ;; - esac - gl_make_literal_regex_sed='s,[]$^\\.*/[],\\&,g' - gl_header_literal_regex=`echo 'sys/select.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_select_h=`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&5 | - sed -n "$gl_absolute_header_sed"` - - gl_header=$gl_cv_absolute_sys_select_h - gl_cv_next_sys_select_h='"'$gl_header'"' - else - gl_cv_next_sys_select_h='<'sys/select.h'>' - fi - - -fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_next_sys_select_h" >&5 -printf "%s\n" "$gl_cv_next_sys_select_h" >&6; } - fi - NEXT_SYS_SELECT_H=$gl_cv_next_sys_select_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/select.h'>' - else - # INCLUDE_NEXT_AS_FIRST_DIRECTIVE='include' - gl_next_as_first_directive=$gl_cv_next_sys_select_h - fi - NEXT_AS_FIRST_DIRECTIVE_SYS_SELECT_H=$gl_next_as_first_directive - - - - - if test $ac_cv_header_sys_select_h = yes; then - HAVE_SYS_SELECT_H=1 - else - HAVE_SYS_SELECT_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_compile "$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 - - - - - for gl_func in pselect select; do - as_gl_Symbol=`printf "%s\n" "gl_cv_have_raw_decl_$gl_func" | $as_tr_sh` - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $gl_func is declared without a macro" >&5 -printf %s "checking whether $gl_func is declared without a macro... " >&6; } -if eval test \${$as_gl_Symbol+y} -then : - printf %s "(cached) " >&6 -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -/* Some systems require prerequisite headers. */ -#include <sys/types.h> -#if !(defined __GLIBC__ && !defined __UCLIBC__) && HAVE_SYS_TIME_H -# include <sys/time.h> -#endif -#include <sys/select.h> - -int -main (void) -{ -#undef $gl_func - (void) $gl_func; - ; - return 0; -} -_ACEOF -if ac_fn_c_try_compile "$LINENO" -then : - eval "$as_gl_Symbol=yes" -else - eval "$as_gl_Symbol=no" -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi -eval ac_res=\$$as_gl_Symbol - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 -printf "%s\n" "$ac_res" >&6; } - if eval test \"x\$"$as_gl_Symbol"\" = x"yes" -then : - cat >>confdefs.h <<_ACEOF -#define `printf "%s\n" "HAVE_RAW_DECL_$gl_func" | $as_tr_cpp` 1 -_ACEOF - - eval ac_cv_have_decl_$gl_func=yes -fi - done - - - - @@ -37129,9 +37126,7 @@ else ac_have_decl=0 fi -cat >>confdefs.h <<_ACEOF -#define HAVE_DECL_WCTOB $ac_have_decl -_ACEOF +printf "%s\n" "#define HAVE_DECL_WCTOB $ac_have_decl" >>confdefs.h if test $ac_cv_have_decl_wctob != yes; then HAVE_DECL_WCTOB=0 @@ -37418,10 +37413,11 @@ else CFLAGS="$CFLAGS -W -Werror" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -void f (void) +int f (void) { typedef struct { int a; int b; } s_t; s_t s1 = { 0, }; + return s1.b; } int @@ -37488,11 +37484,11 @@ printf "%s\n" "$gl_cv_cc_uninitialized_supported" >&6; } # comm -3 \ # <(sed -n 's/^ *\(-[^ ]*\) .*/\1/p' manywarnings.m4 | sort) \ # <(gcc --help=warnings | sed -n 's/^ \(-[^ ]*\) .*/\1/p' | sort | - # grep -v -x -f <( + # grep -v -x -F -f <( # awk '/^[^#]/ {print ws}' ../build-aux/gcc-warning.spec)) gl_manywarn_set= - for gl_manywarn_item in \ + for gl_manywarn_item in -fno-common \ -W \ -Wabi \ -Waddress \ @@ -37501,6 +37497,8 @@ printf "%s\n" "$gl_cv_cc_uninitialized_supported" >&6; } -Wattributes \ -Wbad-function-cast \ -Wbool-compare \ + -Wbool-operation \ + -Wbuiltin-declaration-mismatch \ -Wbuiltin-macro-redefined \ -Wcast-align \ -Wchar-subscripts \ @@ -37510,6 +37508,7 @@ printf "%s\n" "$gl_cv_cc_uninitialized_supported" >&6; } -Wcomments \ -Wcoverage-mismatch \ -Wcpp \ + -Wdangling-else \ -Wdate-time \ -Wdeprecated \ -Wdeprecated-declarations \ @@ -37519,10 +37518,13 @@ printf "%s\n" "$gl_cv_cc_uninitialized_supported" >&6; } -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 \ @@ -37543,6 +37545,7 @@ printf "%s\n" "$gl_cv_cc_uninitialized_supported" >&6; } -Winit-self \ -Winline \ -Wint-conversion \ + -Wint-in-bool-context \ -Wint-to-pointer-cast \ -Winvalid-memory-model \ -Winvalid-pch \ @@ -37551,6 +37554,7 @@ printf "%s\n" "$gl_cv_cc_uninitialized_supported" >&6; } -Wlogical-op \ -Wmain \ -Wmaybe-uninitialized \ + -Wmemset-elt-size \ -Wmemset-transposed-args \ -Wmisleading-indentation \ -Wmissing-braces \ @@ -37576,9 +37580,12 @@ printf "%s\n" "$gl_cv_cc_uninitialized_supported" >&6; } -Wpacked-bitfield-compat \ -Wparentheses \ -Wpointer-arith \ + -Wpointer-compare \ -Wpointer-sign \ -Wpointer-to-int-cast \ -Wpragmas \ + -Wpsabi \ + -Wrestrict \ -Wreturn-local-addr \ -Wreturn-type \ -Wscalar-storage-order \ @@ -37602,6 +37609,7 @@ printf "%s\n" "$gl_cv_cc_uninitialized_supported" >&6; } -Wswitch \ -Wswitch-bool \ -Wswitch-default \ + -Wswitch-unreachable \ -Wsync-nand \ -Wsystem-headers \ -Wtautological-compare \ @@ -37635,10 +37643,18 @@ printf "%s\n" "$gl_cv_cc_uninitialized_supported" >&6; } # 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: + ptrdiff_max_max=9223372036854775807 + gl_manywarn_set="$gl_manywarn_set -Walloc-size-larger-than=$ptrdiff_max_max" gl_manywarn_set="$gl_manywarn_set -Warray-bounds=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" # These are needed for older GCC versions. if test -n "$GCC"; then @@ -38305,18 +38321,14 @@ fi -cat >>confdefs.h <<_ACEOF -#define PR_PROGRAM "$PR_PROGRAM" -_ACEOF +printf "%s\n" "#define PR_PROGRAM \"$PR_PROGRAM\"" >>confdefs.h ac_fn_c_check_member "$LINENO" "struct stat" "st_blksize" "ac_cv_member_struct_stat_st_blksize" "$ac_includes_default" if test "x$ac_cv_member_struct_stat_st_blksize" = xyes then : -cat >>confdefs.h <<_ACEOF -#define HAVE_STRUCT_STAT_ST_BLKSIZE 1 -_ACEOF +printf "%s\n" "#define HAVE_STRUCT_STAT_ST_BLKSIZE 1" >>confdefs.h fi @@ -38325,9 +38337,7 @@ ac_fn_c_check_member "$LINENO" "struct stat" "st_rdev" "ac_cv_member_struct_stat if test "x$ac_cv_member_struct_stat_st_rdev" = xyes then : -cat >>confdefs.h <<_ACEOF -#define HAVE_STRUCT_STAT_ST_RDEV 1 -_ACEOF +printf "%s\n" "#define HAVE_STRUCT_STAT_ST_RDEV 1" >>confdefs.h fi @@ -38554,9 +38564,7 @@ then : else -cat >>confdefs.h <<_ACEOF -#define pid_t int -_ACEOF +printf "%s\n" "#define pid_t int" >>confdefs.h fi @@ -38565,21 +38573,13 @@ fi - - - if test $ac_cv_func_sigprocmask = no; then - for ac_func in sigblock -do : ac_fn_c_check_func "$LINENO" "sigblock" "ac_cv_func_sigblock" if test "x$ac_cv_func_sigblock" = xyes then : - cat >>confdefs.h <<_ACEOF -#define HAVE_SIGBLOCK 1 -_ACEOF + printf "%s\n" "#define HAVE_SIGBLOCK 1" >>confdefs.h fi -done fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether closedir returns void" >&5 @@ -38632,9 +38632,6 @@ fi - - - if test "x$ac_cv_func_fork" = xyes; then { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for working fork" >&5 printf %s "checking for working fork... " >&6; } @@ -40434,6 +40431,14 @@ if test -z "${GL_GENERATE_ICONV_H_TRUE}" && test -z "${GL_GENERATE_ICONV_H_FALSE as_fn_error $? "conditional \"GL_GENERATE_ICONV_H\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi +if test -z "${GL_GENERATE_LIMITS_H_TRUE}" && test -z "${GL_GENERATE_LIMITS_H_FALSE}"; then + as_fn_error $? "conditional \"GL_GENERATE_LIMITS_H\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 +fi +if test -z "${GL_GENERATE_LIMITS_H_TRUE}" && test -z "${GL_GENERATE_LIMITS_H_FALSE}"; then + as_fn_error $? "conditional \"GL_GENERATE_LIMITS_H\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 +fi if test -z "${GL_GENERATE_STDINT_H_TRUE}" && test -z "${GL_GENERATE_STDINT_H_FALSE}"; then as_fn_error $? "conditional \"GL_GENERATE_STDINT_H\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 @@ -40879,8 +40884,8 @@ 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 diffutils $as_me 3.5, which was -generated by GNU Autoconf 2.69.147-5ad35. Invocation command line was +This file was extended by GNU diffutils $as_me 3.6, which was +generated by GNU Autoconf 2.69.185-b502e. Invocation command line was CONFIG_FILES = $CONFIG_FILES CONFIG_HEADERS = $CONFIG_HEADERS @@ -40951,11 +40956,11 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`printf "%s\n" "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -GNU diffutils config.status 3.5 -configured by $0, generated by GNU Autoconf 2.69.147-5ad35, +GNU diffutils config.status 3.6 +configured by $0, generated by GNU Autoconf 2.69.185-b502e, with options \\"\$ac_cs_config\\" -Copyright (C) 2015 Free Software Foundation, Inc. +Copyright (C) 2017 Free Software Foundation, Inc. This config.status script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it." diff --git a/configure.ac b/configure.ac index 936338f..28e0107 100644 --- a/configure.ac +++ b/configure.ac @@ -1,6 +1,6 @@ # Configure template for GNU Diffutils. -# Copyright (C) 1994-1995, 1998, 2001-2002, 2004, 2006, 2009-2013, 2015-2016 +# Copyright (C) 1994-1995, 1998, 2001-2002, 2004, 2006, 2009-2013, 2015-2017 # Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify diff --git a/doc/Makefile.am b/doc/Makefile.am index 4f738c6..2fbfc69 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -1,6 +1,6 @@ # Makefile for GNU diffutils documentation. -# Copyright (C) 2001-2002, 2009-2013, 2015-2016 Free Software Foundation, Inc. +# Copyright (C) 2001-2002, 2009-2013, 2015-2017 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/doc/Makefile.in b/doc/Makefile.in index 23a7fae..717a2e2 100644 --- a/doc/Makefile.in +++ b/doc/Makefile.in @@ -16,7 +16,7 @@ # Makefile for GNU diffutils documentation. -# Copyright (C) 2001-2002, 2009-2013, 2015-2016 Free Software Foundation, Inc. +# Copyright (C) 2001-2002, 2009-2013, 2015-2017 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -108,10 +108,11 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \ $(top_srcdir)/m4/absolute-header.m4 $(top_srcdir)/m4/alloca.m4 \ $(top_srcdir)/m4/arpa_inet_h.m4 $(top_srcdir)/m4/btowc.m4 \ - $(top_srcdir)/m4/c-stack.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/dirname.m4 \ + $(top_srcdir)/m4/builtin-expect.m4 $(top_srcdir)/m4/c-stack.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/dirname.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 \ @@ -124,7 +125,8 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \ $(top_srcdir)/m4/freopen.m4 $(top_srcdir)/m4/fstat.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/gettext.m4 \ + $(top_srcdir)/m4/getpagesize.m4 \ + $(top_srcdir)/m4/getprogname.m4 $(top_srcdir)/m4/gettext.m4 \ $(top_srcdir)/m4/gettime.m4 $(top_srcdir)/m4/gettimeofday.m4 \ $(top_srcdir)/m4/glibc21.m4 $(top_srcdir)/m4/gnu-make.m4 \ $(top_srcdir)/m4/gnulib-common.m4 \ @@ -141,17 +143,19 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \ $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \ $(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libsigsegv.m4 \ $(top_srcdir)/m4/libunistring-base.m4 \ - $(top_srcdir)/m4/localcharset.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/longlong.m4 \ - $(top_srcdir)/m4/lstat.m4 $(top_srcdir)/m4/malloc.m4 \ - $(top_srcdir)/m4/malloca.m4 $(top_srcdir)/m4/manywarnings.m4 \ - $(top_srcdir)/m4/mbchar.m4 $(top_srcdir)/m4/mbiter.m4 \ - $(top_srcdir)/m4/mbrtowc.m4 $(top_srcdir)/m4/mbsinit.m4 \ - $(top_srcdir)/m4/mbslen.m4 $(top_srcdir)/m4/mbsrtowcs.m4 \ - $(top_srcdir)/m4/mbstate_t.m4 $(top_srcdir)/m4/mbtowc.m4 \ - $(top_srcdir)/m4/memchr.m4 $(top_srcdir)/m4/mkstemp.m4 \ + $(top_srcdir)/m4/limits-h.m4 $(top_srcdir)/m4/localcharset.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/localtime-buffer.m4 \ + $(top_srcdir)/m4/longlong.m4 $(top_srcdir)/m4/lstat.m4 \ + $(top_srcdir)/m4/malloc.m4 $(top_srcdir)/m4/malloca.m4 \ + $(top_srcdir)/m4/manywarnings.m4 $(top_srcdir)/m4/mbchar.m4 \ + $(top_srcdir)/m4/mbiter.m4 $(top_srcdir)/m4/mbrtowc.m4 \ + $(top_srcdir)/m4/mbsinit.m4 $(top_srcdir)/m4/mbslen.m4 \ + $(top_srcdir)/m4/mbsrtowcs.m4 $(top_srcdir)/m4/mbstate_t.m4 \ + $(top_srcdir)/m4/mbtowc.m4 $(top_srcdir)/m4/memchr.m4 \ + $(top_srcdir)/m4/minmax.m4 $(top_srcdir)/m4/mkstemp.m4 \ $(top_srcdir)/m4/mktime.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 \ @@ -193,9 +197,10 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \ $(top_srcdir)/m4/time_h.m4 $(top_srcdir)/m4/time_r.m4 \ $(top_srcdir)/m4/time_rz.m4 $(top_srcdir)/m4/timegm.m4 \ $(top_srcdir)/m4/timespec.m4 $(top_srcdir)/m4/tm_gmtoff.m4 \ - $(top_srcdir)/m4/unistd_h.m4 $(top_srcdir)/m4/unlocked-io.m4 \ - $(top_srcdir)/m4/vararrays.m4 $(top_srcdir)/m4/vasnprintf.m4 \ - $(top_srcdir)/m4/vasprintf.m4 $(top_srcdir)/m4/version-etc.m4 \ + $(top_srcdir)/m4/tzset.m4 $(top_srcdir)/m4/unistd_h.m4 \ + $(top_srcdir)/m4/unlocked-io.m4 $(top_srcdir)/m4/vararrays.m4 \ + $(top_srcdir)/m4/vasnprintf.m4 $(top_srcdir)/m4/vasprintf.m4 \ + $(top_srcdir)/m4/version-etc.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 \ @@ -346,6 +351,7 @@ ERRNO_H = @ERRNO_H@ EXEEXT = @EXEEXT@ FLOAT_H = @FLOAT_H@ FNMATCH_H = @FNMATCH_H@ +GETOPT_CDEFS_H = @GETOPT_CDEFS_H@ GETOPT_H = @GETOPT_H@ GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@ GLIBC21 = @GLIBC21@ @@ -362,6 +368,7 @@ GNULIB_CHDIR = @GNULIB_CHDIR@ GNULIB_CHOWN = @GNULIB_CHOWN@ GNULIB_CLOSE = @GNULIB_CLOSE@ GNULIB_CONNECT = @GNULIB_CONNECT@ +GNULIB_CTIME = @GNULIB_CTIME@ GNULIB_DPRINTF = @GNULIB_DPRINTF@ GNULIB_DUP = @GNULIB_DUP@ GNULIB_DUP2 = @GNULIB_DUP2@ @@ -440,6 +447,7 @@ GNULIB_LINK = @GNULIB_LINK@ GNULIB_LINKAT = @GNULIB_LINKAT@ GNULIB_LISTEN = @GNULIB_LISTEN@ GNULIB_LOCALECONV = @GNULIB_LOCALECONV@ +GNULIB_LOCALTIME = @GNULIB_LOCALTIME@ GNULIB_LSEEK = @GNULIB_LSEEK@ GNULIB_LSTAT = @GNULIB_LSTAT@ GNULIB_MALLOC_POSIX = @GNULIB_MALLOC_POSIX@ @@ -485,6 +493,8 @@ GNULIB_OBSTACK_PRINTF = @GNULIB_OBSTACK_PRINTF@ GNULIB_OBSTACK_PRINTF_POSIX = @GNULIB_OBSTACK_PRINTF_POSIX@ GNULIB_OPEN = @GNULIB_OPEN@ GNULIB_OPENAT = @GNULIB_OPENAT@ +GNULIB_OVERRIDES_STRUCT_STAT = @GNULIB_OVERRIDES_STRUCT_STAT@ +GNULIB_OVERRIDES_WINT_T = @GNULIB_OVERRIDES_WINT_T@ GNULIB_PCLOSE = @GNULIB_PCLOSE@ GNULIB_PERROR = @GNULIB_PERROR@ GNULIB_PIPE = @GNULIB_PIPE@ @@ -547,6 +557,7 @@ GNULIB_STRCHRNUL = @GNULIB_STRCHRNUL@ GNULIB_STRDUP = @GNULIB_STRDUP@ GNULIB_STRERROR = @GNULIB_STRERROR@ GNULIB_STRERROR_R = @GNULIB_STRERROR_R@ +GNULIB_STRFTIME = @GNULIB_STRFTIME@ GNULIB_STRNCAT = @GNULIB_STRNCAT@ GNULIB_STRNDUP = @GNULIB_STRNDUP@ GNULIB_STRNLEN = @GNULIB_STRNLEN@ @@ -570,7 +581,9 @@ GNULIB_TIME_R = @GNULIB_TIME_R@ GNULIB_TIME_RZ = @GNULIB_TIME_RZ@ GNULIB_TMPFILE = @GNULIB_TMPFILE@ GNULIB_TOWCTRANS = @GNULIB_TOWCTRANS@ +GNULIB_TRUNCATE = @GNULIB_TRUNCATE@ GNULIB_TTYNAME_R = @GNULIB_TTYNAME_R@ +GNULIB_TZSET = @GNULIB_TZSET@ GNULIB_UNISTD_H_NONBLOCKING = @GNULIB_UNISTD_H_NONBLOCKING@ GNULIB_UNISTD_H_SIGPIPE = @GNULIB_UNISTD_H_SIGPIPE@ GNULIB_UNLINK = @GNULIB_UNLINK@ @@ -602,6 +615,7 @@ GNULIB_WCSCOLL = @GNULIB_WCSCOLL@ GNULIB_WCSCPY = @GNULIB_WCSCPY@ GNULIB_WCSCSPN = @GNULIB_WCSCSPN@ GNULIB_WCSDUP = @GNULIB_WCSDUP@ +GNULIB_WCSFTIME = @GNULIB_WCSFTIME@ GNULIB_WCSLEN = @GNULIB_WCSLEN@ GNULIB_WCSNCASECMP = @GNULIB_WCSNCASECMP@ GNULIB_WCSNCAT = @GNULIB_WCSNCAT@ @@ -634,8 +648,10 @@ HAVE_ACCEPT4 = @HAVE_ACCEPT4@ HAVE_ARPA_INET_H = @HAVE_ARPA_INET_H@ HAVE_ATOLL = @HAVE_ATOLL@ HAVE_BTOWC = @HAVE_BTOWC@ +HAVE_C99_STDINT_H = @HAVE_C99_STDINT_H@ HAVE_CANONICALIZE_FILE_NAME = @HAVE_CANONICALIZE_FILE_NAME@ HAVE_CHOWN = @HAVE_CHOWN@ +HAVE_CRTDEFS_H = @HAVE_CRTDEFS_H@ HAVE_DECL_ENVIRON = @HAVE_DECL_ENVIRON@ HAVE_DECL_FCHDIR = @HAVE_DECL_FCHDIR@ HAVE_DECL_FDATASYNC = @HAVE_DECL_FDATASYNC@ @@ -646,6 +662,7 @@ HAVE_DECL_GETDELIM = @HAVE_DECL_GETDELIM@ HAVE_DECL_GETDOMAINNAME = @HAVE_DECL_GETDOMAINNAME@ HAVE_DECL_GETLINE = @HAVE_DECL_GETLINE@ HAVE_DECL_GETLOADAVG = @HAVE_DECL_GETLOADAVG@ +HAVE_DECL_GETLOGIN = @HAVE_DECL_GETLOGIN@ HAVE_DECL_GETLOGIN_R = @HAVE_DECL_GETLOGIN_R@ HAVE_DECL_GETPAGESIZE = @HAVE_DECL_GETPAGESIZE@ HAVE_DECL_GETUSERSHELL = @HAVE_DECL_GETUSERSHELL@ @@ -758,6 +775,7 @@ HAVE_PTHREAD_SIGMASK = @HAVE_PTHREAD_SIGMASK@ HAVE_PTSNAME = @HAVE_PTSNAME@ HAVE_PTSNAME_R = @HAVE_PTSNAME_R@ HAVE_PWRITE = @HAVE_PWRITE@ +HAVE_QSORT_R = @HAVE_QSORT_R@ HAVE_RAISE = @HAVE_RAISE@ HAVE_RANDOM = @HAVE_RANDOM@ HAVE_RANDOM_H = @HAVE_RANDOM_H@ @@ -802,6 +820,7 @@ HAVE_STRVERSCMP = @HAVE_STRVERSCMP@ HAVE_SYMLINK = @HAVE_SYMLINK@ HAVE_SYMLINKAT = @HAVE_SYMLINKAT@ HAVE_SYS_BITYPES_H = @HAVE_SYS_BITYPES_H@ +HAVE_SYS_CDEFS_H = @HAVE_SYS_CDEFS_H@ HAVE_SYS_INTTYPES_H = @HAVE_SYS_INTTYPES_H@ HAVE_SYS_IOCTL_H = @HAVE_SYS_IOCTL_H@ HAVE_SYS_LOADAVG_H = @HAVE_SYS_LOADAVG_H@ @@ -813,7 +832,9 @@ HAVE_SYS_TYPES_H = @HAVE_SYS_TYPES_H@ HAVE_SYS_UIO_H = @HAVE_SYS_UIO_H@ HAVE_TIMEGM = @HAVE_TIMEGM@ HAVE_TIMEZONE_T = @HAVE_TIMEZONE_T@ +HAVE_TRUNCATE = @HAVE_TRUNCATE@ HAVE_TYPE_VOLATILE_SIG_ATOMIC_T = @HAVE_TYPE_VOLATILE_SIG_ATOMIC_T@ +HAVE_TZSET = @HAVE_TZSET@ HAVE_UNISTD_H = @HAVE_UNISTD_H@ HAVE_UNLINKAT = @HAVE_UNLINKAT@ HAVE_UNLOCKPT = @HAVE_UNLOCKPT@ @@ -835,6 +856,7 @@ HAVE_WCSCOLL = @HAVE_WCSCOLL@ HAVE_WCSCPY = @HAVE_WCSCPY@ HAVE_WCSCSPN = @HAVE_WCSCSPN@ HAVE_WCSDUP = @HAVE_WCSDUP@ +HAVE_WCSFTIME = @HAVE_WCSFTIME@ HAVE_WCSLEN = @HAVE_WCSLEN@ HAVE_WCSNCASECMP = @HAVE_WCSNCASECMP@ HAVE_WCSNCAT = @HAVE_WCSNCAT@ @@ -897,6 +919,7 @@ LIBUNISTRING_UNIWIDTH_H = @LIBUNISTRING_UNIWIDTH_H@ LIB_CLOCK_GETTIME = @LIB_CLOCK_GETTIME@ LIB_NANOSLEEP = @LIB_NANOSLEEP@ LIB_SELECT = @LIB_SELECT@ +LIMITS_H = @LIMITS_H@ LOCALCHARSET_TESTS_ENVIRONMENT = @LOCALCHARSET_TESTS_ENVIRONMENT@ LOCALE_FR = @LOCALE_FR@ LOCALE_FR_UTF8 = @LOCALE_FR_UTF8@ @@ -924,6 +947,7 @@ NEXT_AS_FIRST_DIRECTIVE_GETOPT_H = @NEXT_AS_FIRST_DIRECTIVE_GETOPT_H@ NEXT_AS_FIRST_DIRECTIVE_ICONV_H = @NEXT_AS_FIRST_DIRECTIVE_ICONV_H@ NEXT_AS_FIRST_DIRECTIVE_INTTYPES_H = @NEXT_AS_FIRST_DIRECTIVE_INTTYPES_H@ NEXT_AS_FIRST_DIRECTIVE_LANGINFO_H = @NEXT_AS_FIRST_DIRECTIVE_LANGINFO_H@ +NEXT_AS_FIRST_DIRECTIVE_LIMITS_H = @NEXT_AS_FIRST_DIRECTIVE_LIMITS_H@ NEXT_AS_FIRST_DIRECTIVE_LOCALE_H = @NEXT_AS_FIRST_DIRECTIVE_LOCALE_H@ NEXT_AS_FIRST_DIRECTIVE_NETINET_IN_H = @NEXT_AS_FIRST_DIRECTIVE_NETINET_IN_H@ NEXT_AS_FIRST_DIRECTIVE_SIGNAL_H = @NEXT_AS_FIRST_DIRECTIVE_SIGNAL_H@ @@ -954,6 +978,7 @@ NEXT_GETOPT_H = @NEXT_GETOPT_H@ NEXT_ICONV_H = @NEXT_ICONV_H@ NEXT_INTTYPES_H = @NEXT_INTTYPES_H@ NEXT_LANGINFO_H = @NEXT_LANGINFO_H@ +NEXT_LIMITS_H = @NEXT_LIMITS_H@ NEXT_LOCALE_H = @NEXT_LOCALE_H@ NEXT_NETINET_IN_H = @NEXT_NETINET_IN_H@ NEXT_SIGNAL_H = @NEXT_SIGNAL_H@ @@ -999,6 +1024,7 @@ REPLACE_CALLOC = @REPLACE_CALLOC@ REPLACE_CANONICALIZE_FILE_NAME = @REPLACE_CANONICALIZE_FILE_NAME@ REPLACE_CHOWN = @REPLACE_CHOWN@ REPLACE_CLOSE = @REPLACE_CLOSE@ +REPLACE_CTIME = @REPLACE_CTIME@ REPLACE_DPRINTF = @REPLACE_DPRINTF@ REPLACE_DUP = @REPLACE_DUP@ REPLACE_DUP2 = @REPLACE_DUP2@ @@ -1106,6 +1132,7 @@ REPLACE_STRCHRNUL = @REPLACE_STRCHRNUL@ REPLACE_STRDUP = @REPLACE_STRDUP@ REPLACE_STRERROR = @REPLACE_STRERROR@ REPLACE_STRERROR_R = @REPLACE_STRERROR_R@ +REPLACE_STRFTIME = @REPLACE_STRFTIME@ REPLACE_STRNCAT = @REPLACE_STRNCAT@ REPLACE_STRNDUP = @REPLACE_STRNDUP@ REPLACE_STRNLEN = @REPLACE_STRNLEN@ @@ -1122,7 +1149,9 @@ REPLACE_SYMLINKAT = @REPLACE_SYMLINKAT@ REPLACE_TIMEGM = @REPLACE_TIMEGM@ REPLACE_TMPFILE = @REPLACE_TMPFILE@ REPLACE_TOWLOWER = @REPLACE_TOWLOWER@ +REPLACE_TRUNCATE = @REPLACE_TRUNCATE@ REPLACE_TTYNAME_R = @REPLACE_TTYNAME_R@ +REPLACE_TZSET = @REPLACE_TZSET@ REPLACE_UNLINK = @REPLACE_UNLINK@ REPLACE_UNLINKAT = @REPLACE_UNLINKAT@ REPLACE_UNSETENV = @REPLACE_UNSETENV@ @@ -1135,6 +1164,7 @@ REPLACE_VPRINTF = @REPLACE_VPRINTF@ REPLACE_VSNPRINTF = @REPLACE_VSNPRINTF@ REPLACE_VSPRINTF = @REPLACE_VSPRINTF@ REPLACE_WCRTOMB = @REPLACE_WCRTOMB@ +REPLACE_WCSFTIME = @REPLACE_WCSFTIME@ REPLACE_WCSNRTOMBS = @REPLACE_WCSNRTOMBS@ REPLACE_WCSRTOMBS = @REPLACE_WCSRTOMBS@ REPLACE_WCSWIDTH = @REPLACE_WCSWIDTH@ @@ -1171,6 +1201,8 @@ WCHAR_T_SUFFIX = @WCHAR_T_SUFFIX@ WERROR_CFLAGS = @WERROR_CFLAGS@ WINDOWS_64_BIT_OFF_T = @WINDOWS_64_BIT_OFF_T@ WINDOWS_64_BIT_ST_SIZE = @WINDOWS_64_BIT_ST_SIZE@ +WINDOWS_STAT_INODES = @WINDOWS_STAT_INODES@ +WINDOWS_STAT_TIMESPEC = @WINDOWS_STAT_TIMESPEC@ WINT_T_SUFFIX = @WINT_T_SUFFIX@ XGETTEXT = @XGETTEXT@ XGETTEXT_015 = @XGETTEXT_015@ @@ -1180,7 +1212,6 @@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ abs_top_srcdir = @abs_top_srcdir@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ am__include = @am__include@ am__quote = @am__quote@ diff --git a/doc/diffutils.info b/doc/diffutils.info index 179f11d..573a5dc 100644 --- a/doc/diffutils.info +++ b/doc/diffutils.info @@ -1,12 +1,12 @@ -This is diffutils.info-t, produced by makeinfo version 6.1 from +This is diffutils.info-t, produced by makeinfo version 6.3 from diffutils.texi. -This manual is for GNU Diffutils (version 3.5, 4 August 2016), and +This manual is for GNU Diffutils (version 3.6, 6 May 2017), and documents the GNU 'diff', 'diff3', 'sdiff', and 'cmp' commands for showing the differences between files and the GNU 'patch' command for using their output to update files. - Copyright (C) 1992-1994, 1998, 2001-2002, 2004, 2006, 2009-2016 Free + Copyright (C) 1992-1994, 1998, 2001-2002, 2004, 2006, 2009-2017 Free Software Foundation, Inc. Permission is granted to copy, distribute and/or modify this @@ -35,12 +35,12 @@ File: diffutils.info-t, Node: Top, Next: Overview, Up: (dir) Comparing and Merging Files *************************** -This manual is for GNU Diffutils (version 3.5, 4 August 2016), and +This manual is for GNU Diffutils (version 3.6, 6 May 2017), and documents the GNU 'diff', 'diff3', 'sdiff', and 'cmp' commands for showing the differences between files and the GNU 'patch' command for using their output to update files. - Copyright (C) 1992-1994, 1998, 2001-2002, 2004, 2006, 2009-2016 Free + Copyright (C) 1992-1994, 1998, 2001-2002, 2004, 2006, 2009-2017 Free Software Foundation, Inc. Permission is granted to copy, distribute and/or modify this @@ -137,7 +137,10 @@ Experience' Vol. 15, 1985, pp. 1025-1040, <http://dx.doi.org/10.1002/spe.4380151102>. The algorithm was independently discovered as described by Esko Ukkonen in "Algorithms for Approximate String Matching", 'Information and Control' Vol. 64, 1985, -pp. 100-118, <http://dx.doi.org/10.1016/S0019-9958(85)80046-2>. Related +pp. 100-118, <http://dx.doi.org/10.1016/S0019-9958(85)80046-2>. Unless +the '--minimal' option is used, 'diff' uses a heuristic by Paul Eggert +that limits the cost to O(N^1.5 log N) at the price of producing +suboptimal output for large inputs with many differences. Related algorithms are surveyed by Alfred V. Aho in section 6.3 of "Algorithms for Finding Patterns in Strings", 'Handbook of Theoretical Computer Science' (Jan Van Leeuwen, ed.), Vol. A, 'Algorithms and Complexity', @@ -653,13 +656,12 @@ like this: *** FROM-FILE FROM-FILE-MODIFICATION-TIME --- TO-FILE TO-FILE-MODIFICATION TIME -The time stamp normally looks like '2002-02-21 23:30:39.942229878 -0800' +The timestamp normally looks like '2002-02-21 23:30:39.942229878 -0800' to indicate the date, time with fractional seconds, and time zone in Internet RFC 2822 format (ftp://ftp.isi.edu/in-notes/rfc2822.txt). (The fractional seconds are omitted on hosts that do not support fractional -time stamps.) However, a traditional time stamp like 'Thu Feb 21 -23:30:39 2002' is used if the 'LC_TIME' locale category is either 'C' or -'POSIX'. +timestamps.) However, a traditional timestamp like 'Thu Feb 21 23:30:39 +2002' is used if the 'LC_TIME' locale category is either 'C' or 'POSIX'. You can change the header's content with the '--label=LABEL' option; see *note Alternate Names::. @@ -763,10 +765,10 @@ like this: --- FROM-FILE FROM-FILE-MODIFICATION-TIME +++ TO-FILE TO-FILE-MODIFICATION-TIME -The time stamp looks like '2002-02-21 23:30:39.942229878 -0800' to +The timestamp looks like '2002-02-21 23:30:39.942229878 -0800' to indicate the date, time with fractional seconds, and time zone. The fractional seconds are omitted on hosts that do not support fractional -time stamps. +timestamps. You can change the header's content with the '--label=LABEL' option. *Note Alternate Names::. @@ -2447,7 +2449,7 @@ each file F with its new version, putting reject hunks (if any) into * Revision Control:: Getting files from RCS, SCCS, etc. * Imperfect:: Dealing with imperfect patches. * Creating and Removing:: Creating and removing files with a patch. -* Patching Time Stamps:: Updating time stamps on patched files. +* Patching Timestamps:: Updating timestamps on patched files. * Multiple Patches:: Handling multiple patches in a file. * patch Directories:: Changing directory and stripping directories. * Backups:: Whether backup files are made. @@ -2495,7 +2497,7 @@ File: diffutils.info-t, Node: Revision Control, Next: Imperfect, Prev: patch If a nonexistent input file is under a revision control system supported by 'patch', 'patch' normally asks the user whether to get (or check out) the file from the revision control system. Patch currently supports -RCS, ClearCase and SCCS. Under RCS and SCCS, 'patch' also asks when the +RCS, ClearCase and SCCS. Under RCS and SCCS, 'patch' also asks when the input file is read-only and matches the default version in the revision control system. @@ -2668,7 +2670,7 @@ it by invoking 'patch' as before, but this time without the '--dry-run' option. -File: diffutils.info-t, Node: Creating and Removing, Next: Patching Time Stamps, Prev: Imperfect, Up: Merging with patch +File: diffutils.info-t, Node: Creating and Removing, Next: Patching Timestamps, Prev: Imperfect, Up: Merging with patch 10.4 Creating and Removing Files ================================ @@ -2689,48 +2691,47 @@ appear to be one that removed the file. asks for confirmation before applying the patch. -File: diffutils.info-t, Node: Patching Time Stamps, Next: Multiple Patches, Prev: Creating and Removing, Up: Merging with patch +File: diffutils.info-t, Node: Patching Timestamps, Next: Multiple Patches, Prev: Creating and Removing, Up: Merging with patch -10.5 Updating Time Stamps on Patched Files -========================================== +10.5 Updating Timestamps on Patched Files +========================================= When 'patch' updates a file, it normally sets the file's last-modified -time stamp to the current time of day. If you are using 'patch' to -track a software distribution, this can cause 'make' to incorrectly -conclude that a patched file is out of date. For example, if 'syntax.c' -depends on 'syntax.y', and 'patch' updates 'syntax.c' and then -'syntax.y', then 'syntax.c' will normally appear to be out of date with -respect to 'syntax.y' even though its contents are actually up to date. +timestamp to the current time of day. If you are using 'patch' to track +a software distribution, this can cause 'make' to incorrectly conclude +that a patched file is out of date. For example, if 'syntax.c' depends +on 'syntax.y', and 'patch' updates 'syntax.c' and then 'syntax.y', then +'syntax.c' will normally appear to be out of date with respect to +'syntax.y' even though its contents are actually up to date. The '--set-utc' ('-Z') option causes 'patch' to set a patched file's -modification and access times to the time stamps given in context diff +modification and access times to the timestamps given in context diff headers. If the context diff headers do not specify a time zone, they are assumed to use Coordinated Universal Time (UTC, often known as GMT). The '--set-time' ('-T') option acts like '-Z' or '--set-utc', except -that it assumes that the context diff headers' time stamps use local -time instead of UTC. This option is not recommended, because patches -using local time cannot easily be used by people in other time zones, -and because local time stamps are ambiguous when local clocks move -backwards during daylight-saving time adjustments. If the context diff -headers specify a time zone, this option is equivalent to '--set-utc' -('-Z'). - - 'patch' normally refrains from setting a file's time stamps if the -file's original last-modified time stamp does not match the time given -in the diff header, of if the file's contents do not exactly match the +that it assumes that the context diff headers' timestamps use local time +instead of UTC. This option is not recommended, because patches using +local time cannot easily be used by people in other time zones, and +because local timestamps are ambiguous when local clocks move backwards +during daylight-saving time adjustments. If the context diff headers +specify a time zone, this option is equivalent to '--set-utc' ('-Z'). + + 'patch' normally refrains from setting a file's timestamps if the +file's original last-modified timestamp does not match the time given in +the diff header, of if the file's contents do not exactly match the patch. However, if the '--force' ('-f') option is given, the file's -time stamps are set regardless. +timestamps are set regardless. Due to the limitations of the current 'diff' format, 'patch' cannot update the times of files whose contents have not changed. Also, if you -set file time stamps to values other than the current time of day, you +set file timestamps to values other than the current time of day, you should also remove (e.g., with 'make clean') all files that depend on the patched files, so that later invocations of 'make' do not get confused by the patched files' times. -File: diffutils.info-t, Node: Multiple Patches, Next: patch Directories, Prev: Patching Time Stamps, Up: Merging with patch +File: diffutils.info-t, Node: Multiple Patches, Next: patch Directories, Prev: Patching Timestamps, Up: Merging with patch 10.6 Multiple Patches in a File =============================== @@ -2836,7 +2837,7 @@ not create backup files by default. *Note patch and POSIX::. The '--backup' ('-b') option causes 'patch' to make a backup file regardless of whether the patch matches the original input. The '--backup-if-mismatch' option causes 'patch' to create backup files for -mismatches files; this is the default when not conforming to POSIX. The +mismatches files; this is the default when not conforming to POSIX. The '--no-backup-if-mismatch' option causes 'patch' to not create backup files, even for mismatched patches; this is the default when conforming to POSIX. @@ -3046,8 +3047,8 @@ standard, as follows: * Do not remove files that are removed by a diff. *Note Creating and Removing::. - * Do not ask whether to get files from RCS, ClearCase, or SCCS. - *Note Revision Control::. + * Do not ask whether to get files from RCS, ClearCase, or SCCS. *Note + Revision Control::. * Require that all options precede the files in the command line. @@ -3115,7 +3116,7 @@ must interoperate with traditional 'patch', or with GNU 'patch' version * Limit yourself to the following options when sending instructions meant to be executed by anyone running GNU 'patch', traditional - 'patch', or a 'patch' that conforms to POSIX. Spaces are + 'patch', or a 'patch' that conforms to POSIX. Spaces are significant in the following list, and operands are required. -c @@ -3166,7 +3167,7 @@ archives of the two versions. and NEW identify the old and new directories. The names OLD and NEW should not contain any slashes. The '-N' option lets the patch create and remove files; '-a' lets the patch update non-text files; '-u' -generates useful time stamps and enough context; and '-r' lets the patch +generates useful timestamps and enough context; and '-r' lets the patch update subdirectories. Here is an example command, using Bourne shell syntax: @@ -3268,7 +3269,7 @@ giving 'diff' the '-x PATTERN' option (*note Comparing Directories::). If you want your patch to modify a derived file because your recipients lack tools to build it, make sure that the patch for the derived file follows any patches for files that it depends on, so that the -recipients' time stamps will not confuse 'make'. +recipients' timestamps will not confuse 'make'. Now you can create the patch using 'diff -Naur'. Make sure to specify the scratch directory first and the newer directory second. @@ -3300,19 +3301,20 @@ operands specify how many bytes to ignore at the start of each file; they are equivalent to the '--ignore-initial=FROM-SKIP:TO-SKIP' option. By default, 'cmp' outputs nothing if the two files have the same -contents. If one file is a prefix of the other, 'cmp' prints to -standard error a message of the following form: +contents. If the two files have bytes that differ, 'cmp' reports the +location of the first difference to standard output: - cmp: EOF on SHORTER-FILE + FROM-FILE TO-FILE differ: char BYTE-NUMBER, line LINE-NUMBER - Otherwise, 'cmp' prints to standard output a message of the following -form: +If one file is a prefix of the other, 'cmp' reports the shorter file's +name to standard error, followed by a blank and extra information about +the shorter file: - FROM-FILE TO-FILE differ: char BYTE-NUMBER, line LINE-NUMBER + cmp: EOF on SHORTER-FILE EXTRA-INFO - The message formats can differ outside the POSIX locale. Also, POSIX -allows the EOF message to be followed by a blank and some additional -information. + The message formats can differ outside the POSIX locale. POSIX +allows but does not require the EOF diagnostic's file name to be +followed by a blank and additional information. An exit status of 0 means no differences were found, 1 means some differences were found, and 2 means trouble. @@ -3970,7 +3972,7 @@ combined into a single command line argument with only one dash. '--backup-if-mismatch' Back up the original contents of each file if the patch does not exactly match the file. This is the default behavior when not - conforming to POSIX. *Note Backups::. + conforming to POSIX. *Note Backups::. '--binary' Read and write all files in binary mode, except for standard output @@ -4046,7 +4048,7 @@ combined into a single command line argument with only one dash. '--no-backup-if-mismatch' Do not back up the original contents of files. This is the default - behavior when conforming to POSIX. *Note Backups::. + behavior when conforming to POSIX. *Note Backups::. '-o FILE' '--output=FILE' @@ -4086,9 +4088,9 @@ combined into a single command line argument with only one dash. '-T' '--set-time' - Set the modification and access times of patched files from time - stamps given in context diff headers, assuming that the context - diff headers use local time. *Note Patching Time Stamps::. + Set the modification and access times of patched files from + timestamps given in context diff headers, assuming that the context + diff headers use local time. *Note Patching Timestamps::. '-u' '--unified' @@ -4123,9 +4125,9 @@ combined into a single command line argument with only one dash. '-Z' '--set-utc' - Set the modification and access times of patched files from time - stamps given in context diff headers, assuming that the context - diff headers use UTC. *Note Patching Time Stamps::. + Set the modification and access times of patched files from + timestamps given in context diff headers, assuming that the context + diff headers use UTC. *Note Patching Timestamps::. File: diffutils.info-t, Node: Invoking sdiff, Next: Standards conformance, Prev: Invoking patch, Up: Top @@ -4337,7 +4339,7 @@ These shortcomings motivate the following suggested projects. * Changing Structure:: Handling changes to the directory structure. * Special Files:: Handling symbolic links, device special files, etc. * Unusual File Names:: Handling file names that contain unusual characters. -* Time Stamp Order:: Outputting diffs in time stamp order. +* Timestamp Order:: Outputting diffs in timestamp order. * Ignoring Changes:: Ignoring certain changes while showing others. * Speedups:: Improving performance. @@ -4382,7 +4384,7 @@ transform the directory subtree into the file. having to include its entire contents in the patch file. There should also be a way to tell 'patch' that a file was renamed, even if there is no way for 'diff' to generate such information. There should be a way -to tell 'patch' that a file's time stamp has changed, even if its +to tell 'patch' that a file's timestamp has changed, even if its contents have not changed. These problems can be fixed by extending the 'diff' output format to @@ -4411,7 +4413,7 @@ of the change to the symbolic link. and 'patch' should be extended to understand these extensions. -File: diffutils.info-t, Node: Unusual File Names, Next: Time Stamp Order, Prev: Special Files, Up: Shortcomings +File: diffutils.info-t, Node: Unusual File Names, Next: Timestamp Order, Prev: Special Files, Up: Shortcomings 18.1.4 File Names that Contain Unusual Characters ------------------------------------------------- @@ -4424,21 +4426,21 @@ is syntactically correct but patches the wrong files. The format of 'diff' output should be extended to handle all possible file names. -File: diffutils.info-t, Node: Time Stamp Order, Next: Ignoring Changes, Prev: Unusual File Names, Up: Shortcomings +File: diffutils.info-t, Node: Timestamp Order, Next: Ignoring Changes, Prev: Unusual File Names, Up: Shortcomings -18.1.5 Outputting Diffs in Time Stamp Order -------------------------------------------- +18.1.5 Outputting Diffs in Timestamp Order +------------------------------------------ -Applying 'patch' to a multiple-file diff can result in files whose time -stamps are out of order. GNU 'patch' has options to restore the time -stamps of the updated files (*note Patching Time Stamps::), but +Applying 'patch' to a multiple-file diff can result in files whose +timestamps are out of order. GNU 'patch' has options to restore the +timestamps of the updated files (*note Patching Timestamps::), but sometimes it is useful to generate a patch that works even if the recipient does not have GNU patch, or does not use these options. One way to do this would be to implement a 'diff' option to output diffs in -time stamp order. +timestamp order. -File: diffutils.info-t, Node: Ignoring Changes, Next: Speedups, Prev: Time Stamp Order, Up: Shortcomings +File: diffutils.info-t, Node: Ignoring Changes, Next: Speedups, Prev: Timestamp Order, Up: Shortcomings 18.1.6 Ignoring Certain Changes ------------------------------- @@ -4466,10 +4468,10 @@ File: diffutils.info-t, Node: Speedups, Prev: Ignoring Changes, Up: Shortcomi ---------------------------- When comparing two large directory structures, one of which was -originally copied from the other with time stamps preserved (e.g., with +originally copied from the other with timestamps preserved (e.g., with 'cp -pR'), it would greatly improve performance if an option told 'diff' -to assume that two files with the same size and time stamps have the -same content. *Note diff Performance::. +to assume that two files with the same size and timestamps have the same +content. *Note diff Performance::. File: diffutils.info-t, Node: Bugs, Prev: Shortcomings, Up: Projects @@ -5173,10 +5175,9 @@ Appendix C Index * terminal, using color iff: diff Options. (line 42) * testing patch: Dry Runs. (line 6) * text versus binary diff: Binary. (line 6) -* time stamp format, context diffs: Detailed Context. (line 12) -* time stamp format, unified diffs: Detailed Unified. (line 12) -* time stamps on patched files: Patching Time Stamps. - (line 6) +* timestamp format, context diffs: Detailed Context. (line 12) +* timestamp format, unified diffs: Detailed Unified. (line 12) +* timestamps on patched files: Patching Timestamps. (line 6) * traditional patch: patch and Tradition. (line 6) * trailing blanks: Trailing Blanks. (line 6) * two-column output: Side by Side. (line 6) @@ -5196,118 +5197,118 @@ Appendix C Index Tag Table: -Node: Top1432 -Node: Overview3646 -Node: Comparison7200 -Node: Hunks10144 -Node: White Space11587 -Node: Blank Lines13428 -Node: Specified Lines14419 -Node: Case Folding15547 -Node: Brief15966 -Node: Binary17291 -Node: Output Formats21090 -Node: Sample diff Input21817 -Node: Context23318 -Node: Context Format24897 -Node: Example Context25691 -Node: Less Context27201 -Node: Detailed Context28393 -Node: Unified Format30593 -Node: Example Unified31392 -Node: Detailed Unified32432 -Node: Sections34076 -Node: Specified Headings34837 -Node: C Function Headings36388 -Node: Alternate Names37236 -Node: Side by Side38151 -Node: Side by Side Format40303 -Node: Example Side by Side41207 -Node: Normal42549 -Node: Example Normal43552 -Node: Detailed Normal44291 -Node: Scripts46032 -Node: ed Scripts46439 -Node: Example ed47647 -Node: Detailed ed48099 -Node: Forward ed49860 -Node: RCS50638 -Node: If-then-else51856 -Node: Line Group Formats53536 -Node: Line Formats59419 -Node: Example If-then-else62690 -Node: Detailed If-then-else63771 -Node: Incomplete Lines65658 -Node: Comparing Directories67296 -Node: Adjusting Output71590 -Node: Tabs72099 -Node: Trailing Blanks73715 -Node: Pagination74942 -Node: diff Performance75412 -Node: Comparing Three Files78503 -Node: Sample diff3 Input79383 -Node: Example diff3 Normal80333 -Node: Detailed diff3 Normal81399 -Node: diff3 Hunks83189 -Node: diff3 Merging84457 -Node: Which Changes86704 -Node: Marking Conflicts88106 -Node: Bypassing ed90563 -Node: Merging Incomplete Lines91908 -Node: Saving the Changed File92636 -Node: Interactive Merging93254 -Node: sdiff Option Summary93965 -Node: Merge Commands95170 -Node: Merging with patch96461 -Node: patch Input98832 -Node: Revision Control99516 -Node: Imperfect100689 -Node: Changed White Space101840 -Node: Reversed Patches102639 -Node: Inexact104105 -Node: Dry Runs107663 -Node: Creating and Removing108529 -Node: Patching Time Stamps109581 -Node: Multiple Patches111782 -Node: patch Directories114446 -Node: Backups116072 -Node: Backup Names117139 -Ref: Backup Names-Footnote-1120096 -Node: Reject Names120223 -Node: patch Messages120814 -Node: More or Fewer Messages121876 -Node: patch and Keyboard Input122509 -Node: patch Quoting Style123540 -Node: patch and POSIX124688 -Node: patch and Tradition125529 -Node: Making Patches128953 -Node: Tips for Patch Producers129781 -Node: Tips for Patch Consumers131039 -Node: Avoiding Common Mistakes131678 -Node: Generating Smaller Patches134205 -Node: Invoking cmp135967 -Node: cmp Options137391 -Node: Invoking diff141037 -Node: diff Options142658 -Node: Invoking diff3152509 -Node: diff3 Options153149 -Node: Invoking patch156184 -Node: patch Options157394 -Node: Invoking sdiff162623 -Node: sdiff Options163767 -Node: Standards conformance166741 -Node: Projects168489 -Node: Shortcomings169203 -Node: Internationalization170307 -Node: Changing Structure171475 -Node: Special Files172581 -Node: Unusual File Names173694 -Node: Time Stamp Order174335 -Node: Ignoring Changes174980 -Node: Speedups175752 -Node: Bugs176218 -Node: Copying This Manual177073 -Node: Translations202194 -Node: Index202568 +Node: Top1429 +Node: Overview3640 +Node: Comparison7396 +Node: Hunks10340 +Node: White Space11783 +Node: Blank Lines13624 +Node: Specified Lines14615 +Node: Case Folding15743 +Node: Brief16162 +Node: Binary17487 +Node: Output Formats21286 +Node: Sample diff Input22013 +Node: Context23514 +Node: Context Format25093 +Node: Example Context25887 +Node: Less Context27397 +Node: Detailed Context28589 +Node: Unified Format30786 +Node: Example Unified31585 +Node: Detailed Unified32625 +Node: Sections34267 +Node: Specified Headings35028 +Node: C Function Headings36579 +Node: Alternate Names37427 +Node: Side by Side38342 +Node: Side by Side Format40494 +Node: Example Side by Side41398 +Node: Normal42740 +Node: Example Normal43743 +Node: Detailed Normal44482 +Node: Scripts46223 +Node: ed Scripts46630 +Node: Example ed47838 +Node: Detailed ed48290 +Node: Forward ed50051 +Node: RCS50829 +Node: If-then-else52047 +Node: Line Group Formats53727 +Node: Line Formats59610 +Node: Example If-then-else62881 +Node: Detailed If-then-else63962 +Node: Incomplete Lines65849 +Node: Comparing Directories67487 +Node: Adjusting Output71781 +Node: Tabs72290 +Node: Trailing Blanks73906 +Node: Pagination75133 +Node: diff Performance75603 +Node: Comparing Three Files78694 +Node: Sample diff3 Input79574 +Node: Example diff3 Normal80524 +Node: Detailed diff3 Normal81590 +Node: diff3 Hunks83380 +Node: diff3 Merging84648 +Node: Which Changes86895 +Node: Marking Conflicts88297 +Node: Bypassing ed90754 +Node: Merging Incomplete Lines92099 +Node: Saving the Changed File92827 +Node: Interactive Merging93445 +Node: sdiff Option Summary94156 +Node: Merge Commands95361 +Node: Merging with patch96652 +Node: patch Input99021 +Node: Revision Control99705 +Node: Imperfect100877 +Node: Changed White Space102028 +Node: Reversed Patches102827 +Node: Inexact104293 +Node: Dry Runs107851 +Node: Creating and Removing108717 +Node: Patching Timestamps109768 +Node: Multiple Patches111957 +Node: patch Directories114620 +Node: Backups116246 +Node: Backup Names117312 +Ref: Backup Names-Footnote-1120269 +Node: Reject Names120396 +Node: patch Messages120987 +Node: More or Fewer Messages122049 +Node: patch and Keyboard Input122682 +Node: patch Quoting Style123713 +Node: patch and POSIX124861 +Node: patch and Tradition125702 +Node: Making Patches129125 +Node: Tips for Patch Producers129953 +Node: Tips for Patch Consumers131210 +Node: Avoiding Common Mistakes131849 +Node: Generating Smaller Patches134376 +Node: Invoking cmp136137 +Node: cmp Options137689 +Node: Invoking diff141335 +Node: diff Options142956 +Node: Invoking diff3152807 +Node: diff3 Options153447 +Node: Invoking patch156482 +Node: patch Options157692 +Node: Invoking sdiff162914 +Node: sdiff Options164058 +Node: Standards conformance167032 +Node: Projects168780 +Node: Shortcomings169494 +Node: Internationalization170596 +Node: Changing Structure171764 +Node: Special Files172869 +Node: Unusual File Names173982 +Node: Timestamp Order174622 +Node: Ignoring Changes175260 +Node: Speedups176031 +Node: Bugs176495 +Node: Copying This Manual177350 +Node: Translations202471 +Node: Index202845 End Tag Table diff --git a/doc/diffutils.texi b/doc/diffutils.texi index b478380..8479b3f 100644 --- a/doc/diffutils.texi +++ b/doc/diffutils.texi @@ -9,12 +9,12 @@ @copying This manual is for GNU Diffutils (version @value{VERSION}, @value{UPDATED}), -and documents the @acronym{GNU} @command{diff}, @command{diff3}, +and documents the GNU @command{diff}, @command{diff3}, @command{sdiff}, and @command{cmp} commands for showing the -differences between files and the @acronym{GNU} @command{patch} command for +differences between files and the GNU @command{patch} command for using their output to update files. -Copyright @copyright{} 1992-1994, 1998, 2001-2002, 2004, 2006, 2009-2016 Free +Copyright @copyright{} 1992-1994, 1998, 2001-2002, 2004, 2006, 2009-2017 Free Software Foundation, Inc. @quotation @@ -23,7 +23,7 @@ under the terms of the GNU Free Documentation License, Version 1.3 or any later version published by the Free Software Foundation; with no Invariant Sections, no Front-Cover Texts, and no Back-Cover Texts. A copy of the license is included in the section entitled -``@acronym{GNU} Free Documentation License.'' +``GNU Free Documentation License.'' @end quotation @end copying @@ -87,7 +87,7 @@ A copy of the license is included in the section entitled * Invoking patch:: Apply a diff file to an original. * Invoking sdiff:: Side-by-side merge of file differences. -* Standards conformance:: Conformance to the @acronym{POSIX} standard. +* Standards conformance:: Conformance to the POSIX standard. * Projects:: If you've found a bug or other shortcoming. * Copying This Manual:: How to make copies of this manual. @@ -115,7 +115,7 @@ You can use the @command{cmp} command to show the byte and line numbers where two files differ. @command{cmp} can also show all the bytes that differ between the two files, side by side. A way to compare two files character by character is the Emacs command @kbd{M-x -compare-windows}. @xref{Other Window, , Other Window, emacs, The @acronym{GNU} +compare-windows}. @xref{Other Window, , Other Window, emacs, The GNU Emacs Manual}, for more information on that command. You can use the @command{diff3} command to show differences among three @@ -138,7 +138,7 @@ to one file to reproduce the other. This manual first concentrates on making diffs, and later shows how to use diffs to update files. -@acronym{GNU} @command{diff} was written by Paul Eggert, Mike Haertel, +GNU @command{diff} was written by Paul Eggert, Mike Haertel, David Hayes, Richard Stallman, and Len Tower. Wayne Davison designed and implemented the unified output format. The basic algorithm is described by Eugene W. Myers in ``An O(ND) Difference Algorithm and its Variations'', @@ -161,18 +161,21 @@ The algorithm was independently discovered as described by Esko Ukkonen in @c Date: Wed, 29 Sep 1993 08:27:55 MST @c Ukkonen should be given credit for also discovering the algorithm used @c in GNU diff. -Related algorithms are surveyed by Alfred V. Aho in +Unless the @option{--minimal} option is used, @command{diff} uses a +heuristic by Paul Eggert that limits the cost to @math{O(N^1.5 log N)} +at the price of producing suboptimal output for large inputs with many +differences. Related algorithms are surveyed by Alfred V. Aho in section 6.3 of ``Algorithms for Finding Patterns in Strings'', @cite{Handbook of Theoretical Computer Science} (Jan Van Leeuwen, ed.), Vol.@: A, @cite{Algorithms and Complexity}, Elsevier/MIT Press, 1990, pp.@: 255--300. -@acronym{GNU} @command{diff3} was written by Randy Smith. @acronym{GNU} -@command{sdiff} was written by Thomas Lord. @acronym{GNU} @command{cmp} +GNU @command{diff3} was written by Randy Smith. GNU +@command{sdiff} was written by Thomas Lord. GNU @command{cmp} was written by Torbj@"orn Granlund and David MacKenzie. -@acronym{GNU} @command{patch} was written mainly by Larry Wall and Paul Eggert; -several @acronym{GNU} enhancements were contributed by Wayne Davison and +GNU @command{patch} was written mainly by Larry Wall and Paul Eggert; +several GNU enhancements were contributed by Wayne Davison and David MacKenzie. Parts of this manual are adapted from a manual page written by Larry Wall, with his permission. @@ -188,7 +191,7 @@ lines that differ, and reports each group of differing lines. It can report the differing lines in several formats, which have different purposes. -@acronym{GNU} @command{diff} can show whether files are different +GNU @command{diff} can show whether files are different without detailing the differences. It also provides ways to suppress certain kinds of differences that are not important to you. Most commonly, such differences are changes in the amount of white space @@ -385,7 +388,7 @@ line against each regular expression. @section Suppressing Case Differences @cindex case difference suppression -@acronym{GNU} @command{diff} can treat lower case letters as +GNU @command{diff} can treat lower case letters as equivalent to their upper case counterparts, so that, for example, it considers @samp{Funky Stuff}, @samp{funky STUFF}, and @samp{fUNKy stuFf} to all be the same. To request this, use the @option{-i} or @@ -460,8 +463,8 @@ this. In operating systems that distinguish between text and binary files, @command{diff} normally reads and writes all data as text. Use the @option{--binary} option to force @command{diff} to read and write binary -data instead. This option has no effect on a @acronym{POSIX}-compliant system -like @acronym{GNU} or traditional Unix. However, many personal computer +data instead. This option has no effect on a POSIX-compliant system +like GNU or traditional Unix. However, many personal computer operating systems represent the end of a line with a carriage return followed by a newline. On such systems, @command{diff} normally ignores these carriage returns on input and generates them at the end of each @@ -469,7 +472,7 @@ output line, but with the @option{--binary} option @command{diff} treats each carriage return as just another input character, and does not generate a carriage return at the end of each output line. This can be useful when dealing with non-text files that are meant to be -interchanged with @acronym{POSIX}-compliant systems. +interchanged with POSIX-compliant systems. The @option{--strip-trailing-cr} causes @command{diff} to treat input lines that end in carriage return followed by newline as if they end @@ -481,8 +484,8 @@ are compared and output. If you want to compare two files byte by byte, you can use the @command{cmp} program with the @option{--verbose} (@option{-l}) option to show the values of each differing byte in the two files. -With @acronym{GNU} @command{cmp}, you can also use the @option{-b} or -@option{--print-bytes} option to show the @acronym{ASCII} representation of +With GNU @command{cmp}, you can also use the @option{-b} or +@option{--print-bytes} option to show the ASCII representation of those bytes. @xref{Invoking cmp}, for more information. If @command{diff3} thinks that any of the files it is comparing is binary @@ -570,7 +573,7 @@ also want to see the parts of the files near the lines that differ, to help you understand exactly what has changed. These nearby parts of the files are called the @dfn{context}. -@acronym{GNU} @command{diff} provides two output formats that show context +GNU @command{diff} provides two output formats that show context around the differing lines: @dfn{context format} and @dfn{unified format}. It can optionally show in which function or section of the file the differing lines are found. @@ -697,13 +700,13 @@ like this: @noindent @vindex LC_TIME -@cindex time stamp format, context diffs -The time stamp normally looks like @samp{2002-02-21 23:30:39.942229878 +@cindex timestamp format, context diffs +The timestamp normally looks like @samp{2002-02-21 23:30:39.942229878 -0800} to indicate the date, time with fractional seconds, and time zone in @uref{ftp://ftp.isi.edu/in-notes/rfc2822.txt, Internet RFC 2822 format}. (The fractional seconds are omitted on hosts that do -not support fractional time stamps.) However, a traditional time -stamp like @samp{Thu Feb 21 23:30:39 2002} is used if the +not support fractional timestamps.) However, a traditional timestamp +like @samp{Thu Feb 21 23:30:39 2002} is used if the @env{LC_TIME} locale category is either @samp{C} or @samp{POSIX}. You can change the header's content with the @@ -763,8 +766,8 @@ or @option{-u} option. The argument @var{lines} is the number of lines of context to show. When it is not given, it defaults to three. -At present, only @acronym{GNU} @command{diff} can produce this format and -only @acronym{GNU} @command{patch} can automatically apply diffs in this +At present, only GNU @command{diff} can produce this format and +only GNU @command{patch} can automatically apply diffs in this format. For proper operation, @command{patch} typically needs at least three lines of context. @@ -813,11 +816,11 @@ like this: @end example @noindent -@cindex time stamp format, unified diffs -The time stamp looks like @samp{2002-02-21 23:30:39.942229878 -0800} +@cindex timestamp format, unified diffs +The timestamp looks like @samp{2002-02-21 23:30:39.942229878 -0800} to indicate the date, time with fractional seconds, and time zone. The fractional seconds are omitted on hosts that do not support -fractional time stamps. +fractional timestamps. You can change the header's content with the @option{--label=@var{label}} option. @xref{Alternate Names}. @@ -860,7 +863,7 @@ A line was removed here from the first file. Sometimes you might want to know which part of the files each change falls in. If the files are source code, this could mean which function was changed. If the files are documents, it could mean which -chapter or appendix was changed. @acronym{GNU} @command{diff} can +chapter or appendix was changed. GNU @command{diff} can show this by displaying the nearest section heading line that precedes the differing lines. Which lines are ``section headings'' is determined by a regular expression. @@ -925,7 +928,7 @@ command line. You can override both the format and the number with The @option{--show-c-function} (@option{-p}) option is equivalent to @option{-F '^[[:alpha:]$_]'} if the unified format is specified, otherwise -@option{-c -F '^[[:alpha:]$_]'} (@pxref{Specified Headings}). @acronym{GNU} +@option{-c -F '^[[:alpha:]$_]'} (@pxref{Specified Headings}). GNU @command{diff} provides this option for the sake of convenience. @node Alternate Names @@ -1067,7 +1070,7 @@ or unified formats by using 0 lines of context). However, this format is no longer widely used for sending out patches; for that purpose, the context format (@pxref{Context Format}) and the unified format (@pxref{Unified Format}) are superior. Normal format is the default for -compatibility with older versions of @command{diff} and the @acronym{POSIX} +compatibility with older versions of @command{diff} and the POSIX standard. Use the @option{--normal} option to select this output format explicitly. @@ -1154,7 +1157,7 @@ to produce @var{to-file}. @menu * ed Scripts:: Using @command{diff} to produce commands for @command{ed}. * Forward ed:: Making forward @command{ed} scripts. -* RCS:: A special @command{diff} output format used by @acronym{RCS}. +* RCS:: A special @command{diff} output format used by RCS. @end menu @node ed Scripts @@ -1221,7 +1224,7 @@ format hunks look like this: @end example Because @command{ed} uses a single period on a line to indicate the -end of input, @acronym{GNU} @command{diff} protects lines of changes +end of input, GNU @command{diff} protects lines of changes that contain a single period on a line by writing two periods instead, then writing a subsequent @command{ed} command to change the two periods into one. The @command{ed} format cannot represent an @@ -1270,10 +1273,10 @@ compatibility with older versions of @command{diff}. Use the @option{-f} or @option{--forward-ed} option to select it. @node RCS -@subsection @acronym{RCS} Scripts -@cindex @acronym{RCS} script output format +@subsection RCS Scripts +@cindex RCS script output format -The @acronym{RCS} output format is designed specifically for use by +The RCS output format is designed specifically for use by the Revision Control System, which is a set of free programs used for organizing different versions and systems of files. Use the @option{--rcs} (@option{-n}) option to select this output format. It @@ -1723,7 +1726,7 @@ differences in white space are ignored (@pxref{White Space}). An incomplete line is normally distinguished on output from a full line by a following line that starts with @samp{\}. However, the -@acronym{RCS} format (@pxref{RCS}) outputs the incomplete line as-is, +RCS format (@pxref{RCS}) outputs the incomplete line as-is, without any trailing newline or following line. The side by side format normally represents incomplete lines as-is, but in some cases uses a @samp{\} or @samp{/} gutter marker. @xref{Side by Side}. The @@ -1873,7 +1876,7 @@ The lines of text in some of the @command{diff} output formats are preceded by one or two characters that indicate whether the text is inserted, deleted, or changed. The addition of those characters can cause tabs to move to the next tab stop, throwing off the alignment of -columns in the line. @acronym{GNU} @command{diff} provides two ways +columns in the line. GNU @command{diff} provides two ways to make tab-aligned columns line up correctly. The first way is to have @command{diff} convert all tabs into the correct @@ -1916,7 +1919,7 @@ and unified format, unless the trailing blanks were already present in the input. This changes the output format slightly, so that output lines are guaranteed to never end in a blank unless an input line ends in a blank. This format is less likely to be munged by text editors -or by transmission via email. It is accepted by @acronym{GNU} +or by transmission via email. It is accepted by GNU @command{patch} as well. @node Pagination @@ -1936,7 +1939,7 @@ header might look like for @samp{diff -lc lao tzu}: @chapter @command{diff} Performance Tradeoffs @cindex performance of @command{diff} -@acronym{GNU} @command{diff} runs quite efficiently; however, in some +GNU @command{diff} runs quite efficiently; however, in some circumstances you can cause it to run faster or produce a more compact set of changes. @@ -1948,17 +1951,17 @@ identical. For example, suppose you copy a large directory hierarchy, make a few changes to the copy, and then often use @samp{diff -r} to compare the original to the copy. If the original files are read-only, you can greatly improve performance by creating the copy -using hard or symbolic links (e.g., with @acronym{GNU} @samp{cp -lR} or +using hard or symbolic links (e.g., with GNU @samp{cp -lR} or @samp{cp -sR}). Before editing a file in the copy for the first time, you should break the link and replace it with a regular copy. -You can also affect the performance of @acronym{GNU} @command{diff} by +You can also affect the performance of GNU @command{diff} by giving it options that change the way it compares files. Performance has more than one dimension. These options improve one aspect of performance at the cost of another, or they improve performance in some cases while hurting it in others. -The way that @acronym{GNU} @command{diff} determines which lines have +The way that GNU @command{diff} determines which lines have changed always comes up with a near-minimal set of differences. Usually it is good enough for practical purposes. If the @command{diff} output is large, you might want @command{diff} to use a @@ -2416,7 +2419,7 @@ if a newline had been present. Traditional Unix @command{diff3} generates an @command{ed} script without the trailing @samp{w} and @samp{q} commands that save the changes. -System V @command{diff3} generates these extra commands. @acronym{GNU} +System V @command{diff3} generates these extra commands. GNU @command{diff3} normally behaves like traditional Unix @command{diff3}, but with the @option{-i} option it behaves like System V @command{diff3} and appends the @samp{w} and @samp{q} @@ -2439,7 +2442,7 @@ options to @command{sdiff}. Another way to merge files interactively is to use the Emacs Lisp package @command{emerge}. @xref{Emerge, , Emerge, emacs, The -@acronym{GNU} Emacs Manual}, for more information. +GNU Emacs Manual}, for more information. @menu * sdiff Option Summary:: Summary of @command{sdiff} options. @@ -2564,18 +2567,18 @@ hunks (if any) into @samp{@var{f}.rej}. @menu * patch Input:: Selecting the type of @command{patch} input. -* Revision Control:: Getting files from @acronym{RCS}, @acronym{SCCS}, etc. +* Revision Control:: Getting files from RCS, SCCS, etc. * Imperfect:: Dealing with imperfect patches. * Creating and Removing:: Creating and removing files with a patch. -* Patching Time Stamps:: Updating time stamps on patched files. +* Patching Timestamps:: Updating timestamps on patched files. * Multiple Patches:: Handling multiple patches in a file. * patch Directories:: Changing directory and stripping directories. * Backups:: Whether backup files are made. * Backup Names:: Backup file names. * Reject Names:: Reject file names. * patch Messages:: Messages and questions @command{patch} can produce. -* patch and POSIX:: Conformance to the @acronym{POSIX} standard. -* patch and Tradition:: @acronym{GNU} versus traditional @command{patch}. +* patch and POSIX:: Conformance to the POSIX standard. +* patch and Tradition:: GNU versus traditional @command{patch}. @end menu @node patch Input @@ -2611,15 +2614,15 @@ unified diff. @section Revision Control @cindex revision control @cindex version control -@cindex @acronym{RCS} +@cindex RCS @cindex ClearCase -@cindex @acronym{SCCS} +@cindex SCCS If a nonexistent input file is under a revision control system supported by @command{patch}, @command{patch} normally asks the user whether to get (or check out) the file from the revision control -system. Patch currently supports @acronym{RCS}, ClearCase and -@acronym{SCCS}. Under @acronym{RCS} and @acronym{SCCS}, +system. Patch currently supports RCS, ClearCase and +SCCS. Under RCS and SCCS, @command{patch} also asks when the input file is read-only and matches the default version in the revision control system. @@ -2631,7 +2634,7 @@ zero, @command{patch} neither asks the user nor gets the file; and if negative, @command{patch} asks the user before getting the file. The default value of @var{num} is given by the value of the @env{PATCH_GET} environment variable if it is set; if not, the default -value is zero if @command{patch} is conforming to @acronym{POSIX}, negative +value is zero if @command{patch} is conforming to POSIX, negative otherwise. @xref{patch and POSIX}. @vindex VERSION_CONTROL @@ -2803,7 +2806,7 @@ new file that is named @file{/dev/null} or is empty and is dated the Epoch (1970-01-01 00:00:00 UTC), @command{diff} outputs a patch that adds or deletes the contents of this file. When given such a patch, @command{patch} normally creates a new file or removes the old file. -However, when conforming to @acronym{POSIX} (@pxref{patch and POSIX}), +However, when conforming to POSIX (@pxref{patch and POSIX}), @command{patch} does not remove the old file, but leaves it empty. The @option{--remove-empty-files} (@option{-E}) option causes @command{patch} to remove output files that are empty after applying a @@ -2813,12 +2816,12 @@ file. If the patch appears to create a file that already exists, @command{patch} asks for confirmation before applying the patch. -@node Patching Time Stamps -@section Updating Time Stamps on Patched Files -@cindex time stamps on patched files +@node Patching Timestamps +@section Updating Timestamps on Patched Files +@cindex timestamps on patched files When @command{patch} updates a file, it normally sets the file's -last-modified time stamp to the current time of day. If you are using +last-modified timestamp to the current time of day. If you are using @command{patch} to track a software distribution, this can cause @command{make} to incorrectly conclude that a patched file is out of date. For example, if @file{syntax.c} depends on @file{syntax.y}, and @@ -2827,29 +2830,29 @@ date. For example, if @file{syntax.c} depends on @file{syntax.y}, and @file{syntax.y} even though its contents are actually up to date. The @option{--set-utc} (@option{-Z}) option causes @command{patch} to -set a patched file's modification and access times to the time stamps +set a patched file's modification and access times to the timestamps given in context diff headers. If the context diff headers do not specify a time zone, they are assumed to use Coordinated Universal -Time (@acronym{UTC}, often known as @acronym{GMT}). +Time (UTC, often known as GMT). The @option{--set-time} (@option{-T}) option acts like @option{-Z} or @option{--set-utc}, except that it assumes that the context diff -headers' time stamps use local time instead of @acronym{UTC}. This option +headers' timestamps use local time instead of UTC. This option is not recommended, because patches using local time cannot easily be -used by people in other time zones, and because local time stamps are +used by people in other time zones, and because local timestamps are ambiguous when local clocks move backwards during daylight-saving time adjustments. If the context diff headers specify a time zone, this option is equivalent to @option{--set-utc} (@option{-Z}). -@command{patch} normally refrains from setting a file's time stamps if -the file's original last-modified time stamp does not match the time +@command{patch} normally refrains from setting a file's timestamps if +the file's original last-modified timestamp does not match the time given in the diff header, of if the file's contents do not exactly match the patch. However, if the @option{--force} (@option{-f}) -option is given, the file's time stamps are set regardless. +option is given, the file's timestamps are set regardless. Due to the limitations of the current @command{diff} format, @command{patch} cannot update the times of files whose contents have -not changed. Also, if you set file time stamps to values other than +not changed. Also, if you set file timestamps to values other than the current time of day, you should also remove (e.g., with @samp{make clean}) all files that depend on the patched files, so that later invocations of @command{make} do not get confused by the patched @@ -2883,7 +2886,7 @@ ignored. @item If there is an @samp{Index:} line in the leading garbage and if either the old and new names are both absent or if @command{patch} is -conforming to @acronym{POSIX}, @command{patch} takes the name in the +conforming to POSIX, @command{patch} takes the name in the @samp{Index:} line. @item @@ -2899,18 +2902,18 @@ follows: @itemize @bullet @item If some of the named files exist, @command{patch} selects the first -name if conforming to @acronym{POSIX}, and the best name otherwise. +name if conforming to POSIX, and the best name otherwise. @item -If @command{patch} is not ignoring @acronym{RCS}, ClearCase, and @acronym{SCCS} -(@pxref{Revision Control}), and no named files exist but an @acronym{RCS}, -ClearCase, or @acronym{SCCS} master is found, @command{patch} selects the -first named file with an @acronym{RCS}, ClearCase, or @acronym{SCCS} master. +If @command{patch} is not ignoring RCS, ClearCase, and SCCS +(@pxref{Revision Control}), and no named files exist but an RCS, +ClearCase, or SCCS master is found, @command{patch} selects the +first named file with an RCS, ClearCase, or SCCS master. @item -If no named files exist, no @acronym{RCS}, ClearCase, or @acronym{SCCS} master +If no named files exist, no RCS, ClearCase, or SCCS master was found, some names are given, @command{patch} is not conforming to -@acronym{POSIX}, and the patch appears to create a file, @command{patch} +POSIX, and the patch appears to create a file, @command{patch} selects the best name requiring the creation of the fewest directories. @@ -2926,7 +2929,7 @@ basename; of those, it then takes all the shortest names; finally, it takes the first remaining name. @xref{patch and POSIX}, to see whether @command{patch} is conforming -to @acronym{POSIX}. +to POSIX. @node patch Directories @section Applying Patches in Other Directories @@ -2974,17 +2977,17 @@ Normally, @command{patch} creates a backup file if the patch does not exactly match the original input file, because in that case the original data might not be recovered if you undo the patch with @samp{patch -R} (@pxref{Reversed Patches}). However, when conforming -to @acronym{POSIX}, @command{patch} does not create backup files by +to POSIX, @command{patch} does not create backup files by default. @xref{patch and POSIX}. The @option{--backup} (@option{-b}) option causes @command{patch} to make a backup file regardless of whether the patch matches the original input. The @option{--backup-if-mismatch} option causes @command{patch} to create backup files for mismatches files; this is -the default when not conforming to @acronym{POSIX}. The +the default when not conforming to POSIX. The @option{--no-backup-if-mismatch} option causes @command{patch} to not create backup files, even for mismatched patches; this is the default -when conforming to @acronym{POSIX}. +when conforming to POSIX. When backing up a file that does not exist, an empty, unreadable backup file is created as a placeholder to represent the nonexistent @@ -2997,7 +3000,7 @@ file. Normally, @command{patch} renames an original input file into a backup file by appending to its name the extension @samp{.orig}, or @samp{~} if using @samp{.orig} would make the backup file name too -long.@footnote{A coding error in @acronym{GNU} @command{patch} version +long.@footnote{A coding error in GNU @command{patch} version 2.5.4 causes it to always use @samp{~}, but this should be fixed in the next release.} The @option{-z @var{backup-suffix}} or @option{--suffix=@var{backup-suffix}} option causes @command{patch} to @@ -3009,7 +3012,7 @@ Alternately, you can specify the extension for backup files with the override. @command{patch} can also create numbered backup files the way -@acronym{GNU} Emacs does. With this method, instead of having a +GNU Emacs does. With this method, instead of having a single backup of each file, @command{patch} makes a new backup file name each time it patches a file. For example, the backups of a file named @file{sink} would be called, successively, @file{sink.~1~}, @@ -3029,8 +3032,8 @@ names; they do not affect the choice of revision control system (@pxref{Revision Control}). The values of these environment variables and the argument to the -@option{-V} option are like the @acronym{GNU} Emacs @code{version-control} -variable (@pxref{Backup Names, , , emacs, The @acronym{GNU} Emacs Manual}, +@option{-V} option are like the GNU Emacs @code{version-control} +variable (@pxref{Backup Names, , , emacs, The GNU Emacs Manual}, for more information on backup versions in Emacs). They also recognize synonyms that are more descriptive. The valid values are listed below; unique abbreviations are acceptable. @@ -3200,13 +3203,13 @@ environment variable is not set, the default value is @samp{shell}, but this default may change in a future version of @command{patch}. @node patch and POSIX -@section @command{patch} and the @acronym{POSIX} Standard -@cindex @acronym{POSIX} +@section @command{patch} and the POSIX Standard +@cindex POSIX @vindex POSIXLY_CORRECT If you specify the @option{--posix} option, or set the @env{POSIXLY_CORRECT} environment variable, @command{patch} conforms -more strictly to the @acronym{POSIX} standard, as follows: +more strictly to the POSIX standard, as follows: @itemize @bullet @item @@ -3218,8 +3221,8 @@ Do not remove files that are removed by a diff. @xref{Creating and Removing}. @item -Do not ask whether to get files from @acronym{RCS}, ClearCase, or -@acronym{SCCS}. @xref{Revision Control}. +Do not ask whether to get files from RCS, ClearCase, or +SCCS. @xref{Revision Control}. @item Require that all options precede the files in the command line. @@ -3230,17 +3233,17 @@ Do not backup files, even when there is a mismatch. @xref{Backups}. @end itemize @node patch and Tradition -@section @acronym{GNU} @command{patch} and Traditional @command{patch} +@section GNU @command{patch} and Traditional @command{patch} @cindex traditional @command{patch} -The current version of @acronym{GNU} @command{patch} normally follows the -@acronym{POSIX} standard. @xref{patch and POSIX}, for the few exceptions +The current version of GNU @command{patch} normally follows the +POSIX standard. @xref{patch and POSIX}, for the few exceptions to this general rule. -Unfortunately, @acronym{POSIX} redefined the behavior of @command{patch} in +Unfortunately, POSIX redefined the behavior of @command{patch} in several important ways. You should be aware of the following differences if you must interoperate with traditional @command{patch}, -or with @acronym{GNU} @command{patch} version 2.1 and earlier. +or with GNU @command{patch} version 2.1 and earlier. @itemize @bullet @item @@ -3261,22 +3264,22 @@ In traditional @command{patch}, backups were enabled by default. This behavior is now enabled with the @option{--backup} (@option{-b}) option. -Conversely, in @acronym{POSIX} @command{patch}, backups are never made, -even when there is a mismatch. In @acronym{GNU} @command{patch}, this +Conversely, in POSIX @command{patch}, backups are never made, +even when there is a mismatch. In GNU @command{patch}, this behavior is enabled with the @option{--no-backup-if-mismatch} option, -or by conforming to @acronym{POSIX}. +or by conforming to POSIX. The @option{-b@ @var{suffix}} option of traditional @command{patch} is -equivalent to the @samp{-b -z@ @var{suffix}} options of @acronym{GNU} +equivalent to the @samp{-b -z@ @var{suffix}} options of GNU @command{patch}. @item Traditional @command{patch} used a complicated (and incompletely documented) method to intuit the name of the file to be patched from -the patch header. This method did not conform to @acronym{POSIX}, and had +the patch header. This method did not conform to POSIX, and had a few gotchas. Now @command{patch} uses a different, equally complicated (but better documented) method that is optionally -@acronym{POSIX}-conforming; we hope it has fewer gotchas. The two methods +POSIX-conforming; we hope it has fewer gotchas. The two methods are compatible if the file names in the context diff header and the @samp{Index:} line are all identical after prefix-stripping. Your patch is normally compatible if each header's file names all contain @@ -3300,9 +3303,9 @@ Now @command{patch} exits with status 1 if some hunks failed, or with @item Limit yourself to the following options when sending instructions -meant to be executed by anyone running @acronym{GNU} @command{patch}, +meant to be executed by anyone running GNU @command{patch}, traditional @command{patch}, or a @command{patch} that conforms to -@acronym{POSIX}. Spaces are significant in the following list, and +POSIX. Spaces are significant in the following list, and operands are required. @example @@ -3353,7 +3356,7 @@ To generate the patch, use the command @samp{diff -Naur @var{old} directories. The names @var{old} and @var{new} should not contain any slashes. The @option{-N} option lets the patch create and remove files; @option{-a} lets the patch update non-text files; @option{-u} -generates useful time stamps and enough context; and @option{-r} lets +generates useful timestamps and enough context; and @option{-r} lets the patch update subdirectories. Here is an example command, using Bourne shell syntax: @@ -3378,10 +3381,10 @@ A patch producer should tell recipients how to apply the patches, so the first rule of thumb for a patch consumer is to follow the instructions supplied with the patch. -@acronym{GNU} @command{diff} can analyze files with arbitrarily long lines +GNU @command{diff} can analyze files with arbitrarily long lines and files that end in incomplete lines. However, older versions of @command{patch} cannot patch such files. If you are having trouble -applying such patches, try upgrading to a recent version of @acronym{GNU} +applying such patches, try upgrading to a recent version of GNU @command{patch}. @node Avoiding Common Mistakes @@ -3462,8 +3465,8 @@ exclude them from the patch by giving @command{diff} the @option{-x @var{pattern}} option (@pxref{Comparing Directories}). If you want your patch to modify a derived file because your recipients lack tools to build it, make sure that the patch for the derived file follows any -patches for files that it depends on, so that the recipients' time -stamps will not confuse @command{make}. +patches for files that it depends on, so that the recipients' +timestamps will not confuse @command{make}. Now you can create the patch using @samp{diff -Naur}. Make sure to specify the scratch directory first and the newer directory second. @@ -3499,23 +3502,25 @@ ignore at the start of each file; they are equivalent to the @option{--ignore-initial=@var{from-skip}:@var{to-skip}} option. By default, @command{cmp} outputs nothing if the two files have the -same contents. If one file is a prefix of the other, @command{cmp} -prints to standard error a message of the following form: +same contents. If the two files have bytes that differ, @command{cmp} +reports the location of the first difference to standard output: @example -cmp: EOF on @var{shorter-file} +@var{from-file} @var{to-file} differ: char @var{byte-number}, line @var{line-number} @end example -Otherwise, @command{cmp} prints to standard output a message of the -following form: +@noindent +If one file is a prefix of the other, @command{cmp} reports the +shorter file's name to standard error, followed by a blank and extra +information about the shorter file: @example -@var{from-file} @var{to-file} differ: char @var{byte-number}, line @var{line-number} +cmp: EOF on @var{shorter-file} @var{extra-info} @end example -The message formats can differ outside the @acronym{POSIX} locale. -Also, @acronym{POSIX} allows the @acronym{EOF} message to be followed -by a blank and some additional information. +The message formats can differ outside the POSIX locale. +POSIX allows but does not require the EOF diagnostic's file +name to be followed by a blank and additional information. An exit status of 0 means no differences were found, 1 means some differences were found, and 2 means trouble. @@ -3529,7 +3534,7 @@ differences were found, and 2 means trouble. @cindex @command{cmp} options @cindex options for @command{cmp} -Below is a summary of all of the options that @acronym{GNU} +Below is a summary of all of the options that GNU @command{cmp} accepts. Most options have two equivalent names, one of which is a single letter preceded by @samp{-}, and the other of which is a long name preceded by @samp{--}. Multiple single letter options @@ -3562,7 +3567,7 @@ instead of the default standard output. Each output line contains a differing byte's number relative to the start of the input, followed by the differing byte values. Byte numbers start at 1. -Also, output the @acronym{EOF} message if one file is shorter than the other. +Also, output the EOF message if one file is shorter than the other. @item -n @var{count} @itemx --bytes=@var{count} @@ -3608,7 +3613,7 @@ kilobyte: @math{10^3 = 1000}. @cindex kibibyte, definition of kibibyte: @math{2^10 = 1024}. @samp{K} is special: the SI prefix is @samp{k} and the IEC 60027-2 prefix is @samp{Ki}, but tradition and -@acronym{POSIX} use @samp{k} to mean @samp{KiB}. +POSIX use @samp{k} to mean @samp{KiB}. @item MB @cindex megabyte, definition of megabyte: @math{10^6 = 1,000,000}. @@ -3711,7 +3716,7 @@ differences were found, and 2 means trouble. @cindex @command{diff} options @cindex options for @command{diff} -Below is a summary of all of the options that @acronym{GNU} +Below is a summary of all of the options that GNU @command{diff} accepts. Most options have two equivalent names, one of which is a single letter preceded by @samp{-}, and the other of which is a long name preceded by @samp{--}. Multiple single letter @@ -3857,7 +3862,7 @@ Use @var{format} to output all input lines in if-then-else format. @item -n @itemx --rcs -Output @acronym{RCS}-format diffs; like @option{-f} except that each command +Output RCS-format diffs; like @option{-f} except that each command specifies the number of lines affected. @xref{RCS}. @item -N @@ -4003,7 +4008,7 @@ context. On older systems, @command{diff} supports an obsolete option @option{-@var{lines}} that has effect when combined with @option{-u}. -@acronym{POSIX} 1003.1-2001 (@pxref{Standards conformance}) does not allow +POSIX 1003.1-2001 (@pxref{Standards conformance}) does not allow this; use @option{-U @var{lines}} instead. @item -v @@ -4066,7 +4071,7 @@ conflicts were found, and 2 means trouble. @cindex @command{diff3} options @cindex options for @command{diff3} -Below is a summary of all of the options that @acronym{GNU} @command{diff3} +Below is a summary of all of the options that GNU @command{diff3} accepts. Multiple single letter options (unless they take an argument) can be combined into a single command line argument. @@ -4206,7 +4211,7 @@ if @var{file} is one of the input files. @cindex @command{patch} options @cindex options for @command{patch} -Here is a summary of all of the options that @acronym{GNU} @command{patch} +Here is a summary of all of the options that GNU @command{patch} accepts. @xref{patch and Tradition}, for which of these options are safe to use in older versions of @command{patch}. @@ -4226,12 +4231,12 @@ Prepend @var{prefix} to backup file names. @xref{Backup Names}. @item --backup-if-mismatch Back up the original contents of each file if the patch does not exactly match the file. This is the default behavior when not -conforming to @acronym{POSIX}. @xref{Backups}. +conforming to POSIX. @xref{Backups}. @item --binary Read and write all files in binary mode, except for standard output and @file{/dev/tty}. This option has no effect on -@acronym{POSIX}-conforming systems like @acronym{GNU}/Linux. On systems where +POSIX-conforming systems like GNU/Linux. On systems where this option makes a difference, the patch should be generated by @samp{diff -a --binary}. @xref{Binary}. @@ -4301,7 +4306,7 @@ See also @option{-R}. @xref{Reversed Patches}. @item --no-backup-if-mismatch Do not back up the original contents of files. This is the default -behavior when conforming to @acronym{POSIX}. @xref{Backups}. +behavior when conforming to POSIX. @xref{Backups}. @item -o @var{file} @itemx --output=@var{file} @@ -4312,7 +4317,7 @@ Use @var{file} as the output file name. @xref{patch Options}. Set the file name strip count to @var{number}. @xref{patch Directories}. @item --posix -Conform to @acronym{POSIX}, as if the @env{POSIXLY_CORRECT} environment +Conform to POSIX, as if the @env{POSIXLY_CORRECT} environment variable had been set. @xref{patch and POSIX}. @item --quoting-style=@var{word} @@ -4340,9 +4345,9 @@ Do not ask any questions. @xref{patch Messages}. @item -T @itemx --set-time -Set the modification and access times of patched files from time -stamps given in context diff headers, assuming that the context diff -headers use local time. @xref{Patching Time Stamps}. +Set the modification and access times of patched files from timestamps +given in context diff headers, assuming that the context diff +headers use local time. @xref{Patching Timestamps}. @item -u @itemx --unified @@ -4375,9 +4380,9 @@ Use @var{suffix} as the backup extension instead of @samp{.orig} or @item -Z @itemx --set-utc -Set the modification and access times of patched files from time -stamps given in context diff headers, assuming that the context diff -headers use @acronym{UTC}. @xref{Patching Time Stamps}. +Set the modification and access times of patched files from timestamps +given in context diff headers, assuming that the context diff +headers use UTC. @xref{Patching Timestamps}. @end table @@ -4420,7 +4425,7 @@ differences were found, and 2 means trouble. @cindex @command{sdiff} options @cindex options for @command{sdiff} -Below is a summary of all of the options that @acronym{GNU} +Below is a summary of all of the options that GNU @command{sdiff} accepts. Each option has two equivalent names, one of which is a single letter preceded by @samp{-}, and the other of which is a long name preceded by @samp{--}. Multiple single letter options @@ -4524,13 +4529,13 @@ Ignore white space at line end. @xref{White Space}. @node Standards conformance @chapter Standards conformance -@cindex @acronym{POSIX} +@cindex POSIX @vindex POSIXLY_CORRECT -In a few cases, the @acronym{GNU} utilities' default behavior is -incompatible with the @acronym{POSIX} standard. To suppress these +In a few cases, the GNU utilities' default behavior is +incompatible with the POSIX standard. To suppress these incompatibilities, define the @env{POSIXLY_CORRECT} environment -variable. Unless you are checking for @acronym{POSIX} conformance, you +variable. Unless you are checking for POSIX conformance, you probably do not need to define @env{POSIXLY_CORRECT}. Normally options and operands can appear in any order, and programs act @@ -4540,35 +4545,35 @@ as if all the options appear before any operands. For example, @env{POSIXLY_CORRECT} environment variable is set, options must appear before operands, unless otherwise specified for a particular command. -Newer versions of @acronym{POSIX} are occasionally incompatible with older -versions. For example, older versions of @acronym{POSIX} allowed the +Newer versions of POSIX are occasionally incompatible with older +versions. For example, older versions of POSIX allowed the command @samp{diff -c -10} to have the same meaning as @samp{diff -C -10}, but @acronym{POSIX} 1003.1-2001 @samp{diff} no longer allows +10}, but POSIX 1003.1-2001 @samp{diff} no longer allows digit-string options like @option{-10}. @vindex _POSIX2_VERSION -The @acronym{GNU} utilities normally conform to the version of @acronym{POSIX} +The GNU utilities normally conform to the version of POSIX that is standard for your system. To cause them to conform to a -different version of @acronym{POSIX}, define the @env{_POSIX2_VERSION} +different version of POSIX, define the @env{_POSIX2_VERSION} environment variable to a value of the form @var{yyyymm} specifying the year and month the standard was adopted. Two values are currently supported for @env{_POSIX2_VERSION}: @samp{199209} stands for -@acronym{POSIX} 1003.2-1992, and @samp{200112} stands for @acronym{POSIX} +POSIX 1003.2-1992, and @samp{200112} stands for POSIX 1003.1-2001. For example, if you are running older software that -assumes an older version of @acronym{POSIX} and uses @samp{diff -c -10}, +assumes an older version of POSIX and uses @samp{diff -c -10}, you can work around the compatibility problems by setting @samp{_POSIX2_VERSION=199209} in your environment. @node Projects @chapter Future Projects -Here are some ideas for improving @acronym{GNU} @command{diff} and -@command{patch}. The @acronym{GNU} project has identified some +Here are some ideas for improving GNU @command{diff} and +@command{patch}. The GNU project has identified some improvements as potential programming projects for volunteers. You can also help by reporting any bugs that you find. If you are a programmer and would like to contribute something to the -@acronym{GNU} project, please consider volunteering for one of these +GNU project, please consider volunteering for one of these projects. If you are seriously contemplating work, please write to @email{gvc@@gnu.org} to coordinate with other volunteers. @@ -4578,10 +4583,10 @@ projects. If you are seriously contemplating work, please write to @end menu @node Shortcomings -@section Suggested Projects for Improving @acronym{GNU} @command{diff} and @command{patch} +@section Suggested Projects for Improving GNU @command{diff} and @command{patch} @cindex projects for directories -One should be able to use @acronym{GNU} @command{diff} to generate a +One should be able to use GNU @command{diff} to generate a patch from any pair of directory trees, and given the patch and a copy of one such tree, use @command{patch} to generate a faithful copy of the other. Unfortunately, some changes to directory trees cannot be @@ -4594,7 +4599,7 @@ following suggested projects. * Changing Structure:: Handling changes to the directory structure. * Special Files:: Handling symbolic links, device special files, etc. * Unusual File Names:: Handling file names that contain unusual characters. -* Time Stamp Order:: Outputting diffs in time stamp order. +* Timestamp Order:: Outputting diffs in timestamp order. * Ignoring Changes:: Ignoring certain changes while showing others. * Speedups:: Improving performance. @end menu @@ -4639,7 +4644,7 @@ There should be a way to specify that a file has been removed without having to include its entire contents in the patch file. There should also be a way to tell @command{patch} that a file was renamed, even if there is no way for @command{diff} to generate such information. -There should be a way to tell @command{patch} that a file's time stamp +There should be a way to tell @command{patch} that a file's timestamp has changed, even if its contents have not changed. These problems can be fixed by extending the @command{diff} output format @@ -4680,16 +4685,16 @@ parse. The problem is with format of @command{diff} output, not just with patches the wrong files. The format of @command{diff} output should be extended to handle all possible file names. -@node Time Stamp Order -@subsection Outputting Diffs in Time Stamp Order +@node Timestamp Order +@subsection Outputting Diffs in Timestamp Order Applying @command{patch} to a multiple-file diff can result in files -whose time stamps are out of order. @acronym{GNU} @command{patch} has -options to restore the time stamps of the updated files -(@pxref{Patching Time Stamps}), but sometimes it is useful to generate -a patch that works even if the recipient does not have @acronym{GNU} patch, +whose timestamps are out of order. GNU @command{patch} has +options to restore the timestamps of the updated files +(@pxref{Patching Timestamps}), but sometimes it is useful to generate +a patch that works even if the recipient does not have GNU patch, or does not use these options. One way to do this would be to -implement a @command{diff} option to output diffs in time stamp order. +implement a @command{diff} option to output diffs in timestamp order. @node Ignoring Changes @subsection Ignoring Certain Changes @@ -4716,22 +4721,22 @@ However, this outputs the filtered text, not the original. @subsection Improving Performance When comparing two large directory structures, one of which was -originally copied from the other with time stamps preserved (e.g., +originally copied from the other with timestamps preserved (e.g., with @samp{cp -pR}), it would greatly improve performance if an option told @command{diff} to assume that two files with the same size and -time stamps have the same content. @xref{diff Performance}. +timestamps have the same content. @xref{diff Performance}. @node Bugs @section Reporting Bugs @cindex bug reports @cindex reporting bugs -If you think you have found a bug in @acronym{GNU} @command{cmp}, +If you think you have found a bug in GNU @command{cmp}, @command{diff}, @command{diff3}, or @command{sdiff}, please report it by electronic mail to the @uref{http://mail.gnu.org/mailman/listinfo/bug-diffutils,GNU utilities bug report mailing list} @email{bug-diffutils@@gnu.org}. Please send -bug reports for @acronym{GNU} @command{patch} to +bug reports for GNU @command{patch} to @email{bug-patch@@gnu.org}. Send as precise a description of the problem as you can, including the output of the @option{--version} option and sample input files that produce the bug, if applicable. If diff --git a/doc/stamp-vti b/doc/stamp-vti index 4f2a926..afaf160 100644 --- a/doc/stamp-vti +++ b/doc/stamp-vti @@ -1,4 +1,4 @@ -@set UPDATED 4 August 2016 -@set UPDATED-MONTH August 2016 -@set EDITION 3.5 -@set VERSION 3.5 +@set UPDATED 6 May 2017 +@set UPDATED-MONTH May 2017 +@set EDITION 3.6 +@set VERSION 3.6 diff --git a/doc/version.texi b/doc/version.texi index 4f2a926..afaf160 100644 --- a/doc/version.texi +++ b/doc/version.texi @@ -1,4 +1,4 @@ -@set UPDATED 4 August 2016 -@set UPDATED-MONTH August 2016 -@set EDITION 3.5 -@set VERSION 3.5 +@set UPDATED 6 May 2017 +@set UPDATED-MONTH May 2017 +@set EDITION 3.6 +@set VERSION 3.6 @@ -1,7 +1,7 @@ #! /bin/sh # Wrapper around gettext for programs using the msgid convention. -# Copyright (C) 1998, 2001, 2004, 2009-2013, 2015-2016 Free Software +# Copyright (C) 1998, 2001, 2004, 2009-2013, 2015-2017 Free Software # Foundation, Inc. # Written by Paul Eggert <eggert@twinsun.com>. diff --git a/gnulib-tests/Makefile.in b/gnulib-tests/Makefile.in index d986484..e24250b 100644 --- a/gnulib-tests/Makefile.in +++ b/gnulib-tests/Makefile.in @@ -14,7 +14,7 @@ @SET_MAKE@ -# Copyright (C) 2002-2016 Free Software Foundation, Inc. +# Copyright (C) 2002-2017 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 @@ -128,17 +128,19 @@ TESTS = test-accept$(EXEEXT) test-alloca-opt$(EXEEXT) \ test-freopen-safer$(EXEEXT) test-freopen$(EXEEXT) \ test-fstat$(EXEEXT) test-ftruncate.sh test-fwrite$(EXEEXT) \ test-getcwd-lgpl$(EXEEXT) test-getdtablesize$(EXEEXT) \ - test-getopt$(EXEEXT) test-gettimeofday$(EXEEXT) \ + test-getopt-gnu$(EXEEXT) test-getopt-posix$(EXEEXT) \ + test-getprogname$(EXEEXT) test-gettimeofday$(EXEEXT) \ test-hash$(EXEEXT) test-iconv-h$(EXEEXT) test-iconv$(EXEEXT) \ test-ignore-value$(EXEEXT) test-inet_pton$(EXEEXT) \ test-intprops$(EXEEXT) test-inttostr$(EXEEXT) \ test-inttypes$(EXEEXT) test-ioctl$(EXEEXT) \ test-isblank$(EXEEXT) test-iswblank$(EXEEXT) \ - test-langinfo$(EXEEXT) test-listen$(EXEEXT) \ - test-locale$(EXEEXT) test-localeconv$(EXEEXT) \ - test-lstat$(EXEEXT) test-malloca$(EXEEXT) test-mbrtowc1.sh \ - test-mbrtowc2.sh test-mbrtowc3.sh test-mbrtowc4.sh \ - test-mbrtowc5.sh test-mbrtowc-w32-1.sh test-mbrtowc-w32-2.sh \ + test-langinfo$(EXEEXT) test-limits-h$(EXEEXT) \ + test-listen$(EXEEXT) test-locale$(EXEEXT) \ + test-localeconv$(EXEEXT) test-lstat$(EXEEXT) \ + test-malloca$(EXEEXT) test-mbrtowc1.sh test-mbrtowc2.sh \ + test-mbrtowc3.sh test-mbrtowc4.sh test-mbrtowc5.sh \ + test-mbrtowc-w32-1.sh test-mbrtowc-w32-2.sh \ test-mbrtowc-w32-3.sh test-mbrtowc-w32-4.sh \ test-mbrtowc-w32-5.sh test-mbscasecmp.sh test-mbsinit.sh \ test-mbsrtowcs1.sh test-mbsrtowcs2.sh test-mbsrtowcs3.sh \ @@ -199,22 +201,24 @@ check_PROGRAMS = test-accept$(EXEEXT) test-alloca-opt$(EXEEXT) \ test-freopen$(EXEEXT) test-fstat$(EXEEXT) \ test-ftruncate$(EXEEXT) test-fwrite$(EXEEXT) \ test-getcwd-lgpl$(EXEEXT) test-getdtablesize$(EXEEXT) \ - test-getopt$(EXEEXT) test-gettimeofday$(EXEEXT) \ + test-getopt-gnu$(EXEEXT) test-getopt-posix$(EXEEXT) \ + test-getprogname$(EXEEXT) test-gettimeofday$(EXEEXT) \ test-hash$(EXEEXT) test-iconv-h$(EXEEXT) test-iconv$(EXEEXT) \ test-ignore-value$(EXEEXT) test-inet_pton$(EXEEXT) \ test-intprops$(EXEEXT) test-inttostr$(EXEEXT) \ test-inttypes$(EXEEXT) test-ioctl$(EXEEXT) \ test-isblank$(EXEEXT) test-iswblank$(EXEEXT) \ - test-langinfo$(EXEEXT) test-listen$(EXEEXT) \ - test-locale$(EXEEXT) test-localeconv$(EXEEXT) \ - test-lstat$(EXEEXT) test-malloca$(EXEEXT) \ - test-mbrtowc$(EXEEXT) test-mbrtowc-w32$(EXEEXT) \ - test-mbscasecmp$(EXEEXT) test-mbsinit$(EXEEXT) \ - test-mbsrtowcs$(EXEEXT) test-mbsstr1$(EXEEXT) \ - test-mbsstr2$(EXEEXT) test-mbsstr3$(EXEEXT) \ - test-memchr$(EXEEXT) test-nanosleep$(EXEEXT) \ - test-netinet_in$(EXEEXT) test-nl_langinfo$(EXEEXT) \ - test-open$(EXEEXT) test-pathmax$(EXEEXT) test-perror$(EXEEXT) \ + test-langinfo$(EXEEXT) test-limits-h$(EXEEXT) \ + test-listen$(EXEEXT) test-locale$(EXEEXT) \ + test-localeconv$(EXEEXT) test-lstat$(EXEEXT) \ + test-malloca$(EXEEXT) test-mbrtowc$(EXEEXT) \ + test-mbrtowc-w32$(EXEEXT) test-mbscasecmp$(EXEEXT) \ + test-mbsinit$(EXEEXT) test-mbsrtowcs$(EXEEXT) \ + test-mbsstr1$(EXEEXT) test-mbsstr2$(EXEEXT) \ + test-mbsstr3$(EXEEXT) test-memchr$(EXEEXT) \ + test-nanosleep$(EXEEXT) test-netinet_in$(EXEEXT) \ + test-nl_langinfo$(EXEEXT) test-open$(EXEEXT) \ + test-pathmax$(EXEEXT) test-perror$(EXEEXT) \ test-perror2$(EXEEXT) test-pipe$(EXEEXT) \ test-quotearg-simple$(EXEEXT) test-raise$(EXEEXT) \ test-rawmemchr$(EXEEXT) test-readlink$(EXEEXT) \ @@ -249,15 +253,17 @@ check_PROGRAMS = test-accept$(EXEEXT) test-alloca-opt$(EXEEXT) \ test-xalloc-die$(EXEEXT) test-xstrtol$(EXEEXT) \ test-xstrtoul$(EXEEXT) test-xstrtoumax$(EXEEXT) \ test-xvasprintf$(EXEEXT) +EXTRA_PROGRAMS = test-verify-try$(EXEEXT) subdir = gnulib-tests ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \ $(top_srcdir)/m4/absolute-header.m4 $(top_srcdir)/m4/alloca.m4 \ $(top_srcdir)/m4/arpa_inet_h.m4 $(top_srcdir)/m4/btowc.m4 \ - $(top_srcdir)/m4/c-stack.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/dirname.m4 \ + $(top_srcdir)/m4/builtin-expect.m4 $(top_srcdir)/m4/c-stack.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/dirname.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 \ @@ -270,7 +276,8 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \ $(top_srcdir)/m4/freopen.m4 $(top_srcdir)/m4/fstat.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/gettext.m4 \ + $(top_srcdir)/m4/getpagesize.m4 \ + $(top_srcdir)/m4/getprogname.m4 $(top_srcdir)/m4/gettext.m4 \ $(top_srcdir)/m4/gettime.m4 $(top_srcdir)/m4/gettimeofday.m4 \ $(top_srcdir)/m4/glibc21.m4 $(top_srcdir)/m4/gnu-make.m4 \ $(top_srcdir)/m4/gnulib-common.m4 \ @@ -287,17 +294,19 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \ $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \ $(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libsigsegv.m4 \ $(top_srcdir)/m4/libunistring-base.m4 \ - $(top_srcdir)/m4/localcharset.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/longlong.m4 \ - $(top_srcdir)/m4/lstat.m4 $(top_srcdir)/m4/malloc.m4 \ - $(top_srcdir)/m4/malloca.m4 $(top_srcdir)/m4/manywarnings.m4 \ - $(top_srcdir)/m4/mbchar.m4 $(top_srcdir)/m4/mbiter.m4 \ - $(top_srcdir)/m4/mbrtowc.m4 $(top_srcdir)/m4/mbsinit.m4 \ - $(top_srcdir)/m4/mbslen.m4 $(top_srcdir)/m4/mbsrtowcs.m4 \ - $(top_srcdir)/m4/mbstate_t.m4 $(top_srcdir)/m4/mbtowc.m4 \ - $(top_srcdir)/m4/memchr.m4 $(top_srcdir)/m4/mkstemp.m4 \ + $(top_srcdir)/m4/limits-h.m4 $(top_srcdir)/m4/localcharset.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/localtime-buffer.m4 \ + $(top_srcdir)/m4/longlong.m4 $(top_srcdir)/m4/lstat.m4 \ + $(top_srcdir)/m4/malloc.m4 $(top_srcdir)/m4/malloca.m4 \ + $(top_srcdir)/m4/manywarnings.m4 $(top_srcdir)/m4/mbchar.m4 \ + $(top_srcdir)/m4/mbiter.m4 $(top_srcdir)/m4/mbrtowc.m4 \ + $(top_srcdir)/m4/mbsinit.m4 $(top_srcdir)/m4/mbslen.m4 \ + $(top_srcdir)/m4/mbsrtowcs.m4 $(top_srcdir)/m4/mbstate_t.m4 \ + $(top_srcdir)/m4/mbtowc.m4 $(top_srcdir)/m4/memchr.m4 \ + $(top_srcdir)/m4/minmax.m4 $(top_srcdir)/m4/mkstemp.m4 \ $(top_srcdir)/m4/mktime.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 \ @@ -339,9 +348,10 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \ $(top_srcdir)/m4/time_h.m4 $(top_srcdir)/m4/time_r.m4 \ $(top_srcdir)/m4/time_rz.m4 $(top_srcdir)/m4/timegm.m4 \ $(top_srcdir)/m4/timespec.m4 $(top_srcdir)/m4/tm_gmtoff.m4 \ - $(top_srcdir)/m4/unistd_h.m4 $(top_srcdir)/m4/unlocked-io.m4 \ - $(top_srcdir)/m4/vararrays.m4 $(top_srcdir)/m4/vasnprintf.m4 \ - $(top_srcdir)/m4/vasprintf.m4 $(top_srcdir)/m4/version-etc.m4 \ + $(top_srcdir)/m4/tzset.m4 $(top_srcdir)/m4/unistd_h.m4 \ + $(top_srcdir)/m4/unlocked-io.m4 $(top_srcdir)/m4/vararrays.m4 \ + $(top_srcdir)/m4/vasnprintf.m4 $(top_srcdir)/m4/vasprintf.m4 \ + $(top_srcdir)/m4/version-etc.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 \ @@ -542,9 +552,17 @@ test_getdtablesize_OBJECTS = test-getdtablesize.$(OBJEXT) test_getdtablesize_LDADD = $(LDADD) test_getdtablesize_DEPENDENCIES = libtests.a ../lib/libdiffutils.a \ libtests.a $(am__DEPENDENCIES_1) -test_getopt_SOURCES = test-getopt.c -test_getopt_OBJECTS = test-getopt.$(OBJEXT) -test_getopt_DEPENDENCIES = $(am__DEPENDENCIES_2) $(am__DEPENDENCIES_1) +test_getopt_gnu_SOURCES = test-getopt-gnu.c +test_getopt_gnu_OBJECTS = test-getopt-gnu.$(OBJEXT) +test_getopt_gnu_DEPENDENCIES = $(am__DEPENDENCIES_2) \ + $(am__DEPENDENCIES_1) +test_getopt_posix_SOURCES = test-getopt-posix.c +test_getopt_posix_OBJECTS = test-getopt-posix.$(OBJEXT) +test_getopt_posix_DEPENDENCIES = $(am__DEPENDENCIES_2) \ + $(am__DEPENDENCIES_1) +test_getprogname_SOURCES = test-getprogname.c +test_getprogname_OBJECTS = test-getprogname.$(OBJEXT) +test_getprogname_DEPENDENCIES = $(am__DEPENDENCIES_2) test_gettimeofday_SOURCES = test-gettimeofday.c test_gettimeofday_OBJECTS = test-gettimeofday.$(OBJEXT) test_gettimeofday_LDADD = $(LDADD) @@ -606,6 +624,11 @@ test_langinfo_OBJECTS = test-langinfo.$(OBJEXT) test_langinfo_LDADD = $(LDADD) test_langinfo_DEPENDENCIES = libtests.a ../lib/libdiffutils.a \ libtests.a $(am__DEPENDENCIES_1) +test_limits_h_SOURCES = test-limits-h.c +test_limits_h_OBJECTS = test-limits-h.$(OBJEXT) +test_limits_h_LDADD = $(LDADD) +test_limits_h_DEPENDENCIES = libtests.a ../lib/libdiffutils.a \ + libtests.a $(am__DEPENDENCIES_1) test_listen_SOURCES = test-listen.c test_listen_OBJECTS = test-listen.$(OBJEXT) test_listen_DEPENDENCIES = $(am__DEPENDENCIES_2) @@ -965,6 +988,11 @@ test_verify_OBJECTS = test-verify.$(OBJEXT) test_verify_LDADD = $(LDADD) test_verify_DEPENDENCIES = libtests.a ../lib/libdiffutils.a libtests.a \ $(am__DEPENDENCIES_1) +test_verify_try_SOURCES = test-verify-try.c +test_verify_try_OBJECTS = test-verify-try.$(OBJEXT) +test_verify_try_LDADD = $(LDADD) +test_verify_try_DEPENDENCIES = libtests.a ../lib/libdiffutils.a \ + libtests.a $(am__DEPENDENCIES_1) test_version_etc_SOURCES = test-version-etc.c test_version_etc_OBJECTS = test-version-etc.$(OBJEXT) test_version_etc_DEPENDENCIES = $(am__DEPENDENCIES_2) @@ -1054,50 +1082,54 @@ am__depfiles_remade = ./$(DEPDIR)/accept.Po ./$(DEPDIR)/bind.Po \ ./$(DEPDIR)/test-freopen-safer.Po ./$(DEPDIR)/test-freopen.Po \ ./$(DEPDIR)/test-fstat.Po ./$(DEPDIR)/test-ftruncate.Po \ ./$(DEPDIR)/test-fwrite.Po ./$(DEPDIR)/test-getcwd-lgpl.Po \ - ./$(DEPDIR)/test-getdtablesize.Po ./$(DEPDIR)/test-getopt.Po \ + ./$(DEPDIR)/test-getdtablesize.Po \ + ./$(DEPDIR)/test-getopt-gnu.Po \ + ./$(DEPDIR)/test-getopt-posix.Po \ + ./$(DEPDIR)/test-getprogname.Po \ ./$(DEPDIR)/test-gettimeofday.Po ./$(DEPDIR)/test-hash.Po \ ./$(DEPDIR)/test-iconv-h.Po ./$(DEPDIR)/test-iconv.Po \ ./$(DEPDIR)/test-ignore-value.Po ./$(DEPDIR)/test-inet_pton.Po \ ./$(DEPDIR)/test-intprops.Po ./$(DEPDIR)/test-inttostr.Po \ ./$(DEPDIR)/test-inttypes.Po ./$(DEPDIR)/test-ioctl.Po \ ./$(DEPDIR)/test-isblank.Po ./$(DEPDIR)/test-iswblank.Po \ - ./$(DEPDIR)/test-langinfo.Po ./$(DEPDIR)/test-listen.Po \ - ./$(DEPDIR)/test-locale.Po ./$(DEPDIR)/test-localeconv.Po \ - ./$(DEPDIR)/test-lstat.Po ./$(DEPDIR)/test-malloca.Po \ - ./$(DEPDIR)/test-mbrtowc-w32.Po ./$(DEPDIR)/test-mbrtowc.Po \ - ./$(DEPDIR)/test-mbscasecmp.Po ./$(DEPDIR)/test-mbsinit.Po \ - ./$(DEPDIR)/test-mbsrtowcs.Po ./$(DEPDIR)/test-mbsstr1.Po \ - ./$(DEPDIR)/test-mbsstr2.Po ./$(DEPDIR)/test-mbsstr3.Po \ - ./$(DEPDIR)/test-memchr.Po ./$(DEPDIR)/test-nanosleep.Po \ - ./$(DEPDIR)/test-netinet_in.Po ./$(DEPDIR)/test-nl_langinfo.Po \ - ./$(DEPDIR)/test-open.Po ./$(DEPDIR)/test-pathmax.Po \ - ./$(DEPDIR)/test-perror.Po ./$(DEPDIR)/test-perror2.Po \ - ./$(DEPDIR)/test-pipe.Po ./$(DEPDIR)/test-quotearg-simple.Po \ - ./$(DEPDIR)/test-raise.Po ./$(DEPDIR)/test-rawmemchr.Po \ - ./$(DEPDIR)/test-readlink.Po ./$(DEPDIR)/test-regex.Po \ - ./$(DEPDIR)/test-select-fd.Po ./$(DEPDIR)/test-select-stdin.Po \ - ./$(DEPDIR)/test-select.Po ./$(DEPDIR)/test-setenv.Po \ - ./$(DEPDIR)/test-setlocale1.Po ./$(DEPDIR)/test-setlocale2.Po \ - ./$(DEPDIR)/test-setsockopt.Po ./$(DEPDIR)/test-sh-quote.Po \ - ./$(DEPDIR)/test-sigaction.Po ./$(DEPDIR)/test-signal-h.Po \ - ./$(DEPDIR)/test-sigprocmask.Po ./$(DEPDIR)/test-sleep.Po \ - ./$(DEPDIR)/test-snprintf.Po ./$(DEPDIR)/test-sockets.Po \ - ./$(DEPDIR)/test-stat-time.Po ./$(DEPDIR)/test-stat.Po \ - ./$(DEPDIR)/test-stdalign.Po ./$(DEPDIR)/test-stdbool.Po \ - ./$(DEPDIR)/test-stddef.Po ./$(DEPDIR)/test-stdint.Po \ - ./$(DEPDIR)/test-stdio.Po ./$(DEPDIR)/test-stdlib.Po \ - ./$(DEPDIR)/test-strerror.Po ./$(DEPDIR)/test-strerror_r.Po \ - ./$(DEPDIR)/test-strftime.Po ./$(DEPDIR)/test-striconv.Po \ - ./$(DEPDIR)/test-string.Po ./$(DEPDIR)/test-strings.Po \ - ./$(DEPDIR)/test-strnlen.Po ./$(DEPDIR)/test-strtoull.Po \ - ./$(DEPDIR)/test-strtoumax.Po ./$(DEPDIR)/test-symlink.Po \ - ./$(DEPDIR)/test-sys_ioctl.Po ./$(DEPDIR)/test-sys_select.Po \ - ./$(DEPDIR)/test-sys_socket.Po ./$(DEPDIR)/test-sys_stat.Po \ - ./$(DEPDIR)/test-sys_time.Po ./$(DEPDIR)/test-sys_types.Po \ - ./$(DEPDIR)/test-sys_uio.Po ./$(DEPDIR)/test-sys_wait.Po \ - ./$(DEPDIR)/test-time.Po ./$(DEPDIR)/test-timespec.Po \ - ./$(DEPDIR)/test-unistd.Po ./$(DEPDIR)/test-unsetenv.Po \ - ./$(DEPDIR)/test-vasnprintf.Po ./$(DEPDIR)/test-vasprintf.Po \ + ./$(DEPDIR)/test-langinfo.Po ./$(DEPDIR)/test-limits-h.Po \ + ./$(DEPDIR)/test-listen.Po ./$(DEPDIR)/test-locale.Po \ + ./$(DEPDIR)/test-localeconv.Po ./$(DEPDIR)/test-lstat.Po \ + ./$(DEPDIR)/test-malloca.Po ./$(DEPDIR)/test-mbrtowc-w32.Po \ + ./$(DEPDIR)/test-mbrtowc.Po ./$(DEPDIR)/test-mbscasecmp.Po \ + ./$(DEPDIR)/test-mbsinit.Po ./$(DEPDIR)/test-mbsrtowcs.Po \ + ./$(DEPDIR)/test-mbsstr1.Po ./$(DEPDIR)/test-mbsstr2.Po \ + ./$(DEPDIR)/test-mbsstr3.Po ./$(DEPDIR)/test-memchr.Po \ + ./$(DEPDIR)/test-nanosleep.Po ./$(DEPDIR)/test-netinet_in.Po \ + ./$(DEPDIR)/test-nl_langinfo.Po ./$(DEPDIR)/test-open.Po \ + ./$(DEPDIR)/test-pathmax.Po ./$(DEPDIR)/test-perror.Po \ + ./$(DEPDIR)/test-perror2.Po ./$(DEPDIR)/test-pipe.Po \ + ./$(DEPDIR)/test-quotearg-simple.Po ./$(DEPDIR)/test-raise.Po \ + ./$(DEPDIR)/test-rawmemchr.Po ./$(DEPDIR)/test-readlink.Po \ + ./$(DEPDIR)/test-regex.Po ./$(DEPDIR)/test-select-fd.Po \ + ./$(DEPDIR)/test-select-stdin.Po ./$(DEPDIR)/test-select.Po \ + ./$(DEPDIR)/test-setenv.Po ./$(DEPDIR)/test-setlocale1.Po \ + ./$(DEPDIR)/test-setlocale2.Po ./$(DEPDIR)/test-setsockopt.Po \ + ./$(DEPDIR)/test-sh-quote.Po ./$(DEPDIR)/test-sigaction.Po \ + ./$(DEPDIR)/test-signal-h.Po ./$(DEPDIR)/test-sigprocmask.Po \ + ./$(DEPDIR)/test-sleep.Po ./$(DEPDIR)/test-snprintf.Po \ + ./$(DEPDIR)/test-sockets.Po ./$(DEPDIR)/test-stat-time.Po \ + ./$(DEPDIR)/test-stat.Po ./$(DEPDIR)/test-stdalign.Po \ + ./$(DEPDIR)/test-stdbool.Po ./$(DEPDIR)/test-stddef.Po \ + ./$(DEPDIR)/test-stdint.Po ./$(DEPDIR)/test-stdio.Po \ + ./$(DEPDIR)/test-stdlib.Po ./$(DEPDIR)/test-strerror.Po \ + ./$(DEPDIR)/test-strerror_r.Po ./$(DEPDIR)/test-strftime.Po \ + ./$(DEPDIR)/test-striconv.Po ./$(DEPDIR)/test-string.Po \ + ./$(DEPDIR)/test-strings.Po ./$(DEPDIR)/test-strnlen.Po \ + ./$(DEPDIR)/test-strtoull.Po ./$(DEPDIR)/test-strtoumax.Po \ + ./$(DEPDIR)/test-symlink.Po ./$(DEPDIR)/test-sys_ioctl.Po \ + ./$(DEPDIR)/test-sys_select.Po ./$(DEPDIR)/test-sys_socket.Po \ + ./$(DEPDIR)/test-sys_stat.Po ./$(DEPDIR)/test-sys_time.Po \ + ./$(DEPDIR)/test-sys_types.Po ./$(DEPDIR)/test-sys_uio.Po \ + ./$(DEPDIR)/test-sys_wait.Po ./$(DEPDIR)/test-time.Po \ + ./$(DEPDIR)/test-timespec.Po ./$(DEPDIR)/test-unistd.Po \ + ./$(DEPDIR)/test-unsetenv.Po ./$(DEPDIR)/test-vasnprintf.Po \ + ./$(DEPDIR)/test-vasprintf.Po ./$(DEPDIR)/test-verify-try.Po \ ./$(DEPDIR)/test-verify.Po ./$(DEPDIR)/test-version-etc.Po \ ./$(DEPDIR)/test-wchar.Po ./$(DEPDIR)/test-wcrtomb-w32.Po \ ./$(DEPDIR)/test-wcrtomb.Po ./$(DEPDIR)/test-wctype-h.Po \ @@ -1135,17 +1167,18 @@ SOURCES = $(libtests_a_SOURCES) $(EXTRA_libtests_a_SOURCES) \ test-float.c test-fnmatch.c test-fputc.c test-fread.c \ test-freopen.c test-freopen-safer.c test-fstat.c \ test-ftruncate.c test-fwrite.c test-getcwd-lgpl.c \ - test-getdtablesize.c test-getopt.c test-gettimeofday.c \ - test-hash.c test-iconv.c test-iconv-h.c test-ignore-value.c \ + test-getdtablesize.c test-getopt-gnu.c test-getopt-posix.c \ + test-getprogname.c test-gettimeofday.c test-hash.c \ + test-iconv.c test-iconv-h.c test-ignore-value.c \ test-inet_pton.c test-intprops.c test-inttostr.c \ test-inttypes.c test-ioctl.c test-isblank.c test-iswblank.c \ - test-langinfo.c test-listen.c test-locale.c test-localeconv.c \ - test-lstat.c test-malloca.c test-mbrtowc.c test-mbrtowc-w32.c \ - test-mbscasecmp.c test-mbsinit.c test-mbsrtowcs.c \ - test-mbsstr1.c test-mbsstr2.c test-mbsstr3.c test-memchr.c \ - test-nanosleep.c test-netinet_in.c test-nl_langinfo.c \ - test-open.c test-pathmax.c test-perror.c test-perror2.c \ - test-pipe.c test-quotearg-simple.c test-raise.c \ + test-langinfo.c test-limits-h.c test-listen.c test-locale.c \ + test-localeconv.c test-lstat.c test-malloca.c test-mbrtowc.c \ + test-mbrtowc-w32.c test-mbscasecmp.c test-mbsinit.c \ + test-mbsrtowcs.c test-mbsstr1.c test-mbsstr2.c test-mbsstr3.c \ + test-memchr.c test-nanosleep.c test-netinet_in.c \ + test-nl_langinfo.c test-open.c test-pathmax.c test-perror.c \ + test-perror2.c test-pipe.c test-quotearg-simple.c test-raise.c \ test-rawmemchr.c test-readlink.c test-regex.c test-select.c \ test-select-fd.c test-select-stdin.c test-setenv.c \ test-setlocale1.c test-setlocale2.c test-setsockopt.c \ @@ -1162,10 +1195,11 @@ SOURCES = $(libtests_a_SOURCES) $(EXTRA_libtests_a_SOURCES) \ $(test_u8_mbtoucr_SOURCES) $(test_u8_uctomb_SOURCES) \ $(test_uc_width_SOURCES) $(test_uc_width2_SOURCES) \ test-unistd.c test-unsetenv.c test-vasnprintf.c \ - test-vasprintf.c test-verify.c test-version-etc.c test-wchar.c \ - test-wcrtomb.c test-wcrtomb-w32.c test-wctype-h.c \ - test-wcwidth.c test-xalloc-die.c test-xstrtol.c \ - test-xstrtoul.c test-xstrtoumax.c test-xvasprintf.c + test-vasprintf.c test-verify.c test-verify-try.c \ + test-version-etc.c test-wchar.c test-wcrtomb.c \ + test-wcrtomb-w32.c test-wctype-h.c test-wcwidth.c \ + test-xalloc-die.c test-xstrtol.c test-xstrtoul.c \ + test-xstrtoumax.c test-xvasprintf.c DIST_SOURCES = $(libtests_a_SOURCES) $(EXTRA_libtests_a_SOURCES) \ test-accept.c test-alloca-opt.c test-areadlink.c \ test-argmatch.c test-arpa_inet.c test-binary-io.c test-bind.c \ @@ -1177,17 +1211,18 @@ DIST_SOURCES = $(libtests_a_SOURCES) $(EXTRA_libtests_a_SOURCES) \ test-float.c test-fnmatch.c test-fputc.c test-fread.c \ test-freopen.c test-freopen-safer.c test-fstat.c \ test-ftruncate.c test-fwrite.c test-getcwd-lgpl.c \ - test-getdtablesize.c test-getopt.c test-gettimeofday.c \ - test-hash.c test-iconv.c test-iconv-h.c test-ignore-value.c \ + test-getdtablesize.c test-getopt-gnu.c test-getopt-posix.c \ + test-getprogname.c test-gettimeofday.c test-hash.c \ + test-iconv.c test-iconv-h.c test-ignore-value.c \ test-inet_pton.c test-intprops.c test-inttostr.c \ test-inttypes.c test-ioctl.c test-isblank.c test-iswblank.c \ - test-langinfo.c test-listen.c test-locale.c test-localeconv.c \ - test-lstat.c test-malloca.c test-mbrtowc.c test-mbrtowc-w32.c \ - test-mbscasecmp.c test-mbsinit.c test-mbsrtowcs.c \ - test-mbsstr1.c test-mbsstr2.c test-mbsstr3.c test-memchr.c \ - test-nanosleep.c test-netinet_in.c test-nl_langinfo.c \ - test-open.c test-pathmax.c test-perror.c test-perror2.c \ - test-pipe.c test-quotearg-simple.c test-raise.c \ + test-langinfo.c test-limits-h.c test-listen.c test-locale.c \ + test-localeconv.c test-lstat.c test-malloca.c test-mbrtowc.c \ + test-mbrtowc-w32.c test-mbscasecmp.c test-mbsinit.c \ + test-mbsrtowcs.c test-mbsstr1.c test-mbsstr2.c test-mbsstr3.c \ + test-memchr.c test-nanosleep.c test-netinet_in.c \ + test-nl_langinfo.c test-open.c test-pathmax.c test-perror.c \ + test-perror2.c test-pipe.c test-quotearg-simple.c test-raise.c \ test-rawmemchr.c test-readlink.c test-regex.c test-select.c \ test-select-fd.c test-select-stdin.c test-setenv.c \ test-setlocale1.c test-setlocale2.c test-setsockopt.c \ @@ -1204,10 +1239,11 @@ DIST_SOURCES = $(libtests_a_SOURCES) $(EXTRA_libtests_a_SOURCES) \ $(test_u8_mbtoucr_SOURCES) $(test_u8_uctomb_SOURCES) \ $(test_uc_width_SOURCES) $(test_uc_width2_SOURCES) \ test-unistd.c test-unsetenv.c test-vasnprintf.c \ - test-vasprintf.c test-verify.c test-version-etc.c test-wchar.c \ - test-wcrtomb.c test-wcrtomb-w32.c test-wctype-h.c \ - test-wcwidth.c test-xalloc-die.c test-xstrtol.c \ - test-xstrtoul.c test-xstrtoumax.c test-xvasprintf.c + test-vasprintf.c test-verify.c test-verify-try.c \ + test-version-etc.c test-wchar.c test-wcrtomb.c \ + test-wcrtomb-w32.c test-wctype-h.c test-wcwidth.c \ + test-xalloc-die.c test-xstrtol.c test-xstrtoul.c \ + test-xstrtoumax.c test-xvasprintf.c RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \ ctags-recursive dvi-recursive html-recursive info-recursive \ install-data-recursive install-dvi-recursive \ @@ -1507,7 +1543,7 @@ CONFIG_INCLUDE = @CONFIG_INCLUDE@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ -DEFS = @DEFS@ +DEFS = @DEFS@ -DEXEEXT=\"@EXEEXT@\" DEPDIR = @DEPDIR@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ @@ -1523,6 +1559,7 @@ ERRNO_H = @ERRNO_H@ EXEEXT = @EXEEXT@ FLOAT_H = @FLOAT_H@ FNMATCH_H = @FNMATCH_H@ +GETOPT_CDEFS_H = @GETOPT_CDEFS_H@ GETOPT_H = @GETOPT_H@ GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@ GLIBC21 = @GLIBC21@ @@ -1539,6 +1576,7 @@ GNULIB_CHDIR = @GNULIB_CHDIR@ GNULIB_CHOWN = @GNULIB_CHOWN@ GNULIB_CLOSE = @GNULIB_CLOSE@ GNULIB_CONNECT = @GNULIB_CONNECT@ +GNULIB_CTIME = @GNULIB_CTIME@ GNULIB_DPRINTF = @GNULIB_DPRINTF@ GNULIB_DUP = @GNULIB_DUP@ GNULIB_DUP2 = @GNULIB_DUP2@ @@ -1617,6 +1655,7 @@ GNULIB_LINK = @GNULIB_LINK@ GNULIB_LINKAT = @GNULIB_LINKAT@ GNULIB_LISTEN = @GNULIB_LISTEN@ GNULIB_LOCALECONV = @GNULIB_LOCALECONV@ +GNULIB_LOCALTIME = @GNULIB_LOCALTIME@ GNULIB_LSEEK = @GNULIB_LSEEK@ GNULIB_LSTAT = @GNULIB_LSTAT@ GNULIB_MALLOC_POSIX = @GNULIB_MALLOC_POSIX@ @@ -1662,6 +1701,8 @@ GNULIB_OBSTACK_PRINTF = @GNULIB_OBSTACK_PRINTF@ GNULIB_OBSTACK_PRINTF_POSIX = @GNULIB_OBSTACK_PRINTF_POSIX@ GNULIB_OPEN = @GNULIB_OPEN@ GNULIB_OPENAT = @GNULIB_OPENAT@ +GNULIB_OVERRIDES_STRUCT_STAT = @GNULIB_OVERRIDES_STRUCT_STAT@ +GNULIB_OVERRIDES_WINT_T = @GNULIB_OVERRIDES_WINT_T@ GNULIB_PCLOSE = @GNULIB_PCLOSE@ GNULIB_PERROR = @GNULIB_PERROR@ GNULIB_PIPE = @GNULIB_PIPE@ @@ -1724,6 +1765,7 @@ GNULIB_STRCHRNUL = @GNULIB_STRCHRNUL@ GNULIB_STRDUP = @GNULIB_STRDUP@ GNULIB_STRERROR = @GNULIB_STRERROR@ GNULIB_STRERROR_R = @GNULIB_STRERROR_R@ +GNULIB_STRFTIME = @GNULIB_STRFTIME@ GNULIB_STRNCAT = @GNULIB_STRNCAT@ GNULIB_STRNDUP = @GNULIB_STRNDUP@ GNULIB_STRNLEN = @GNULIB_STRNLEN@ @@ -1747,7 +1789,9 @@ GNULIB_TIME_R = @GNULIB_TIME_R@ GNULIB_TIME_RZ = @GNULIB_TIME_RZ@ GNULIB_TMPFILE = @GNULIB_TMPFILE@ GNULIB_TOWCTRANS = @GNULIB_TOWCTRANS@ +GNULIB_TRUNCATE = @GNULIB_TRUNCATE@ GNULIB_TTYNAME_R = @GNULIB_TTYNAME_R@ +GNULIB_TZSET = @GNULIB_TZSET@ GNULIB_UNISTD_H_NONBLOCKING = @GNULIB_UNISTD_H_NONBLOCKING@ GNULIB_UNISTD_H_SIGPIPE = @GNULIB_UNISTD_H_SIGPIPE@ GNULIB_UNLINK = @GNULIB_UNLINK@ @@ -1779,6 +1823,7 @@ GNULIB_WCSCOLL = @GNULIB_WCSCOLL@ GNULIB_WCSCPY = @GNULIB_WCSCPY@ GNULIB_WCSCSPN = @GNULIB_WCSCSPN@ GNULIB_WCSDUP = @GNULIB_WCSDUP@ +GNULIB_WCSFTIME = @GNULIB_WCSFTIME@ GNULIB_WCSLEN = @GNULIB_WCSLEN@ GNULIB_WCSNCASECMP = @GNULIB_WCSNCASECMP@ GNULIB_WCSNCAT = @GNULIB_WCSNCAT@ @@ -1811,8 +1856,10 @@ HAVE_ACCEPT4 = @HAVE_ACCEPT4@ HAVE_ARPA_INET_H = @HAVE_ARPA_INET_H@ HAVE_ATOLL = @HAVE_ATOLL@ HAVE_BTOWC = @HAVE_BTOWC@ +HAVE_C99_STDINT_H = @HAVE_C99_STDINT_H@ HAVE_CANONICALIZE_FILE_NAME = @HAVE_CANONICALIZE_FILE_NAME@ HAVE_CHOWN = @HAVE_CHOWN@ +HAVE_CRTDEFS_H = @HAVE_CRTDEFS_H@ HAVE_DECL_ENVIRON = @HAVE_DECL_ENVIRON@ HAVE_DECL_FCHDIR = @HAVE_DECL_FCHDIR@ HAVE_DECL_FDATASYNC = @HAVE_DECL_FDATASYNC@ @@ -1823,6 +1870,7 @@ HAVE_DECL_GETDELIM = @HAVE_DECL_GETDELIM@ HAVE_DECL_GETDOMAINNAME = @HAVE_DECL_GETDOMAINNAME@ HAVE_DECL_GETLINE = @HAVE_DECL_GETLINE@ HAVE_DECL_GETLOADAVG = @HAVE_DECL_GETLOADAVG@ +HAVE_DECL_GETLOGIN = @HAVE_DECL_GETLOGIN@ HAVE_DECL_GETLOGIN_R = @HAVE_DECL_GETLOGIN_R@ HAVE_DECL_GETPAGESIZE = @HAVE_DECL_GETPAGESIZE@ HAVE_DECL_GETUSERSHELL = @HAVE_DECL_GETUSERSHELL@ @@ -1935,6 +1983,7 @@ HAVE_PTHREAD_SIGMASK = @HAVE_PTHREAD_SIGMASK@ HAVE_PTSNAME = @HAVE_PTSNAME@ HAVE_PTSNAME_R = @HAVE_PTSNAME_R@ HAVE_PWRITE = @HAVE_PWRITE@ +HAVE_QSORT_R = @HAVE_QSORT_R@ HAVE_RAISE = @HAVE_RAISE@ HAVE_RANDOM = @HAVE_RANDOM@ HAVE_RANDOM_H = @HAVE_RANDOM_H@ @@ -1979,6 +2028,7 @@ HAVE_STRVERSCMP = @HAVE_STRVERSCMP@ HAVE_SYMLINK = @HAVE_SYMLINK@ HAVE_SYMLINKAT = @HAVE_SYMLINKAT@ HAVE_SYS_BITYPES_H = @HAVE_SYS_BITYPES_H@ +HAVE_SYS_CDEFS_H = @HAVE_SYS_CDEFS_H@ HAVE_SYS_INTTYPES_H = @HAVE_SYS_INTTYPES_H@ HAVE_SYS_IOCTL_H = @HAVE_SYS_IOCTL_H@ HAVE_SYS_LOADAVG_H = @HAVE_SYS_LOADAVG_H@ @@ -1990,7 +2040,9 @@ HAVE_SYS_TYPES_H = @HAVE_SYS_TYPES_H@ HAVE_SYS_UIO_H = @HAVE_SYS_UIO_H@ HAVE_TIMEGM = @HAVE_TIMEGM@ HAVE_TIMEZONE_T = @HAVE_TIMEZONE_T@ +HAVE_TRUNCATE = @HAVE_TRUNCATE@ HAVE_TYPE_VOLATILE_SIG_ATOMIC_T = @HAVE_TYPE_VOLATILE_SIG_ATOMIC_T@ +HAVE_TZSET = @HAVE_TZSET@ HAVE_UNISTD_H = @HAVE_UNISTD_H@ HAVE_UNLINKAT = @HAVE_UNLINKAT@ HAVE_UNLOCKPT = @HAVE_UNLOCKPT@ @@ -2012,6 +2064,7 @@ HAVE_WCSCOLL = @HAVE_WCSCOLL@ HAVE_WCSCPY = @HAVE_WCSCPY@ HAVE_WCSCSPN = @HAVE_WCSCSPN@ HAVE_WCSDUP = @HAVE_WCSDUP@ +HAVE_WCSFTIME = @HAVE_WCSFTIME@ HAVE_WCSLEN = @HAVE_WCSLEN@ HAVE_WCSNCASECMP = @HAVE_WCSNCASECMP@ HAVE_WCSNCAT = @HAVE_WCSNCAT@ @@ -2074,6 +2127,7 @@ LIBUNISTRING_UNIWIDTH_H = @LIBUNISTRING_UNIWIDTH_H@ LIB_CLOCK_GETTIME = @LIB_CLOCK_GETTIME@ LIB_NANOSLEEP = @LIB_NANOSLEEP@ LIB_SELECT = @LIB_SELECT@ +LIMITS_H = @LIMITS_H@ LOCALCHARSET_TESTS_ENVIRONMENT = @LOCALCHARSET_TESTS_ENVIRONMENT@ LOCALE_FR = @LOCALE_FR@ LOCALE_FR_UTF8 = @LOCALE_FR_UTF8@ @@ -2101,6 +2155,7 @@ NEXT_AS_FIRST_DIRECTIVE_GETOPT_H = @NEXT_AS_FIRST_DIRECTIVE_GETOPT_H@ NEXT_AS_FIRST_DIRECTIVE_ICONV_H = @NEXT_AS_FIRST_DIRECTIVE_ICONV_H@ NEXT_AS_FIRST_DIRECTIVE_INTTYPES_H = @NEXT_AS_FIRST_DIRECTIVE_INTTYPES_H@ NEXT_AS_FIRST_DIRECTIVE_LANGINFO_H = @NEXT_AS_FIRST_DIRECTIVE_LANGINFO_H@ +NEXT_AS_FIRST_DIRECTIVE_LIMITS_H = @NEXT_AS_FIRST_DIRECTIVE_LIMITS_H@ NEXT_AS_FIRST_DIRECTIVE_LOCALE_H = @NEXT_AS_FIRST_DIRECTIVE_LOCALE_H@ NEXT_AS_FIRST_DIRECTIVE_NETINET_IN_H = @NEXT_AS_FIRST_DIRECTIVE_NETINET_IN_H@ NEXT_AS_FIRST_DIRECTIVE_SIGNAL_H = @NEXT_AS_FIRST_DIRECTIVE_SIGNAL_H@ @@ -2131,6 +2186,7 @@ NEXT_GETOPT_H = @NEXT_GETOPT_H@ NEXT_ICONV_H = @NEXT_ICONV_H@ NEXT_INTTYPES_H = @NEXT_INTTYPES_H@ NEXT_LANGINFO_H = @NEXT_LANGINFO_H@ +NEXT_LIMITS_H = @NEXT_LIMITS_H@ NEXT_LOCALE_H = @NEXT_LOCALE_H@ NEXT_NETINET_IN_H = @NEXT_NETINET_IN_H@ NEXT_SIGNAL_H = @NEXT_SIGNAL_H@ @@ -2176,6 +2232,7 @@ REPLACE_CALLOC = @REPLACE_CALLOC@ REPLACE_CANONICALIZE_FILE_NAME = @REPLACE_CANONICALIZE_FILE_NAME@ REPLACE_CHOWN = @REPLACE_CHOWN@ REPLACE_CLOSE = @REPLACE_CLOSE@ +REPLACE_CTIME = @REPLACE_CTIME@ REPLACE_DPRINTF = @REPLACE_DPRINTF@ REPLACE_DUP = @REPLACE_DUP@ REPLACE_DUP2 = @REPLACE_DUP2@ @@ -2283,6 +2340,7 @@ REPLACE_STRCHRNUL = @REPLACE_STRCHRNUL@ REPLACE_STRDUP = @REPLACE_STRDUP@ REPLACE_STRERROR = @REPLACE_STRERROR@ REPLACE_STRERROR_R = @REPLACE_STRERROR_R@ +REPLACE_STRFTIME = @REPLACE_STRFTIME@ REPLACE_STRNCAT = @REPLACE_STRNCAT@ REPLACE_STRNDUP = @REPLACE_STRNDUP@ REPLACE_STRNLEN = @REPLACE_STRNLEN@ @@ -2299,7 +2357,9 @@ REPLACE_SYMLINKAT = @REPLACE_SYMLINKAT@ REPLACE_TIMEGM = @REPLACE_TIMEGM@ REPLACE_TMPFILE = @REPLACE_TMPFILE@ REPLACE_TOWLOWER = @REPLACE_TOWLOWER@ +REPLACE_TRUNCATE = @REPLACE_TRUNCATE@ REPLACE_TTYNAME_R = @REPLACE_TTYNAME_R@ +REPLACE_TZSET = @REPLACE_TZSET@ REPLACE_UNLINK = @REPLACE_UNLINK@ REPLACE_UNLINKAT = @REPLACE_UNLINKAT@ REPLACE_UNSETENV = @REPLACE_UNSETENV@ @@ -2312,6 +2372,7 @@ REPLACE_VPRINTF = @REPLACE_VPRINTF@ REPLACE_VSNPRINTF = @REPLACE_VSNPRINTF@ REPLACE_VSPRINTF = @REPLACE_VSPRINTF@ REPLACE_WCRTOMB = @REPLACE_WCRTOMB@ +REPLACE_WCSFTIME = @REPLACE_WCSFTIME@ REPLACE_WCSNRTOMBS = @REPLACE_WCSNRTOMBS@ REPLACE_WCSRTOMBS = @REPLACE_WCSRTOMBS@ REPLACE_WCSWIDTH = @REPLACE_WCSWIDTH@ @@ -2348,6 +2409,8 @@ WCHAR_T_SUFFIX = @WCHAR_T_SUFFIX@ WERROR_CFLAGS = @WERROR_CFLAGS@ WINDOWS_64_BIT_OFF_T = @WINDOWS_64_BIT_OFF_T@ WINDOWS_64_BIT_ST_SIZE = @WINDOWS_64_BIT_ST_SIZE@ +WINDOWS_STAT_INODES = @WINDOWS_STAT_INODES@ +WINDOWS_STAT_TIMESPEC = @WINDOWS_STAT_TIMESPEC@ WINT_T_SUFFIX = @WINT_T_SUFFIX@ XGETTEXT = @XGETTEXT@ XGETTEXT_015 = @XGETTEXT_015@ @@ -2357,7 +2420,6 @@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ abs_top_srcdir = @abs_top_srcdir@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ am__include = @am__include@ am__quote = @am__quote@ @@ -2458,20 +2520,23 @@ EXTRA_DIST = accept.c w32sock.h test-accept.c signature.h macros.h \ test-ftruncate.c test-ftruncate.sh signature.h macros.h \ test-fwrite.c signature.h macros.h getcwd-lgpl.c \ test-getcwd-lgpl.c signature.h macros.h test-getdtablesize.c \ - signature.h macros.h macros.h signature.h test-getopt.c \ - test-getopt.h test-getopt_long.h getpagesize.c signature.h \ + signature.h macros.h macros.h signature.h test-getopt-gnu.c \ + test-getopt-main.h test-getopt.h test-getopt_long.h macros.h \ + signature.h test-getopt-posix.c test-getopt-main.h \ + test-getopt.h getpagesize.c test-getprogname.c signature.h \ test-gettimeofday.c test-hash.c macros.h test-iconv-h.c \ test-iconv.c signature.h macros.h test-ignore-value.c \ inet_pton.c test-inet_pton.c signature.h macros.h \ test-intprops.c macros.h macros.h test-inttostr.c \ test-inttypes.c ioctl.c w32sock.h test-ioctl.c signature.h \ macros.h test-isblank.c signature.h macros.h test-iswblank.c \ - macros.h test-langinfo.c listen.c w32sock.h test-listen.c \ - signature.h macros.h test-locale.c test-localeconv.c \ - signature.h macros.h test-lstat.h test-lstat.c signature.h \ - macros.h test-malloca.c test-mbrtowc1.sh test-mbrtowc2.sh \ - test-mbrtowc3.sh test-mbrtowc4.sh test-mbrtowc5.sh \ - test-mbrtowc.c test-mbrtowc-w32-1.sh test-mbrtowc-w32-2.sh \ + macros.h test-langinfo.c test-limits-h.c listen.c w32sock.h \ + test-listen.c signature.h macros.h test-locale.c \ + test-localeconv.c signature.h macros.h test-lstat.h \ + test-lstat.c signature.h macros.h test-malloca.c \ + test-mbrtowc1.sh test-mbrtowc2.sh test-mbrtowc3.sh \ + test-mbrtowc4.sh test-mbrtowc5.sh test-mbrtowc.c \ + test-mbrtowc-w32-1.sh test-mbrtowc-w32-2.sh \ test-mbrtowc-w32-3.sh test-mbrtowc-w32-4.sh \ test-mbrtowc-w32-5.sh test-mbrtowc-w32.c signature.h macros.h \ test-mbscasecmp.sh test-mbscasecmp.c macros.h test-mbsinit.sh \ @@ -2499,25 +2564,21 @@ EXTRA_DIST = accept.c w32sock.h test-accept.c signature.h macros.h \ test-setsockopt.c signature.h macros.h test-sh-quote.c \ test-sigaction.c signature.h macros.h test-signal-h.c \ test-sigprocmask.c signature.h macros.h sleep.c test-sleep.c \ - signature.h macros.h \ - $(top_srcdir)/build-aux/snippet/_Noreturn.h \ - $(top_srcdir)/build-aux/snippet/arg-nonnull.h \ - $(top_srcdir)/build-aux/snippet/c++defs.h \ - $(top_srcdir)/build-aux/snippet/unused-parameter.h \ - $(top_srcdir)/build-aux/snippet/warn-on-use.h snprintf.c \ - test-snprintf.c signature.h macros.h socket.c w32sock.h \ - w32sock.h test-sockets.c test-stat.h test-stat.c signature.h \ - macros.h test-stat-time.c macros.h nap.h stdalign.in.h \ - test-stdalign.c macros.h test-stdbool.c test-stddef.c \ - test-stdint.c test-stdio.c test-stdlib.c test-sys_wait.h \ - test-strerror.c signature.h macros.h strerror_r.c \ - test-strerror_r.c signature.h macros.h test-strftime.c \ - macros.h test-striconv.c macros.h test-string.c test-strings.c \ - test-strnlen.c zerosize-ptr.h signature.h macros.h \ - test-strtoull.c signature.h macros.h test-strtoumax.c \ - signature.h macros.h symlink.c test-symlink.h test-symlink.c \ - signature.h macros.h sys_ioctl.in.h test-sys_ioctl.c \ - sys_select.in.h test-sys_select.c signature.h sys_socket.in.h \ + signature.h macros.h _Noreturn.h arg-nonnull.h c++defs.h \ + unused-parameter.h warn-on-use.h snprintf.c test-snprintf.c \ + signature.h macros.h socket.c w32sock.h w32sock.h \ + test-sockets.c test-stat.h test-stat.c signature.h macros.h \ + test-stat-time.c macros.h nap.h stdalign.in.h test-stdalign.c \ + macros.h test-stdbool.c test-stddef.c test-stdint.c \ + test-stdio.c test-stdlib.c test-sys_wait.h test-strerror.c \ + signature.h macros.h strerror_r.c test-strerror_r.c \ + signature.h macros.h test-strftime.c macros.h test-striconv.c \ + macros.h test-string.c test-strings.c test-strnlen.c \ + zerosize-ptr.h signature.h macros.h test-strtoull.c \ + signature.h macros.h test-strtoumax.c signature.h macros.h \ + symlink.c test-symlink.h test-symlink.c signature.h macros.h \ + sys_ioctl.in.h test-sys_ioctl.c sys_select.in.h \ + test-sys_select.c signature.h sys_socket.in.h \ test-sys_socket.c test-sys_stat.c test-sys_time.c \ test-sys_types.c sys_uio.in.h test-sys_uio.c test-sys_wait.c \ test-sys_wait.h init.sh test-init.sh test-time.c \ @@ -2528,46 +2589,28 @@ EXTRA_DIST = accept.c w32sock.h test-accept.c signature.h macros.h \ signature.h macros.h test-update-copyright.sh \ test-vasnprintf.c macros.h test-vasprintf.c signature.h \ macros.h test-vc-list-files-git.sh test-vc-list-files-cvs.sh \ - test-verify.c test-verify.sh test-version-etc.c \ - test-version-etc.sh test-wchar.c test-wcrtomb.sh \ - test-wcrtomb.c test-wcrtomb-w32-1.sh test-wcrtomb-w32-2.sh \ - test-wcrtomb-w32-3.sh test-wcrtomb-w32-4.sh \ - test-wcrtomb-w32-5.sh test-wcrtomb-w32.c signature.h macros.h \ - wctob.c wctomb-impl.h wctomb.c test-wctype-h.c macros.h \ - test-wcwidth.c signature.h macros.h test-xalloc-die.c \ - test-xalloc-die.sh test-xstrtol.c test-xstrtoul.c \ - test-xstrtol.sh test-xstrtoumax.c test-xstrtoumax.sh \ - test-xvasprintf.c macros.h - -# The BUILT_SOURCES created by this Makefile snippet are not used via #include -# statements but through direct file reference. Therefore this snippet must be -# present in all Makefile.am that need it. This is ensured by the applicability -# 'all' defined above. - -# The BUILT_SOURCES created by this Makefile snippet are not used via #include -# statements but through direct file reference. Therefore this snippet must be -# present in all Makefile.am that need it. This is ensured by the applicability -# 'all' defined above. - -# The BUILT_SOURCES created by this Makefile snippet are not used via #include -# statements but through direct file reference. Therefore this snippet must be -# present in all Makefile.am that need it. This is ensured by the applicability -# 'all' defined above. -BUILT_SOURCES = arpa/inet.h $(NETINET_IN_H) arg-nonnull.h c++defs.h \ - unused-parameter.h warn-on-use.h $(STDALIGN_H) sys/ioctl.h \ + test-verify.c test-verify-try.c test-verify.sh \ + test-version-etc.c test-version-etc.sh test-wchar.c \ + test-wcrtomb.sh test-wcrtomb.c test-wcrtomb-w32-1.sh \ + test-wcrtomb-w32-2.sh test-wcrtomb-w32-3.sh \ + test-wcrtomb-w32-4.sh test-wcrtomb-w32-5.sh test-wcrtomb-w32.c \ + signature.h macros.h wctob.c wctomb-impl.h wctomb.c \ + test-wctype-h.c macros.h test-wcwidth.c signature.h macros.h \ + test-xalloc-die.c test-xalloc-die.sh test-xstrtol.c \ + test-xstrtoul.c test-xstrtol.sh test-xstrtoumax.c \ + test-xstrtoumax.sh test-xvasprintf.c macros.h +BUILT_SOURCES = arpa/inet.h $(NETINET_IN_H) $(STDALIGN_H) sys/ioctl.h \ sys/select.h sys/socket.h sys/uio.h SUFFIXES = -# This test expects compilation of test-verify.c to fail, and +# This test expects compilation of test-verify-try.c to fail, and # each time it fails, the makefile rule does not perform the usual # "mv -f $name.Tpo $name.po, so tell make clean to remove that file. MOSTLYCLEANFILES = core *.stackdump arpa/inet.h arpa/inet.h-t \ t-c-stack.tmp t-c-stack2.tmp netinet/in.h netinet/in.h-t \ - arg-nonnull.h arg-nonnull.h-t c++defs.h c++defs.h-t \ - unused-parameter.h unused-parameter.h-t warn-on-use.h \ - warn-on-use.h-t stdalign.h stdalign.h-t sys/ioctl.h \ - sys/ioctl.h-t sys/select.h sys/select.h-t sys/socket.h \ - sys/socket.h-t sys/uio.h sys/uio.h-t .deps/test-verify.Tpo + stdalign.h stdalign.h-t sys/ioctl.h sys/ioctl.h-t sys/select.h \ + sys/select.h-t sys/socket.h sys/socket.h-t sys/uio.h \ + sys/uio.h-t .deps/test-verify-try.Tpo MOSTLYCLEANDIRS = arpa netinet sys sys sys sys CLEANFILES = DISTCLEANFILES = @@ -2598,7 +2641,9 @@ test_dirname_LDADD = $(LDADD) @LIBINTL@ test_exclude_LDADD = $(LDADD) @LIBINTL@ $(LIBTHREAD) test_filenamecat_LDADD = $(LDADD) @LIBINTL@ test_getcwd_lgpl_LDADD = $(LDADD) $(LIBINTL) -test_getopt_LDADD = $(LDADD) $(LIBINTL) +test_getopt_gnu_LDADD = $(LDADD) $(LIBINTL) +test_getopt_posix_LDADD = $(LDADD) $(LIBINTL) +test_getprogname_LDADD = $(LDADD) test_iconv_LDADD = $(LDADD) @LIBICONV@ test_inet_pton_LDADD = $(LDADD) @INET_PTON_LIB@ test_listen_LDADD = $(LDADD) @LIBSOCKET@ @@ -2612,13 +2657,29 @@ test_setsockopt_LDADD = $(LDADD) @LIBSOCKET@ test_sh_quote_LDADD = $(LDADD) @LIBINTL@ # Because this Makefile snippet defines a variable used by other -# gnulib Makefile snippets, it must be present in all Makefile.am that +# gnulib Makefile snippets, it must be present in all makefiles that +# need it. This is ensured by the applicability 'all' defined above. +_NORETURN_H = $(srcdir)/_Noreturn.h + +# Because this Makefile snippet defines a variable used by other +# gnulib Makefile snippets, it must be present in all makefiles that +# need it. This is ensured by the applicability 'all' defined above. +ARG_NONNULL_H = $(srcdir)/arg-nonnull.h + +# Because this Makefile snippet defines a variable used by other +# gnulib Makefile snippets, it must be present in all makefiles that +# need it. This is ensured by the applicability 'all' defined above. +CXXDEFS_H = $(srcdir)/c++defs.h + +# Because this Makefile snippet defines a variable used by other +# gnulib Makefile snippets, it must be present in all makefiles that # need it. This is ensured by the applicability 'all' defined above. -_NORETURN_H = $(top_srcdir)/build-aux/snippet/_Noreturn.h -ARG_NONNULL_H = arg-nonnull.h -CXXDEFS_H = c++defs.h -UNUSED_PARAMETER_H = unused-parameter.h -WARN_ON_USE_H = warn-on-use.h +UNUSED_PARAMETER_H = $(srcdir)/unused-parameter.h + +# Because this Makefile snippet defines a variable used by other +# gnulib Makefile snippets, it must be present in all makefiles that +# need it. This is ensured by the applicability 'all' defined above. +WARN_ON_USE_H = $(srcdir)/warn-on-use.h test_sockets_LDADD = $(LDADD) @LIBSOCKET@ test_stat_LDADD = $(LDADD) $(LIBINTL) test_stat_time_LDADD = $(LDADD) $(LIB_NANOSLEEP) @@ -2838,9 +2899,17 @@ test-getdtablesize$(EXEEXT): $(test_getdtablesize_OBJECTS) $(test_getdtablesize_ @rm -f test-getdtablesize$(EXEEXT) $(AM_V_CCLD)$(LINK) $(test_getdtablesize_OBJECTS) $(test_getdtablesize_LDADD) $(LIBS) -test-getopt$(EXEEXT): $(test_getopt_OBJECTS) $(test_getopt_DEPENDENCIES) $(EXTRA_test_getopt_DEPENDENCIES) - @rm -f test-getopt$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(test_getopt_OBJECTS) $(test_getopt_LDADD) $(LIBS) +test-getopt-gnu$(EXEEXT): $(test_getopt_gnu_OBJECTS) $(test_getopt_gnu_DEPENDENCIES) $(EXTRA_test_getopt_gnu_DEPENDENCIES) + @rm -f test-getopt-gnu$(EXEEXT) + $(AM_V_CCLD)$(LINK) $(test_getopt_gnu_OBJECTS) $(test_getopt_gnu_LDADD) $(LIBS) + +test-getopt-posix$(EXEEXT): $(test_getopt_posix_OBJECTS) $(test_getopt_posix_DEPENDENCIES) $(EXTRA_test_getopt_posix_DEPENDENCIES) + @rm -f test-getopt-posix$(EXEEXT) + $(AM_V_CCLD)$(LINK) $(test_getopt_posix_OBJECTS) $(test_getopt_posix_LDADD) $(LIBS) + +test-getprogname$(EXEEXT): $(test_getprogname_OBJECTS) $(test_getprogname_DEPENDENCIES) $(EXTRA_test_getprogname_DEPENDENCIES) + @rm -f test-getprogname$(EXEEXT) + $(AM_V_CCLD)$(LINK) $(test_getprogname_OBJECTS) $(test_getprogname_LDADD) $(LIBS) test-gettimeofday$(EXEEXT): $(test_gettimeofday_OBJECTS) $(test_gettimeofday_DEPENDENCIES) $(EXTRA_test_gettimeofday_DEPENDENCIES) @rm -f test-gettimeofday$(EXEEXT) @@ -2894,6 +2963,10 @@ test-langinfo$(EXEEXT): $(test_langinfo_OBJECTS) $(test_langinfo_DEPENDENCIES) $ @rm -f test-langinfo$(EXEEXT) $(AM_V_CCLD)$(LINK) $(test_langinfo_OBJECTS) $(test_langinfo_LDADD) $(LIBS) +test-limits-h$(EXEEXT): $(test_limits_h_OBJECTS) $(test_limits_h_DEPENDENCIES) $(EXTRA_test_limits_h_DEPENDENCIES) + @rm -f test-limits-h$(EXEEXT) + $(AM_V_CCLD)$(LINK) $(test_limits_h_OBJECTS) $(test_limits_h_LDADD) $(LIBS) + test-listen$(EXEEXT): $(test_listen_OBJECTS) $(test_listen_DEPENDENCIES) $(EXTRA_test_listen_DEPENDENCIES) @rm -f test-listen$(EXEEXT) $(AM_V_CCLD)$(LINK) $(test_listen_OBJECTS) $(test_listen_LDADD) $(LIBS) @@ -3226,6 +3299,10 @@ test-verify$(EXEEXT): $(test_verify_OBJECTS) $(test_verify_DEPENDENCIES) $(EXTRA @rm -f test-verify$(EXEEXT) $(AM_V_CCLD)$(LINK) $(test_verify_OBJECTS) $(test_verify_LDADD) $(LIBS) +test-verify-try$(EXEEXT): $(test_verify_try_OBJECTS) $(test_verify_try_DEPENDENCIES) $(EXTRA_test_verify_try_DEPENDENCIES) + @rm -f test-verify-try$(EXEEXT) + $(AM_V_CCLD)$(LINK) $(test_verify_try_OBJECTS) $(test_verify_try_LDADD) $(LIBS) + test-version-etc$(EXEEXT): $(test_version_etc_OBJECTS) $(test_version_etc_DEPENDENCIES) $(EXTRA_test_version_etc_DEPENDENCIES) @rm -f test-version-etc$(EXEEXT) $(AM_V_CCLD)$(LINK) $(test_version_etc_OBJECTS) $(test_version_etc_LDADD) $(LIBS) @@ -3341,7 +3418,9 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-fwrite.Po@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-getcwd-lgpl.Po@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-getdtablesize.Po@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-getopt.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-getopt-gnu.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-getopt-posix.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-getprogname.Po@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-gettimeofday.Po@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-hash.Po@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-iconv-h.Po@am__quote@ # am--include-marker @@ -3355,6 +3434,7 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-isblank.Po@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-iswblank.Po@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-langinfo.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-limits-h.Po@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-listen.Po@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-locale.Po@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-localeconv.Po@am__quote@ # am--include-marker @@ -3428,6 +3508,7 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-unsetenv.Po@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-vasnprintf.Po@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-vasprintf.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-verify-try.Po@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-verify.Po@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-version-etc.Po@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-wchar.Po@am__quote@ # am--include-marker @@ -4028,9 +4109,23 @@ test-getdtablesize.log: test-getdtablesize$(EXEEXT) --log-file $$b.log --trs-file $$b.trs \ $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ "$$tst" $(AM_TESTS_FD_REDIRECT) -test-getopt.log: test-getopt$(EXEEXT) - @p='test-getopt$(EXEEXT)'; \ - b='test-getopt'; \ +test-getopt-gnu.log: test-getopt-gnu$(EXEEXT) + @p='test-getopt-gnu$(EXEEXT)'; \ + b='test-getopt-gnu'; \ + $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ + --log-file $$b.log --trs-file $$b.trs \ + $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ + "$$tst" $(AM_TESTS_FD_REDIRECT) +test-getopt-posix.log: test-getopt-posix$(EXEEXT) + @p='test-getopt-posix$(EXEEXT)'; \ + b='test-getopt-posix'; \ + $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ + --log-file $$b.log --trs-file $$b.trs \ + $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ + "$$tst" $(AM_TESTS_FD_REDIRECT) +test-getprogname.log: test-getprogname$(EXEEXT) + @p='test-getprogname$(EXEEXT)'; \ + b='test-getprogname'; \ $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ --log-file $$b.log --trs-file $$b.trs \ $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ @@ -4126,6 +4221,13 @@ test-langinfo.log: test-langinfo$(EXEEXT) --log-file $$b.log --trs-file $$b.trs \ $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ "$$tst" $(AM_TESTS_FD_REDIRECT) +test-limits-h.log: test-limits-h$(EXEEXT) + @p='test-limits-h$(EXEEXT)'; \ + b='test-limits-h'; \ + $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ + --log-file $$b.log --trs-file $$b.trs \ + $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ + "$$tst" $(AM_TESTS_FD_REDIRECT) test-listen.log: test-listen$(EXEEXT) @p='test-listen$(EXEEXT)'; \ b='test-listen'; \ @@ -5073,7 +5175,9 @@ distclean: distclean-recursive -rm -f ./$(DEPDIR)/test-fwrite.Po -rm -f ./$(DEPDIR)/test-getcwd-lgpl.Po -rm -f ./$(DEPDIR)/test-getdtablesize.Po - -rm -f ./$(DEPDIR)/test-getopt.Po + -rm -f ./$(DEPDIR)/test-getopt-gnu.Po + -rm -f ./$(DEPDIR)/test-getopt-posix.Po + -rm -f ./$(DEPDIR)/test-getprogname.Po -rm -f ./$(DEPDIR)/test-gettimeofday.Po -rm -f ./$(DEPDIR)/test-hash.Po -rm -f ./$(DEPDIR)/test-iconv-h.Po @@ -5087,6 +5191,7 @@ distclean: distclean-recursive -rm -f ./$(DEPDIR)/test-isblank.Po -rm -f ./$(DEPDIR)/test-iswblank.Po -rm -f ./$(DEPDIR)/test-langinfo.Po + -rm -f ./$(DEPDIR)/test-limits-h.Po -rm -f ./$(DEPDIR)/test-listen.Po -rm -f ./$(DEPDIR)/test-locale.Po -rm -f ./$(DEPDIR)/test-localeconv.Po @@ -5160,6 +5265,7 @@ distclean: distclean-recursive -rm -f ./$(DEPDIR)/test-unsetenv.Po -rm -f ./$(DEPDIR)/test-vasnprintf.Po -rm -f ./$(DEPDIR)/test-vasprintf.Po + -rm -f ./$(DEPDIR)/test-verify-try.Po -rm -f ./$(DEPDIR)/test-verify.Po -rm -f ./$(DEPDIR)/test-version-etc.Po -rm -f ./$(DEPDIR)/test-wchar.Po @@ -5288,7 +5394,9 @@ maintainer-clean: maintainer-clean-recursive -rm -f ./$(DEPDIR)/test-fwrite.Po -rm -f ./$(DEPDIR)/test-getcwd-lgpl.Po -rm -f ./$(DEPDIR)/test-getdtablesize.Po - -rm -f ./$(DEPDIR)/test-getopt.Po + -rm -f ./$(DEPDIR)/test-getopt-gnu.Po + -rm -f ./$(DEPDIR)/test-getopt-posix.Po + -rm -f ./$(DEPDIR)/test-getprogname.Po -rm -f ./$(DEPDIR)/test-gettimeofday.Po -rm -f ./$(DEPDIR)/test-hash.Po -rm -f ./$(DEPDIR)/test-iconv-h.Po @@ -5302,6 +5410,7 @@ maintainer-clean: maintainer-clean-recursive -rm -f ./$(DEPDIR)/test-isblank.Po -rm -f ./$(DEPDIR)/test-iswblank.Po -rm -f ./$(DEPDIR)/test-langinfo.Po + -rm -f ./$(DEPDIR)/test-limits-h.Po -rm -f ./$(DEPDIR)/test-listen.Po -rm -f ./$(DEPDIR)/test-locale.Po -rm -f ./$(DEPDIR)/test-localeconv.Po @@ -5375,6 +5484,7 @@ maintainer-clean: maintainer-clean-recursive -rm -f ./$(DEPDIR)/test-unsetenv.Po -rm -f ./$(DEPDIR)/test-vasnprintf.Po -rm -f ./$(DEPDIR)/test-vasprintf.Po + -rm -f ./$(DEPDIR)/test-verify-try.Po -rm -f ./$(DEPDIR)/test-verify.Po -rm -f ./$(DEPDIR)/test-version-etc.Po -rm -f ./$(DEPDIR)/test-wchar.Po @@ -5478,41 +5588,6 @@ arpa/inet.h: arpa_inet.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(WARN_ON @GL_GENERATE_NETINET_IN_H_TRUE@ mv $@-t $@ @GL_GENERATE_NETINET_IN_H_FALSE@netinet/in.h: $(top_builddir)/config.status @GL_GENERATE_NETINET_IN_H_FALSE@ rm -f $@ -# The arg-nonnull.h that gets inserted into generated .h files is the same as -# build-aux/snippet/arg-nonnull.h, except that it has the copyright header cut -# off. -arg-nonnull.h: $(top_srcdir)/build-aux/snippet/arg-nonnull.h - $(AM_V_GEN)rm -f $@-t $@ && \ - sed -n -e '/GL_ARG_NONNULL/,$$p' \ - < $(top_srcdir)/build-aux/snippet/arg-nonnull.h \ - > $@-t && \ - mv $@-t $@ -# The c++defs.h that gets inserted into generated .h files is the same as -# build-aux/snippet/c++defs.h, except that it has the copyright header cut off. -c++defs.h: $(top_srcdir)/build-aux/snippet/c++defs.h - $(AM_V_GEN)rm -f $@-t $@ && \ - sed -n -e '/_GL_CXXDEFS/,$$p' \ - < $(top_srcdir)/build-aux/snippet/c++defs.h \ - > $@-t && \ - mv $@-t $@ -# The unused-parameter.h that gets inserted into generated .h files is the same -# as build-aux/snippet/unused-parameter.h, except that it has the copyright -# header cut off. -unused-parameter.h: $(top_srcdir)/build-aux/snippet/unused-parameter.h - $(AM_V_GEN)rm -f $@-t $@ && \ - sed -n -e '/GL_UNUSED_PARAMETER/,$$p' \ - < $(top_srcdir)/build-aux/snippet/unused-parameter.h \ - > $@-t && \ - mv $@-t $@ -# The warn-on-use.h that gets inserted into generated .h files is the same as -# build-aux/snippet/warn-on-use.h, except that it has the copyright header cut -# off. -warn-on-use.h: $(top_srcdir)/build-aux/snippet/warn-on-use.h - $(AM_V_GEN)rm -f $@-t $@ && \ - sed -n -e '/^.ifndef/,$$p' \ - < $(top_srcdir)/build-aux/snippet/warn-on-use.h \ - > $@-t && \ - mv $@-t $@ # We need the following in order to create <stdalign.h> when the system # doesn't have one that works. diff --git a/build-aux/snippet/_Noreturn.h b/gnulib-tests/_Noreturn.h index c44ad89..c44ad89 100644 --- a/build-aux/snippet/_Noreturn.h +++ b/gnulib-tests/_Noreturn.h diff --git a/gnulib-tests/accept.c b/gnulib-tests/accept.c index bd0605e..08bb4d9 100644 --- a/gnulib-tests/accept.c +++ b/gnulib-tests/accept.c @@ -1,6 +1,6 @@ /* accept.c --- wrappers for Windows accept function - Copyright (C) 2008-2016 Free Software Foundation, Inc. + Copyright (C) 2008-2017 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/build-aux/snippet/arg-nonnull.h b/gnulib-tests/arg-nonnull.h index 584649f..1e62cc8 100644 --- a/build-aux/snippet/arg-nonnull.h +++ b/gnulib-tests/arg-nonnull.h @@ -1,5 +1,5 @@ /* A C macro for declaring that specific arguments must not be NULL. - Copyright (C) 2009-2016 Free Software Foundation, Inc. + Copyright (C) 2009-2017 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published diff --git a/gnulib-tests/arpa_inet.in.h b/gnulib-tests/arpa_inet.in.h index 026c4dc..dc3d2bd 100644 --- a/gnulib-tests/arpa_inet.in.h +++ b/gnulib-tests/arpa_inet.in.h @@ -1,6 +1,6 @@ /* A GNU-like <arpa/inet.h>. - Copyright (C) 2005-2006, 2008-2016 Free Software Foundation, Inc. + Copyright (C) 2005-2006, 2008-2017 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/gnulib-tests/bind.c b/gnulib-tests/bind.c index 7f526e2..bde82d3 100644 --- a/gnulib-tests/bind.c +++ b/gnulib-tests/bind.c @@ -1,6 +1,6 @@ /* bind.c --- wrappers for Windows bind function - Copyright (C) 2008-2016 Free Software Foundation, Inc. + Copyright (C) 2008-2017 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/build-aux/snippet/c++defs.h b/gnulib-tests/c++defs.h index 813f2e2..f03f359 100644 --- a/build-aux/snippet/c++defs.h +++ b/gnulib-tests/c++defs.h @@ -1,5 +1,5 @@ /* C++ compatible function declaration macros. - Copyright (C) 2010-2016 Free Software Foundation, Inc. + Copyright (C) 2010-2017 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published @@ -17,6 +17,15 @@ #ifndef _GL_CXXDEFS_H #define _GL_CXXDEFS_H +/* Begin/end the GNULIB_NAMESPACE namespace. */ +#if defined __cplusplus && defined GNULIB_NAMESPACE +# define _GL_BEGIN_NAMESPACE namespace GNULIB_NAMESPACE { +# define _GL_END_NAMESPACE } +#else +# define _GL_BEGIN_NAMESPACE +# define _GL_END_NAMESPACE +#endif + /* The three most frequent use cases of these macros are: * For providing a substitute for a function that is missing on some @@ -111,14 +120,25 @@ that redirects to rpl_func, if GNULIB_NAMESPACE is defined. Example: _GL_CXXALIAS_RPL (open, int, (const char *filename, int flags, ...)); - */ + + Wrapping rpl_func in an object with an inline conversion operator + avoids a reference to rpl_func unless GNULIB_NAMESPACE::func is + actually used in the program. */ #define _GL_CXXALIAS_RPL(func,rettype,parameters) \ _GL_CXXALIAS_RPL_1 (func, rpl_##func, rettype, parameters) #if defined __cplusplus && defined GNULIB_NAMESPACE # define _GL_CXXALIAS_RPL_1(func,rpl_func,rettype,parameters) \ namespace GNULIB_NAMESPACE \ { \ - rettype (*const func) parameters = ::rpl_func; \ + static const struct _gl_ ## func ## _wrapper \ + { \ + typedef rettype (*type) parameters; \ + \ + inline operator type () const \ + { \ + return ::rpl_func; \ + } \ + } func = {}; \ } \ _GL_EXTERN_C int _gl_cxxalias_dummy #else @@ -135,8 +155,15 @@ # define _GL_CXXALIAS_RPL_CAST_1(func,rpl_func,rettype,parameters) \ namespace GNULIB_NAMESPACE \ { \ - rettype (*const func) parameters = \ - reinterpret_cast<rettype(*)parameters>(::rpl_func); \ + static const struct _gl_ ## func ## _wrapper \ + { \ + typedef rettype (*type) parameters; \ + \ + inline operator type () const \ + { \ + return reinterpret_cast<type>(::rpl_func); \ + } \ + } func = {}; \ } \ _GL_EXTERN_C int _gl_cxxalias_dummy #else @@ -150,19 +177,24 @@ is defined. Example: _GL_CXXALIAS_SYS (open, int, (const char *filename, int flags, ...)); - */ + + Wrapping func in an object with an inline conversion operator + avoids a reference to func unless GNULIB_NAMESPACE::func is + actually used in the program. */ #if defined __cplusplus && defined GNULIB_NAMESPACE - /* If we were to write - rettype (*const func) parameters = ::func; - like above in _GL_CXXALIAS_RPL_1, the compiler could optimize calls - better (remove an indirection through a 'static' pointer variable), - but then the _GL_CXXALIASWARN macro below would cause a warning not only - for uses of ::func but also for uses of GNULIB_NAMESPACE::func. */ -# define _GL_CXXALIAS_SYS(func,rettype,parameters) \ - namespace GNULIB_NAMESPACE \ - { \ - static rettype (*func) parameters = ::func; \ - } \ +# define _GL_CXXALIAS_SYS(func,rettype,parameters) \ + namespace GNULIB_NAMESPACE \ + { \ + static const struct _gl_ ## func ## _wrapper \ + { \ + typedef rettype (*type) parameters; \ + \ + inline operator type () const \ + { \ + return ::func; \ + } \ + } func = {}; \ + } \ _GL_EXTERN_C int _gl_cxxalias_dummy #else # define _GL_CXXALIAS_SYS(func,rettype,parameters) \ @@ -178,8 +210,15 @@ # define _GL_CXXALIAS_SYS_CAST(func,rettype,parameters) \ namespace GNULIB_NAMESPACE \ { \ - static rettype (*func) parameters = \ - reinterpret_cast<rettype(*)parameters>(::func); \ + static const struct _gl_ ## func ## _wrapper \ + { \ + typedef rettype (*type) parameters; \ + \ + inline operator type () const \ + { \ + return reinterpret_cast<type>(::func); \ + } \ + } func = {}; \ } \ _GL_EXTERN_C int _gl_cxxalias_dummy #else @@ -202,9 +241,15 @@ # define _GL_CXXALIAS_SYS_CAST2(func,rettype,parameters,rettype2,parameters2) \ namespace GNULIB_NAMESPACE \ { \ - static rettype (*func) parameters = \ - reinterpret_cast<rettype(*)parameters>( \ - (rettype2(*)parameters2)(::func)); \ + static const struct _gl_ ## func ## _wrapper \ + { \ + typedef rettype (*type) parameters; \ + \ + inline operator type () const \ + { \ + return reinterpret_cast<type>((rettype2 (*) parameters2)(::func)); \ + } \ + } func = {}; \ } \ _GL_EXTERN_C int _gl_cxxalias_dummy #else diff --git a/gnulib-tests/connect.c b/gnulib-tests/connect.c index 1d42317..9e2a36e 100644 --- a/gnulib-tests/connect.c +++ b/gnulib-tests/connect.c @@ -1,6 +1,6 @@ /* connect.c --- wrappers for Windows connect function - Copyright (C) 2008-2016 Free Software Foundation, Inc. + Copyright (C) 2008-2017 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/gnulib-tests/dtotimespec.c b/gnulib-tests/dtotimespec.c index 9028044..3ca5a9c 100644 --- a/gnulib-tests/dtotimespec.c +++ b/gnulib-tests/dtotimespec.c @@ -1,6 +1,6 @@ /* Convert double to timespec. - Copyright (C) 2011-2016 Free Software Foundation, Inc. + Copyright (C) 2011-2017 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -29,15 +29,9 @@ struct timespec dtotimespec (double sec) { - double min_representable = TYPE_MINIMUM (time_t); - double max_representable = - ((TYPE_MAXIMUM (time_t) * (double) TIMESPEC_RESOLUTION - + (TIMESPEC_RESOLUTION - 1)) - / TIMESPEC_RESOLUTION); - - if (! (min_representable < sec)) + if (! (TYPE_MINIMUM (time_t) < sec)) return make_timespec (TYPE_MINIMUM (time_t), 0); - else if (! (sec < max_representable)) + else if (! (sec < 1.0 + TYPE_MAXIMUM (time_t))) return make_timespec (TYPE_MAXIMUM (time_t), TIMESPEC_RESOLUTION - 1); else { diff --git a/gnulib-tests/fdopen.c b/gnulib-tests/fdopen.c index 61fbfdf..2ee87eb 100644 --- a/gnulib-tests/fdopen.c +++ b/gnulib-tests/fdopen.c @@ -1,5 +1,5 @@ /* Open a stream with a given file descriptor. - Copyright (C) 2011-2016 Free Software Foundation, Inc. + Copyright (C) 2011-2017 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/gnulib-tests/fpucw.h b/gnulib-tests/fpucw.h index 05ee0ca..dc30dd6 100644 --- a/gnulib-tests/fpucw.h +++ b/gnulib-tests/fpucw.h @@ -1,5 +1,5 @@ /* Manipulating the FPU control word. -*- coding: utf-8 -*- - Copyright (C) 2007-2016 Free Software Foundation, Inc. + Copyright (C) 2007-2017 Free Software Foundation, Inc. Written by Bruno Haible <bruno@clisp.org>, 2007. This program is free software: you can redistribute it and/or modify diff --git a/gnulib-tests/ftruncate.c b/gnulib-tests/ftruncate.c index 1b39c87..3dac017 100644 --- a/gnulib-tests/ftruncate.c +++ b/gnulib-tests/ftruncate.c @@ -1,5 +1,5 @@ /* ftruncate emulations for native Windows. - Copyright (C) 1992-2016 Free Software Foundation, Inc. + Copyright (C) 1992-2017 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -31,14 +31,18 @@ /* Ensure that <windows.h> declares GetFileSizeEx. */ # undef _WIN32_WINNT -# define _WIN32_WINNT 0x500 +# define _WIN32_WINNT _WIN32_WINNT_WIN2K /* Get declarations of the native Windows API functions. */ # define WIN32_LEAN_AND_MEAN # include <windows.h> /* Get _get_osfhandle. */ -# include "msvc-nothrow.h" +# if GNULIB_MSVC_NOTHROW +# include "msvc-nothrow.h" +# else +# include <io.h> +# endif static BOOL SetFileSize (HANDLE h, LONGLONG size) @@ -175,13 +179,14 @@ chsize_nothrow (int fd, long length) return result; } -# define chsize chsize_nothrow +# else +# define chsize_nothrow chsize # endif int ftruncate (int fd, off_t length) { - return chsize (fd, length); + return chsize_nothrow (fd, length); } # endif diff --git a/gnulib-tests/getcwd-lgpl.c b/gnulib-tests/getcwd-lgpl.c index c553f7b..34603c1 100644 --- a/gnulib-tests/getcwd-lgpl.c +++ b/gnulib-tests/getcwd-lgpl.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2011-2016 Free Software Foundation, Inc. +/* Copyright (C) 2011-2017 Free Software Foundation, Inc. This file is part of gnulib. This program is free software: you can redistribute it and/or modify diff --git a/gnulib-tests/getpagesize.c b/gnulib-tests/getpagesize.c index dc4a200..9e91315 100644 --- a/gnulib-tests/getpagesize.c +++ b/gnulib-tests/getpagesize.c @@ -1,6 +1,6 @@ /* getpagesize emulation for systems where it cannot be done in a C macro. - Copyright (C) 2007, 2009-2016 Free Software Foundation, Inc. + Copyright (C) 2007, 2009-2017 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/gnulib-tests/gnulib.mk b/gnulib-tests/gnulib.mk index 76bf8d1..73326aa 100644 --- a/gnulib-tests/gnulib.mk +++ b/gnulib-tests/gnulib.mk @@ -1,6 +1,6 @@ ## DO NOT EDIT! GENERATED AUTOMATICALLY! ## Process this file with automake to produce Makefile.in. -# Copyright (C) 2002-2016 Free Software Foundation, Inc. +# Copyright (C) 2002-2017 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 @@ -30,6 +30,7 @@ XFAIL_TESTS = TESTS_ENVIRONMENT = noinst_PROGRAMS = check_PROGRAMS = +EXTRA_PROGRAMS = noinst_HEADERS = noinst_LIBRARIES = check_LIBRARIES = libtests.a @@ -478,12 +479,21 @@ EXTRA_DIST += test-getdtablesize.c signature.h macros.h ## end gnulib module getdtablesize-tests +## begin gnulib module getopt-gnu-tests + +TESTS += test-getopt-gnu +check_PROGRAMS += test-getopt-gnu +test_getopt_gnu_LDADD = $(LDADD) $(LIBINTL) +EXTRA_DIST += macros.h signature.h test-getopt-gnu.c test-getopt-main.h test-getopt.h test-getopt_long.h + +## end gnulib module getopt-gnu-tests + ## begin gnulib module getopt-posix-tests -TESTS += test-getopt -check_PROGRAMS += test-getopt -test_getopt_LDADD = $(LDADD) $(LIBINTL) -EXTRA_DIST += macros.h signature.h test-getopt.c test-getopt.h test-getopt_long.h +TESTS += test-getopt-posix +check_PROGRAMS += test-getopt-posix +test_getopt_posix_LDADD = $(LDADD) $(LIBINTL) +EXTRA_DIST += macros.h signature.h test-getopt-posix.c test-getopt-main.h test-getopt.h ## end gnulib module getopt-posix-tests @@ -496,6 +506,16 @@ EXTRA_libtests_a_SOURCES += getpagesize.c ## end gnulib module getpagesize +## begin gnulib module getprogname-tests + +DEFS += -DEXEEXT=\"@EXEEXT@\" +TESTS += test-getprogname +check_PROGRAMS += test-getprogname +test_getprogname_LDADD = $(LDADD) +EXTRA_DIST += test-getprogname.c + +## end gnulib module getprogname-tests + ## begin gnulib module gettimeofday-tests TESTS += test-gettimeofday @@ -628,6 +648,14 @@ EXTRA_DIST += test-langinfo.c ## end gnulib module langinfo-tests +## begin gnulib module limits-h-tests + +TESTS += test-limits-h +check_PROGRAMS += test-limits-h +EXTRA_DIST += test-limits-h.c + +## end gnulib module limits-h-tests + ## begin gnulib module listen @@ -1044,106 +1072,60 @@ EXTRA_DIST += test-sleep.c signature.h macros.h ## begin gnulib module snippet/_Noreturn # Because this Makefile snippet defines a variable used by other -# gnulib Makefile snippets, it must be present in all Makefile.am that +# gnulib Makefile snippets, it must be present in all makefiles that # need it. This is ensured by the applicability 'all' defined above. -_NORETURN_H=$(top_srcdir)/build-aux/snippet/_Noreturn.h +_NORETURN_H=$(srcdir)/_Noreturn.h -EXTRA_DIST += $(top_srcdir)/build-aux/snippet/_Noreturn.h +EXTRA_DIST += _Noreturn.h ## end gnulib module snippet/_Noreturn ## begin gnulib module snippet/arg-nonnull -# The BUILT_SOURCES created by this Makefile snippet are not used via #include -# statements but through direct file reference. Therefore this snippet must be -# present in all Makefile.am that need it. This is ensured by the applicability -# 'all' defined above. - -BUILT_SOURCES += arg-nonnull.h -# The arg-nonnull.h that gets inserted into generated .h files is the same as -# build-aux/snippet/arg-nonnull.h, except that it has the copyright header cut -# off. -arg-nonnull.h: $(top_srcdir)/build-aux/snippet/arg-nonnull.h - $(AM_V_GEN)rm -f $@-t $@ && \ - sed -n -e '/GL_ARG_NONNULL/,$$p' \ - < $(top_srcdir)/build-aux/snippet/arg-nonnull.h \ - > $@-t && \ - mv $@-t $@ -MOSTLYCLEANFILES += arg-nonnull.h arg-nonnull.h-t +# Because this Makefile snippet defines a variable used by other +# gnulib Makefile snippets, it must be present in all makefiles that +# need it. This is ensured by the applicability 'all' defined above. -ARG_NONNULL_H=arg-nonnull.h +ARG_NONNULL_H=$(srcdir)/arg-nonnull.h -EXTRA_DIST += $(top_srcdir)/build-aux/snippet/arg-nonnull.h +EXTRA_DIST += arg-nonnull.h ## end gnulib module snippet/arg-nonnull ## begin gnulib module snippet/c++defs -# The BUILT_SOURCES created by this Makefile snippet are not used via #include -# statements but through direct file reference. Therefore this snippet must be -# present in all Makefile.am that need it. This is ensured by the applicability -# 'all' defined above. - -BUILT_SOURCES += c++defs.h -# The c++defs.h that gets inserted into generated .h files is the same as -# build-aux/snippet/c++defs.h, except that it has the copyright header cut off. -c++defs.h: $(top_srcdir)/build-aux/snippet/c++defs.h - $(AM_V_GEN)rm -f $@-t $@ && \ - sed -n -e '/_GL_CXXDEFS/,$$p' \ - < $(top_srcdir)/build-aux/snippet/c++defs.h \ - > $@-t && \ - mv $@-t $@ -MOSTLYCLEANFILES += c++defs.h c++defs.h-t +# Because this Makefile snippet defines a variable used by other +# gnulib Makefile snippets, it must be present in all makefiles that +# need it. This is ensured by the applicability 'all' defined above. -CXXDEFS_H=c++defs.h +CXXDEFS_H=$(srcdir)/c++defs.h -EXTRA_DIST += $(top_srcdir)/build-aux/snippet/c++defs.h +EXTRA_DIST += c++defs.h ## end gnulib module snippet/c++defs ## begin gnulib module snippet/unused-parameter -# The BUILT_SOURCES created by this Makefile snippet are not used via #include -# statements but through direct file reference. Therefore this snippet must be -# present in all Makefile.am that need it. This is ensured by the applicability -# 'all' defined above. - -BUILT_SOURCES += unused-parameter.h -# The unused-parameter.h that gets inserted into generated .h files is the same -# as build-aux/snippet/unused-parameter.h, except that it has the copyright -# header cut off. -unused-parameter.h: $(top_srcdir)/build-aux/snippet/unused-parameter.h - $(AM_V_GEN)rm -f $@-t $@ && \ - sed -n -e '/GL_UNUSED_PARAMETER/,$$p' \ - < $(top_srcdir)/build-aux/snippet/unused-parameter.h \ - > $@-t && \ - mv $@-t $@ -MOSTLYCLEANFILES += unused-parameter.h unused-parameter.h-t +# Because this Makefile snippet defines a variable used by other +# gnulib Makefile snippets, it must be present in all makefiles that +# need it. This is ensured by the applicability 'all' defined above. -UNUSED_PARAMETER_H=unused-parameter.h +UNUSED_PARAMETER_H=$(srcdir)/unused-parameter.h -EXTRA_DIST += $(top_srcdir)/build-aux/snippet/unused-parameter.h +EXTRA_DIST += unused-parameter.h ## end gnulib module snippet/unused-parameter ## begin gnulib module snippet/warn-on-use -BUILT_SOURCES += warn-on-use.h -# The warn-on-use.h that gets inserted into generated .h files is the same as -# build-aux/snippet/warn-on-use.h, except that it has the copyright header cut -# off. -warn-on-use.h: $(top_srcdir)/build-aux/snippet/warn-on-use.h - $(AM_V_GEN)rm -f $@-t $@ && \ - sed -n -e '/^.ifndef/,$$p' \ - < $(top_srcdir)/build-aux/snippet/warn-on-use.h \ - > $@-t && \ - mv $@-t $@ -MOSTLYCLEANFILES += warn-on-use.h warn-on-use.h-t +# Because this Makefile snippet defines a variable used by other +# gnulib Makefile snippets, it must be present in all makefiles that +# need it. This is ensured by the applicability 'all' defined above. -WARN_ON_USE_H=warn-on-use.h +WARN_ON_USE_H=$(srcdir)/warn-on-use.h -EXTRA_DIST += $(top_srcdir)/build-aux/snippet/warn-on-use.h +EXTRA_DIST += warn-on-use.h ## end gnulib module snippet/warn-on-use @@ -1712,12 +1694,15 @@ EXTRA_DIST += test-vc-list-files-git.sh test-vc-list-files-cvs.sh TESTS_ENVIRONMENT += MAKE='$(MAKE)' TESTS += test-verify test-verify.sh check_PROGRAMS += test-verify +# test-verify-try is never built, but test-verify.sh needs a rule to +# build test-verify-try.o. +EXTRA_PROGRAMS += test-verify-try -# This test expects compilation of test-verify.c to fail, and +# This test expects compilation of test-verify-try.c to fail, and # each time it fails, the makefile rule does not perform the usual # "mv -f $name.Tpo $name.po, so tell make clean to remove that file. -MOSTLYCLEANFILES += .deps/test-verify.Tpo -EXTRA_DIST += test-verify.c test-verify.sh +MOSTLYCLEANFILES += .deps/test-verify-try.Tpo +EXTRA_DIST += test-verify.c test-verify-try.c test-verify.sh ## end gnulib module verify-tests @@ -1785,7 +1770,6 @@ EXTRA_DIST += test-wctype-h.c macros.h TESTS += test-wcwidth check_PROGRAMS += test-wcwidth - EXTRA_DIST += test-wcwidth.c signature.h macros.h ## end gnulib module wcwidth-tests diff --git a/gnulib-tests/hash-pjw.c b/gnulib-tests/hash-pjw.c index 7796238..a886b49 100644 --- a/gnulib-tests/hash-pjw.c +++ b/gnulib-tests/hash-pjw.c @@ -1,6 +1,6 @@ /* hash-pjw.c -- compute a hash value from a NUL-terminated string. - Copyright (C) 2001, 2003, 2006, 2009-2016 Free Software Foundation, Inc. + Copyright (C) 2001, 2003, 2006, 2009-2017 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/gnulib-tests/hash-pjw.h b/gnulib-tests/hash-pjw.h index ae537d1..2e7d230 100644 --- a/gnulib-tests/hash-pjw.h +++ b/gnulib-tests/hash-pjw.h @@ -1,5 +1,5 @@ /* hash-pjw.h -- declaration for a simple hash function - Copyright (C) 2001, 2003, 2009-2016 Free Software Foundation, Inc. + Copyright (C) 2001, 2003, 2009-2017 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/gnulib-tests/inet_pton.c b/gnulib-tests/inet_pton.c index 3cddfb1..f730d84 100644 --- a/gnulib-tests/inet_pton.c +++ b/gnulib-tests/inet_pton.c @@ -1,6 +1,6 @@ /* inet_pton.c -- convert IPv4 and IPv6 addresses from text to binary form - Copyright (C) 2006, 2008-2016 Free Software Foundation, Inc. + Copyright (C) 2006, 2008-2017 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/gnulib-tests/init.sh b/gnulib-tests/init.sh index 09b0739..584194f 100644 --- a/gnulib-tests/init.sh +++ b/gnulib-tests/init.sh @@ -1,6 +1,6 @@ # source this file; set up for tests -# Copyright (C) 2009-2016 Free Software Foundation, Inc. +# Copyright (C) 2009-2017 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -45,6 +45,9 @@ # Running a single test, with verbose output: # $ make check TESTS=test-foo.sh VERBOSE=yes # +# Running a single test, keeping the temporary directory: +# $ make check TESTS=test-foo.sh KEEP=yes +# # Running a single test, with single-stepping: # 1. Go into a sub-shell: # $ bash @@ -295,50 +298,24 @@ compare_dev_null_ () return 2 } -if diff_out_=`exec 2>/dev/null; diff -u "$0" "$0" < /dev/null` \ - && diff -u Makefile "$0" 2>/dev/null | grep '^[+]#!' >/dev/null; then - # diff accepts the -u option and does not (like AIX 7 'diff') produce an - # extra space on column 1 of every content line. - if test -z "$diff_out_"; then - compare_ () { diff -u "$@"; } - else - compare_ () - { - if diff -u "$@" > diff.out; then - # No differences were found, but Solaris 'diff' produces output - # "No differences encountered". Hide this output. - rm -f diff.out - true - else - cat diff.out - rm -f diff.out - false - fi - } - fi -elif - for diff_opt_ in -U3 -c '' no; do - test "$diff_opt_" = no && break - diff_out_=`exec 2>/dev/null; diff $diff_opt_ "$0" "$0" </dev/null` && break - done - test "$diff_opt_" != no -then +for diff_opt_ in -u -U3 -c '' no; do + test "$diff_opt_" != no && + diff_out_=`exec 2>/dev/null; diff $diff_opt_ "$0" "$0" < /dev/null` && + break +done +if test "$diff_opt_" != no; then if test -z "$diff_out_"; then compare_ () { diff $diff_opt_ "$@"; } else compare_ () { - if diff $diff_opt_ "$@" > diff.out; then - # No differences were found, but AIX and HP-UX 'diff' produce output - # "No differences encountered" or "There are no differences between the - # files.". Hide this output. - rm -f diff.out - true - else - cat diff.out - rm -f diff.out - false - fi + # If no differences were found, AIX and HP-UX 'diff' produce output + # like "No differences encountered". Hide this output. + diff $diff_opt_ "$@" > diff.out + diff_status_=$? + test $diff_status_ -eq 0 || cat diff.out || diff_status_=2 + rm -f diff.out || diff_status_=2 + return $diff_status_ } fi elif cmp -s /dev/null /dev/null 2>/dev/null; then @@ -375,11 +352,15 @@ remove_tmp_ () { __st=$? cleanup_ - # cd out of the directory we're about to remove - cd "$initial_cwd_" || cd / || cd /tmp - chmod -R u+rwx "$test_dir_" - # If removal fails and exit status was to be 0, then change it to 1. - rm -rf "$test_dir_" || { test $__st = 0 && __st=1; } + if test "$KEEP" = yes; then + echo "Not removing temporary directory $test_dir_" + else + # cd out of the directory we're about to remove + cd "$initial_cwd_" || cd / || cd /tmp + chmod -R u+rwx "$test_dir_" + # If removal fails and exit status was to be 0, then change it to 1. + rm -rf "$test_dir_" || { test $__st = 0 && __st=1; } + fi exit $__st } diff --git a/gnulib-tests/ioctl.c b/gnulib-tests/ioctl.c index bd3a198..f142558 100644 --- a/gnulib-tests/ioctl.c +++ b/gnulib-tests/ioctl.c @@ -1,6 +1,6 @@ /* ioctl.c --- wrappers for Windows ioctl function - Copyright (C) 2008-2016 Free Software Foundation, Inc. + Copyright (C) 2008-2017 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -52,7 +52,11 @@ rpl_ioctl (int fd, int request, ... /* {void *,char *} arg */) # include "fd-hook.h" /* Get _get_osfhandle. */ -# include "msvc-nothrow.h" +# if GNULIB_MSVC_NOTHROW +# include "msvc-nothrow.h" +# else +# include <io.h> +# endif static int primary_ioctl (int fd, int request, void *arg) diff --git a/gnulib-tests/listen.c b/gnulib-tests/listen.c index fd59f75..81936f0 100644 --- a/gnulib-tests/listen.c +++ b/gnulib-tests/listen.c @@ -1,6 +1,6 @@ /* listen.c --- wrappers for Windows listen function - Copyright (C) 2008-2016 Free Software Foundation, Inc. + Copyright (C) 2008-2017 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/gnulib-tests/macros.h b/gnulib-tests/macros.h index 578bfe7..0423d06 100644 --- a/gnulib-tests/macros.h +++ b/gnulib-tests/macros.h @@ -1,5 +1,5 @@ /* Common macros used by gnulib tests. - Copyright (C) 2006-2016 Free Software Foundation, Inc. + Copyright (C) 2006-2017 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -21,6 +21,14 @@ #include <stdio.h> #include <stdlib.h> +#ifndef FALLTHROUGH +# if __GNUC__ < 7 +# define FALLTHROUGH ((void) 0) +# else +# define FALLTHROUGH __attribute__ ((__fallthrough__)) +# endif +#endif + /* Define ASSERT_STREAM before including this file if ASSERT must target a stream other than stderr. */ #ifndef ASSERT_STREAM diff --git a/gnulib-tests/nanosleep.c b/gnulib-tests/nanosleep.c index a3116c2..4f65802 100644 --- a/gnulib-tests/nanosleep.c +++ b/gnulib-tests/nanosleep.c @@ -1,6 +1,6 @@ /* Provide a replacement for the POSIX nanosleep function. - Copyright (C) 1999-2000, 2002, 2004-2016 Free Software Foundation, Inc. + Copyright (C) 1999-2000, 2002, 2004-2017 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/gnulib-tests/nap.h b/gnulib-tests/nap.h index 6d46a36..a49befc 100644 --- a/gnulib-tests/nap.h +++ b/gnulib-tests/nap.h @@ -1,5 +1,5 @@ /* Assist in file system timestamp tests. - Copyright (C) 2009-2016 Free Software Foundation, Inc. + Copyright (C) 2009-2017 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -22,6 +22,9 @@ # include <limits.h> # include <stdbool.h> +/* Name of the witness file. */ +#define TEMPFILE BASE "nap.tmp" + /* File descriptor used for the witness file. */ static int nap_fd = -1; @@ -48,36 +51,46 @@ diff_timespec (struct timespec a, struct timespec b) return INT_MAX; } +/* If DO_WRITE, bump the modification time of the file designated by NAP_FD. + Then fetch the new STAT information of NAP_FD. */ static void -get_stat (int fd, struct stat *st, int do_write) +nap_get_stat (struct stat *st, int do_write) { if (do_write) - ASSERT (write (fd, "\n", 1) == 1); - ASSERT (fstat (fd, st) == 0); + { + ASSERT (write (nap_fd, "\n", 1) == 1); +#if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__ + /* On native Windows, the modification times are not changed until NAP_FD + is closed. See + https://msdn.microsoft.com/en-us/library/windows/desktop/aa365747(v=vs.85).aspx */ + close (nap_fd); + nap_fd = open (TEMPFILE, O_RDWR, 0600); + ASSERT (nap_fd != -1); + lseek (nap_fd, 0, SEEK_END); +#endif + } + ASSERT (fstat (nap_fd, st) == 0); } /* Given a file whose descriptor is FD, see whether delaying by DELAY - nanoseconds causes a change in a file's ctime and mtime. + nanoseconds causes a change in a file's mtime. OLD_ST is the file's status, recently gotten. */ static bool -nap_works (int fd, int delay, struct stat old_st) +nap_works (int delay, struct stat old_st) { struct stat st; struct timespec delay_spec; delay_spec.tv_sec = delay / 1000000000; delay_spec.tv_nsec = delay % 1000000000; ASSERT (nanosleep (&delay_spec, 0) == 0); - get_stat (fd, &st, 1); + nap_get_stat (&st, 1); - if ( diff_timespec (get_stat_ctime (&st), get_stat_ctime (&old_st)) - && diff_timespec (get_stat_mtime (&st), get_stat_mtime (&old_st))) + if (diff_timespec (get_stat_mtime (&st), get_stat_mtime (&old_st))) return true; return false; } -#define TEMPFILE BASE "nap.tmp" - static void clear_temp_file (void) { @@ -105,21 +118,30 @@ nap (void) { atexit (clear_temp_file); ASSERT ((nap_fd = creat (TEMPFILE, 0600)) != -1); - get_stat (nap_fd, &old_st, 0); + nap_get_stat (&old_st, 0); } else { ASSERT (0 <= nap_fd); - get_stat (nap_fd, &old_st, 1); + nap_get_stat (&old_st, 1); } if (1 < delay) delay = delay / 2; /* Try half of the previous delay. */ ASSERT (0 < delay); - for ( ; delay <= 2147483647; delay = delay * 2) - if (nap_works (nap_fd, delay, old_st)) - return; + for (;;) + { + if (nap_works (delay, old_st)) + return; + if (delay <= (2147483647 - 1) / 2) + { + delay = delay * 2 + 1; + continue; + } + else + break; + } /* Bummer: even the highest nap delay didn't work. */ ASSERT (0); diff --git a/gnulib-tests/netinet_in.in.h b/gnulib-tests/netinet_in.in.h index 54e1ec0..9411b9f 100644 --- a/gnulib-tests/netinet_in.in.h +++ b/gnulib-tests/netinet_in.in.h @@ -1,5 +1,5 @@ /* Substitute for <netinet/in.h>. - Copyright (C) 2007-2016 Free Software Foundation, Inc. + Copyright (C) 2007-2017 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/gnulib-tests/perror.c b/gnulib-tests/perror.c index 09dafb6..6f1e744 100644 --- a/gnulib-tests/perror.c +++ b/gnulib-tests/perror.c @@ -1,5 +1,5 @@ /* Print a message describing error code. - Copyright (C) 2008-2016 Free Software Foundation, Inc. + Copyright (C) 2008-2017 Free Software Foundation, Inc. Written by Bruno Haible and Simon Josefsson. This program is free software: you can redistribute it and/or modify diff --git a/gnulib-tests/pipe.c b/gnulib-tests/pipe.c index cc8e184..2a6e38f 100644 --- a/gnulib-tests/pipe.c +++ b/gnulib-tests/pipe.c @@ -1,5 +1,5 @@ /* Create a pipe. - Copyright (C) 2009-2016 Free Software Foundation, Inc. + Copyright (C) 2009-2017 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/gnulib-tests/putenv.c b/gnulib-tests/putenv.c index e67712d..b55e262 100644 --- a/gnulib-tests/putenv.c +++ b/gnulib-tests/putenv.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1991, 1994, 1997-1998, 2000, 2003-2016 Free Software +/* Copyright (C) 1991, 1994, 1997-1998, 2000, 2003-2017 Free Software Foundation, Inc. NOTE: The canonical source of this file is maintained with the GNU C diff --git a/gnulib-tests/same-inode.h b/gnulib-tests/same-inode.h index bf45635..a08bc4e 100644 --- a/gnulib-tests/same-inode.h +++ b/gnulib-tests/same-inode.h @@ -1,6 +1,6 @@ -/* Determine whether two stat buffers refer to the same file. +/* Determine whether two stat buffers are known to refer to the same file. - Copyright (C) 2006, 2009-2016 Free Software Foundation, Inc. + Copyright (C) 2006, 2009-2017 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -18,12 +18,26 @@ #ifndef SAME_INODE_H # define SAME_INODE_H 1 +# include <sys/types.h> + # ifdef __VMS # define SAME_INODE(a, b) \ ((a).st_ino[0] == (b).st_ino[0] \ && (a).st_ino[1] == (b).st_ino[1] \ && (a).st_ino[2] == (b).st_ino[2] \ && (a).st_dev == (b).st_dev) +# elif (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__ + /* Native Windows. */ +# if _GL_WINDOWS_STAT_INODES + /* stat() and fstat() set st_dev and st_ino to 0 if information about + the inode is not available. */ +# define SAME_INODE(a, b) \ + (!((a).st_ino == 0 && (a).st_dev == 0) \ + && (a).st_ino == (b).st_ino && (a).st_dev == (b).st_dev) +# else + /* stat() and fstat() set st_ino to 0 always. */ +# define SAME_INODE(a, b) 0 +# endif # else # define SAME_INODE(a, b) \ ((a).st_ino == (b).st_ino \ diff --git a/gnulib-tests/select.c b/gnulib-tests/select.c index 73abcf3..cba802d 100644 --- a/gnulib-tests/select.c +++ b/gnulib-tests/select.c @@ -1,7 +1,7 @@ /* Emulation for select(2) Contributed by Paolo Bonzini. - Copyright 2008-2016 Free Software Foundation, Inc. + Copyright 2008-2017 Free Software Foundation, Inc. This file is part of gnulib. @@ -39,7 +39,11 @@ /* Get the overridden 'struct timeval'. */ #include <sys/time.h> -#include "msvc-nothrow.h" +#if GNULIB_MSVC_NOTHROW +# include "msvc-nothrow.h" +#else +# include <io.h> +#endif #undef select diff --git a/gnulib-tests/setlocale.c b/gnulib-tests/setlocale.c index 7d366ed..d2f203e 100644 --- a/gnulib-tests/setlocale.c +++ b/gnulib-tests/setlocale.c @@ -1,5 +1,5 @@ /* Set the current locale. -*- coding: utf-8 -*- - Copyright (C) 2009, 2011-2016 Free Software Foundation, Inc. + Copyright (C) 2009, 2011-2017 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -633,6 +633,13 @@ setlocale_unixlike (int category, const char *locale) char ll_buf[64]; char CC_buf[64]; + /* The native Windows implementation of setlocale understands the special + locale name "C", but not "POSIX". Therefore map "POSIX" to "C". */ +#if (defined _WIN32 || defined __WIN32__) && !defined __CYGWIN__ + if (locale != NULL && strcmp (locale, "POSIX") == 0) + locale = "C"; +#endif + /* First, try setlocale with the original argument unchanged. */ result = setlocale (category, locale); if (result != NULL) diff --git a/gnulib-tests/setsockopt.c b/gnulib-tests/setsockopt.c index af09f32..157e4b6 100644 --- a/gnulib-tests/setsockopt.c +++ b/gnulib-tests/setsockopt.c @@ -1,6 +1,6 @@ /* setsockopt.c --- wrappers for Windows setsockopt function - Copyright (C) 2008-2016 Free Software Foundation, Inc. + Copyright (C) 2008-2017 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/gnulib-tests/signature.h b/gnulib-tests/signature.h index 2df8067..0fdfc11 100644 --- a/gnulib-tests/signature.h +++ b/gnulib-tests/signature.h @@ -1,5 +1,5 @@ /* Macro for checking that a function declaration is compliant. - Copyright (C) 2009-2016 Free Software Foundation, Inc. + Copyright (C) 2009-2017 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/gnulib-tests/sleep.c b/gnulib-tests/sleep.c index 997285e..8a8fe7c 100644 --- a/gnulib-tests/sleep.c +++ b/gnulib-tests/sleep.c @@ -1,5 +1,5 @@ /* Pausing execution of the current thread. - Copyright (C) 2007, 2009-2016 Free Software Foundation, Inc. + Copyright (C) 2007, 2009-2017 Free Software Foundation, Inc. Written by Bruno Haible <bruno@clisp.org>, 2007. This program is free software: you can redistribute it and/or modify diff --git a/gnulib-tests/snprintf.c b/gnulib-tests/snprintf.c index 7cd89af..d66302f 100644 --- a/gnulib-tests/snprintf.c +++ b/gnulib-tests/snprintf.c @@ -1,5 +1,5 @@ /* Formatted output to strings. - Copyright (C) 2004, 2006-2016 Free Software Foundation, Inc. + Copyright (C) 2004, 2006-2017 Free Software Foundation, Inc. Written by Simon Josefsson and Paul Eggert. This program is free software; you can redistribute it and/or modify diff --git a/gnulib-tests/socket.c b/gnulib-tests/socket.c index 4ccec4b..47aa557 100644 --- a/gnulib-tests/socket.c +++ b/gnulib-tests/socket.c @@ -1,6 +1,6 @@ /* socket.c --- wrappers for Windows socket function - Copyright (C) 2008-2016 Free Software Foundation, Inc. + Copyright (C) 2008-2017 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/gnulib-tests/sockets.c b/gnulib-tests/sockets.c index abfab02..028e20e 100644 --- a/gnulib-tests/sockets.c +++ b/gnulib-tests/sockets.c @@ -1,6 +1,6 @@ /* sockets.c --- wrappers for Windows socket functions - Copyright (C) 2008-2016 Free Software Foundation, Inc. + Copyright (C) 2008-2017 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -28,7 +28,11 @@ # include <sys/socket.h> # include "fd-hook.h" -# include "msvc-nothrow.h" +# if GNULIB_MSVC_NOTHROW +# include "msvc-nothrow.h" +# else +# include <io.h> +# endif /* Get set_winsock_errno, FD_TO_SOCKET etc. */ # include "w32sock.h" diff --git a/gnulib-tests/sockets.h b/gnulib-tests/sockets.h index 01a68d0..23ad74d 100644 --- a/gnulib-tests/sockets.h +++ b/gnulib-tests/sockets.h @@ -1,6 +1,6 @@ /* sockets.h - wrappers for Windows socket functions - Copyright (C) 2008-2016 Free Software Foundation, Inc. + Copyright (C) 2008-2017 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -18,7 +18,7 @@ /* Written by Simon Josefsson */ #ifndef SOCKETS_H -# define SOCKETS_H 1 +#define SOCKETS_H 1 #define SOCKETS_1_0 0x0001 #define SOCKETS_1_1 0x0101 @@ -27,13 +27,13 @@ #define SOCKETS_2_2 0x0202 int gl_sockets_startup (int version) -#if !WINDOWS_SOCKETS +#ifndef WINDOWS_SOCKETS _GL_ATTRIBUTE_CONST #endif ; int gl_sockets_cleanup (void) -#if !WINDOWS_SOCKETS +#ifndef WINDOWS_SOCKETS _GL_ATTRIBUTE_CONST #endif ; @@ -41,11 +41,15 @@ int gl_sockets_cleanup (void) /* This function is useful it you create a socket using gnulib's Winsock wrappers but needs to pass on the socket handle to some other library that only accepts sockets. */ -#if WINDOWS_SOCKETS +#ifdef WINDOWS_SOCKETS -#include <sys/socket.h> +# include <sys/socket.h> -#include "msvc-nothrow.h" +# if GNULIB_MSVC_NOTHROW +# include "msvc-nothrow.h" +# else +# include <io.h> +# endif static inline SOCKET gl_fd_to_handle (int fd) @@ -55,7 +59,7 @@ gl_fd_to_handle (int fd) #else -#define gl_fd_to_handle(x) (x) +# define gl_fd_to_handle(x) (x) #endif /* WINDOWS_SOCKETS */ diff --git a/gnulib-tests/stdalign.in.h b/gnulib-tests/stdalign.in.h index 12f8a15..ea24823 100644 --- a/gnulib-tests/stdalign.in.h +++ b/gnulib-tests/stdalign.in.h @@ -1,6 +1,6 @@ /* A substitute for ISO C11 <stdalign.h>. - Copyright 2011-2016 Free Software Foundation, Inc. + Copyright 2011-2017 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -103,7 +103,7 @@ # elif ((defined __APPLE__ && defined __MACH__ \ ? 4 < __GNUC__ + (1 <= __GNUC_MINOR__) \ : __GNUC__) \ - || 061200 <= __HP_cc || 061200 <= __HP_aCC \ + || (__ia64 && (61200 <= __HP_cc || 61200 <= __HP_aCC)) \ || __ICC || 0x590 <= __SUNPRO_C || 0x0600 <= __xlC__) # define _Alignas(a) __attribute__ ((__aligned__ (a))) # elif 1300 <= _MSC_VER diff --git a/gnulib-tests/strerror_r.c b/gnulib-tests/strerror_r.c index 07a00cf..650751f 100644 --- a/gnulib-tests/strerror_r.c +++ b/gnulib-tests/strerror_r.c @@ -1,6 +1,6 @@ /* strerror_r.c --- POSIX compatible system error routine - Copyright (C) 2010-2016 Free Software Foundation, Inc. + Copyright (C) 2010-2017 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -28,6 +28,9 @@ #include <errno.h> #include <stdio.h> #include <stdlib.h> +#if !HAVE_SNPRINTF +# include <stdarg.h> +#endif #include "strerror-override.h" @@ -329,6 +332,115 @@ strerror_r (int errnum, char *buf, size_t buflen) #endif +#if (defined _WIN32 || defined __WIN32__) && !defined __CYGWIN__ + /* MSVC 14 defines names for many error codes in the range 100..140, + but _sys_errlist contains strings only for the error codes + < _sys_nerr = 43. */ + if (ret == EINVAL) + { + const char *errmsg; + + switch (errnum) + { + case 100 /* EADDRINUSE */: + errmsg = "Address already in use"; + break; + case 101 /* EADDRNOTAVAIL */: + errmsg = "Cannot assign requested address"; + break; + case 102 /* EAFNOSUPPORT */: + errmsg = "Address family not supported by protocol"; + break; + case 103 /* EALREADY */: + errmsg = "Operation already in progress"; + break; + case 105 /* ECANCELED */: + errmsg = "Operation canceled"; + break; + case 106 /* ECONNABORTED */: + errmsg = "Software caused connection abort"; + break; + case 107 /* ECONNREFUSED */: + errmsg = "Connection refused"; + break; + case 108 /* ECONNRESET */: + errmsg = "Connection reset by peer"; + break; + case 109 /* EDESTADDRREQ */: + errmsg = "Destination address required"; + break; + case 110 /* EHOSTUNREACH */: + errmsg = "No route to host"; + break; + case 112 /* EINPROGRESS */: + errmsg = "Operation now in progress"; + break; + case 113 /* EISCONN */: + errmsg = "Transport endpoint is already connected"; + break; + case 114 /* ELOOP */: + errmsg = "Too many levels of symbolic links"; + break; + case 115 /* EMSGSIZE */: + errmsg = "Message too long"; + break; + case 116 /* ENETDOWN */: + errmsg = "Network is down"; + break; + case 117 /* ENETRESET */: + errmsg = "Network dropped connection on reset"; + break; + case 118 /* ENETUNREACH */: + errmsg = "Network is unreachable"; + break; + case 119 /* ENOBUFS */: + errmsg = "No buffer space available"; + break; + case 123 /* ENOPROTOOPT */: + errmsg = "Protocol not available"; + break; + case 126 /* ENOTCONN */: + errmsg = "Transport endpoint is not connected"; + break; + case 128 /* ENOTSOCK */: + errmsg = "Socket operation on non-socket"; + break; + case 129 /* ENOTSUP */: + errmsg = "Not supported"; + break; + case 130 /* EOPNOTSUPP */: + errmsg = "Operation not supported"; + break; + case 132 /* EOVERFLOW */: + errmsg = "Value too large for defined data type"; + break; + case 133 /* EOWNERDEAD */: + errmsg = "Owner died"; + break; + case 134 /* EPROTO */: + errmsg = "Protocol error"; + break; + case 135 /* EPROTONOSUPPORT */: + errmsg = "Protocol not supported"; + break; + case 136 /* EPROTOTYPE */: + errmsg = "Protocol wrong type for socket"; + break; + case 138 /* ETIMEDOUT */: + errmsg = "Connection timed out"; + break; + case 140 /* EWOULDBLOCK */: + errmsg = "Operation would block"; + break; + default: + errmsg = NULL; + break; + } + if (errmsg != NULL) + ret = safe_copy (buf, buflen, errmsg); + } +#endif + if (ret == EINVAL && !*buf) snprintf (buf, buflen, "Unknown error %d", errnum); diff --git a/gnulib-tests/symlink.c b/gnulib-tests/symlink.c index d8684b6..60d4c14 100644 --- a/gnulib-tests/symlink.c +++ b/gnulib-tests/symlink.c @@ -1,5 +1,5 @@ /* Stub for symlink(). - Copyright (C) 2009-2016 Free Software Foundation, Inc. + Copyright (C) 2009-2017 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/gnulib-tests/sys_ioctl.in.h b/gnulib-tests/sys_ioctl.in.h index a07dc97..7d410cd 100644 --- a/gnulib-tests/sys_ioctl.in.h +++ b/gnulib-tests/sys_ioctl.in.h @@ -1,5 +1,5 @@ /* Substitute for and wrapper around <sys/ioctl.h>. - Copyright (C) 2008-2016 Free Software Foundation, Inc. + Copyright (C) 2008-2017 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/gnulib-tests/sys_select.in.h b/gnulib-tests/sys_select.in.h index 9a2622f..616e77d 100644 --- a/gnulib-tests/sys_select.in.h +++ b/gnulib-tests/sys_select.in.h @@ -1,5 +1,5 @@ /* Substitute for <sys/select.h>. - Copyright (C) 2007-2016 Free Software Foundation, Inc. + Copyright (C) 2007-2017 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/gnulib-tests/sys_socket.in.h b/gnulib-tests/sys_socket.in.h index a627dd4..cf4f7bc 100644 --- a/gnulib-tests/sys_socket.in.h +++ b/gnulib-tests/sys_socket.in.h @@ -1,6 +1,6 @@ /* Provide a sys/socket header file for systems lacking it (read: MinGW) and for systems where it is incomplete. - Copyright (C) 2005-2016 Free Software Foundation, Inc. + Copyright (C) 2005-2017 Free Software Foundation, Inc. Written by Simon Josefsson. This program is free software; you can redistribute it and/or modify @@ -79,7 +79,12 @@ _GL_INLINE_HEADER_BEGIN #if !@HAVE_SA_FAMILY_T@ # if !GNULIB_defined_sa_family_t +/* On OS/2 kLIBC, sa_family_t is unsigned char unless TCPV40HDRS is defined. */ +# if !defined __KLIBC__ || defined TCPV40HDRS typedef unsigned short sa_family_t; +# else +typedef unsigned char sa_family_t; +# endif # define GNULIB_defined_sa_family_t 1 # endif #endif diff --git a/gnulib-tests/sys_uio.in.h b/gnulib-tests/sys_uio.in.h index e70663f..d45d846 100644 --- a/gnulib-tests/sys_uio.in.h +++ b/gnulib-tests/sys_uio.in.h @@ -1,5 +1,5 @@ /* Substitute for <sys/uio.h>. - Copyright (C) 2011-2016 Free Software Foundation, Inc. + Copyright (C) 2011-2017 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/gnulib-tests/test-accept.c b/gnulib-tests/test-accept.c index 9d510a6..5e4081b 100644 --- a/gnulib-tests/test-accept.c +++ b/gnulib-tests/test-accept.c @@ -1,5 +1,5 @@ /* Test accepting a connection to a server socket. - Copyright (C) 2011-2016 Free Software Foundation, Inc. + Copyright (C) 2011-2017 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/gnulib-tests/test-alloca-opt.c b/gnulib-tests/test-alloca-opt.c index b9aaa4a..4c5b3bd 100644 --- a/gnulib-tests/test-alloca-opt.c +++ b/gnulib-tests/test-alloca-opt.c @@ -1,5 +1,5 @@ /* Test of optional automatic memory allocation. - Copyright (C) 2005, 2007, 2009-2016 Free Software Foundation, Inc. + Copyright (C) 2005, 2007, 2009-2017 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/gnulib-tests/test-areadlink.c b/gnulib-tests/test-areadlink.c index 738a498..2a826c4 100644 --- a/gnulib-tests/test-areadlink.c +++ b/gnulib-tests/test-areadlink.c @@ -1,5 +1,5 @@ /* Tests of areadlink. - Copyright (C) 2009-2016 Free Software Foundation, Inc. + Copyright (C) 2009-2017 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/gnulib-tests/test-areadlink.h b/gnulib-tests/test-areadlink.h index 3251ca2..efaf07b 100644 --- a/gnulib-tests/test-areadlink.h +++ b/gnulib-tests/test-areadlink.h @@ -1,5 +1,5 @@ /* Tests of areadlink and friends. - Copyright (C) 2009-2016 Free Software Foundation, Inc. + Copyright (C) 2009-2017 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/gnulib-tests/test-argmatch.c b/gnulib-tests/test-argmatch.c index 9a3a4a9..5fe0df7 100644 --- a/gnulib-tests/test-argmatch.c +++ b/gnulib-tests/test-argmatch.c @@ -1,5 +1,5 @@ /* Test of exact or abbreviated match search. - Copyright (C) 1990, 1998-1999, 2001-2016 Free Software Foundation, Inc. + Copyright (C) 1990, 1998-1999, 2001-2017 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -23,7 +23,6 @@ #include <stdlib.h> -#include "progname.h" #include "macros.h" /* Some packages define ARGMATCH_DIE and ARGMATCH_DIE_DECL in <config.h>, and @@ -63,8 +62,6 @@ static const enum backup_type backup_vals[] = int main (int argc, char *argv[]) { - set_program_name (argv[0]); - /* Not found. */ ASSERT (ARGMATCH ("klingon", backup_args, backup_vals) == -1); diff --git a/gnulib-tests/test-arpa_inet.c b/gnulib-tests/test-arpa_inet.c index 5fc6cdd..8e37a41 100644 --- a/gnulib-tests/test-arpa_inet.c +++ b/gnulib-tests/test-arpa_inet.c @@ -1,5 +1,5 @@ /* Test of <arpa/inet.h> substitute. - Copyright (C) 2007, 2009-2016 Free Software Foundation, Inc. + Copyright (C) 2007, 2009-2017 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/gnulib-tests/test-binary-io.c b/gnulib-tests/test-binary-io.c index 6801e96..46ccce5 100644 --- a/gnulib-tests/test-binary-io.c +++ b/gnulib-tests/test-binary-io.c @@ -1,5 +1,5 @@ /* Test of binary mode I/O. - Copyright (C) 2005, 2007-2016 Free Software Foundation, Inc. + Copyright (C) 2005, 2007-2017 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -55,12 +55,6 @@ main (int argc, char *argv[]) fputs ("Hello\n", stdout); break; - case '2': - /* Test the SET_BINARY macro. */ - SET_BINARY (1); - fputs ("Hello\n", stdout); - break; - default: break; } diff --git a/gnulib-tests/test-binary-io.sh b/gnulib-tests/test-binary-io.sh index c4dd6e9..38af099 100755 --- a/gnulib-tests/test-binary-io.sh +++ b/gnulib-tests/test-binary-io.sh @@ -3,11 +3,9 @@ tmpfiles="" trap 'rm -fr $tmpfiles' 1 2 3 15 -tmpfiles="$tmpfiles t-bin-out0.tmp t-bin-out1.tmp t-bin-out2.tmp" +tmpfiles="$tmpfiles t-bin-out0.tmp t-bin-out1.tmp" ./test-binary-io${EXEEXT} 1 > t-bin-out1.tmp || exit 1 cmp t-bin-out0.tmp t-bin-out1.tmp > /dev/null || exit 1 -./test-binary-io${EXEEXT} 2 > t-bin-out2.tmp || exit 1 -cmp t-bin-out0.tmp t-bin-out2.tmp > /dev/null || exit 1 rm -fr $tmpfiles diff --git a/gnulib-tests/test-bind.c b/gnulib-tests/test-bind.c index 4885519..9ee4977 100644 --- a/gnulib-tests/test-bind.c +++ b/gnulib-tests/test-bind.c @@ -1,5 +1,5 @@ /* Test binding a server socket to a port. - Copyright (C) 2011-2016 Free Software Foundation, Inc. + Copyright (C) 2011-2017 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/gnulib-tests/test-bitrotate.c b/gnulib-tests/test-bitrotate.c index f3df469..c87e56c 100644 --- a/gnulib-tests/test-bitrotate.c +++ b/gnulib-tests/test-bitrotate.c @@ -1,5 +1,5 @@ /* Test of <bitrotate.h> substitute. - Copyright (C) 2007-2016 Free Software Foundation, Inc. + Copyright (C) 2007-2017 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/gnulib-tests/test-btowc.c b/gnulib-tests/test-btowc.c index 9953ac4..7d3a7b6 100644 --- a/gnulib-tests/test-btowc.c +++ b/gnulib-tests/test-btowc.c @@ -1,5 +1,5 @@ /* Test of conversion of unibyte character to wide character. - Copyright (C) 2008-2016 Free Software Foundation, Inc. + Copyright (C) 2008-2017 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/gnulib-tests/test-c-ctype.c b/gnulib-tests/test-c-ctype.c index 184cdec..d978035 100644 --- a/gnulib-tests/test-c-ctype.c +++ b/gnulib-tests/test-c-ctype.c @@ -1,5 +1,5 @@ /* Test of character handling in C locale. - Copyright (C) 2005, 2007-2016 Free Software Foundation, Inc. + Copyright (C) 2005, 2007-2017 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/gnulib-tests/test-c-stack.c b/gnulib-tests/test-c-stack.c index 073f1c6..7da4e4f 100644 --- a/gnulib-tests/test-c-stack.c +++ b/gnulib-tests/test-c-stack.c @@ -1,5 +1,5 @@ /* Test of c-stack module. - Copyright (C) 2002, 2004, 2006, 2008-2016 Free Software Foundation, Inc. + Copyright (C) 2002, 2004, 2006, 2008-2017 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -30,8 +30,6 @@ #include "macros.h" -char *program_name; - static volatile int * recurse_1 (volatile int n, volatile int *p) { @@ -60,7 +58,6 @@ main (int argc, char **argv) setrlimit (RLIMIT_STACK, &rl); #endif - program_name = argv[0]; if (c_stack_action (NULL) == 0) { if (1 < argc) diff --git a/gnulib-tests/test-c-strcasecmp.c b/gnulib-tests/test-c-strcasecmp.c index 37f9431..8eb5fd5 100644 --- a/gnulib-tests/test-c-strcasecmp.c +++ b/gnulib-tests/test-c-strcasecmp.c @@ -1,5 +1,5 @@ /* Test of case-insensitive string comparison function. - Copyright (C) 2007-2016 Free Software Foundation, Inc. + Copyright (C) 2007-2017 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -19,6 +19,7 @@ #include <config.h> #include "c-strcase.h" +#include "c-ctype.h" #include <locale.h> #include <string.h> @@ -57,9 +58,11 @@ main (int argc, char *argv[]) ASSERT (c_strcasecmp ("\303\266zg\303\274r", "\303\226ZG\303\234R") > 0); /* özgür */ ASSERT (c_strcasecmp ("\303\226ZG\303\234R", "\303\266zg\303\274r") < 0); /* özgür */ +#if C_CTYPE_ASCII /* This test shows how strings of different size cannot compare equal. */ ASSERT (c_strcasecmp ("turkish", "TURK\304\260SH") < 0); ASSERT (c_strcasecmp ("TURK\304\260SH", "turkish") > 0); +#endif return 0; } diff --git a/gnulib-tests/test-c-strncasecmp.c b/gnulib-tests/test-c-strncasecmp.c index 1ca42d8..6aea06c 100644 --- a/gnulib-tests/test-c-strncasecmp.c +++ b/gnulib-tests/test-c-strncasecmp.c @@ -1,5 +1,5 @@ /* Test of case-insensitive string comparison function. - Copyright (C) 2007-2016 Free Software Foundation, Inc. + Copyright (C) 2007-2017 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -19,6 +19,7 @@ #include <config.h> #include "c-strcase.h" +#include "c-ctype.h" #include <locale.h> #include <string.h> @@ -71,9 +72,11 @@ main (int argc, char *argv[]) ASSERT (c_strncasecmp ("\303\266zg\303\274r", "\303\226ZG\303\234R", 99) > 0); /* özgür */ ASSERT (c_strncasecmp ("\303\226ZG\303\234R", "\303\266zg\303\274r", 99) < 0); /* özgür */ +#if C_CTYPE_ASCII /* This test shows how strings of different size cannot compare equal. */ ASSERT (c_strncasecmp ("turkish", "TURK\304\260SH", 7) < 0); ASSERT (c_strncasecmp ("TURK\304\260SH", "turkish", 7) > 0); +#endif return 0; } diff --git a/gnulib-tests/test-close.c b/gnulib-tests/test-close.c index a0428e0..c8565aa 100644 --- a/gnulib-tests/test-close.c +++ b/gnulib-tests/test-close.c @@ -1,5 +1,5 @@ /* Test closing a file or socket. - Copyright (C) 2011-2016 Free Software Foundation, Inc. + Copyright (C) 2011-2017 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/gnulib-tests/test-connect.c b/gnulib-tests/test-connect.c index efe419e..46e2f7e 100644 --- a/gnulib-tests/test-connect.c +++ b/gnulib-tests/test-connect.c @@ -1,5 +1,5 @@ /* Test connecting a client socket. - Copyright (C) 2011-2016 Free Software Foundation, Inc. + Copyright (C) 2011-2017 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/gnulib-tests/test-ctype.c b/gnulib-tests/test-ctype.c index 570fbdb..66e1026 100644 --- a/gnulib-tests/test-ctype.c +++ b/gnulib-tests/test-ctype.c @@ -1,5 +1,5 @@ /* Test of <ctype.h> substitute. - Copyright (C) 2009-2016 Free Software Foundation, Inc. + Copyright (C) 2009-2017 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/gnulib-tests/test-dirname.c b/gnulib-tests/test-dirname.c index b9b876a..bbd135e 100644 --- a/gnulib-tests/test-dirname.c +++ b/gnulib-tests/test-dirname.c @@ -1,5 +1,5 @@ /* Test the gnulib dirname module. - Copyright (C) 2005-2007, 2009-2016 Free Software Foundation, Inc. + Copyright (C) 2005-2007, 2009-2017 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/gnulib-tests/test-dup2.c b/gnulib-tests/test-dup2.c index 5da6812..f98486a 100644 --- a/gnulib-tests/test-dup2.c +++ b/gnulib-tests/test-dup2.c @@ -1,5 +1,5 @@ /* Test duplicating file descriptors. - Copyright (C) 2009-2016 Free Software Foundation, Inc. + Copyright (C) 2009-2017 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -41,7 +41,11 @@ SIGNATURE_CHECK (dup2, int, (int, int)); # define WIN32_LEAN_AND_MEAN # include <windows.h> /* Get _get_osfhandle. */ -# include "msvc-nothrow.h" +# if GNULIB_MSVC_NOTHROW +# include "msvc-nothrow.h" +# else +# include <io.h> +# endif #endif #include "macros.h" diff --git a/gnulib-tests/test-environ.c b/gnulib-tests/test-environ.c index 0047246..97a268a 100644 --- a/gnulib-tests/test-environ.c +++ b/gnulib-tests/test-environ.c @@ -1,5 +1,5 @@ /* Test of environ variable. - Copyright (C) 2008-2016 Free Software Foundation, Inc. + Copyright (C) 2008-2017 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/gnulib-tests/test-errno.c b/gnulib-tests/test-errno.c index 1e0bb6d..8accfda 100644 --- a/gnulib-tests/test-errno.c +++ b/gnulib-tests/test-errno.c @@ -1,5 +1,5 @@ /* Test of <errno.h> substitute. - Copyright (C) 2008-2016 Free Software Foundation, Inc. + Copyright (C) 2008-2017 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/gnulib-tests/test-exclude.c b/gnulib-tests/test-exclude.c index 9b20ba5..cfeb647 100644 --- a/gnulib-tests/test-exclude.c +++ b/gnulib-tests/test-exclude.c @@ -1,5 +1,5 @@ /* Test suite for exclude. - Copyright (C) 2009-2016 Free Software Foundation, Inc. + Copyright (C) 2009-2017 Free Software Foundation, Inc. This file is part of the GNUlib Library. This program is free software: you can redistribute it and/or modify @@ -24,7 +24,6 @@ #include <fnmatch.h> #include "exclude.h" -#include "progname.h" #include "error.h" #include "argmatch.h" @@ -75,8 +74,6 @@ main (int argc, char **argv) int exclude_options = 0; struct exclude *exclude = new_exclude (); - set_program_name (argv[0]); - if (argc == 1) error (1, 0, "usage: %s file -- words...", argv[0]); @@ -125,5 +122,7 @@ main (int argc, char **argv) printf ("%s: %d\n", word, excluded_file_name (exclude, word)); } + + free_exclude (exclude); return 0; } diff --git a/gnulib-tests/test-exclude1.sh b/gnulib-tests/test-exclude1.sh index 6f6252e..fba7153 100755 --- a/gnulib-tests/test-exclude1.sh +++ b/gnulib-tests/test-exclude1.sh @@ -1,6 +1,6 @@ #! /bin/sh # Test suite for exclude. -# Copyright (C) 2009-2016 Free Software Foundation, Inc. +# Copyright (C) 2009-2017 Free Software Foundation, Inc. # This file is part of the GNUlib Library. # # This program is free software: you can redistribute it and/or modify diff --git a/gnulib-tests/test-exclude2.sh b/gnulib-tests/test-exclude2.sh index c488109..e626c62 100755 --- a/gnulib-tests/test-exclude2.sh +++ b/gnulib-tests/test-exclude2.sh @@ -1,6 +1,6 @@ #! /bin/sh # Test suite for exclude. -# Copyright (C) 2009-2016 Free Software Foundation, Inc. +# Copyright (C) 2009-2017 Free Software Foundation, Inc. # This file is part of the GNUlib Library. # # This program is free software: you can redistribute it and/or modify diff --git a/gnulib-tests/test-exclude3.sh b/gnulib-tests/test-exclude3.sh index c2376cc..38c8b64 100755 --- a/gnulib-tests/test-exclude3.sh +++ b/gnulib-tests/test-exclude3.sh @@ -1,6 +1,6 @@ #! /bin/sh # Test suite for exclude. -# Copyright (C) 2009-2016 Free Software Foundation, Inc. +# Copyright (C) 2009-2017 Free Software Foundation, Inc. # This file is part of the GNUlib Library. # # This program is free software: you can redistribute it and/or modify diff --git a/gnulib-tests/test-exclude4.sh b/gnulib-tests/test-exclude4.sh index 4c22db4..42fa633 100755 --- a/gnulib-tests/test-exclude4.sh +++ b/gnulib-tests/test-exclude4.sh @@ -1,6 +1,6 @@ #! /bin/sh # Test suite for exclude. -# Copyright (C) 2009-2016 Free Software Foundation, Inc. +# Copyright (C) 2009-2017 Free Software Foundation, Inc. # This file is part of the GNUlib Library. # # This program is free software: you can redistribute it and/or modify diff --git a/gnulib-tests/test-exclude5.sh b/gnulib-tests/test-exclude5.sh index ba53a43..7552179 100755 --- a/gnulib-tests/test-exclude5.sh +++ b/gnulib-tests/test-exclude5.sh @@ -1,6 +1,6 @@ #! /bin/sh # Test suite for exclude. -# Copyright (C) 2009-2016 Free Software Foundation, Inc. +# Copyright (C) 2009-2017 Free Software Foundation, Inc. # This file is part of the GNUlib Library. # # This program is free software: you can redistribute it and/or modify diff --git a/gnulib-tests/test-exclude6.sh b/gnulib-tests/test-exclude6.sh index 53368dc..11016c4 100755 --- a/gnulib-tests/test-exclude6.sh +++ b/gnulib-tests/test-exclude6.sh @@ -1,6 +1,6 @@ #! /bin/sh # Test suite for exclude. -# Copyright (C) 2009-2016 Free Software Foundation, Inc. +# Copyright (C) 2009-2017 Free Software Foundation, Inc. # This file is part of the GNUlib Library. # # This program is free software: you can redistribute it and/or modify diff --git a/gnulib-tests/test-exclude7.sh b/gnulib-tests/test-exclude7.sh index 4a92ff5..6b9de77 100755 --- a/gnulib-tests/test-exclude7.sh +++ b/gnulib-tests/test-exclude7.sh @@ -1,6 +1,6 @@ #! /bin/sh # Test suite for exclude. -# Copyright (C) 2009-2016 Free Software Foundation, Inc. +# Copyright (C) 2009-2017 Free Software Foundation, Inc. # This file is part of the GNUlib Library. # # This program is free software: you can redistribute it and/or modify diff --git a/gnulib-tests/test-exclude8.sh b/gnulib-tests/test-exclude8.sh index 91644ea..6585a4e 100755 --- a/gnulib-tests/test-exclude8.sh +++ b/gnulib-tests/test-exclude8.sh @@ -1,6 +1,6 @@ #! /bin/sh # Test suite for exclude. -# Copyright (C) 2010-2016 Free Software Foundation, Inc. +# Copyright (C) 2010-2017 Free Software Foundation, Inc. # This file is part of the GNUlib Library. # # This program is free software: you can redistribute it and/or modify diff --git a/gnulib-tests/test-fcntl-h.c b/gnulib-tests/test-fcntl-h.c index aef1661..4c17fdf 100644 --- a/gnulib-tests/test-fcntl-h.c +++ b/gnulib-tests/test-fcntl-h.c @@ -1,5 +1,5 @@ /* Test of <fcntl.h> substitute. - Copyright (C) 2007, 2009-2016 Free Software Foundation, Inc. + Copyright (C) 2007, 2009-2017 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/gnulib-tests/test-fcntl.c b/gnulib-tests/test-fcntl.c index 974ee33..a249f9a 100644 --- a/gnulib-tests/test-fcntl.c +++ b/gnulib-tests/test-fcntl.c @@ -1,5 +1,5 @@ /* Test of fcntl(2). - Copyright (C) 2009-2016 Free Software Foundation, Inc. + Copyright (C) 2009-2017 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -35,7 +35,11 @@ SIGNATURE_CHECK (fcntl, int, (int, int, ...)); # define WIN32_LEAN_AND_MEAN # include <windows.h> /* Get _get_osfhandle. */ -# include "msvc-nothrow.h" +# if GNULIB_MSVC_NOTHROW +# include "msvc-nothrow.h" +# else +# include <io.h> +# endif #endif #include "binary-io.h" diff --git a/gnulib-tests/test-fdopen.c b/gnulib-tests/test-fdopen.c index 55b49a6..c4ce344 100644 --- a/gnulib-tests/test-fdopen.c +++ b/gnulib-tests/test-fdopen.c @@ -1,5 +1,5 @@ /* Test opening a stream with a file descriptor. - Copyright (C) 2011-2016 Free Software Foundation, Inc. + Copyright (C) 2011-2017 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/gnulib-tests/test-fgetc.c b/gnulib-tests/test-fgetc.c index c62e70c..17edf13 100644 --- a/gnulib-tests/test-fgetc.c +++ b/gnulib-tests/test-fgetc.c @@ -1,5 +1,5 @@ /* Test of fgetc() function. - Copyright (C) 2011-2016 Free Software Foundation, Inc. + Copyright (C) 2011-2017 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -25,7 +25,9 @@ SIGNATURE_CHECK (fgetc, int, (FILE *)); #include <fcntl.h> #include <unistd.h> -#include "msvc-inval.h" +#if HAVE_MSVC_INVALID_PARAMETER_HANDLER +# include "msvc-inval.h" +#endif #include "macros.h" diff --git a/gnulib-tests/test-filenamecat.c b/gnulib-tests/test-filenamecat.c index 79f752f..b4d6581 100644 --- a/gnulib-tests/test-filenamecat.c +++ b/gnulib-tests/test-filenamecat.c @@ -1,6 +1,6 @@ /* Test of concatenation of two arbitrary file names. - Copyright (C) 1996-2007, 2009-2016 Free Software Foundation, Inc. + Copyright (C) 1996-2007, 2009-2017 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -26,7 +26,6 @@ #include <stdlib.h> #include <string.h> -#include "progname.h" int main (int argc _GL_UNUSED, char *argv[]) @@ -49,8 +48,6 @@ main (int argc _GL_UNUSED, char *argv[]) unsigned int i; bool fail = false; - set_program_name (argv[0]); - for (i = 0; i < sizeof tests / sizeof tests[0]; i++) { char *base_in_result; diff --git a/gnulib-tests/test-float.c b/gnulib-tests/test-float.c index a5f33b6..71df845 100644 --- a/gnulib-tests/test-float.c +++ b/gnulib-tests/test-float.c @@ -1,5 +1,5 @@ /* Test of <float.h> substitute. - Copyright (C) 2011-2016 Free Software Foundation, Inc. + Copyright (C) 2011-2017 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/gnulib-tests/test-fnmatch.c b/gnulib-tests/test-fnmatch.c index c110409..e5eb3e9 100644 --- a/gnulib-tests/test-fnmatch.c +++ b/gnulib-tests/test-fnmatch.c @@ -1,5 +1,5 @@ /* Test of fnmatch string matching function. - Copyright (C) 2009-2016 Free Software Foundation, Inc. + Copyright (C) 2009-2017 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/gnulib-tests/test-fputc.c b/gnulib-tests/test-fputc.c index 95a1cb6..448e5f2 100644 --- a/gnulib-tests/test-fputc.c +++ b/gnulib-tests/test-fputc.c @@ -1,5 +1,5 @@ /* Test of fputc() function. - Copyright (C) 2011-2016 Free Software Foundation, Inc. + Copyright (C) 2011-2017 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -25,7 +25,9 @@ SIGNATURE_CHECK (fputc, int, (int, FILE *)); #include <fcntl.h> #include <unistd.h> -#include "msvc-inval.h" +#if HAVE_MSVC_INVALID_PARAMETER_HANDLER +# include "msvc-inval.h" +#endif #include "macros.h" diff --git a/gnulib-tests/test-fread.c b/gnulib-tests/test-fread.c index b9fc72a..751774d 100644 --- a/gnulib-tests/test-fread.c +++ b/gnulib-tests/test-fread.c @@ -1,5 +1,5 @@ /* Test of fread() function. - Copyright (C) 2011-2016 Free Software Foundation, Inc. + Copyright (C) 2011-2017 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -25,7 +25,9 @@ SIGNATURE_CHECK (fread, size_t, (void *, size_t, size_t, FILE *)); #include <fcntl.h> #include <unistd.h> -#include "msvc-inval.h" +#if HAVE_MSVC_INVALID_PARAMETER_HANDLER +# include "msvc-inval.h" +#endif #include "macros.h" diff --git a/gnulib-tests/test-freopen-safer.c b/gnulib-tests/test-freopen-safer.c index 980f19b..5e46e91 100644 --- a/gnulib-tests/test-freopen-safer.c +++ b/gnulib-tests/test-freopen-safer.c @@ -1,5 +1,5 @@ /* Test of reopening a stream. - Copyright (C) 2009-2016 Free Software Foundation, Inc. + Copyright (C) 2009-2017 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/gnulib-tests/test-freopen.c b/gnulib-tests/test-freopen.c index 80453bf..717502e 100644 --- a/gnulib-tests/test-freopen.c +++ b/gnulib-tests/test-freopen.c @@ -1,5 +1,5 @@ /* Test of opening a file stream. - Copyright (C) 2007-2016 Free Software Foundation, Inc. + Copyright (C) 2007-2017 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -33,7 +33,11 @@ main () { const char *filename = "test-freopen.txt"; + close (STDIN_FILENO); ASSERT (freopen ("/dev/null", "r", stdin) != NULL); + ASSERT (getchar () == EOF); + ASSERT (!ferror (stdin)); + ASSERT (feof (stdin)); #if 0 /* freopen (NULL, ...) is unsupported on most platforms. */ /* Test that freopen() sets errno if someone else closes the stream diff --git a/gnulib-tests/test-fstat.c b/gnulib-tests/test-fstat.c index c9ac749..35479fa 100644 --- a/gnulib-tests/test-fstat.c +++ b/gnulib-tests/test-fstat.c @@ -1,5 +1,5 @@ /* Tests of fstat() function. - Copyright (C) 2011-2016 Free Software Foundation, Inc. + Copyright (C) 2011-2017 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/gnulib-tests/test-ftruncate.c b/gnulib-tests/test-ftruncate.c index 09f175e..47b6070 100644 --- a/gnulib-tests/test-ftruncate.c +++ b/gnulib-tests/test-ftruncate.c @@ -1,5 +1,5 @@ /* Test truncating a file. - Copyright (C) 2011-2016 Free Software Foundation, Inc. + Copyright (C) 2011-2017 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/gnulib-tests/test-fwrite.c b/gnulib-tests/test-fwrite.c index bc285f3..0dfb15b 100644 --- a/gnulib-tests/test-fwrite.c +++ b/gnulib-tests/test-fwrite.c @@ -1,5 +1,5 @@ /* Test of fwrite() function. - Copyright (C) 2011-2016 Free Software Foundation, Inc. + Copyright (C) 2011-2017 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -25,7 +25,9 @@ SIGNATURE_CHECK (fwrite, size_t, (const void *, size_t, size_t, FILE *)); #include <fcntl.h> #include <unistd.h> -#include "msvc-inval.h" +#if HAVE_MSVC_INVALID_PARAMETER_HANDLER +# include "msvc-inval.h" +#endif #include "macros.h" diff --git a/gnulib-tests/test-getcwd-lgpl.c b/gnulib-tests/test-getcwd-lgpl.c index 6bea7b7..7c0688c 100644 --- a/gnulib-tests/test-getcwd-lgpl.c +++ b/gnulib-tests/test-getcwd-lgpl.c @@ -1,5 +1,5 @@ /* Test of getcwd() function. - Copyright (C) 2009-2016 Free Software Foundation, Inc. + Copyright (C) 2009-2017 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/gnulib-tests/test-getdtablesize.c b/gnulib-tests/test-getdtablesize.c index 54efa04..885010f 100644 --- a/gnulib-tests/test-getdtablesize.c +++ b/gnulib-tests/test-getdtablesize.c @@ -1,5 +1,5 @@ /* Test of getdtablesize() function. - Copyright (C) 2008-2016 Free Software Foundation, Inc. + Copyright (C) 2008-2017 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/gnulib-tests/test-getopt-gnu.c b/gnulib-tests/test-getopt-gnu.c new file mode 100644 index 0000000..c26e7f1 --- /dev/null +++ b/gnulib-tests/test-getopt-gnu.c @@ -0,0 +1,45 @@ +/* Test of command line argument processing. + Copyright (C) 2009-2017 Free Software Foundation, Inc. + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see <http://www.gnu.org/licenses/>. */ + +/* Written by Bruno Haible <bruno@clisp.org>, 2009. */ + +#include <config.h> + +/* None of the files accessed by this test are large, so disable the + ftell link warning if we are not using the gnulib ftell module. */ +#define _GL_NO_LARGE_FILES + +/* POSIX and glibc provide the getopt() function in <unistd.h>, see + http://pubs.opengroup.org/onlinepubs/9699919799/functions/getopt.html + https://www.gnu.org/software/libc/manual/html_node/Using-Getopt.html + But gnulib provides the getopt() function in <getopt.h>, not in <unistd.h>. + This is what we are testing here. */ +#include <getopt.h> + +#ifndef __getopt_argv_const +# define __getopt_argv_const const +#endif +#include "signature.h" +SIGNATURE_CHECK (getopt_long, int, (int, char *__getopt_argv_const *, + char const *, struct option const *, + int *)); +SIGNATURE_CHECK (getopt_long_only, int, (int, char *__getopt_argv_const *, + char const *, struct option const *, + int *)); + +#define TEST_GETOPT_GNU 1 +#define TEST_GETOPT_TMP_NAME "test-getopt-gnu.tmp" +#include "test-getopt-main.h" diff --git a/gnulib-tests/test-getopt.c b/gnulib-tests/test-getopt-main.h index 505cb2a..4e3cd2d 100644 --- a/gnulib-tests/test-getopt.c +++ b/gnulib-tests/test-getopt-main.h @@ -1,5 +1,5 @@ /* Test of command line argument processing. - Copyright (C) 2009-2016 Free Software Foundation, Inc. + Copyright (C) 2009-2017 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -16,36 +16,13 @@ /* Written by Bruno Haible <bruno@clisp.org>, 2009. */ -#include <config.h> - -/* None of the files accessed by this test are large, so disable the - ftell link warning if we are not using the gnulib ftell module. */ -#define _GL_NO_LARGE_FILES - -#if GNULIB_TEST_GETOPT_GNU -# include <getopt.h> - -# ifndef __getopt_argv_const -# define __getopt_argv_const const -# endif -# include "signature.h" -SIGNATURE_CHECK (getopt_long, int, (int, char *__getopt_argv_const *, - char const *, struct option const *, - int *)); -SIGNATURE_CHECK (getopt_long_only, int, (int, char *__getopt_argv_const *, - char const *, struct option const *, - int *)); - -#endif - -#include <unistd.h> - #include "signature.h" SIGNATURE_CHECK (getopt, int, (int, char * const[], char const *)); #include <stdio.h> #include <stdlib.h> #include <string.h> +#include <unistd.h> /* This test intentionally remaps stderr. So, we arrange to have fd 10 (outside the range of interesting fd's during the test) set up to @@ -58,7 +35,7 @@ SIGNATURE_CHECK (getopt, int, (int, char * const[], char const *)); static FILE *myerr; #include "test-getopt.h" -#if GNULIB_TEST_GETOPT_GNU +#if TEST_GETOPT_GNU # include "test-getopt_long.h" #endif @@ -71,7 +48,7 @@ main (void) || (myerr = fdopen (BACKUP_STDERR_FILENO, "w")) == NULL) return 2; - ASSERT (freopen ("test-getopt.tmp", "w", stderr) == stderr); + ASSERT (freopen (TEST_GETOPT_TMP_NAME, "w", stderr) == stderr); /* These default values are required by POSIX. */ ASSERT (optind == 1); @@ -80,20 +57,20 @@ main (void) setenv ("POSIXLY_CORRECT", "1", 1); test_getopt (); -#if GNULIB_TEST_GETOPT_GNU +#if TEST_GETOPT_GNU test_getopt_long_posix (); #endif unsetenv ("POSIXLY_CORRECT"); test_getopt (); -#if GNULIB_TEST_GETOPT_GNU +#if TEST_GETOPT_GNU test_getopt_long (); test_getopt_long_only (); #endif ASSERT (fclose (stderr) == 0); - ASSERT (remove ("test-getopt.tmp") == 0); + ASSERT (remove (TEST_GETOPT_TMP_NAME) == 0); return 0; } diff --git a/gnulib-tests/test-getopt-posix.c b/gnulib-tests/test-getopt-posix.c new file mode 100644 index 0000000..216912d --- /dev/null +++ b/gnulib-tests/test-getopt-posix.c @@ -0,0 +1,34 @@ +/* Test of command line argument processing. + Copyright (C) 2009-2017 Free Software Foundation, Inc. + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see <http://www.gnu.org/licenses/>. */ + +/* Written by Bruno Haible <bruno@clisp.org>, 2009. */ + +#include <config.h> + +/* None of the files accessed by this test are large, so disable the + ftell link warning if we are not using the gnulib ftell module. */ +#define _GL_NO_LARGE_FILES + +/* POSIX and glibc provide the getopt() function in <unistd.h>, see + http://pubs.opengroup.org/onlinepubs/9699919799/functions/getopt.html + https://www.gnu.org/software/libc/manual/html_node/Using-Getopt.html + But gnulib provides the getopt() function in <getopt.h>, not in <unistd.h>. + Nevertheless the getopt() function should also be found in <unistd.h>. */ +#include <unistd.h> + +#define TEST_GETOPT_GNU 0 +#define TEST_GETOPT_TMP_NAME "test-getopt-posix.tmp" +#include "test-getopt-main.h" diff --git a/gnulib-tests/test-getopt.h b/gnulib-tests/test-getopt.h index 8e61eb2..5c0e5b5 100644 --- a/gnulib-tests/test-getopt.h +++ b/gnulib-tests/test-getopt.h @@ -1,5 +1,5 @@ /* Test of command line argument processing. - Copyright (C) 2009-2016 Free Software Foundation, Inc. + Copyright (C) 2009-2017 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -17,6 +17,7 @@ /* Written by Bruno Haible <bruno@clisp.org>, 2009. */ #include <stdbool.h> +#include "macros.h" /* The glibc/gnulib implementation of getopt supports setting optind = 0, but not all other implementations do. This matters for getopt. @@ -66,7 +67,7 @@ getopt_loop (int argc, const char **argv, ASSERT (options[0] == ':' || ((options[0] == '-' || options[0] == '+') && options[1] == ':')); - /* fall through */ + FALLTHROUGH; case '?': *unrecognized = optopt; break; diff --git a/gnulib-tests/test-getopt_long.h b/gnulib-tests/test-getopt_long.h index 0f83f47..e90ebed 100644 --- a/gnulib-tests/test-getopt_long.h +++ b/gnulib-tests/test-getopt_long.h @@ -1,5 +1,5 @@ /* Test of command line argument processing. - Copyright (C) 2009-2016 Free Software Foundation, Inc. + Copyright (C) 2009-2017 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -87,7 +87,7 @@ getopt_long_loop (int argc, const char **argv, ASSERT (options[0] == ':' || ((options[0] == '-' || options[0] == '+') && options[1] == ':')); - /* fall through */ + FALLTHROUGH; case '?': *unrecognized = optopt; break; diff --git a/gnulib-tests/test-getprogname.c b/gnulib-tests/test-getprogname.c new file mode 100644 index 0000000..299ca3d --- /dev/null +++ b/gnulib-tests/test-getprogname.c @@ -0,0 +1,58 @@ +/* Test the gnulib getprogname module. + Copyright (C) 2016-2017 Free Software Foundation, Inc. + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see <http://www.gnu.org/licenses/>. */ + +#include <config.h> + +#include "getprogname.h" +#include <string.h> +#include <assert.h> + +#ifdef __hpux +# define STREQ(a, b) (strncmp (a, b, 14) == 0) +#else +# define STREQ(a, b) (strcmp (a, b) == 0) +#endif + +int +main (void) +{ + char const *p = getprogname (); + + /* libtool creates a temporary executable whose name is sometimes prefixed + with "lt-" (depends on the platform). But the name of the temporary + executable is a detail that should not be visible to the end user and to + the test suite. Remove this "lt-" prefix here. */ + if (strncmp (p, "lt-", 3) == 0) + p += 3; + + /* Note: You can make this test fail + a) by running it on a case-insensitive file system (such as on Windows, + Cygwin, or on Mac OS X with a case-insensitive HFS+ file system), + with an invocation that contains upper case characters, e.g. + test-GETPROGNAME, + b) by hardlinking or symlinking it to a different name (e.g. test-foo) + and invoking it through that name. + That's not the intended use. The Makefile always invokes it as + 'test-getprogname${EXEEXT}'. */ +#if defined __CYGWIN__ + /* The Cygwin getprogname() function strips the ".exe" suffix. */ + assert (STREQ (p, "test-getprogname")); +#else + assert (STREQ (p, "test-getprogname" EXEEXT)); +#endif + + return 0; +} diff --git a/gnulib-tests/test-gettimeofday.c b/gnulib-tests/test-gettimeofday.c index 7a44d71..124d991 100644 --- a/gnulib-tests/test-gettimeofday.c +++ b/gnulib-tests/test-gettimeofday.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005, 2007, 2009-2016 Free Software Foundation, Inc. + * Copyright (C) 2005, 2007, 2009-2017 Free Software Foundation, Inc. * Written by Jim Meyering. * * This program is free software: you can redistribute it and/or modify diff --git a/gnulib-tests/test-hash.c b/gnulib-tests/test-hash.c index 7bb53f0..9792627 100644 --- a/gnulib-tests/test-hash.c +++ b/gnulib-tests/test-hash.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2016 Free Software Foundation, Inc. + * Copyright (C) 2009-2017 Free Software Foundation, Inc. * Written by Jim Meyering * * This program is free software: you can redistribute it and/or modify diff --git a/gnulib-tests/test-iconv-h.c b/gnulib-tests/test-iconv-h.c index fbb0548..fb121f3 100644 --- a/gnulib-tests/test-iconv-h.c +++ b/gnulib-tests/test-iconv-h.c @@ -1,5 +1,5 @@ /* Test of <iconv.h> substitute. - Copyright (C) 2007-2016 Free Software Foundation, Inc. + Copyright (C) 2007-2017 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/gnulib-tests/test-iconv.c b/gnulib-tests/test-iconv.c index 3e4c4ff..dcb5b3d 100644 --- a/gnulib-tests/test-iconv.c +++ b/gnulib-tests/test-iconv.c @@ -1,5 +1,5 @@ /* Test of character set conversion. - Copyright (C) 2007-2016 Free Software Foundation, Inc. + Copyright (C) 2007-2017 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -44,8 +44,14 @@ main () #if HAVE_ICONV /* Assume that iconv() supports at least the encodings ASCII, ISO-8859-1, and UTF-8. */ - iconv_t cd_88591_to_utf8 = iconv_open ("UTF-8", "ISO-8859-1"); - iconv_t cd_utf8_to_88591 = iconv_open ("ISO-8859-1", "UTF-8"); + iconv_t cd_88591_to_utf8 = iconv_open ("UTF-8", "ISO8859-1"); + iconv_t cd_utf8_to_88591 = iconv_open ("ISO8859-1", "UTF-8"); + +#if defined __MVS__ && defined __IBMC__ + /* String literals below are in ASCII, not EBCDIC. */ +# pragma convert("ISO8859-1") +# define CONVERT_ENABLED +#endif ASSERT (cd_88591_to_utf8 != (iconv_t)(-1)); ASSERT (cd_utf8_to_88591 != (iconv_t)(-1)); @@ -142,7 +148,12 @@ main () iconv_close (cd_88591_to_utf8); iconv_close (cd_utf8_to_88591); + +#ifdef CONVERT_ENABLED +# pragma convert(pop) #endif +#endif /* HAVE_ICONV */ + return 0; } diff --git a/gnulib-tests/test-ignore-value.c b/gnulib-tests/test-ignore-value.c index 7c4b2de..ca77294 100644 --- a/gnulib-tests/test-ignore-value.c +++ b/gnulib-tests/test-ignore-value.c @@ -1,6 +1,6 @@ /* Test the "ignore-value" module. - Copyright (C) 2011-2016 Free Software Foundation, Inc. + Copyright (C) 2011-2017 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/gnulib-tests/test-inet_pton.c b/gnulib-tests/test-inet_pton.c index 3d12556..fea261e 100644 --- a/gnulib-tests/test-inet_pton.c +++ b/gnulib-tests/test-inet_pton.c @@ -1,5 +1,5 @@ /* Test of inet_pton function. - Copyright (C) 2009-2016 Free Software Foundation, Inc. + Copyright (C) 2009-2017 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/gnulib-tests/test-init.sh b/gnulib-tests/test-init.sh index 1dd05f4..98fe2c0 100755 --- a/gnulib-tests/test-init.sh +++ b/gnulib-tests/test-init.sh @@ -1,6 +1,6 @@ #!/bin/sh # Unit tests for init.sh -# Copyright (C) 2011-2016 Free Software Foundation, Inc. +# Copyright (C) 2011-2017 Free Software Foundation, Inc. # This file is part of the GNUlib Library. # # This program is free software: you can redistribute it and/or modify @@ -57,7 +57,8 @@ EOF # Also remove the @@ line, since Solaris 5.10 and GNU diff formats differ: # -@@ -0,0 +1 @@ # +@@ -1,0 +1,1 @@ - sed 's/ .*//;/^@@/d' out > k && mv k out + # Also, remove space after leading '+', since AIX 7.1 diff outputs a space. + sed 's/ .*//;/^@@/d;s/^+ /+/' out > k && mv k out cat <<\EOF > exp --- empty +++ in diff --git a/gnulib-tests/test-intprops.c b/gnulib-tests/test-intprops.c index 0a8ddcd..a030e73 100644 --- a/gnulib-tests/test-intprops.c +++ b/gnulib-tests/test-intprops.c @@ -1,5 +1,5 @@ /* Test intprops.h. - Copyright (C) 2011-2016 Free Software Foundation, Inc. + Copyright (C) 2011-2017 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -113,11 +113,32 @@ main (void) VERIFY (TYPE_MAXIMUM (long int) == LONG_MAX); VERIFY (TYPE_MINIMUM (unsigned long int) == 0); VERIFY (TYPE_MAXIMUM (unsigned long int) == ULONG_MAX); + #ifdef LLONG_MAX + verify (TYPE_MINIMUM (long long int) == LLONG_MIN); + verify (TYPE_MAXIMUM (long long int) == LLONG_MAX); + #endif VERIFY (TYPE_MINIMUM (intmax_t) == INTMAX_MIN); VERIFY (TYPE_MAXIMUM (intmax_t) == INTMAX_MAX); VERIFY (TYPE_MINIMUM (uintmax_t) == 0); VERIFY (TYPE_MAXIMUM (uintmax_t) == UINTMAX_MAX); + /* TYPE_WIDTH. */ + #ifdef CHAR_WIDTH + verify (TYPE_WIDTH (char) == CHAR_WIDTH); + verify (TYPE_WIDTH (signed char) == SCHAR_WIDTH); + verify (TYPE_WIDTH (unsigned char) == UCHAR_WIDTH); + verify (TYPE_WIDTH (short int) == SHRT_WIDTH); + verify (TYPE_WIDTH (unsigned short int) == USHRT_WIDTH); + verify (TYPE_WIDTH (int) == INT_WIDTH); + verify (TYPE_WIDTH (unsigned int) == UINT_WIDTH); + verify (TYPE_WIDTH (long int) == LONG_WIDTH); + verify (TYPE_WIDTH (unsigned long int) == ULONG_WIDTH); + #ifdef LLONG_WIDTH + verify (TYPE_WIDTH (long long int) == LLONG_WIDTH); + verify (TYPE_WIDTH (unsigned long long int) == ULLONG_WIDTH); + #endif + #endif + /* INT_BITS_STRLEN_BOUND. */ VERIFY (INT_BITS_STRLEN_BOUND (1) == 1); VERIFY (INT_BITS_STRLEN_BOUND (2620) == 789); diff --git a/gnulib-tests/test-inttostr.c b/gnulib-tests/test-inttostr.c index 18ff4a2..19c6d8a 100644 --- a/gnulib-tests/test-inttostr.c +++ b/gnulib-tests/test-inttostr.c @@ -1,5 +1,5 @@ /* Test inttostr functions, and incidentally, INT_BUFSIZE_BOUND - Copyright (C) 2010-2016 Free Software Foundation, Inc. + Copyright (C) 2010-2017 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/gnulib-tests/test-inttypes.c b/gnulib-tests/test-inttypes.c index 9a3193c..d6524c7 100644 --- a/gnulib-tests/test-inttypes.c +++ b/gnulib-tests/test-inttypes.c @@ -1,5 +1,5 @@ /* Test of <inttypes.h> substitute. - Copyright (C) 2006-2007, 2009-2016 Free Software Foundation, Inc. + Copyright (C) 2006-2007, 2009-2017 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/gnulib-tests/test-ioctl.c b/gnulib-tests/test-ioctl.c index db7ab9e..8709104 100644 --- a/gnulib-tests/test-ioctl.c +++ b/gnulib-tests/test-ioctl.c @@ -1,5 +1,5 @@ /* Test of ioctl() function. - Copyright (C) 2011-2016 Free Software Foundation, Inc. + Copyright (C) 2011-2017 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/gnulib-tests/test-isblank.c b/gnulib-tests/test-isblank.c index 2f6f676..54769dd 100644 --- a/gnulib-tests/test-isblank.c +++ b/gnulib-tests/test-isblank.c @@ -1,5 +1,5 @@ /* Test of isblank() function. - Copyright (C) 2009-2016 Free Software Foundation, Inc. + Copyright (C) 2009-2017 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/gnulib-tests/test-iswblank.c b/gnulib-tests/test-iswblank.c index 175718f..9175f0c 100644 --- a/gnulib-tests/test-iswblank.c +++ b/gnulib-tests/test-iswblank.c @@ -1,5 +1,5 @@ /* Test of iswblank() function. - Copyright (C) 2007-2016 Free Software Foundation, Inc. + Copyright (C) 2007-2017 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/gnulib-tests/test-langinfo.c b/gnulib-tests/test-langinfo.c index 30b0007..f1c9429 100644 --- a/gnulib-tests/test-langinfo.c +++ b/gnulib-tests/test-langinfo.c @@ -1,5 +1,5 @@ /* Test of <langinfo.h> substitute. - Copyright (C) 2009-2016 Free Software Foundation, Inc. + Copyright (C) 2009-2017 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/gnulib-tests/test-limits-h.c b/gnulib-tests/test-limits-h.c new file mode 100644 index 0000000..15a291f --- /dev/null +++ b/gnulib-tests/test-limits-h.c @@ -0,0 +1,50 @@ +/* Test of <limits.h> substitute. + Copyright 2016-2017 Free Software Foundation, Inc. + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see <http://www.gnu.org/licenses/>. */ + +/* Written by Paul Eggert. */ + +#include <config.h> + +#include <limits.h> + +#include "verify.h" + +#if 4 < __GNUC__ + (3 <= __GNUC_MINOR__) +# pragma GCC diagnostic ignored "-Woverlength-strings" +#endif + +/* Macros specified by ISO/IEC TS 18661-1:2014. */ + +#define verify_width(width, min, max) \ + verify ((max) >> ((width) - 1 - ((min) < 0)) == 1) + +verify_width (CHAR_WIDTH, CHAR_MIN, CHAR_MAX); +verify_width (SCHAR_WIDTH, SCHAR_MIN, SCHAR_MAX); +verify_width (UCHAR_WIDTH, 0, UCHAR_MAX); +verify_width (SHRT_WIDTH, SHRT_MIN, SHRT_MAX); +verify_width (USHRT_WIDTH, 0, USHRT_MAX); +verify_width (INT_WIDTH, INT_MIN, INT_MAX); +verify_width (UINT_WIDTH, 0, UINT_MAX); +verify_width (LONG_WIDTH, LONG_MIN, LONG_MAX); +verify_width (ULONG_WIDTH, 0, ULONG_MAX); +verify_width (LLONG_WIDTH, LLONG_MIN, LLONG_MAX); +verify_width (ULLONG_WIDTH, 0, ULLONG_MAX); + +int +main (void) +{ + return 0; +} diff --git a/gnulib-tests/test-listen.c b/gnulib-tests/test-listen.c index 4bc66fc..e67b3b6 100644 --- a/gnulib-tests/test-listen.c +++ b/gnulib-tests/test-listen.c @@ -1,5 +1,5 @@ /* Test listen() function. - Copyright (C) 2011-2016 Free Software Foundation, Inc. + Copyright (C) 2011-2017 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/gnulib-tests/test-locale.c b/gnulib-tests/test-locale.c index c1811af..749adf3 100644 --- a/gnulib-tests/test-locale.c +++ b/gnulib-tests/test-locale.c @@ -1,5 +1,5 @@ /* Test of <locale.h> substitute. - Copyright (C) 2007, 2009-2016 Free Software Foundation, Inc. + Copyright (C) 2007, 2009-2017 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/gnulib-tests/test-localeconv.c b/gnulib-tests/test-localeconv.c index 9e83f2d..2fb5c41 100644 --- a/gnulib-tests/test-localeconv.c +++ b/gnulib-tests/test-localeconv.c @@ -1,5 +1,5 @@ /* Test of localeconv() function. - Copyright (C) 2012-2016 Free Software Foundation, Inc. + Copyright (C) 2012-2017 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -37,13 +37,13 @@ main () ASSERT (STREQ (l->decimal_point, ".")); ASSERT (STREQ (l->thousands_sep, "")); -#if !(defined __FreeBSD__ || defined __sun) +#if !((defined __FreeBSD__ || defined __DragonFly__) || defined __sun) ASSERT (STREQ (l->grouping, "")); #endif ASSERT (STREQ (l->mon_decimal_point, "")); ASSERT (STREQ (l->mon_thousands_sep, "")); -#if !(defined __FreeBSD__ || defined __sun) +#if !((defined __FreeBSD__ || defined __DragonFly__) || defined __sun) ASSERT (STREQ (l->mon_grouping, "")); #endif ASSERT (STREQ (l->positive_sign, "")); diff --git a/gnulib-tests/test-lstat.c b/gnulib-tests/test-lstat.c index 86ff465..20e83a6 100644 --- a/gnulib-tests/test-lstat.c +++ b/gnulib-tests/test-lstat.c @@ -1,5 +1,5 @@ /* Test of lstat() function. - Copyright (C) 2008-2016 Free Software Foundation, Inc. + Copyright (C) 2008-2017 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/gnulib-tests/test-lstat.h b/gnulib-tests/test-lstat.h index 4eb9036..b5815f6 100644 --- a/gnulib-tests/test-lstat.h +++ b/gnulib-tests/test-lstat.h @@ -1,5 +1,5 @@ /* Test of lstat() function. - Copyright (C) 2008-2016 Free Software Foundation, Inc. + Copyright (C) 2008-2017 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/gnulib-tests/test-malloca.c b/gnulib-tests/test-malloca.c index e9ab83d..11f0f79 100644 --- a/gnulib-tests/test-malloca.c +++ b/gnulib-tests/test-malloca.c @@ -1,5 +1,5 @@ /* Test of safe automatic memory allocation. - Copyright (C) 2005, 2007, 2009-2016 Free Software Foundation, Inc. + Copyright (C) 2005, 2007, 2009-2017 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/gnulib-tests/test-mbrtowc-w32.c b/gnulib-tests/test-mbrtowc-w32.c index f637330..70afc87 100644 --- a/gnulib-tests/test-mbrtowc-w32.c +++ b/gnulib-tests/test-mbrtowc-w32.c @@ -1,5 +1,5 @@ /* Test of conversion of multibyte character to wide character. - Copyright (C) 2008-2016 Free Software Foundation, Inc. + Copyright (C) 2008-2017 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -325,14 +325,12 @@ test_one_locale (const char *name, int codepage) memset (&state, '\0', sizeof (mbstate_t)); wc = (wchar_t) 0xBADFACE; ret = mbrtowc (&wc, "\377", 1, &state); /* 0xFF */ - ASSERT (ret == (size_t)-1); - ASSERT (errno == EILSEQ); + ASSERT ((ret == (size_t)-1 && errno == EILSEQ) || ret == (size_t)-2); memset (&state, '\0', sizeof (mbstate_t)); wc = (wchar_t) 0xBADFACE; ret = mbrtowc (&wc, "\225\377", 2, &state); /* 0x95 0xFF */ - ASSERT (ret == (size_t)-1); - ASSERT (errno == EILSEQ); + ASSERT ((ret == (size_t)-1 && errno == EILSEQ) || (ret == 2 && wc == 0x30FB)); } return 0; @@ -397,14 +395,12 @@ test_one_locale (const char *name, int codepage) memset (&state, '\0', sizeof (mbstate_t)); wc = (wchar_t) 0xBADFACE; ret = mbrtowc (&wc, "\377", 1, &state); /* 0xFF */ - ASSERT (ret == (size_t)-1); - ASSERT (errno == EILSEQ); + ASSERT ((ret == (size_t)-1 && errno == EILSEQ) || ret == (size_t)-2); memset (&state, '\0', sizeof (mbstate_t)); wc = (wchar_t) 0xBADFACE; ret = mbrtowc (&wc, "\225\377", 2, &state); /* 0x95 0xFF */ - ASSERT (ret == (size_t)-1); - ASSERT (errno == EILSEQ); + ASSERT ((ret == (size_t)-1 && errno == EILSEQ) || (ret == 2 && wc == '?')); } return 0; @@ -469,14 +465,12 @@ test_one_locale (const char *name, int codepage) memset (&state, '\0', sizeof (mbstate_t)); wc = (wchar_t) 0xBADFACE; ret = mbrtowc (&wc, "\377", 1, &state); /* 0xFF */ - ASSERT (ret == (size_t)-1); - ASSERT (errno == EILSEQ); + ASSERT ((ret == (size_t)-1 && errno == EILSEQ) || ret == (size_t)-2); memset (&state, '\0', sizeof (mbstate_t)); wc = (wchar_t) 0xBADFACE; ret = mbrtowc (&wc, "\225\377", 2, &state); /* 0x95 0xFF */ - ASSERT (ret == (size_t)-1); - ASSERT (errno == EILSEQ); + ASSERT ((ret == (size_t)-1 && errno == EILSEQ) || (ret == 2 && wc == '?')); } return 0; diff --git a/gnulib-tests/test-mbrtowc.c b/gnulib-tests/test-mbrtowc.c index f7fed6a..70c8a2a 100644 --- a/gnulib-tests/test-mbrtowc.c +++ b/gnulib-tests/test-mbrtowc.c @@ -1,5 +1,5 @@ /* Test of conversion of multibyte character to wide character. - Copyright (C) 2008-2016 Free Software Foundation, Inc. + Copyright (C) 2008-2017 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -75,7 +75,7 @@ main (int argc, char *argv[]) default: if (! (c && 1 < argc && argv[1][0] == '5')) break; - /* Fall through. */ + FALLTHROUGH; case '\t': case '\v': case '\f': case ' ': case '!': case '"': case '#': case '%': case '&': case '\'': case '(': case ')': case '*': diff --git a/gnulib-tests/test-mbscasecmp.c b/gnulib-tests/test-mbscasecmp.c index 76b6772..4b15726 100644 --- a/gnulib-tests/test-mbscasecmp.c +++ b/gnulib-tests/test-mbscasecmp.c @@ -1,5 +1,5 @@ /* Test of case-insensitive string comparison function. - Copyright (C) 2007-2016 Free Software Foundation, Inc. + Copyright (C) 2007-2017 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/gnulib-tests/test-mbsinit.c b/gnulib-tests/test-mbsinit.c index 8cd1c4d..315937c 100644 --- a/gnulib-tests/test-mbsinit.c +++ b/gnulib-tests/test-mbsinit.c @@ -1,5 +1,5 @@ /* Test of test for initial conversion state. - Copyright (C) 2008-2016 Free Software Foundation, Inc. + Copyright (C) 2008-2017 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/gnulib-tests/test-mbsrtowcs.c b/gnulib-tests/test-mbsrtowcs.c index aef88a3..4a47a3f 100644 --- a/gnulib-tests/test-mbsrtowcs.c +++ b/gnulib-tests/test-mbsrtowcs.c @@ -1,5 +1,5 @@ /* Test of conversion of string to wide string. - Copyright (C) 2008-2016 Free Software Foundation, Inc. + Copyright (C) 2008-2017 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/gnulib-tests/test-mbsstr1.c b/gnulib-tests/test-mbsstr1.c index 8b1ac0a..eb1b90e 100644 --- a/gnulib-tests/test-mbsstr1.c +++ b/gnulib-tests/test-mbsstr1.c @@ -1,5 +1,5 @@ /* Test of searching in a string. - Copyright (C) 2007-2016 Free Software Foundation, Inc. + Copyright (C) 2007-2017 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/gnulib-tests/test-mbsstr2.c b/gnulib-tests/test-mbsstr2.c index 919e47c..96078fe 100644 --- a/gnulib-tests/test-mbsstr2.c +++ b/gnulib-tests/test-mbsstr2.c @@ -1,5 +1,5 @@ /* Test of searching in a string. - Copyright (C) 2007-2016 Free Software Foundation, Inc. + Copyright (C) 2007-2017 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/gnulib-tests/test-mbsstr3.c b/gnulib-tests/test-mbsstr3.c index 622f0ec..ffa24dc 100644 --- a/gnulib-tests/test-mbsstr3.c +++ b/gnulib-tests/test-mbsstr3.c @@ -1,5 +1,5 @@ /* Test of searching in a string. - Copyright (C) 2007-2016 Free Software Foundation, Inc. + Copyright (C) 2007-2017 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/gnulib-tests/test-memchr.c b/gnulib-tests/test-memchr.c index 1526ed2..f31bf8c 100644 --- a/gnulib-tests/test-memchr.c +++ b/gnulib-tests/test-memchr.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2008-2016 Free Software Foundation, Inc. + * Copyright (C) 2008-2017 Free Software Foundation, Inc. * Written by Eric Blake and Bruno Haible * * This program is free software: you can redistribute it and/or modify diff --git a/gnulib-tests/test-nanosleep.c b/gnulib-tests/test-nanosleep.c index 26ca73b..04b3229 100644 --- a/gnulib-tests/test-nanosleep.c +++ b/gnulib-tests/test-nanosleep.c @@ -1,5 +1,5 @@ /* Test of nanosleep() function. - Copyright (C) 2009-2016 Free Software Foundation, Inc. + Copyright (C) 2009-2017 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/gnulib-tests/test-netinet_in.c b/gnulib-tests/test-netinet_in.c index 8a603da..20710d7 100644 --- a/gnulib-tests/test-netinet_in.c +++ b/gnulib-tests/test-netinet_in.c @@ -1,5 +1,5 @@ /* Test of <netinet/in.h> substitute. - Copyright (C) 2007, 2009-2016 Free Software Foundation, Inc. + Copyright (C) 2007, 2009-2017 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/gnulib-tests/test-nl_langinfo.c b/gnulib-tests/test-nl_langinfo.c index 3a8fa8f..69a0885 100644 --- a/gnulib-tests/test-nl_langinfo.c +++ b/gnulib-tests/test-nl_langinfo.c @@ -1,5 +1,5 @@ /* Test of nl_langinfo replacement. - Copyright (C) 2009-2016 Free Software Foundation, Inc. + Copyright (C) 2009-2017 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/gnulib-tests/test-open.c b/gnulib-tests/test-open.c index d9e2e27..cfcad6a 100644 --- a/gnulib-tests/test-open.c +++ b/gnulib-tests/test-open.c @@ -1,5 +1,5 @@ /* Test of opening a file descriptor. - Copyright (C) 2007-2016 Free Software Foundation, Inc. + Copyright (C) 2007-2017 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/gnulib-tests/test-open.h b/gnulib-tests/test-open.h index faaff0f..6d01dd9 100644 --- a/gnulib-tests/test-open.h +++ b/gnulib-tests/test-open.h @@ -1,5 +1,5 @@ /* Test of opening a file descriptor. - Copyright (C) 2007-2016 Free Software Foundation, Inc. + Copyright (C) 2007-2017 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/gnulib-tests/test-pathmax.c b/gnulib-tests/test-pathmax.c index ac4a393..7b3510c 100644 --- a/gnulib-tests/test-pathmax.c +++ b/gnulib-tests/test-pathmax.c @@ -1,5 +1,5 @@ /* Test of "pathmax.h". - Copyright (C) 2011-2016 Free Software Foundation, Inc. + Copyright (C) 2011-2017 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/gnulib-tests/test-perror.c b/gnulib-tests/test-perror.c index 164a79c..140e05b 100644 --- a/gnulib-tests/test-perror.c +++ b/gnulib-tests/test-perror.c @@ -1,5 +1,5 @@ /* Test of perror() function. - Copyright (C) 2008-2016 Free Software Foundation, Inc. + Copyright (C) 2008-2017 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/gnulib-tests/test-perror.sh b/gnulib-tests/test-perror.sh index 7274d32..40a3034 100755 --- a/gnulib-tests/test-perror.sh +++ b/gnulib-tests/test-perror.sh @@ -2,9 +2,11 @@ : ${srcdir=.} . "$srcdir/init.sh"; path_prepend_ . -# Test NULL prefix. Result should not contain a number. +# Test NULL prefix. Result should not contain a number, except in lines that +# start with 'EDC' (IBM z/OS libc produces an error identifier before the +# error message). test-perror 2>&1 >/dev/null | LC_ALL=C tr -d '\r' > t-perror.tmp -grep '[0-9]' t-perror.tmp > /dev/null \ +grep -v '^EDC' t-perror.tmp | grep '[0-9]' > /dev/null \ && fail_ "result should not contain a number" # Test empty prefix. Result should be the same. diff --git a/gnulib-tests/test-perror2.c b/gnulib-tests/test-perror2.c index e295576..125961e 100644 --- a/gnulib-tests/test-perror2.c +++ b/gnulib-tests/test-perror2.c @@ -1,5 +1,5 @@ /* Test of perror() function. - Copyright (C) 2011-2016 Free Software Foundation, Inc. + Copyright (C) 2011-2017 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/gnulib-tests/test-pipe.c b/gnulib-tests/test-pipe.c index 4282c05..08cfe92 100644 --- a/gnulib-tests/test-pipe.c +++ b/gnulib-tests/test-pipe.c @@ -1,5 +1,5 @@ /* Test of pipe. - Copyright (C) 2009-2016 Free Software Foundation, Inc. + Copyright (C) 2009-2017 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -29,7 +29,11 @@ SIGNATURE_CHECK (pipe, int, (int[2])); # define WIN32_LEAN_AND_MEAN # include <windows.h> /* Get _get_osfhandle. */ -# include "msvc-nothrow.h" +# if GNULIB_MSVC_NOTHROW +# include "msvc-nothrow.h" +# else +# include <io.h> +# endif #endif #include "binary-io.h" diff --git a/gnulib-tests/test-quotearg-simple.c b/gnulib-tests/test-quotearg-simple.c index 6bb4b35..4bd2312 100644 --- a/gnulib-tests/test-quotearg-simple.c +++ b/gnulib-tests/test-quotearg-simple.c @@ -1,5 +1,5 @@ /* Test of quotearg family of functions. - Copyright (C) 2008-2016 Free Software Foundation, Inc. + Copyright (C) 2008-2017 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -27,7 +27,6 @@ #include <string.h> #include "localcharset.h" -#include "progname.h" #include "macros.h" #include "zerosize-ptr.h" @@ -36,124 +35,125 @@ static struct result_groups results_g[] = { /* literal_quoting_style */ { { "", "\0""1\0", 3, "simple", " \t\n'\"\033?""?/\\", "a:b", "a\\b", - LQ RQ, LQ RQ }, + "a' b", LQ RQ, LQ RQ }, { "", "1", 1, "simple", " \t\n'\"\033?""?/\\", "a:b", "a\\b", - LQ RQ, LQ RQ }, + "a' b", LQ RQ, LQ RQ }, { "", "1", 1, "simple", " \t\n'\"\033?""?/\\", "a:b", "a\\b", - LQ RQ, LQ RQ } }, + "a' b", LQ RQ, LQ RQ } }, /* shell_quoting_style */ { { "''", "\0""1\0", 3, "simple", "' \t\n'\\''\"\033?""?/\\'", "a:b", - "'a\\b'", LQ RQ, LQ RQ }, + "'a\\b'", "\"a' b\"", LQ RQ, LQ RQ }, { "''", "1", 1, "simple", "' \t\n'\\''\"\033?""?/\\'", "a:b", - "'a\\b'", LQ RQ, LQ RQ }, + "'a\\b'", "\"a' b\"", LQ RQ, LQ RQ }, { "''", "1", 1, "simple", "' \t\n'\\''\"\033?""?/\\'", "'a:b'", - "'a\\b'", LQ RQ, LQ RQ } }, + "'a\\b'", "\"a' b\"", LQ RQ, LQ RQ } }, /* shell_always_quoting_style */ { { "''", "'\0""1\0'", 5, "'simple'", "' \t\n'\\''\"\033?""?/\\'", "'a:b'", - "'a\\b'", "'" LQ RQ "'", "'" LQ RQ "'" }, + "'a\\b'", "\"a' b\"", "'" LQ RQ "'", "'" LQ RQ "'" }, { "''", "'1'", 3, "'simple'", "' \t\n'\\''\"\033?""?/\\'", "'a:b'", - "'a\\b'", "'" LQ RQ "'", "'" LQ RQ "'" }, + "'a\\b'", "\"a' b\"", "'" LQ RQ "'", "'" LQ RQ "'" }, { "''", "'1'", 3, "'simple'", "' \t\n'\\''\"\033?""?/\\'", "'a:b'", - "'a\\b'", "'" LQ RQ "'", "'" LQ RQ "'" } }, + "'a\\b'", "\"a' b\"", "'" LQ RQ "'", "'" LQ RQ "'" } }, /* shell_escape_quoting_style */ { { "''", "''$'\\0''1'$'\\0'", 15, "simple", "' '$'\\t\\n'\\''\"'$'\\033''?""?/\\'", "a:b", - "'a\\b'", "''$'" LQ_ENC RQ_ENC "'", LQ RQ }, + "'a\\b'", "\"a' b\"", "''$'" LQ_ENC RQ_ENC "'", LQ RQ }, { "''", "''$'\\0''1'$'\\0'", 15, "simple", "' '$'\\t\\n'\\''\"'$'\\033''?""?/\\'", "a:b", - "'a\\b'", "''$'" LQ_ENC RQ_ENC "'", LQ RQ }, + "'a\\b'", "\"a' b\"", "''$'" LQ_ENC RQ_ENC "'", LQ RQ }, { "''", "''$'\\0''1'$'\\0'", 15, "simple", "' '$'\\t\\n'\\''\"'$'\\033''?""?/\\'", "'a:b'", - "'a\\b'", "''$'" LQ_ENC RQ_ENC "'", LQ RQ } }, + "'a\\b'", "\"a' b\"", "''$'" LQ_ENC RQ_ENC "'", LQ RQ } }, /* shell_escape_always_quoting_style */ { { "''", "''$'\\0''1'$'\\0'", 15, "'simple'", "' '$'\\t\\n'\\''\"'$'\\033''?""?/\\'", "'a:b'", - "'a\\b'", "''$'" LQ_ENC RQ_ENC "'", "'" LQ RQ "'" }, + "'a\\b'", "\"a' b\"", "''$'" LQ_ENC RQ_ENC "'", "'" LQ RQ "'" }, { "''", "''$'\\0''1'$'\\0'", 15, "'simple'", "' '$'\\t\\n'\\''\"'$'\\033''?""?/\\'", "'a:b'", - "'a\\b'", "''$'" LQ_ENC RQ_ENC "'", "'" LQ RQ "'" }, + "'a\\b'", "\"a' b\"", "''$'" LQ_ENC RQ_ENC "'", "'" LQ RQ "'" }, { "''", "''$'\\0''1'$'\\0'", 15, "'simple'", "' '$'\\t\\n'\\''\"'$'\\033''?""?/\\'", "'a:b'", - "'a\\b'", "''$'" LQ_ENC RQ_ENC "'", "'" LQ RQ "'" } }, + "'a\\b'", "\"a' b\"", "''$'" LQ_ENC RQ_ENC "'", "'" LQ RQ "'" } }, /* c_quoting_style */ { { "\"\"", "\"\\0001\\0\"", 9, "\"simple\"", "\" \\t\\n'\\\"\\033?""?/\\\\\"", "\"a:b\"", "\"a\\\\b\"", - "\"" LQ_ENC RQ_ENC "\"", "\"" LQ RQ "\"" }, + "\"a' b\"", "\"" LQ_ENC RQ_ENC "\"", "\"" LQ RQ "\"" }, { "\"\"", "\"\\0001\\0\"", 9, "\"simple\"", "\" \\t\\n'\\\"\\033?""?/\\\\\"", "\"a:b\"", "\"a\\\\b\"", - "\"" LQ_ENC RQ_ENC "\"", "\"" LQ RQ "\"" }, + "\"a' b\"", "\"" LQ_ENC RQ_ENC "\"", "\"" LQ RQ "\"" }, { "\"\"", "\"\\0001\\0\"", 9, "\"simple\"", "\" \\t\\n'\\\"\\033?""?/\\\\\"", "\"a\\:b\"", "\"a\\\\b\"", - "\"" LQ_ENC RQ_ENC "\"", "\"" LQ RQ "\"" } }, + "\"a' b\"", "\"" LQ_ENC RQ_ENC "\"", "\"" LQ RQ "\"" } }, /* c_maybe_quoting_style */ { { "", "\"\\0001\\0\"", 9, "simple", "\" \\t\\n'\\\"\\033?""?/\\\\\"", - "a:b", "a\\b", "\"" LQ_ENC RQ_ENC "\"", LQ RQ }, + "a:b", "a\\b", "a' b", "\"" LQ_ENC RQ_ENC "\"", LQ RQ }, { "", "\"\\0001\\0\"", 9, "simple", "\" \\t\\n'\\\"\\033?""?/\\\\\"", - "a:b", "a\\b", "\"" LQ_ENC RQ_ENC "\"", LQ RQ }, + "a:b", "a\\b", "a' b", "\"" LQ_ENC RQ_ENC "\"", LQ RQ }, { "", "\"\\0001\\0\"", 9, "simple", "\" \\t\\n'\\\"\\033?""?/\\\\\"", - "\"a:b\"", "a\\b", "\"" LQ_ENC RQ_ENC "\"", LQ RQ } }, + "\"a:b\"", "a\\b", "a' b", "\"" LQ_ENC RQ_ENC "\"", LQ RQ } }, /* escape_quoting_style */ { { "", "\\0001\\0", 7, "simple", " \\t\\n'\"\\033?""?/\\\\", "a:b", - "a\\\\b", LQ_ENC RQ_ENC, LQ RQ }, + "a\\\\b", "a' b", LQ_ENC RQ_ENC, LQ RQ }, { "", "\\0001\\0", 7, "simple", " \\t\\n'\"\\033?""?/\\\\", "a:b", - "a\\\\b", LQ_ENC RQ_ENC, LQ RQ }, + "a\\\\b", "a' b", LQ_ENC RQ_ENC, LQ RQ }, { "", "\\0001\\0", 7, "simple", " \\t\\n'\"\\033?""?/\\\\", "a\\:b", - "a\\\\b", LQ_ENC RQ_ENC, LQ RQ } }, + "a\\\\b", "a' b", LQ_ENC RQ_ENC, LQ RQ } }, /* locale_quoting_style */ { { "''", "'\\0001\\0'", 9, "'simple'", "' \\t\\n\\'\"\\033?""?/\\\\'", - "'a:b'", "'a\\\\b'", "'" LQ_ENC RQ_ENC "'", "'" LQ RQ "'" }, + "'a:b'", "'a\\\\b'", "'a\\' b'", "'" LQ_ENC RQ_ENC "'", "'" LQ RQ "'" }, { "''", "'\\0001\\0'", 9, "'simple'", "' \\t\\n\\'\"\\033?""?/\\\\'", - "'a:b'", "'a\\\\b'", "'" LQ_ENC RQ_ENC "'", "'" LQ RQ "'" }, + "'a:b'", "'a\\\\b'", "'a\\' b'", "'" LQ_ENC RQ_ENC "'", "'" LQ RQ "'" }, { "''", "'\\0001\\0'", 9, "'simple'", "' \\t\\n\\'\"\\033?""?/\\\\'", - "'a\\:b'", "'a\\\\b'", "'" LQ_ENC RQ_ENC "'", "'" LQ RQ "'" } }, + "'a\\:b'", "'a\\\\b'", "'a\\' b'", + "'" LQ_ENC RQ_ENC "'", "'" LQ RQ "'" } }, /* clocale_quoting_style */ { { "\"\"", "\"\\0001\\0\"", 9, "\"simple\"", "\" \\t\\n'\\\"\\033?""?/\\\\\"", "\"a:b\"", "\"a\\\\b\"", - "\"" LQ_ENC RQ_ENC "\"", "\"" LQ RQ "\"" }, + "\"a' b\"", "\"" LQ_ENC RQ_ENC "\"", "\"" LQ RQ "\"" }, { "\"\"", "\"\\0001\\0\"", 9, "\"simple\"", "\" \\t\\n'\\\"\\033?""?/\\\\\"", "\"a:b\"", "\"a\\\\b\"", - "\"" LQ_ENC RQ_ENC "\"", "\"" LQ RQ "\"" }, + "\"a' b\"", "\"" LQ_ENC RQ_ENC "\"", "\"" LQ RQ "\"" }, { "\"\"", "\"\\0001\\0\"", 9, "\"simple\"", "\" \\t\\n'\\\"\\033?""?/\\\\\"", "\"a\\:b\"", "\"a\\\\b\"", - "\"" LQ_ENC RQ_ENC "\"", "\"" LQ RQ "\"" } } + "\"a' b\"", "\"" LQ_ENC RQ_ENC "\"", "\"" LQ RQ "\"" } } }; static struct result_groups flag_results[] = { /* literal_quoting_style and QA_ELIDE_NULL_BYTES */ - { { "", "1", 1, "simple", " \t\n'\"\033?""?/\\", "a:b", "a\\b", LQ RQ, - LQ RQ }, - { "", "1", 1, "simple", " \t\n'\"\033?""?/\\", "a:b", "a\\b", LQ RQ, - LQ RQ }, - { "", "1", 1, "simple", " \t\n'\"\033?""?/\\", "a:b", "a\\b", LQ RQ, - LQ RQ } }, + { { "", "1", 1, "simple", " \t\n'\"\033?""?/\\", "a:b", "a\\b", "a' b", + LQ RQ, LQ RQ }, + { "", "1", 1, "simple", " \t\n'\"\033?""?/\\", "a:b", "a\\b", "a' b", + LQ RQ, LQ RQ }, + { "", "1", 1, "simple", " \t\n'\"\033?""?/\\", "a:b", "a\\b", "a' b", + LQ RQ, LQ RQ } }, /* c_quoting_style and QA_ELIDE_OUTER_QUOTES */ { { "", "\"\\0001\\0\"", 9, "simple", "\" \\t\\n'\\\"\\033?""?/\\\\\"", - "a:b", "a\\b", "\"" LQ_ENC RQ_ENC "\"", LQ RQ }, + "a:b", "a\\b", "a' b", "\"" LQ_ENC RQ_ENC "\"", LQ RQ }, { "", "\"\\0001\\0\"", 9, "simple", "\" \\t\\n'\\\"\\033?""?/\\\\\"", - "a:b", "a\\b", "\"" LQ_ENC RQ_ENC "\"", LQ RQ }, + "a:b", "a\\b", "a' b", "\"" LQ_ENC RQ_ENC "\"", LQ RQ }, { "", "\"\\0001\\0\"", 9, "simple", "\" \\t\\n'\\\"\\033?""?/\\\\\"", - "\"a:b\"", "a\\b", "\"" LQ_ENC RQ_ENC "\"", LQ RQ } }, + "\"a:b\"", "a\\b", "a' b", "\"" LQ_ENC RQ_ENC "\"", LQ RQ } }, /* c_quoting_style and QA_SPLIT_TRIGRAPHS */ { { "\"\"", "\"\\0001\\0\"", 9, "\"simple\"", "\" \\t\\n'\\\"\\033?\"\"?/\\\\\"", "\"a:b\"", "\"a\\\\b\"", - "\"" LQ_ENC RQ_ENC "\"", "\"" LQ RQ "\"" }, + "\"a' b\"", "\"" LQ_ENC RQ_ENC "\"", "\"" LQ RQ "\"" }, { "\"\"", "\"\\0001\\0\"", 9, "\"simple\"", "\" \\t\\n'\\\"\\033?\"\"?/\\\\\"", "\"a:b\"", "\"a\\\\b\"", - "\"" LQ_ENC RQ_ENC "\"", "\"" LQ RQ "\"" }, + "\"a' b\"", "\"" LQ_ENC RQ_ENC "\"", "\"" LQ RQ "\"" }, { "\"\"", "\"\\0001\\0\"", 9, "\"simple\"", "\" \\t\\n'\\\"\\033?\"\"?/\\\\\"", "\"a\\:b\"", "\"a\\\\b\"", - "\"" LQ_ENC RQ_ENC "\"", "\"" LQ RQ "\"" } } + "\"a' b\"", "\"" LQ_ENC RQ_ENC "\"", "\"" LQ RQ "\"" } } }; static char const *custom_quotes[][2] = { @@ -170,89 +170,96 @@ static struct result_groups custom_results[] = { /* left_quote = right_quote = "" */ { { "", "\\0001\\0", 7, "simple", " \\t\\n'\"\\033?""?/\\\\", "a:b", "a\\\\b", - LQ_ENC RQ_ENC, LQ RQ }, + "a' b", LQ_ENC RQ_ENC, LQ RQ }, { "", "\\0001\\0", 7, "simple", " \\t\\n'\"\\033?""?/\\\\", "a:b", "a\\\\b", - LQ_ENC RQ_ENC, LQ RQ }, + "a' b", LQ_ENC RQ_ENC, LQ RQ }, { "", "\\0001\\0", 7, "simple", " \\t\\n'\"\\033?""?/\\\\", "a\\:b", "a\\\\b", - LQ_ENC RQ_ENC, LQ RQ } }, + "a' b", LQ_ENC RQ_ENC, LQ RQ } }, /* left_quote = right_quote = "'" */ { { "''", "'\\0001\\0'", 9, "'simple'", "' \\t\\n\\'\"\\033?""?/\\\\'", "'a:b'", "'a\\\\b'", - "'" LQ_ENC RQ_ENC "'", "'" LQ RQ "'" }, + "'a\\' b'", "'" LQ_ENC RQ_ENC "'", "'" LQ RQ "'" }, { "''", "'\\0001\\0'", 9, "'simple'", "' \\t\\n\\'\"\\033?""?/\\\\'", "'a:b'", "'a\\\\b'", - "'" LQ_ENC RQ_ENC "'", "'" LQ RQ "'" }, + "'a\\' b'", "'" LQ_ENC RQ_ENC "'", "'" LQ RQ "'" }, { "''", "'\\0001\\0'", 9, "'simple'", "' \\t\\n\\'\"\\033?""?/\\\\'", "'a\\:b'", "'a\\\\b'", - "'" LQ_ENC RQ_ENC "'", "'" LQ RQ "'" } }, + "'a\\' b'", "'" LQ_ENC RQ_ENC "'", "'" LQ RQ "'" } }, /* left_quote = "(" and right_quote = ")" */ { { "()", "(\\0001\\0)", 9, "(simple)", "( \\t\\n'\"\\033?""?/\\\\)", "(a:b)", "(a\\\\b)", - "(" LQ_ENC RQ_ENC ")", "(" LQ RQ ")" }, + "(a' b)", "(" LQ_ENC RQ_ENC ")", "(" LQ RQ ")" }, { "()", "(\\0001\\0)", 9, "(simple)", "( \\t\\n'\"\\033?""?/\\\\)", "(a:b)", "(a\\\\b)", - "(" LQ_ENC RQ_ENC ")", "(" LQ RQ ")" }, + "(a' b)", "(" LQ_ENC RQ_ENC ")", "(" LQ RQ ")" }, { "()", "(\\0001\\0)", 9, "(simple)", "( \\t\\n'\"\\033?""?/\\\\)", "(a\\:b)", "(a\\\\b)", - "(" LQ_ENC RQ_ENC ")", "(" LQ RQ ")" } }, + "(a' b)", "(" LQ_ENC RQ_ENC ")", "(" LQ RQ ")" } }, /* left_quote = ":" and right_quote = " " */ { { ": ", ":\\0001\\0 ", 9, ":simple ", ":\\ \\t\\n'\"\\033?""?/\\\\ ", ":a:b ", ":a\\\\b ", - ":" LQ_ENC RQ_ENC " ", ":" LQ RQ " " }, + ":a'\\ b ", ":" LQ_ENC RQ_ENC " ", ":" LQ RQ " " }, { ": ", ":\\0001\\0 ", 9, ":simple ", ":\\ \\t\\n'\"\\033?""?/\\\\ ", ":a:b ", ":a\\\\b ", - ":" LQ_ENC RQ_ENC " ", ":" LQ RQ " " }, + ":a'\\ b ", ":" LQ_ENC RQ_ENC " ", ":" LQ RQ " " }, { ": ", ":\\0001\\0 ", 9, ":simple ", ":\\ \\t\\n'\"\\033?""?/\\\\ ", ":a\\:b ", ":a\\\\b ", - ":" LQ_ENC RQ_ENC " ", ":" LQ RQ " " } }, + ":a'\\ b ", ":" LQ_ENC RQ_ENC " ", ":" LQ RQ " " } }, /* left_quote = " " and right_quote = ":" */ { { " :", " \\0001\\0:", 9, " simple:", " \\t\\n'\"\\033?""?/\\\\:", " a\\:b:", " a\\\\b:", - " " LQ_ENC RQ_ENC ":", " " LQ RQ ":" }, + " a' b:", " " LQ_ENC RQ_ENC ":", " " LQ RQ ":" }, { " :", " \\0001\\0:", 9, " simple:", " \\t\\n'\"\\033?""?/\\\\:", " a\\:b:", " a\\\\b:", - " " LQ_ENC RQ_ENC ":", " " LQ RQ ":" }, + " a' b:", " " LQ_ENC RQ_ENC ":", " " LQ RQ ":" }, { " :", " \\0001\\0:", 9, " simple:", " \\t\\n'\"\\033?""?/\\\\:", " a\\:b:", " a\\\\b:", - " " LQ_ENC RQ_ENC ":", " " LQ RQ ":" } }, + " a' b:", " " LQ_ENC RQ_ENC ":", " " LQ RQ ":" } }, /* left_quote = "# " and right_quote = "\n" */ { { "# \n", "# \\0001\\0\n", 10, "# simple\n", "# \\t\\n'\"\\033?""?/\\\\\n", "# a:b\n", "# a\\\\b\n", - "# " LQ_ENC RQ_ENC "\n", "# " LQ RQ "\n" }, + "# a' b\n", "# " LQ_ENC RQ_ENC "\n", "# " LQ RQ "\n" }, { "# \n", "# \\0001\\0\n", 10, "# simple\n", "# \\t\\n'\"\\033?""?/\\\\\n", "# a:b\n", "# a\\\\b\n", - "# " LQ_ENC RQ_ENC "\n", "# " LQ RQ "\n" }, + "# a' b\n", "# " LQ_ENC RQ_ENC "\n", "# " LQ RQ "\n" }, { "# \n", "# \\0001\\0\n", 10, "# simple\n", "# \\t\\n'\"\\033?""?/\\\\\n", "# a\\:b\n", "# a\\\\b\n", - "# " LQ_ENC RQ_ENC "\n", "# " LQ RQ "\n" } }, + "# a' b\n", "# " LQ_ENC RQ_ENC "\n", "# " LQ RQ "\n" } }, /* left_quote = "\"'" and right_quote = "'\"" */ { { "\"''\"", "\"'\\0001\\0'\"", 11, "\"'simple'\"", "\"' \\t\\n\\'\"\\033?""?/\\\\'\"", "\"'a:b'\"", "\"'a\\\\b'\"", - "\"'" LQ_ENC RQ_ENC "'\"", "\"'" LQ RQ "'\"" }, + "\"'a' b'\"", "\"'" LQ_ENC RQ_ENC "'\"", "\"'" LQ RQ "'\"" }, { "\"''\"", "\"'\\0001\\0'\"", 11, "\"'simple'\"", "\"' \\t\\n\\'\"\\033?""?/\\\\'\"", "\"'a:b'\"", "\"'a\\\\b'\"", - "\"'" LQ_ENC RQ_ENC "'\"", "\"'" LQ RQ "'\"" }, + "\"'a' b'\"", "\"'" LQ_ENC RQ_ENC "'\"", "\"'" LQ RQ "'\"" }, { "\"''\"", "\"'\\0001\\0'\"", 11, "\"'simple'\"", "\"' \\t\\n\\'\"\\033?""?/\\\\'\"", "\"'a\\:b'\"", "\"'a\\\\b'\"", - "\"'" LQ_ENC RQ_ENC "'\"", "\"'" LQ RQ "'\"" } } + "\"'a' b'\"", "\"'" LQ_ENC RQ_ENC "'\"", "\"'" LQ RQ "'\"" } } }; +static char * +use_quote_double_quotes (const char *str, size_t *len) +{ + char *p = *len == SIZE_MAX ? quotearg_char (str, '"') + : quotearg_char_mem (str, *len, '"'); + *len = strlen (p); + return p; +} + int main (int argc _GL_UNUSED, char *argv[]) { int i; bool ascii_only = MB_CUR_MAX == 1 && !isprint ((unsigned char) LQ[0]); - set_program_name (argv[0]); - /* This part of the program is hard-wired to the C locale since it does not call setlocale. However, according to POSIX, the use of 8-bit bytes in a character context in the C locale gives diff --git a/gnulib-tests/test-quotearg.h b/gnulib-tests/test-quotearg.h index 7eee6b5..5aee789 100644 --- a/gnulib-tests/test-quotearg.h +++ b/gnulib-tests/test-quotearg.h @@ -1,5 +1,5 @@ /* Test of quotearg family of functions. - Copyright (C) 2008-2016 Free Software Foundation, Inc. + Copyright (C) 2008-2017 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -24,8 +24,9 @@ struct result_strings { char const *str4; /* Translation of " \t\n'\"\033?""?/\\". */ char const *str5; /* Translation of "a:b". */ char const *str6; /* Translation of "a\\b". */ - char const *str7a; /* Translation of LQ RQ, in ASCII charset. */ - char const *str7b; /* Translation of LQ RQ, in Latin1 or UTF-8 charset. */ + char const *str7; /* Translation of "a' b". */ + char const *str8a; /* Translation of LQ RQ, in ASCII charset. */ + char const *str8b; /* Translation of LQ RQ, in Latin1 or UTF-8 charset. */ }; struct result_groups { @@ -43,7 +44,7 @@ struct result_groups { static struct result_strings inputs = { "", "\0001\0", 3, "simple", " \t\n'\"\033?""?/\\", "a:b", "a\\b", - LQ RQ, NULL + "a' b", LQ RQ, NULL }; static void @@ -85,12 +86,16 @@ compare_strings (char *(func) (char const *, size_t *), p = func (inputs.str6, &len); compare (results->str6, strlen (results->str6), p, len); - len = strlen (inputs.str7a); - p = func (inputs.str7a, &len); + len = strlen (inputs.str7); + p = func (inputs.str7, &len); + compare (results->str7, strlen (results->str7), p, len); + + len = strlen (inputs.str8a); + p = func (inputs.str8a, &len); if (ascii_only) - compare (results->str7a, strlen (results->str7a), p, len); + compare (results->str8a, strlen (results->str8a), p, len); else - compare (results->str7b, strlen (results->str7b), p, len); + compare (results->str8b, strlen (results->str8b), p, len); } static char * @@ -114,15 +119,6 @@ use_quotearg (const char *str, size_t *len) } static char * -use_quote_double_quotes (const char *str, size_t *len) -{ - char *p = *len == SIZE_MAX ? quotearg_char (str, '"') - : quotearg_char_mem (str, *len, '"'); - *len = strlen (p); - return p; -} - -static char * use_quotearg_colon (const char *str, size_t *len) { char *p = (*len == SIZE_MAX ? quotearg_colon (str) diff --git a/gnulib-tests/test-raise.c b/gnulib-tests/test-raise.c index b793e97..47c34ce 100644 --- a/gnulib-tests/test-raise.c +++ b/gnulib-tests/test-raise.c @@ -1,5 +1,5 @@ /* Test raising a signal. - Copyright (C) 2011-2016 Free Software Foundation, Inc. + Copyright (C) 2011-2017 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/gnulib-tests/test-rawmemchr.c b/gnulib-tests/test-rawmemchr.c index 4f4ec7b..5480f43 100644 --- a/gnulib-tests/test-rawmemchr.c +++ b/gnulib-tests/test-rawmemchr.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2008-2016 Free Software Foundation, Inc. + * Copyright (C) 2008-2017 Free Software Foundation, Inc. * Written by Eric Blake and Bruno Haible * * This program is free software: you can redistribute it and/or modify diff --git a/gnulib-tests/test-readlink.c b/gnulib-tests/test-readlink.c index fdff6e1..7911cf4 100644 --- a/gnulib-tests/test-readlink.c +++ b/gnulib-tests/test-readlink.c @@ -1,5 +1,5 @@ /* Tests of readlink. - Copyright (C) 2009-2016 Free Software Foundation, Inc. + Copyright (C) 2009-2017 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/gnulib-tests/test-readlink.h b/gnulib-tests/test-readlink.h index cba98f6..674aef8 100644 --- a/gnulib-tests/test-readlink.h +++ b/gnulib-tests/test-readlink.h @@ -1,5 +1,5 @@ /* Tests of readlink. - Copyright (C) 2009-2016 Free Software Foundation, Inc. + Copyright (C) 2009-2017 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/gnulib-tests/test-regex.c b/gnulib-tests/test-regex.c index c0d9824..9173fe8 100644 --- a/gnulib-tests/test-regex.c +++ b/gnulib-tests/test-regex.c @@ -1,5 +1,5 @@ /* Test regular expressions - Copyright 1996-2001, 2003-2016 Free Software Foundation, Inc. + Copyright 1996-2001, 2003-2017 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/gnulib-tests/test-select-fd.c b/gnulib-tests/test-select-fd.c index 452ddb2..d375fc3 100644 --- a/gnulib-tests/test-select-fd.c +++ b/gnulib-tests/test-select-fd.c @@ -1,5 +1,5 @@ /* Test of select() substitute, reading or writing from a given file descriptor. - Copyright (C) 2008-2016 Free Software Foundation, Inc. + Copyright (C) 2008-2017 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/gnulib-tests/test-select-stdin.c b/gnulib-tests/test-select-stdin.c index 0250af4..698ed5b 100644 --- a/gnulib-tests/test-select-stdin.c +++ b/gnulib-tests/test-select-stdin.c @@ -1,5 +1,5 @@ /* Test of select() substitute, reading from stdin. - Copyright (C) 2008-2016 Free Software Foundation, Inc. + Copyright (C) 2008-2017 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/gnulib-tests/test-select.c b/gnulib-tests/test-select.c index 9747923..e7bf488 100644 --- a/gnulib-tests/test-select.c +++ b/gnulib-tests/test-select.c @@ -1,5 +1,5 @@ /* Test of select() substitute. - Copyright (C) 2008-2016 Free Software Foundation, Inc. + Copyright (C) 2008-2017 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/gnulib-tests/test-select.h b/gnulib-tests/test-select.h index f6daba3..aa67ca0 100644 --- a/gnulib-tests/test-select.h +++ b/gnulib-tests/test-select.h @@ -1,5 +1,5 @@ /* Test of select() substitute. - Copyright (C) 2008-2016 Free Software Foundation, Inc. + Copyright (C) 2008-2017 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -292,8 +292,8 @@ test_bad_fd (select_fn my_select) /* On Linux, Mac OS X, *BSD, values of fd like 99 or 399 are discarded by the kernel early and therefore do *not* lead to EBADF, as required by POSIX. */ -# if defined __linux__ || (defined __APPLE__ && defined __MACH__) || defined __FreeBSD__ || defined __OpenBSD__ || defined __NetBSD__ - fd = 16; +# if defined __linux__ || (defined __APPLE__ && defined __MACH__) || (defined __FreeBSD__ || defined __DragonFly__) || defined __OpenBSD__ || defined __NetBSD__ + fd = 14; # else fd = 99; # endif diff --git a/gnulib-tests/test-setenv.c b/gnulib-tests/test-setenv.c index 519dc27..d5e628f 100644 --- a/gnulib-tests/test-setenv.c +++ b/gnulib-tests/test-setenv.c @@ -1,5 +1,5 @@ /* Tests of setenv. - Copyright (C) 2009-2016 Free Software Foundation, Inc. + Copyright (C) 2009-2017 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/gnulib-tests/test-setlocale1.c b/gnulib-tests/test-setlocale1.c index 143c0d8..69e17cb 100644 --- a/gnulib-tests/test-setlocale1.c +++ b/gnulib-tests/test-setlocale1.c @@ -1,5 +1,5 @@ /* Test of setting the current locale. - Copyright (C) 2011-2016 Free Software Foundation, Inc. + Copyright (C) 2011-2017 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/gnulib-tests/test-setlocale2.c b/gnulib-tests/test-setlocale2.c index 52e65d8..32d7bb3 100644 --- a/gnulib-tests/test-setlocale2.c +++ b/gnulib-tests/test-setlocale2.c @@ -1,5 +1,5 @@ /* Test of setting the current locale. - Copyright (C) 2011-2016 Free Software Foundation, Inc. + Copyright (C) 2011-2017 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/gnulib-tests/test-setsockopt.c b/gnulib-tests/test-setsockopt.c index 4b73b82..0347076 100644 --- a/gnulib-tests/test-setsockopt.c +++ b/gnulib-tests/test-setsockopt.c @@ -1,5 +1,5 @@ /* Test setsockopt() function. - Copyright (C) 2011-2016 Free Software Foundation, Inc. + Copyright (C) 2011-2017 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/gnulib-tests/test-sh-quote.c b/gnulib-tests/test-sh-quote.c index a2633ba..a7db744 100644 --- a/gnulib-tests/test-sh-quote.c +++ b/gnulib-tests/test-sh-quote.c @@ -1,5 +1,5 @@ /* Test of sh-quote module. - Copyright (C) 2012-2016 Free Software Foundation, Inc. + Copyright (C) 2012-2017 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -91,7 +91,7 @@ main (void) check_one ("&", "'&'"); /* "'" would be interpreted as the start of a string. */ - check_one ("'foo'bar", "''\\''foo'\\''bar'"); /* or "\"'foo'bar\"" */ + check_one ("'foo'bar", "\"'foo'bar\""); /* '(' at the beginning of argv[0] would introduce a subshell command. */ check_one ("(", "'('"); diff --git a/gnulib-tests/test-sigaction.c b/gnulib-tests/test-sigaction.c index 27c1ecc..b664e11 100644 --- a/gnulib-tests/test-sigaction.c +++ b/gnulib-tests/test-sigaction.c @@ -1,5 +1,5 @@ /* Test of sigaction() function. - Copyright (C) 2008-2016 Free Software Foundation, Inc. + Copyright (C) 2008-2017 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/gnulib-tests/test-signal-h.c b/gnulib-tests/test-signal-h.c index b050839..9ef589b 100644 --- a/gnulib-tests/test-signal-h.c +++ b/gnulib-tests/test-signal-h.c @@ -1,5 +1,5 @@ /* Test of <signal.h> substitute. - Copyright (C) 2009-2016 Free Software Foundation, Inc. + Copyright (C) 2009-2017 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/gnulib-tests/test-sigprocmask.c b/gnulib-tests/test-sigprocmask.c index e759bf1..7c0da7f 100644 --- a/gnulib-tests/test-sigprocmask.c +++ b/gnulib-tests/test-sigprocmask.c @@ -1,5 +1,5 @@ /* Test of sigprocmask. - Copyright (C) 2011-2016 Free Software Foundation, Inc. + Copyright (C) 2011-2017 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/gnulib-tests/test-sleep.c b/gnulib-tests/test-sleep.c index 64f681e..84567cf 100644 --- a/gnulib-tests/test-sleep.c +++ b/gnulib-tests/test-sleep.c @@ -1,5 +1,5 @@ /* Test of sleep() function. - Copyright (C) 2007-2016 Free Software Foundation, Inc. + Copyright (C) 2007-2017 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/gnulib-tests/test-snprintf.c b/gnulib-tests/test-snprintf.c index 9041e4a..06d48be 100644 --- a/gnulib-tests/test-snprintf.c +++ b/gnulib-tests/test-snprintf.c @@ -1,5 +1,5 @@ /* Test of snprintf() function. - Copyright (C) 2007-2016 Free Software Foundation, Inc. + Copyright (C) 2007-2017 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/gnulib-tests/test-sockets.c b/gnulib-tests/test-sockets.c index 2836ed9..cf56968 100644 --- a/gnulib-tests/test-sockets.c +++ b/gnulib-tests/test-sockets.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2008-2016 Free Software Foundation, Inc. + * Copyright (C) 2008-2017 Free Software Foundation, Inc. * Written by Simon Josefsson. * * This program is free software: you can redistribute it and/or modify diff --git a/gnulib-tests/test-stat-time.c b/gnulib-tests/test-stat-time.c index c60ee7a..47849de 100644 --- a/gnulib-tests/test-stat-time.c +++ b/gnulib-tests/test-stat-time.c @@ -1,5 +1,5 @@ /* Test of <stat-time.h>. - Copyright (C) 2007-2016 Free Software Foundation, Inc. + Copyright (C) 2007-2017 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -22,8 +22,10 @@ #include <fcntl.h> #include <signal.h> +#include <stdio.h> #include <sys/stat.h> #include <unistd.h> +#include <time.h> #include "macros.h" @@ -32,6 +34,27 @@ enum { NFILES = 4 }; +static char filename_stamp1[50]; +static char filename_testfile[50]; +static char filename_stamp2[50]; +static char filename_stamp3[50]; + +/* Use file names that are different at each run. + This is necessary for test_birthtime() to pass on native Windows: + On this platform, the file system apparently remembers the creation time + of a file even after it is removed and created anew. See + "Windows NT Contains File System Tunneling Capabilities" + <https://support.microsoft.com/en-us/help/172190/> */ +static void +initialize_filenames (void) +{ + long t = (long) time (NULL); + sprintf (filename_stamp1, "t-stt-%ld-stamp1", t); + sprintf (filename_testfile, "t-stt-%ld-testfile", t); + sprintf (filename_stamp2, "t-stt-%ld-stamp2", t); + sprintf (filename_stamp3, "t-stt-%ld-stamp3", t); +} + static int force_unlink (const char *filename) { @@ -45,11 +68,10 @@ static void cleanup (int sig) { /* Remove temporary files. */ - force_unlink ("t-stt-stamp1"); - force_unlink ("t-stt-testfile"); - force_unlink ("t-stt-stamp2"); - force_unlink ("t-stt-renamed"); - force_unlink ("t-stt-stamp3"); + force_unlink (filename_stamp1); + force_unlink (filename_testfile); + force_unlink (filename_stamp2); + force_unlink (filename_stamp3); if (sig != 0) _exit (1); @@ -87,20 +109,20 @@ prepare_test (struct stat *statinfo, struct timespec *modtimes) { int i; - create_file ("t-stt-stamp1"); + create_file (filename_stamp1); nap (); - create_file ("t-stt-testfile"); + create_file (filename_testfile); nap (); - create_file ("t-stt-stamp2"); + create_file (filename_stamp2); nap (); - ASSERT (chmod ("t-stt-testfile", 0400) == 0); + ASSERT (chmod (filename_testfile, 0400) == 0); nap (); - create_file ("t-stt-stamp3"); + create_file (filename_stamp3); - do_stat ("t-stt-stamp1", &statinfo[0]); - do_stat ("t-stt-testfile", &statinfo[1]); - do_stat ("t-stt-stamp2", &statinfo[2]); - do_stat ("t-stt-stamp3", &statinfo[3]); + do_stat (filename_stamp1, &statinfo[0]); + do_stat (filename_testfile, &statinfo[1]); + do_stat (filename_stamp2, &statinfo[2]); + do_stat (filename_stamp3, &statinfo[3]); /* Now use our access functions. */ for (i = 0; i < NFILES; ++i) @@ -160,7 +182,7 @@ test_ctime (const struct stat *statinfo) if (statinfo[0].st_mtime != statinfo[0].st_ctime) return; - /* mtime(stamp2) < ctime(renamed) */ + /* mtime(stamp2) < ctime(testfile) */ ASSERT (statinfo[2].st_mtime < statinfo[1].st_ctime || (statinfo[2].st_mtime == statinfo[1].st_ctime && (get_stat_mtime_ns (&statinfo[2]) @@ -183,11 +205,11 @@ test_birthtime (const struct stat *statinfo, return; } - /* mtime(stamp1) < birthtime(renamed) */ + /* mtime(stamp1) < birthtime(testfile) */ ASSERT (modtimes[0].tv_sec < birthtimes[1].tv_sec || (modtimes[0].tv_sec == birthtimes[1].tv_sec && modtimes[0].tv_nsec < birthtimes[1].tv_nsec)); - /* birthtime(renamed) < mtime(stamp2) */ + /* birthtime(testfile) < mtime(stamp2) */ ASSERT (birthtimes[1].tv_sec < modtimes[2].tv_sec || (birthtimes[1].tv_sec == modtimes[2].tv_sec && birthtimes[1].tv_nsec < modtimes[2].tv_nsec)); @@ -200,6 +222,8 @@ main (void) struct timespec modtimes[NFILES]; struct timespec birthtimes[NFILES]; + initialize_filenames (); + #ifdef SIGHUP signal (SIGHUP, cleanup); #endif diff --git a/gnulib-tests/test-stat.c b/gnulib-tests/test-stat.c index 4510e59..225edaa 100644 --- a/gnulib-tests/test-stat.c +++ b/gnulib-tests/test-stat.c @@ -1,5 +1,5 @@ /* Tests of stat. - Copyright (C) 2009-2016 Free Software Foundation, Inc. + Copyright (C) 2009-2017 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/gnulib-tests/test-stat.h b/gnulib-tests/test-stat.h index 4cf6c6d..234ec77 100644 --- a/gnulib-tests/test-stat.h +++ b/gnulib-tests/test-stat.h @@ -1,5 +1,5 @@ /* Tests of stat. - Copyright (C) 2009-2016 Free Software Foundation, Inc. + Copyright (C) 2009-2017 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/gnulib-tests/test-stdalign.c b/gnulib-tests/test-stdalign.c index 0f240c5..c4b70e1 100644 --- a/gnulib-tests/test-stdalign.c +++ b/gnulib-tests/test-stdalign.c @@ -1,5 +1,5 @@ /* Test of <stdalign.h>. - Copyright 2009-2016 Free Software Foundation, Inc. + Copyright 2009-2017 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -84,6 +84,11 @@ main () /* Avoid a test failure due to Sun Studio Developer Bug Report #2125432. */ fputs ("Skipping test: known Sun C compiler bug\n", stderr); return 77; +#elif defined __HP_cc && __ia64 + /* Avoid a test failure due to HP-UX Itanium cc bug; see: + http://lists.gnu.org/archive/html/bug-gnulib/2017-03/msg00078.html */ + fputs ("Skipping test: known HP-UX Itanium cc compiler bug\n", stderr); + return 77; #else CHECK_ALIGNED (static_char_alignas); CHECK_ALIGNED (static_char_Alignas); diff --git a/gnulib-tests/test-stdbool.c b/gnulib-tests/test-stdbool.c index 45dc837..507af83 100644 --- a/gnulib-tests/test-stdbool.c +++ b/gnulib-tests/test-stdbool.c @@ -1,5 +1,5 @@ /* Test of <stdbool.h> substitute. - Copyright (C) 2002-2007, 2009-2016 Free Software Foundation, Inc. + Copyright (C) 2002-2007, 2009-2017 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/gnulib-tests/test-stddef.c b/gnulib-tests/test-stddef.c index bfb72a0..8bf3793 100644 --- a/gnulib-tests/test-stddef.c +++ b/gnulib-tests/test-stddef.c @@ -1,5 +1,5 @@ /* Test of <stddef.h> substitute. - Copyright (C) 2009-2016 Free Software Foundation, Inc. + Copyright (C) 2009-2017 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -19,6 +19,7 @@ #include <config.h> #include <stddef.h> +#include <limits.h> #include <stdalign.h> #include "verify.h" @@ -43,9 +44,12 @@ struct d unlikely to bite real code, we ignore that short-coming. */ /* verify (sizeof offsetof (struct d, e) == sizeof (size_t)); */ verify (sizeof (offsetof (struct d, e)) == sizeof (size_t)); -verify (offsetof (struct d, e) < -1); /* Must be unsigned. */ verify (offsetof (struct d, f) == 1); +/* offsetof promotes to an unsigned integer if and only if sizes do + not fit in int. */ +verify ((offsetof (struct d, e) < -1) == (INT_MAX < (size_t) -1)); + /* Check max_align_t's alignment. */ verify (alignof (double) <= alignof (max_align_t)); verify (alignof (int) <= alignof (max_align_t)); diff --git a/gnulib-tests/test-stdint.c b/gnulib-tests/test-stdint.c index 7705fc7..7352215 100644 --- a/gnulib-tests/test-stdint.c +++ b/gnulib-tests/test-stdint.c @@ -1,5 +1,5 @@ /* Test of <stdint.h> substitute. - Copyright (C) 2006-2016 Free Software Foundation, Inc. + Copyright (C) 2006-2017 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -351,6 +351,73 @@ verify_same_types (INTMAX_C (17), (intmax_t)0 + 0); verify (UINTMAX_C (17) == 17); verify_same_types (UINTMAX_C (17), (uintmax_t)0 + 0); +/* Use _GL_VERIFY (with a fixed-length diagnostic string) rather than verify, + because the latter would require forming each stringified expression, and + many of these would be so long as to trigger a warning/error like this: + + test-stdint.c:407:1: error: string length '6980' is greater than the \ + length '4095' ISO C99 compilers are required to support \ + [-Werror=overlength-strings] + */ +#define verify_width(width, min, max) \ + _GL_VERIFY ((max) >> ((width) - 1 - ((min) < 0)) == 1, \ + "verify_width check") + +/* Macros specified by ISO/IEC TS 18661-1:2014. */ + +#ifdef INT8_MAX +verify_width (INT8_WIDTH, INT8_MIN, INT8_MAX); +#endif +#ifdef UINT8_MAX +verify_width (UINT8_WIDTH, 0, UINT8_MAX); +#endif +#ifdef INT16_MAX +verify_width (INT16_WIDTH, INT16_MIN, INT16_MAX); +#endif +#ifdef UINT16_MAX +verify_width (UINT16_WIDTH, 0, UINT16_MAX); +#endif +#ifdef INT32_MAX +verify_width (INT32_WIDTH, INT32_MIN, INT32_MAX); +#endif +#ifdef UINT32_MAX +verify_width (UINT32_WIDTH, 0, UINT32_MAX); +#endif +#ifdef INT64_MAX +verify_width (INT64_WIDTH, INT64_MIN, INT64_MAX); +#endif +#ifdef UINT64_MAX +verify_width (UINT64_WIDTH, 0, UINT64_MAX); +#endif +verify_width (INT_LEAST8_WIDTH, INT_LEAST8_MIN, INT_LEAST8_MAX); +verify_width (UINT_LEAST8_WIDTH, 0, UINT_LEAST8_MAX); +verify_width (INT_LEAST16_WIDTH, INT_LEAST16_MIN, INT_LEAST16_MAX); +verify_width (UINT_LEAST16_WIDTH, 0, UINT_LEAST16_MAX); +verify_width (INT_LEAST32_WIDTH, INT_LEAST32_MIN, INT_LEAST32_MAX); +verify_width (UINT_LEAST32_WIDTH, 0, UINT_LEAST32_MAX); +verify_width (INT_LEAST64_WIDTH, INT_LEAST64_MIN, INT_LEAST64_MAX); +verify_width (UINT_LEAST64_WIDTH, 0, UINT_LEAST64_MAX); +verify_width (INT_FAST8_WIDTH, INT_FAST8_MIN, INT_FAST8_MAX); +verify_width (UINT_FAST8_WIDTH, 0, UINT_FAST8_MAX); +verify_width (INT_FAST16_WIDTH, INT_FAST16_MIN, INT_FAST16_MAX); +verify_width (UINT_FAST16_WIDTH, 0, UINT_FAST16_MAX); +verify_width (INT_FAST32_WIDTH, INT_FAST32_MIN, INT_FAST32_MAX); +verify_width (UINT_FAST32_WIDTH, 0, UINT_FAST32_MAX); +verify_width (INT_FAST64_WIDTH, INT_FAST64_MIN, INT_FAST64_MAX); +verify_width (UINT_FAST64_WIDTH, 0, UINT_FAST64_MAX); +verify_width (INTPTR_WIDTH, INTPTR_MIN, INTPTR_MAX); +verify_width (UINTPTR_WIDTH, 0, UINTPTR_MAX); +verify_width (INTMAX_WIDTH, INTMAX_MIN, INTMAX_MAX); +verify_width (UINTMAX_WIDTH, 0, UINTMAX_MAX); +verify_width (PTRDIFF_WIDTH, PTRDIFF_MIN, PTRDIFF_MAX); +verify_width (SIZE_WIDTH, 0, SIZE_MAX); +verify_width (WCHAR_WIDTH, WCHAR_MIN, WCHAR_MAX); +#ifdef WINT_MAX +verify_width (WINT_WIDTH, WINT_MIN, WINT_MAX); +#endif +#ifdef SIG_ATOMIC_MAX +verify_width (SIG_ATOMIC_WIDTH, SIG_ATOMIC_MIN, SIG_ATOMIC_MAX); +#endif int main (void) diff --git a/gnulib-tests/test-stdio.c b/gnulib-tests/test-stdio.c index 6cde888..46d75e2 100644 --- a/gnulib-tests/test-stdio.c +++ b/gnulib-tests/test-stdio.c @@ -1,5 +1,5 @@ /* Test of <stdio.h> substitute. - Copyright (C) 2007, 2009-2016 Free Software Foundation, Inc. + Copyright (C) 2007, 2009-2017 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/gnulib-tests/test-stdlib.c b/gnulib-tests/test-stdlib.c index a1fc0d8..3c1d7fb 100644 --- a/gnulib-tests/test-stdlib.c +++ b/gnulib-tests/test-stdlib.c @@ -1,5 +1,5 @@ /* Test of <stdlib.h> substitute. - Copyright (C) 2007, 2009-2016 Free Software Foundation, Inc. + Copyright (C) 2007, 2009-2017 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/gnulib-tests/test-strerror.c b/gnulib-tests/test-strerror.c index 80ffe1c..6b2b4fa 100644 --- a/gnulib-tests/test-strerror.c +++ b/gnulib-tests/test-strerror.c @@ -1,5 +1,5 @@ /* Test of strerror() function. - Copyright (C) 2007-2016 Free Software Foundation, Inc. + Copyright (C) 2007-2017 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/gnulib-tests/test-strerror_r.c b/gnulib-tests/test-strerror_r.c index cb773a3..286e6ab 100644 --- a/gnulib-tests/test-strerror_r.c +++ b/gnulib-tests/test-strerror_r.c @@ -1,5 +1,5 @@ /* Test of strerror_r() function. - Copyright (C) 2007-2016 Free Software Foundation, Inc. + Copyright (C) 2007-2017 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/gnulib-tests/test-strftime.c b/gnulib-tests/test-strftime.c index 39494e6..102e168 100644 --- a/gnulib-tests/test-strftime.c +++ b/gnulib-tests/test-strftime.c @@ -1,5 +1,5 @@ /* Test that posixtime works as required. - Copyright (C) 2011-2016 Free Software Foundation, Inc. + Copyright (C) 2011-2017 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -96,6 +96,8 @@ static struct tzalloc_test TZ[] = { 0, "JST-9" }, #define NZ 5 { 0, "NZST-12NZDT,M9.5.0,M4.1.0/3" }, +#define Unknown 6 + { 0, "<-00>0" }, { 0 } }; @@ -121,18 +123,21 @@ static struct localtime_rz_test LT[] = { TZ+CentEur, 0, "1970-01-01 01:00:00 +0100 (CET)", 0 }, { TZ+Japan , 0, "1970-01-01 09:00:00 +0900 (JST)", 0 }, { TZ+NZ , 0, "1970-01-01 13:00:00 +1300 (NZDT)", 1 }, + { TZ+Unknown, 0, "1970-01-01 00:00:00 -0000 (-00)", 0 }, { TZ+Pacific, 500000001, "1985-11-04 16:53:21 -0800 (PST)", 0 }, { TZ+Arizona, 500000001, "1985-11-04 17:53:21 -0700 (MST)", 0 }, { TZ+UTC , 500000001, "1985-11-05 00:53:21 +0000 (UTC)", 0 }, { TZ+CentEur, 500000001, "1985-11-05 01:53:21 +0100 (CET)", 1 }, { TZ+Japan , 500000001, "1985-11-05 09:53:21 +0900 (JST)", 0 }, { TZ+NZ , 500000001, "1985-11-05 13:53:21 +1300 (NZDT)", 0 }, + { TZ+Unknown, 500000001, "1985-11-05 00:53:21 -0000 (-00)", 0 }, { TZ+Pacific, 1000000002, "2001-09-08 18:46:42 -0700 (PDT)", 0 }, { TZ+Arizona, 1000000002, "2001-09-08 18:46:42 -0700 (MST)", 0 }, { TZ+UTC , 1000000002, "2001-09-09 01:46:42 +0000 (UTC)", 0 }, { TZ+CentEur, 1000000002, "2001-09-09 03:46:42 +0200 (CEST)", 0 }, { TZ+Japan , 1000000002, "2001-09-09 10:46:42 +0900 (JST)", 0 }, { TZ+NZ , 1000000002, "2001-09-09 13:46:42 +1200 (NZST)", 0 }, + { TZ+Unknown, 1000000002, "2001-09-09 01:46:42 -0000 (-00)", 0 }, { 0 } }; @@ -200,12 +205,48 @@ tzalloc_test (void) return fail; } + +static int +quarter_test (void) +{ + int result = 0; + size_t mon; + + /* Check %q. */ + for (mon = 1; mon <= 12; mon++) + { + char out[2]; + char exp[2] = {0,}; + struct tm qtm = { .tm_mon = mon - 1 }; + char fmt[3] = {'%','q','\0'}; + + size_t r = nstrftime (out, sizeof (out), fmt, &qtm, 0, 0); + if (r == 0) + { + puts ("nstrftime(\"%q\") failed"); + result = 1; + break; + } + + exp[0] = mon < 4 ? '1' : mon < 7 ? '2' : mon < 10 ? '3' : '4'; + if (strcmp (out, exp) != 0) + { + printf ("nstrftime %%q: expected \"%s\", got \"%s\"\n", exp, out); + result = 1; + break; + } + } + + return result; +} + int main (void) { int fail = 0; fail |= posixtm_test (); fail |= tzalloc_test (); + fail |= quarter_test (); return fail; } diff --git a/gnulib-tests/test-striconv.c b/gnulib-tests/test-striconv.c index 9b71b69..7002315 100644 --- a/gnulib-tests/test-striconv.c +++ b/gnulib-tests/test-striconv.c @@ -1,5 +1,5 @@ /* Test of character set conversion. - Copyright (C) 2007-2016 Free Software Foundation, Inc. + Copyright (C) 2007-2017 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/gnulib-tests/test-string.c b/gnulib-tests/test-string.c index f4c60f7..f10005d 100644 --- a/gnulib-tests/test-string.c +++ b/gnulib-tests/test-string.c @@ -1,5 +1,5 @@ /* Test of <string.h> substitute. - Copyright (C) 2007, 2009-2016 Free Software Foundation, Inc. + Copyright (C) 2007, 2009-2017 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/gnulib-tests/test-strings.c b/gnulib-tests/test-strings.c index 5eaa61a..d658a29 100644 --- a/gnulib-tests/test-strings.c +++ b/gnulib-tests/test-strings.c @@ -1,5 +1,5 @@ /* Test of <strings.h> substitute. - Copyright (C) 2007, 2009-2016 Free Software Foundation, Inc. + Copyright (C) 2007, 2009-2017 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/gnulib-tests/test-strnlen.c b/gnulib-tests/test-strnlen.c index ee5bd78..bceb059 100644 --- a/gnulib-tests/test-strnlen.c +++ b/gnulib-tests/test-strnlen.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010-2016 Free Software Foundation, Inc. + * Copyright (C) 2010-2017 Free Software Foundation, Inc. * Written by Eric Blake * * This program is free software: you can redistribute it and/or modify diff --git a/gnulib-tests/test-strtoull.c b/gnulib-tests/test-strtoull.c index 6b1e01b..d7dc35c 100644 --- a/gnulib-tests/test-strtoull.c +++ b/gnulib-tests/test-strtoull.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2011-2016 Free Software Foundation, Inc. + * Copyright (C) 2011-2017 Free Software Foundation, Inc. * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/gnulib-tests/test-strtoumax.c b/gnulib-tests/test-strtoumax.c index bb9d30e..a917c17 100644 --- a/gnulib-tests/test-strtoumax.c +++ b/gnulib-tests/test-strtoumax.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2011-2016 Free Software Foundation, Inc. + * Copyright (C) 2011-2017 Free Software Foundation, Inc. * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/gnulib-tests/test-symlink.c b/gnulib-tests/test-symlink.c index ad13b93..6b025a8 100644 --- a/gnulib-tests/test-symlink.c +++ b/gnulib-tests/test-symlink.c @@ -1,5 +1,5 @@ /* Tests of symlink. - Copyright (C) 2009-2016 Free Software Foundation, Inc. + Copyright (C) 2009-2017 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/gnulib-tests/test-symlink.h b/gnulib-tests/test-symlink.h index fc064e8..8b16f4a 100644 --- a/gnulib-tests/test-symlink.h +++ b/gnulib-tests/test-symlink.h @@ -1,5 +1,5 @@ /* Tests of symlink. - Copyright (C) 2009-2016 Free Software Foundation, Inc. + Copyright (C) 2009-2017 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/gnulib-tests/test-sys_ioctl.c b/gnulib-tests/test-sys_ioctl.c index 8e0ddcd..41d9462 100644 --- a/gnulib-tests/test-sys_ioctl.c +++ b/gnulib-tests/test-sys_ioctl.c @@ -1,5 +1,5 @@ /* Test of <sys/ioctl.h> substitute. - Copyright (C) 2009-2016 Free Software Foundation, Inc. + Copyright (C) 2009-2017 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/gnulib-tests/test-sys_select.c b/gnulib-tests/test-sys_select.c index 39a878f..34793c5 100644 --- a/gnulib-tests/test-sys_select.c +++ b/gnulib-tests/test-sys_select.c @@ -1,5 +1,5 @@ /* Test of <sys/select.h> substitute. - Copyright (C) 2007-2016 Free Software Foundation, Inc. + Copyright (C) 2007-2017 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/gnulib-tests/test-sys_socket.c b/gnulib-tests/test-sys_socket.c index a4f7108..35c198b 100644 --- a/gnulib-tests/test-sys_socket.c +++ b/gnulib-tests/test-sys_socket.c @@ -1,5 +1,5 @@ /* Test of <sys/socket.h> substitute. - Copyright (C) 2007, 2009-2016 Free Software Foundation, Inc. + Copyright (C) 2007, 2009-2017 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/gnulib-tests/test-sys_stat.c b/gnulib-tests/test-sys_stat.c index 8a3af94..df1972f 100644 --- a/gnulib-tests/test-sys_stat.c +++ b/gnulib-tests/test-sys_stat.c @@ -1,5 +1,5 @@ /* Test of <sys/stat.h> substitute. - Copyright (C) 2007-2016 Free Software Foundation, Inc. + Copyright (C) 2007-2017 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/gnulib-tests/test-sys_time.c b/gnulib-tests/test-sys_time.c index 44535b9..ea38e84 100644 --- a/gnulib-tests/test-sys_time.c +++ b/gnulib-tests/test-sys_time.c @@ -1,5 +1,5 @@ /* Test of <sys/time.h> substitute. - Copyright (C) 2007, 2009-2016 Free Software Foundation, Inc. + Copyright (C) 2007, 2009-2017 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/gnulib-tests/test-sys_types.c b/gnulib-tests/test-sys_types.c index 7f8fb6d..30a6b9d 100644 --- a/gnulib-tests/test-sys_types.c +++ b/gnulib-tests/test-sys_types.c @@ -1,5 +1,5 @@ /* Test of <sys/types.h> substitute. - Copyright (C) 2011-2016 Free Software Foundation, Inc. + Copyright (C) 2011-2017 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/gnulib-tests/test-sys_uio.c b/gnulib-tests/test-sys_uio.c index c433847..713eafb 100644 --- a/gnulib-tests/test-sys_uio.c +++ b/gnulib-tests/test-sys_uio.c @@ -1,5 +1,5 @@ /* Test of <sys/uio.h> substitute. - Copyright (C) 2011-2016 Free Software Foundation, Inc. + Copyright (C) 2011-2017 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/gnulib-tests/test-sys_wait.c b/gnulib-tests/test-sys_wait.c index f814ff3..d3b6804 100644 --- a/gnulib-tests/test-sys_wait.c +++ b/gnulib-tests/test-sys_wait.c @@ -1,5 +1,5 @@ /* Test of <sys/wait.h> substitute. - Copyright (C) 2009-2016 Free Software Foundation, Inc. + Copyright (C) 2009-2017 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/gnulib-tests/test-sys_wait.h b/gnulib-tests/test-sys_wait.h index 7389be4..00cb1c0 100644 --- a/gnulib-tests/test-sys_wait.h +++ b/gnulib-tests/test-sys_wait.h @@ -1,5 +1,5 @@ /* Test of macros shared between <sys/wait.h> and <stdlib.h>. - Copyright (C) 2010-2016 Free Software Foundation, Inc. + Copyright (C) 2010-2017 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/gnulib-tests/test-time.c b/gnulib-tests/test-time.c index dec2b13..ff9ffee 100644 --- a/gnulib-tests/test-time.c +++ b/gnulib-tests/test-time.c @@ -1,5 +1,5 @@ /* Test of <time.h> substitute. - Copyright (C) 2007, 2009-2016 Free Software Foundation, Inc. + Copyright (C) 2007, 2009-2017 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/gnulib-tests/test-timespec.c b/gnulib-tests/test-timespec.c index 3ea6e2d..de8e29d 100644 --- a/gnulib-tests/test-timespec.c +++ b/gnulib-tests/test-timespec.c @@ -1,5 +1,5 @@ /* Test timespec functions. - Copyright 2015-2016 Free Software Foundation, Inc. + Copyright 2015-2017 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/gnulib-tests/test-unistd.c b/gnulib-tests/test-unistd.c index 463ef57..ce7f59a 100644 --- a/gnulib-tests/test-unistd.c +++ b/gnulib-tests/test-unistd.c @@ -1,5 +1,5 @@ /* Test of <unistd.h> substitute. - Copyright (C) 2007, 2009-2016 Free Software Foundation, Inc. + Copyright (C) 2007, 2009-2017 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/gnulib-tests/test-unsetenv.c b/gnulib-tests/test-unsetenv.c index fe4548d..d7d7d05 100644 --- a/gnulib-tests/test-unsetenv.c +++ b/gnulib-tests/test-unsetenv.c @@ -1,5 +1,5 @@ /* Tests of unsetenv. - Copyright (C) 2009-2016 Free Software Foundation, Inc. + Copyright (C) 2009-2017 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/gnulib-tests/test-update-copyright.sh b/gnulib-tests/test-update-copyright.sh index cd4886a..0df54e2 100755 --- a/gnulib-tests/test-update-copyright.sh +++ b/gnulib-tests/test-update-copyright.sh @@ -1,6 +1,6 @@ #!/bin/sh # Test suite for update-copyright. -# Copyright (C) 2009-2016 Free Software Foundation, Inc. +# Copyright (C) 2009-2017 Free Software Foundation, Inc. # This file is part of the GNUlib Library. # # This program is free software: you can redistribute it and/or modify diff --git a/gnulib-tests/test-vasnprintf.c b/gnulib-tests/test-vasnprintf.c index a75c004..2dd869f 100644 --- a/gnulib-tests/test-vasnprintf.c +++ b/gnulib-tests/test-vasnprintf.c @@ -1,5 +1,5 @@ /* Test of vasnprintf() and asnprintf() functions. - Copyright (C) 2007-2016 Free Software Foundation, Inc. + Copyright (C) 2007-2017 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/gnulib-tests/test-vasprintf.c b/gnulib-tests/test-vasprintf.c index ebcbfc4..2cab307 100644 --- a/gnulib-tests/test-vasprintf.c +++ b/gnulib-tests/test-vasprintf.c @@ -1,5 +1,5 @@ /* Test of vasprintf() and asprintf() functions. - Copyright (C) 2007-2016 Free Software Foundation, Inc. + Copyright (C) 2007-2017 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/gnulib-tests/test-vc-list-files-cvs.sh b/gnulib-tests/test-vc-list-files-cvs.sh index 6262944..f04fe9c 100755 --- a/gnulib-tests/test-vc-list-files-cvs.sh +++ b/gnulib-tests/test-vc-list-files-cvs.sh @@ -1,6 +1,6 @@ #!/bin/sh # Unit tests for vc-list-files -# Copyright (C) 2008-2016 Free Software Foundation, Inc. +# Copyright (C) 2008-2017 Free Software Foundation, Inc. # This file is part of the GNUlib Library. # # This program is free software: you can redistribute it and/or modify diff --git a/gnulib-tests/test-vc-list-files-git.sh b/gnulib-tests/test-vc-list-files-git.sh index 4358115..8249017 100755 --- a/gnulib-tests/test-vc-list-files-git.sh +++ b/gnulib-tests/test-vc-list-files-git.sh @@ -1,6 +1,6 @@ #!/bin/sh # Unit tests for vc-list-files -# Copyright (C) 2008-2016 Free Software Foundation, Inc. +# Copyright (C) 2008-2017 Free Software Foundation, Inc. # This file is part of the GNUlib Library. # # This program is free software: you can redistribute it and/or modify diff --git a/gnulib-tests/test-verify-try.c b/gnulib-tests/test-verify-try.c new file mode 100644 index 0000000..362fb01 --- /dev/null +++ b/gnulib-tests/test-verify-try.c @@ -0,0 +1,21 @@ +/* Test the "verify" module. + + Copyright (C) 2017 Free Software Foundation, Inc. + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see <http://www.gnu.org/licenses/>. */ + +/* This is a separate source file, so that the execution of test-verify.sh + does not interfere with the building of the 'test-verify' program. */ + +#include "test-verify.c" diff --git a/gnulib-tests/test-verify.c b/gnulib-tests/test-verify.c index d7ca053..92b7501 100644 --- a/gnulib-tests/test-verify.c +++ b/gnulib-tests/test-verify.c @@ -1,6 +1,6 @@ /* Test the "verify" module. - Copyright (C) 2005, 2009-2016 Free Software Foundation, Inc. + Copyright (C) 2005, 2009-2017 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/gnulib-tests/test-verify.sh b/gnulib-tests/test-verify.sh index 3e76761..1e75d55 100755 --- a/gnulib-tests/test-verify.sh +++ b/gnulib-tests/test-verify.sh @@ -7,8 +7,9 @@ unset MALLOC_PERTURB_ # Rather than figure out how to invoke the compiler with the right # include path ourselves, we let make do it: -(cd "$initial_cwd_" && rm -f test-verify.o \ - && $MAKE test-verify.o >/dev/null 2>&1) \ +(cd "$initial_cwd_" \ + && rm -f test-verify-try.o \ + && $MAKE test-verify-try.o >/dev/null 2>&1) \ || skip_ "cannot compile error-free" # Now, prove that we encounter all expected compilation failures: @@ -16,8 +17,8 @@ unset MALLOC_PERTURB_ : >err for i in 1 2 3 4 5; do (cd "$initial_cwd_" - rm -f test-verify.o - $MAKE CFLAGS=-DEXP_FAIL=$i test-verify.o) >>out 2>>err \ + rm -f test-verify-try.o + $MAKE CFLAGS=-DEXP_FAIL=$i test-verify-try.o) >>out 2>>err \ && { warn_ "compiler didn't detect verification failure $i"; fail=1; } done diff --git a/gnulib-tests/test-version-etc.c b/gnulib-tests/test-version-etc.c index 4382c76..ad8221a 100644 --- a/gnulib-tests/test-version-etc.c +++ b/gnulib-tests/test-version-etc.c @@ -1,5 +1,5 @@ /* Test suite for version-etc. - Copyright (C) 2009-2016 Free Software Foundation, Inc. + Copyright (C) 2009-2017 Free Software Foundation, Inc. This file is part of the GNUlib Library. This program is free software: you can redistribute it and/or modify @@ -19,14 +19,12 @@ #include "version-etc.h" -#include "progname.h" #define AUTHORS "Sergey Poznyakoff", "Eric Blake" int main (int argc _GL_UNUSED, char **argv) { - set_program_name (argv[0]); version_etc (stdout, "test-version-etc", "dummy", "0", AUTHORS, (const char *) NULL); return 0; diff --git a/gnulib-tests/test-version-etc.sh b/gnulib-tests/test-version-etc.sh index 1706aef..e7de3b7 100755 --- a/gnulib-tests/test-version-etc.sh +++ b/gnulib-tests/test-version-etc.sh @@ -1,6 +1,6 @@ #! /bin/sh # Test suite for version-etc. -# Copyright (C) 2009-2016 Free Software Foundation, Inc. +# Copyright (C) 2009-2017 Free Software Foundation, Inc. # This file is part of the GNUlib Library. # # This program is free software: you can redistribute it and/or modify diff --git a/gnulib-tests/test-wchar.c b/gnulib-tests/test-wchar.c index e118048..2463aeb 100644 --- a/gnulib-tests/test-wchar.c +++ b/gnulib-tests/test-wchar.c @@ -1,5 +1,5 @@ /* Test of <wchar.h> substitute. - Copyright (C) 2007-2016 Free Software Foundation, Inc. + Copyright (C) 2007-2017 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/gnulib-tests/test-wcrtomb-w32.c b/gnulib-tests/test-wcrtomb-w32.c index 0570c73..e7d0803 100644 --- a/gnulib-tests/test-wcrtomb-w32.c +++ b/gnulib-tests/test-wcrtomb-w32.c @@ -1,5 +1,5 @@ /* Test of conversion of wide character to multibyte character. - Copyright (C) 2008-2016 Free Software Foundation, Inc. + Copyright (C) 2008-2017 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/gnulib-tests/test-wcrtomb.c b/gnulib-tests/test-wcrtomb.c index e1d2bb4..1458c76 100644 --- a/gnulib-tests/test-wcrtomb.c +++ b/gnulib-tests/test-wcrtomb.c @@ -1,5 +1,5 @@ /* Test of conversion of wide character to multibyte character. - Copyright (C) 2008-2016 Free Software Foundation, Inc. + Copyright (C) 2008-2017 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/gnulib-tests/test-wctype-h.c b/gnulib-tests/test-wctype-h.c index b401091..6d1b2b6 100644 --- a/gnulib-tests/test-wctype-h.c +++ b/gnulib-tests/test-wctype-h.c @@ -1,5 +1,5 @@ /* Test of <wctype.h> substitute. - Copyright (C) 2007-2016 Free Software Foundation, Inc. + Copyright (C) 2007-2017 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/gnulib-tests/test-wcwidth.c b/gnulib-tests/test-wcwidth.c index 5a0d853..5290cf7 100644 --- a/gnulib-tests/test-wcwidth.c +++ b/gnulib-tests/test-wcwidth.c @@ -1,5 +1,5 @@ /* Test of wcwidth() function. - Copyright (C) 2007-2016 Free Software Foundation, Inc. + Copyright (C) 2007-2017 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -26,6 +26,7 @@ SIGNATURE_CHECK (wcwidth, int, (wchar_t)); #include <locale.h> #include <string.h> +#include "c-ctype.h" #include "localcharset.h" #include "macros.h" @@ -34,9 +35,11 @@ main () { wchar_t wc; +#ifdef C_CTYPE_ASCII /* Test width of ASCII characters. */ for (wc = 0x20; wc < 0x7F; wc++) ASSERT (wcwidth (wc) == 1); +#endif /* Switch to an UTF-8 locale. */ if (setlocale (LC_ALL, "fr_FR.UTF-8") != NULL diff --git a/gnulib-tests/test-xalloc-die.c b/gnulib-tests/test-xalloc-die.c index 9329750..66eb9a9 100644 --- a/gnulib-tests/test-xalloc-die.c +++ b/gnulib-tests/test-xalloc-die.c @@ -1,5 +1,5 @@ /* Test of xalloc_die() function. - Copyright (C) 2009-2016 Free Software Foundation, Inc. + Copyright (C) 2009-2017 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -19,12 +19,10 @@ #include <config.h> #include "xalloc.h" -#include "progname.h" int main (int argc _GL_UNUSED, char **argv) { - set_program_name (argv[0]); xalloc_die (); return 0; } diff --git a/gnulib-tests/test-xalloc-die.sh b/gnulib-tests/test-xalloc-die.sh index fba601f..0538d9f 100755 --- a/gnulib-tests/test-xalloc-die.sh +++ b/gnulib-tests/test-xalloc-die.sh @@ -1,6 +1,6 @@ #!/bin/sh # Test suite for xalloc_die. -# Copyright (C) 2009-2016 Free Software Foundation, Inc. +# Copyright (C) 2009-2017 Free Software Foundation, Inc. # This file is part of the GNUlib Library. # # This program is free software: you can redistribute it and/or modify diff --git a/gnulib-tests/test-xstrtol.c b/gnulib-tests/test-xstrtol.c index fef45e5..6d7b4a0 100644 --- a/gnulib-tests/test-xstrtol.c +++ b/gnulib-tests/test-xstrtol.c @@ -1,5 +1,5 @@ /* Test of xstrtol module. - Copyright (C) 1995-1996, 1998-2001, 2003-2016 Free Software Foundation, Inc. + Copyright (C) 1995-1996, 1998-2001, 2003-2017 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -29,8 +29,6 @@ # define __spec "ld" #endif -char *program_name; - /* Don't show the program name in error messages. */ static void print_no_progname (void) @@ -43,7 +41,6 @@ main (int argc, char **argv) strtol_error s_err; int i; - program_name = argv[0]; error_print_progname = print_no_progname; for (i = 1; i < argc; i++) diff --git a/gnulib-tests/test-xvasprintf.c b/gnulib-tests/test-xvasprintf.c index 985fe2e..922f4ce 100644 --- a/gnulib-tests/test-xvasprintf.c +++ b/gnulib-tests/test-xvasprintf.c @@ -1,5 +1,5 @@ /* Test of xvasprintf() and xasprintf() functions. - Copyright (C) 2007-2016 Free Software Foundation, Inc. + Copyright (C) 2007-2017 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -31,7 +31,6 @@ #include <stdlib.h> #include <string.h> -#include "progname.h" #include "macros.h" static char * @@ -129,8 +128,6 @@ test_xasprintf (void) int main (int argc _GL_UNUSED, char *argv[]) { - set_program_name (argv[0]); - test_xvasprintf (); test_xasprintf (); diff --git a/gnulib-tests/timespec-add.c b/gnulib-tests/timespec-add.c index b093946..e6c87c6 100644 --- a/gnulib-tests/timespec-add.c +++ b/gnulib-tests/timespec-add.c @@ -1,6 +1,6 @@ /* Add two struct timespec values. - Copyright (C) 2011-2016 Free Software Foundation, Inc. + Copyright (C) 2011-2017 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/gnulib-tests/timespec-sub.c b/gnulib-tests/timespec-sub.c index 63cc142..5d9276d 100644 --- a/gnulib-tests/timespec-sub.c +++ b/gnulib-tests/timespec-sub.c @@ -1,6 +1,6 @@ /* Subtract two struct timespec values. - Copyright (C) 2011-2016 Free Software Foundation, Inc. + Copyright (C) 2011-2017 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/gnulib-tests/unistr/test-u8-mbtoucr.c b/gnulib-tests/unistr/test-u8-mbtoucr.c index 7a7b0b9..08bfdb4 100644 --- a/gnulib-tests/unistr/test-u8-mbtoucr.c +++ b/gnulib-tests/unistr/test-u8-mbtoucr.c @@ -1,5 +1,5 @@ /* Test of u8_mbtoucr() function. - Copyright (C) 2010-2016 Free Software Foundation, Inc. + Copyright (C) 2010-2017 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/gnulib-tests/unistr/test-u8-uctomb.c b/gnulib-tests/unistr/test-u8-uctomb.c index bbc9418..5c36fb9 100644 --- a/gnulib-tests/unistr/test-u8-uctomb.c +++ b/gnulib-tests/unistr/test-u8-uctomb.c @@ -1,5 +1,5 @@ /* Test of u8_uctomb() function. - Copyright (C) 2010-2016 Free Software Foundation, Inc. + Copyright (C) 2010-2017 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/gnulib-tests/uniwidth/test-uc_width.c b/gnulib-tests/uniwidth/test-uc_width.c index 8c248fa..6a3fafb 100644 --- a/gnulib-tests/uniwidth/test-uc_width.c +++ b/gnulib-tests/uniwidth/test-uc_width.c @@ -1,5 +1,5 @@ /* Test of uc_width() function. - Copyright (C) 2007-2016 Free Software Foundation, Inc. + Copyright (C) 2007-2017 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/gnulib-tests/uniwidth/test-uc_width2.c b/gnulib-tests/uniwidth/test-uc_width2.c index 60ef755..1792daf 100644 --- a/gnulib-tests/uniwidth/test-uc_width2.c +++ b/gnulib-tests/uniwidth/test-uc_width2.c @@ -1,5 +1,5 @@ /* Test of uc_width() function. - Copyright (C) 2007-2016 Free Software Foundation, Inc. + Copyright (C) 2007-2017 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/build-aux/snippet/unused-parameter.h b/gnulib-tests/unused-parameter.h index 843db76..b300055 100644 --- a/build-aux/snippet/unused-parameter.h +++ b/gnulib-tests/unused-parameter.h @@ -1,5 +1,5 @@ /* A C macro for declaring that specific function parameters are not used. - Copyright (C) 2008-2016 Free Software Foundation, Inc. + Copyright (C) 2008-2017 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published diff --git a/gnulib-tests/w32sock.h b/gnulib-tests/w32sock.h index c78b4bb..2f753fb 100644 --- a/gnulib-tests/w32sock.h +++ b/gnulib-tests/w32sock.h @@ -1,6 +1,6 @@ /* w32sock.h --- internal auxiliary functions for Windows socket functions - Copyright (C) 2008-2016 Free Software Foundation, Inc. + Copyright (C) 2008-2017 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -26,7 +26,11 @@ #include <io.h> /* Get _get_osfhandle(). */ -#include "msvc-nothrow.h" +#if GNULIB_MSVC_NOTHROW +# include "msvc-nothrow.h" +#else +# include <io.h> +#endif #define FD_TO_SOCKET(fd) ((SOCKET) _get_osfhandle ((fd))) #define SOCKET_TO_FD(fh) (_open_osfhandle ((intptr_t) (fh), O_RDWR | O_BINARY)) diff --git a/build-aux/snippet/warn-on-use.h b/gnulib-tests/warn-on-use.h index 2948b47..3c0eb57 100644 --- a/build-aux/snippet/warn-on-use.h +++ b/gnulib-tests/warn-on-use.h @@ -1,5 +1,5 @@ /* A C macro for emitting warnings if a function is used. - Copyright (C) 2010-2016 Free Software Foundation, Inc. + Copyright (C) 2010-2017 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published diff --git a/gnulib-tests/wctob.c b/gnulib-tests/wctob.c index 15e3ff3..ab320cf 100644 --- a/gnulib-tests/wctob.c +++ b/gnulib-tests/wctob.c @@ -1,5 +1,5 @@ /* Convert wide character to unibyte character. - Copyright (C) 2008, 2010-2016 Free Software Foundation, Inc. + Copyright (C) 2008, 2010-2017 Free Software Foundation, Inc. Written by Bruno Haible <bruno@clisp.org>, 2008. This program is free software: you can redistribute it and/or modify diff --git a/gnulib-tests/wctomb-impl.h b/gnulib-tests/wctomb-impl.h index a6ed971..f76b595 100644 --- a/gnulib-tests/wctomb-impl.h +++ b/gnulib-tests/wctomb-impl.h @@ -1,5 +1,5 @@ /* Convert wide character to multibyte character. - Copyright (C) 2011-2016 Free Software Foundation, Inc. + Copyright (C) 2011-2017 Free Software Foundation, Inc. Written by Bruno Haible <bruno@clisp.org>, 2011. This program is free software: you can redistribute it and/or modify diff --git a/gnulib-tests/wctomb.c b/gnulib-tests/wctomb.c index f1d14f5..724ce4f 100644 --- a/gnulib-tests/wctomb.c +++ b/gnulib-tests/wctomb.c @@ -1,5 +1,5 @@ /* Convert wide character to multibyte character. - Copyright (C) 2011-2016 Free Software Foundation, Inc. + Copyright (C) 2011-2017 Free Software Foundation, Inc. Written by Bruno Haible <bruno@clisp.org>, 2011. This program is free software: you can redistribute it and/or modify diff --git a/gnulib-tests/zerosize-ptr.h b/gnulib-tests/zerosize-ptr.h index e6ff672..e097ccd 100644 --- a/gnulib-tests/zerosize-ptr.h +++ b/gnulib-tests/zerosize-ptr.h @@ -1,5 +1,5 @@ /* Return a pointer to a zero-size object in memory. - Copyright (C) 2009-2016 Free Software Foundation, Inc. + Copyright (C) 2009-2017 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/lib/Makefile.am b/lib/Makefile.am index 8542af7..ce32659 100644 --- a/lib/Makefile.am +++ b/lib/Makefile.am @@ -1,6 +1,6 @@ # Automakefile for GNU Diffutils library. -# Copyright (C) 2001-2002, 2004, 2006, 2009-2013, 2015-2016 Free Software +# Copyright (C) 2001-2002, 2004, 2006, 2009-2013, 2015-2017 Free Software # Foundation, Inc. # This program is free software: you can redistribute it and/or modify diff --git a/lib/Makefile.in b/lib/Makefile.in index 2f8ff31..df166fb 100644 --- a/lib/Makefile.in +++ b/lib/Makefile.in @@ -16,7 +16,7 @@ # Automakefile for GNU Diffutils library. -# Copyright (C) 2001-2002, 2004, 2006, 2009-2013, 2015-2016 Free Software +# Copyright (C) 2001-2002, 2004, 2006, 2009-2013, 2015-2017 Free Software # Foundation, Inc. # This program is free software: you can redistribute it and/or modify @@ -32,7 +32,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -# Copyright (C) 2002-2016 Free Software Foundation, Inc. +# Copyright (C) 2002-2017 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 @@ -137,10 +137,11 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \ $(top_srcdir)/m4/absolute-header.m4 $(top_srcdir)/m4/alloca.m4 \ $(top_srcdir)/m4/arpa_inet_h.m4 $(top_srcdir)/m4/btowc.m4 \ - $(top_srcdir)/m4/c-stack.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/dirname.m4 \ + $(top_srcdir)/m4/builtin-expect.m4 $(top_srcdir)/m4/c-stack.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/dirname.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 \ @@ -153,7 +154,8 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \ $(top_srcdir)/m4/freopen.m4 $(top_srcdir)/m4/fstat.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/gettext.m4 \ + $(top_srcdir)/m4/getpagesize.m4 \ + $(top_srcdir)/m4/getprogname.m4 $(top_srcdir)/m4/gettext.m4 \ $(top_srcdir)/m4/gettime.m4 $(top_srcdir)/m4/gettimeofday.m4 \ $(top_srcdir)/m4/glibc21.m4 $(top_srcdir)/m4/gnu-make.m4 \ $(top_srcdir)/m4/gnulib-common.m4 \ @@ -170,17 +172,19 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \ $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \ $(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libsigsegv.m4 \ $(top_srcdir)/m4/libunistring-base.m4 \ - $(top_srcdir)/m4/localcharset.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/longlong.m4 \ - $(top_srcdir)/m4/lstat.m4 $(top_srcdir)/m4/malloc.m4 \ - $(top_srcdir)/m4/malloca.m4 $(top_srcdir)/m4/manywarnings.m4 \ - $(top_srcdir)/m4/mbchar.m4 $(top_srcdir)/m4/mbiter.m4 \ - $(top_srcdir)/m4/mbrtowc.m4 $(top_srcdir)/m4/mbsinit.m4 \ - $(top_srcdir)/m4/mbslen.m4 $(top_srcdir)/m4/mbsrtowcs.m4 \ - $(top_srcdir)/m4/mbstate_t.m4 $(top_srcdir)/m4/mbtowc.m4 \ - $(top_srcdir)/m4/memchr.m4 $(top_srcdir)/m4/mkstemp.m4 \ + $(top_srcdir)/m4/limits-h.m4 $(top_srcdir)/m4/localcharset.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/localtime-buffer.m4 \ + $(top_srcdir)/m4/longlong.m4 $(top_srcdir)/m4/lstat.m4 \ + $(top_srcdir)/m4/malloc.m4 $(top_srcdir)/m4/malloca.m4 \ + $(top_srcdir)/m4/manywarnings.m4 $(top_srcdir)/m4/mbchar.m4 \ + $(top_srcdir)/m4/mbiter.m4 $(top_srcdir)/m4/mbrtowc.m4 \ + $(top_srcdir)/m4/mbsinit.m4 $(top_srcdir)/m4/mbslen.m4 \ + $(top_srcdir)/m4/mbsrtowcs.m4 $(top_srcdir)/m4/mbstate_t.m4 \ + $(top_srcdir)/m4/mbtowc.m4 $(top_srcdir)/m4/memchr.m4 \ + $(top_srcdir)/m4/minmax.m4 $(top_srcdir)/m4/mkstemp.m4 \ $(top_srcdir)/m4/mktime.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 \ @@ -222,9 +226,10 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \ $(top_srcdir)/m4/time_h.m4 $(top_srcdir)/m4/time_r.m4 \ $(top_srcdir)/m4/time_rz.m4 $(top_srcdir)/m4/timegm.m4 \ $(top_srcdir)/m4/timespec.m4 $(top_srcdir)/m4/tm_gmtoff.m4 \ - $(top_srcdir)/m4/unistd_h.m4 $(top_srcdir)/m4/unlocked-io.m4 \ - $(top_srcdir)/m4/vararrays.m4 $(top_srcdir)/m4/vasnprintf.m4 \ - $(top_srcdir)/m4/vasprintf.m4 $(top_srcdir)/m4/version-etc.m4 \ + $(top_srcdir)/m4/tzset.m4 $(top_srcdir)/m4/unistd_h.m4 \ + $(top_srcdir)/m4/unlocked-io.m4 $(top_srcdir)/m4/vararrays.m4 \ + $(top_srcdir)/m4/vasnprintf.m4 $(top_srcdir)/m4/vasprintf.m4 \ + $(top_srcdir)/m4/version-etc.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 \ @@ -254,20 +259,21 @@ am__libdiffutils_a_SOURCES_DIST = allocator.c areadlink.c argmatch.c \ c-strncasecmp.c careadlinkat.c diffseq.h dirname.c basename.c \ dirname-lgpl.c basename-lgpl.c stripslash.c exclude.c \ exitfail.c fd-hook.c file-type.c filenamecat.c \ - filenamecat-lgpl.c freopen-safer.c gettext.h gettime.c \ - hard-locale.c hash.c imaxtostr.c inttostr.c offtostr.c \ - uinttostr.c umaxtostr.c localcharset.h localcharset.c \ - malloca.c mbchar.c mbiter.h mbiter.c mbscasecmp.c mbslen.c \ - mbsstr.c mbuiter.h mbuiter.c progname.h progname.c \ - propername.h propername.c quotearg.c sh-quote.h sh-quote.c \ - sig-handler.c size_max.h stat-time.c strftime.c striconv.h \ - striconv.c strnlen1.h strnlen1.c system-quote.h system-quote.c \ - tempname.c timespec.c trim.c unistd.c unistr/u8-mbtoucr.c \ - unistr/u8-uctomb.c unistr/u8-uctomb-aux.c uniwidth/width.c \ - version-etc.h version-etc.c version-etc-fsf.c wctype-h.c \ - xmalloc.c xalloc-die.c xfreopen.c xfreopen.h xreadlink.c \ - xsize.h xsize.c xstriconv.h xstriconv.c xstrndup.h xstrndup.c \ - xstrtol.c xstrtoul.c xstrtol-error.c xstrtoumax.c xvasprintf.h \ + filenamecat-lgpl.c freopen-safer.c getprogname.h getprogname.c \ + gettext.h gettime.c hard-locale.c hash.c imaxtostr.c \ + inttostr.c offtostr.c uinttostr.c umaxtostr.c localcharset.h \ + localcharset.c malloca.c mbchar.c mbiter.h mbiter.c \ + mbscasecmp.c mbslen.c mbsstr.c mbuiter.h mbuiter.c minmax.h \ + progname.h progname.c propername.h propername.c quotearg.c \ + sh-quote.h sh-quote.c sig-handler.c size_max.h stat-time.c \ + strftime.c striconv.h striconv.c strnlen1.h strnlen1.c \ + system-quote.h system-quote.c tempname.c timespec.c trim.c \ + unistd.c unistr/u8-mbtoucr.c unistr/u8-uctomb.c \ + unistr/u8-uctomb-aux.c uniwidth/width.c version-etc.h \ + version-etc.c version-etc-fsf.c wctype-h.c xmalloc.c \ + xalloc-die.c xfreopen.c xfreopen.h xreadlink.c xsize.h xsize.c \ + xstriconv.h xstriconv.c xstrndup.h xstrndup.c xstrtol.c \ + xstrtoul.c xstrtol-error.c xstrtoumax.c xvasprintf.h \ xvasprintf.c xasprintf.c cmpbuf.c prepargs.c am__dirstamp = .dirstamp @LIBUNISTRING_COMPILE_UNISTR_U8_MBTOUCR_TRUE@am__objects_1 = unistr/u8-mbtoucr.$(OBJEXT) @@ -282,22 +288,23 @@ am_libdiffutils_a_OBJECTS = allocator.$(OBJEXT) areadlink.$(OBJEXT) \ basename-lgpl.$(OBJEXT) stripslash.$(OBJEXT) exclude.$(OBJEXT) \ exitfail.$(OBJEXT) fd-hook.$(OBJEXT) file-type.$(OBJEXT) \ filenamecat.$(OBJEXT) filenamecat-lgpl.$(OBJEXT) \ - freopen-safer.$(OBJEXT) gettime.$(OBJEXT) \ - hard-locale.$(OBJEXT) hash.$(OBJEXT) imaxtostr.$(OBJEXT) \ - inttostr.$(OBJEXT) offtostr.$(OBJEXT) uinttostr.$(OBJEXT) \ - umaxtostr.$(OBJEXT) localcharset.$(OBJEXT) malloca.$(OBJEXT) \ - mbchar.$(OBJEXT) mbiter.$(OBJEXT) mbscasecmp.$(OBJEXT) \ - mbslen.$(OBJEXT) mbsstr.$(OBJEXT) mbuiter.$(OBJEXT) \ - progname.$(OBJEXT) propername.$(OBJEXT) quotearg.$(OBJEXT) \ - sh-quote.$(OBJEXT) sig-handler.$(OBJEXT) stat-time.$(OBJEXT) \ - strftime.$(OBJEXT) striconv.$(OBJEXT) strnlen1.$(OBJEXT) \ - system-quote.$(OBJEXT) tempname.$(OBJEXT) timespec.$(OBJEXT) \ - trim.$(OBJEXT) unistd.$(OBJEXT) $(am__objects_1) \ - $(am__objects_2) $(am__objects_3) version-etc.$(OBJEXT) \ - version-etc-fsf.$(OBJEXT) wctype-h.$(OBJEXT) xmalloc.$(OBJEXT) \ - xalloc-die.$(OBJEXT) xfreopen.$(OBJEXT) xreadlink.$(OBJEXT) \ - xsize.$(OBJEXT) xstriconv.$(OBJEXT) xstrndup.$(OBJEXT) \ - xstrtol.$(OBJEXT) xstrtoul.$(OBJEXT) xstrtol-error.$(OBJEXT) \ + freopen-safer.$(OBJEXT) getprogname.$(OBJEXT) \ + gettime.$(OBJEXT) hard-locale.$(OBJEXT) hash.$(OBJEXT) \ + imaxtostr.$(OBJEXT) inttostr.$(OBJEXT) offtostr.$(OBJEXT) \ + uinttostr.$(OBJEXT) umaxtostr.$(OBJEXT) localcharset.$(OBJEXT) \ + malloca.$(OBJEXT) mbchar.$(OBJEXT) mbiter.$(OBJEXT) \ + mbscasecmp.$(OBJEXT) mbslen.$(OBJEXT) mbsstr.$(OBJEXT) \ + mbuiter.$(OBJEXT) progname.$(OBJEXT) propername.$(OBJEXT) \ + quotearg.$(OBJEXT) sh-quote.$(OBJEXT) sig-handler.$(OBJEXT) \ + stat-time.$(OBJEXT) strftime.$(OBJEXT) striconv.$(OBJEXT) \ + strnlen1.$(OBJEXT) system-quote.$(OBJEXT) tempname.$(OBJEXT) \ + timespec.$(OBJEXT) trim.$(OBJEXT) unistd.$(OBJEXT) \ + $(am__objects_1) $(am__objects_2) $(am__objects_3) \ + version-etc.$(OBJEXT) version-etc-fsf.$(OBJEXT) \ + wctype-h.$(OBJEXT) xmalloc.$(OBJEXT) xalloc-die.$(OBJEXT) \ + xfreopen.$(OBJEXT) xreadlink.$(OBJEXT) xsize.$(OBJEXT) \ + xstriconv.$(OBJEXT) xstrndup.$(OBJEXT) xstrtol.$(OBJEXT) \ + xstrtoul.$(OBJEXT) xstrtol-error.$(OBJEXT) \ xstrtoumax.$(OBJEXT) xvasprintf.$(OBJEXT) xasprintf.$(OBJEXT) \ cmpbuf.$(OBJEXT) prepargs.$(OBJEXT) libdiffutils_a_OBJECTS = $(am_libdiffutils_a_OBJECTS) @@ -316,26 +323,26 @@ am__v_at_1 = DEFAULT_INCLUDES = -I.@am__isrc@ depcomp = $(SHELL) $(top_srcdir)/build-aux/depcomp am__maybe_remake_depfiles = depfiles -am__depfiles_remade = $(DEPDIR)/alloca.Po ./$(DEPDIR)/alloca.Po \ - ./$(DEPDIR)/allocator.Po ./$(DEPDIR)/anytostr.Po \ - ./$(DEPDIR)/areadlink.Po ./$(DEPDIR)/argmatch.Po \ - ./$(DEPDIR)/asnprintf.Po ./$(DEPDIR)/asprintf.Po \ - ./$(DEPDIR)/basename-lgpl.Po ./$(DEPDIR)/basename.Po \ - ./$(DEPDIR)/binary-io.Po ./$(DEPDIR)/bitrotate.Po \ - ./$(DEPDIR)/btowc.Po ./$(DEPDIR)/c-ctype.Po \ - ./$(DEPDIR)/c-stack.Po ./$(DEPDIR)/c-strcasecmp.Po \ - ./$(DEPDIR)/c-strncasecmp.Po ./$(DEPDIR)/careadlinkat.Po \ - ./$(DEPDIR)/close.Po ./$(DEPDIR)/cmpbuf.Po \ - ./$(DEPDIR)/dirname-lgpl.Po ./$(DEPDIR)/dirname.Po \ - ./$(DEPDIR)/dup2.Po ./$(DEPDIR)/error.Po \ - ./$(DEPDIR)/exclude.Po ./$(DEPDIR)/exitfail.Po \ - ./$(DEPDIR)/fcntl.Po ./$(DEPDIR)/fd-hook.Po \ - ./$(DEPDIR)/file-type.Po ./$(DEPDIR)/filenamecat-lgpl.Po \ - ./$(DEPDIR)/filenamecat.Po ./$(DEPDIR)/float.Po \ - ./$(DEPDIR)/fnmatch.Po ./$(DEPDIR)/fnmatch_loop.Po \ - ./$(DEPDIR)/freopen-safer.Po ./$(DEPDIR)/freopen.Po \ - ./$(DEPDIR)/fstat.Po ./$(DEPDIR)/getdtablesize.Po \ - ./$(DEPDIR)/getopt.Po ./$(DEPDIR)/getopt1.Po \ +am__depfiles_remade = ./$(DEPDIR)/alloca.Po ./$(DEPDIR)/allocator.Po \ + ./$(DEPDIR)/anytostr.Po ./$(DEPDIR)/areadlink.Po \ + ./$(DEPDIR)/argmatch.Po ./$(DEPDIR)/asnprintf.Po \ + ./$(DEPDIR)/asprintf.Po ./$(DEPDIR)/basename-lgpl.Po \ + ./$(DEPDIR)/basename.Po ./$(DEPDIR)/binary-io.Po \ + ./$(DEPDIR)/bitrotate.Po ./$(DEPDIR)/btowc.Po \ + ./$(DEPDIR)/c-ctype.Po ./$(DEPDIR)/c-stack.Po \ + ./$(DEPDIR)/c-strcasecmp.Po ./$(DEPDIR)/c-strncasecmp.Po \ + ./$(DEPDIR)/careadlinkat.Po ./$(DEPDIR)/close.Po \ + ./$(DEPDIR)/cmpbuf.Po ./$(DEPDIR)/dirname-lgpl.Po \ + ./$(DEPDIR)/dirname.Po ./$(DEPDIR)/dup2.Po \ + ./$(DEPDIR)/error.Po ./$(DEPDIR)/exclude.Po \ + ./$(DEPDIR)/exitfail.Po ./$(DEPDIR)/fcntl.Po \ + ./$(DEPDIR)/fd-hook.Po ./$(DEPDIR)/file-type.Po \ + ./$(DEPDIR)/filenamecat-lgpl.Po ./$(DEPDIR)/filenamecat.Po \ + ./$(DEPDIR)/float.Po ./$(DEPDIR)/fnmatch.Po \ + ./$(DEPDIR)/fnmatch_loop.Po ./$(DEPDIR)/freopen-safer.Po \ + ./$(DEPDIR)/freopen.Po ./$(DEPDIR)/fstat.Po \ + ./$(DEPDIR)/getdtablesize.Po ./$(DEPDIR)/getopt.Po \ + ./$(DEPDIR)/getopt1.Po ./$(DEPDIR)/getprogname.Po \ ./$(DEPDIR)/gettime.Po ./$(DEPDIR)/gettimeofday.Po \ ./$(DEPDIR)/hard-locale.Po ./$(DEPDIR)/hash.Po \ ./$(DEPDIR)/iconv.Po ./$(DEPDIR)/iconv_close.Po \ @@ -343,27 +350,28 @@ am__depfiles_remade = $(DEPDIR)/alloca.Po ./$(DEPDIR)/alloca.Po \ ./$(DEPDIR)/inttostr.Po ./$(DEPDIR)/isblank.Po \ ./$(DEPDIR)/iswblank.Po ./$(DEPDIR)/itold.Po \ ./$(DEPDIR)/localcharset.Po ./$(DEPDIR)/localeconv.Po \ - ./$(DEPDIR)/lstat.Po ./$(DEPDIR)/malloc.Po \ - ./$(DEPDIR)/malloca.Po ./$(DEPDIR)/mbchar.Po \ - ./$(DEPDIR)/mbiter.Po ./$(DEPDIR)/mbrtowc.Po \ - ./$(DEPDIR)/mbscasecmp.Po ./$(DEPDIR)/mbsinit.Po \ - ./$(DEPDIR)/mbslen.Po ./$(DEPDIR)/mbsrtowcs-state.Po \ - ./$(DEPDIR)/mbsrtowcs.Po ./$(DEPDIR)/mbsstr.Po \ - ./$(DEPDIR)/mbtowc.Po ./$(DEPDIR)/mbuiter.Po \ - ./$(DEPDIR)/memchr.Po ./$(DEPDIR)/mkstemp.Po \ - ./$(DEPDIR)/mktime.Po ./$(DEPDIR)/msvc-inval.Po \ - ./$(DEPDIR)/msvc-nothrow.Po ./$(DEPDIR)/nl_langinfo.Po \ - ./$(DEPDIR)/offtostr.Po ./$(DEPDIR)/open.Po \ - ./$(DEPDIR)/prepargs.Po ./$(DEPDIR)/printf-args.Po \ - ./$(DEPDIR)/printf-parse.Po ./$(DEPDIR)/progname.Po \ - ./$(DEPDIR)/propername.Po ./$(DEPDIR)/quotearg.Po \ - ./$(DEPDIR)/raise.Po ./$(DEPDIR)/rawmemchr.Po \ - ./$(DEPDIR)/readlink.Po ./$(DEPDIR)/regcomp.Po \ - ./$(DEPDIR)/regex.Po ./$(DEPDIR)/regex_internal.Po \ - ./$(DEPDIR)/regexec.Po ./$(DEPDIR)/secure_getenv.Po \ - ./$(DEPDIR)/setenv.Po ./$(DEPDIR)/sh-quote.Po \ - ./$(DEPDIR)/sig-handler.Po ./$(DEPDIR)/sigaction.Po \ - ./$(DEPDIR)/sigprocmask.Po ./$(DEPDIR)/stat-time.Po \ + ./$(DEPDIR)/localtime-buffer.Po ./$(DEPDIR)/lstat.Po \ + ./$(DEPDIR)/malloc.Po ./$(DEPDIR)/malloca.Po \ + ./$(DEPDIR)/mbchar.Po ./$(DEPDIR)/mbiter.Po \ + ./$(DEPDIR)/mbrtowc.Po ./$(DEPDIR)/mbscasecmp.Po \ + ./$(DEPDIR)/mbsinit.Po ./$(DEPDIR)/mbslen.Po \ + ./$(DEPDIR)/mbsrtowcs-state.Po ./$(DEPDIR)/mbsrtowcs.Po \ + ./$(DEPDIR)/mbsstr.Po ./$(DEPDIR)/mbtowc.Po \ + ./$(DEPDIR)/mbuiter.Po ./$(DEPDIR)/memchr.Po \ + ./$(DEPDIR)/mkstemp.Po ./$(DEPDIR)/mktime.Po \ + ./$(DEPDIR)/msvc-inval.Po ./$(DEPDIR)/msvc-nothrow.Po \ + ./$(DEPDIR)/nl_langinfo.Po ./$(DEPDIR)/offtostr.Po \ + ./$(DEPDIR)/open.Po ./$(DEPDIR)/prepargs.Po \ + ./$(DEPDIR)/printf-args.Po ./$(DEPDIR)/printf-parse.Po \ + ./$(DEPDIR)/progname.Po ./$(DEPDIR)/propername.Po \ + ./$(DEPDIR)/quotearg.Po ./$(DEPDIR)/raise.Po \ + ./$(DEPDIR)/rawmemchr.Po ./$(DEPDIR)/readlink.Po \ + ./$(DEPDIR)/regcomp.Po ./$(DEPDIR)/regex.Po \ + ./$(DEPDIR)/regex_internal.Po ./$(DEPDIR)/regexec.Po \ + ./$(DEPDIR)/secure_getenv.Po ./$(DEPDIR)/setenv.Po \ + ./$(DEPDIR)/sh-quote.Po ./$(DEPDIR)/sig-handler.Po \ + ./$(DEPDIR)/sigaction.Po ./$(DEPDIR)/sigprocmask.Po \ + ./$(DEPDIR)/stat-time.Po ./$(DEPDIR)/stat-w32.Po \ ./$(DEPDIR)/stat.Po ./$(DEPDIR)/strcasecmp.Po \ ./$(DEPDIR)/strerror-override.Po ./$(DEPDIR)/strerror.Po \ ./$(DEPDIR)/strftime.Po ./$(DEPDIR)/striconv.Po \ @@ -376,19 +384,19 @@ am__depfiles_remade = $(DEPDIR)/alloca.Po ./$(DEPDIR)/alloca.Po \ ./$(DEPDIR)/tempname.Po ./$(DEPDIR)/time_r.Po \ ./$(DEPDIR)/time_rz.Po ./$(DEPDIR)/timegm.Po \ ./$(DEPDIR)/timespec.Po ./$(DEPDIR)/trim.Po \ - ./$(DEPDIR)/uinttostr.Po ./$(DEPDIR)/umaxtostr.Po \ - ./$(DEPDIR)/unistd.Po ./$(DEPDIR)/unsetenv.Po \ - ./$(DEPDIR)/vasnprintf.Po ./$(DEPDIR)/vasprintf.Po \ - ./$(DEPDIR)/version-etc-fsf.Po ./$(DEPDIR)/version-etc.Po \ - ./$(DEPDIR)/wcrtomb.Po ./$(DEPDIR)/wctype-h.Po \ - ./$(DEPDIR)/wcwidth.Po ./$(DEPDIR)/xalloc-die.Po \ - ./$(DEPDIR)/xasprintf.Po ./$(DEPDIR)/xfreopen.Po \ - ./$(DEPDIR)/xmalloc.Po ./$(DEPDIR)/xreadlink.Po \ - ./$(DEPDIR)/xsize.Po ./$(DEPDIR)/xstriconv.Po \ - ./$(DEPDIR)/xstrndup.Po ./$(DEPDIR)/xstrtol-error.Po \ - ./$(DEPDIR)/xstrtol.Po ./$(DEPDIR)/xstrtoul.Po \ - ./$(DEPDIR)/xstrtoumax.Po ./$(DEPDIR)/xvasprintf.Po \ - unistr/$(DEPDIR)/u8-mbtoucr.Po \ + ./$(DEPDIR)/tzset.Po ./$(DEPDIR)/uinttostr.Po \ + ./$(DEPDIR)/umaxtostr.Po ./$(DEPDIR)/unistd.Po \ + ./$(DEPDIR)/unsetenv.Po ./$(DEPDIR)/vasnprintf.Po \ + ./$(DEPDIR)/vasprintf.Po ./$(DEPDIR)/version-etc-fsf.Po \ + ./$(DEPDIR)/version-etc.Po ./$(DEPDIR)/wcrtomb.Po \ + ./$(DEPDIR)/wctype-h.Po ./$(DEPDIR)/wcwidth.Po \ + ./$(DEPDIR)/xalloc-die.Po ./$(DEPDIR)/xasprintf.Po \ + ./$(DEPDIR)/xfreopen.Po ./$(DEPDIR)/xmalloc.Po \ + ./$(DEPDIR)/xreadlink.Po ./$(DEPDIR)/xsize.Po \ + ./$(DEPDIR)/xstriconv.Po ./$(DEPDIR)/xstrndup.Po \ + ./$(DEPDIR)/xstrtol-error.Po ./$(DEPDIR)/xstrtol.Po \ + ./$(DEPDIR)/xstrtoul.Po ./$(DEPDIR)/xstrtoumax.Po \ + ./$(DEPDIR)/xvasprintf.Po unistr/$(DEPDIR)/u8-mbtoucr.Po \ unistr/$(DEPDIR)/u8-uctomb-aux.Po \ unistr/$(DEPDIR)/u8-uctomb.Po uniwidth/$(DEPDIR)/width.Po am__mv = mv -f @@ -478,6 +486,7 @@ ERRNO_H = @ERRNO_H@ EXEEXT = @EXEEXT@ FLOAT_H = @FLOAT_H@ FNMATCH_H = @FNMATCH_H@ +GETOPT_CDEFS_H = @GETOPT_CDEFS_H@ GETOPT_H = @GETOPT_H@ GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@ GLIBC21 = @GLIBC21@ @@ -494,6 +503,7 @@ GNULIB_CHDIR = @GNULIB_CHDIR@ GNULIB_CHOWN = @GNULIB_CHOWN@ GNULIB_CLOSE = @GNULIB_CLOSE@ GNULIB_CONNECT = @GNULIB_CONNECT@ +GNULIB_CTIME = @GNULIB_CTIME@ GNULIB_DPRINTF = @GNULIB_DPRINTF@ GNULIB_DUP = @GNULIB_DUP@ GNULIB_DUP2 = @GNULIB_DUP2@ @@ -572,6 +582,7 @@ GNULIB_LINK = @GNULIB_LINK@ GNULIB_LINKAT = @GNULIB_LINKAT@ GNULIB_LISTEN = @GNULIB_LISTEN@ GNULIB_LOCALECONV = @GNULIB_LOCALECONV@ +GNULIB_LOCALTIME = @GNULIB_LOCALTIME@ GNULIB_LSEEK = @GNULIB_LSEEK@ GNULIB_LSTAT = @GNULIB_LSTAT@ GNULIB_MALLOC_POSIX = @GNULIB_MALLOC_POSIX@ @@ -617,6 +628,8 @@ GNULIB_OBSTACK_PRINTF = @GNULIB_OBSTACK_PRINTF@ GNULIB_OBSTACK_PRINTF_POSIX = @GNULIB_OBSTACK_PRINTF_POSIX@ GNULIB_OPEN = @GNULIB_OPEN@ GNULIB_OPENAT = @GNULIB_OPENAT@ +GNULIB_OVERRIDES_STRUCT_STAT = @GNULIB_OVERRIDES_STRUCT_STAT@ +GNULIB_OVERRIDES_WINT_T = @GNULIB_OVERRIDES_WINT_T@ GNULIB_PCLOSE = @GNULIB_PCLOSE@ GNULIB_PERROR = @GNULIB_PERROR@ GNULIB_PIPE = @GNULIB_PIPE@ @@ -679,6 +692,7 @@ GNULIB_STRCHRNUL = @GNULIB_STRCHRNUL@ GNULIB_STRDUP = @GNULIB_STRDUP@ GNULIB_STRERROR = @GNULIB_STRERROR@ GNULIB_STRERROR_R = @GNULIB_STRERROR_R@ +GNULIB_STRFTIME = @GNULIB_STRFTIME@ GNULIB_STRNCAT = @GNULIB_STRNCAT@ GNULIB_STRNDUP = @GNULIB_STRNDUP@ GNULIB_STRNLEN = @GNULIB_STRNLEN@ @@ -702,7 +716,9 @@ GNULIB_TIME_R = @GNULIB_TIME_R@ GNULIB_TIME_RZ = @GNULIB_TIME_RZ@ GNULIB_TMPFILE = @GNULIB_TMPFILE@ GNULIB_TOWCTRANS = @GNULIB_TOWCTRANS@ +GNULIB_TRUNCATE = @GNULIB_TRUNCATE@ GNULIB_TTYNAME_R = @GNULIB_TTYNAME_R@ +GNULIB_TZSET = @GNULIB_TZSET@ GNULIB_UNISTD_H_NONBLOCKING = @GNULIB_UNISTD_H_NONBLOCKING@ GNULIB_UNISTD_H_SIGPIPE = @GNULIB_UNISTD_H_SIGPIPE@ GNULIB_UNLINK = @GNULIB_UNLINK@ @@ -734,6 +750,7 @@ GNULIB_WCSCOLL = @GNULIB_WCSCOLL@ GNULIB_WCSCPY = @GNULIB_WCSCPY@ GNULIB_WCSCSPN = @GNULIB_WCSCSPN@ GNULIB_WCSDUP = @GNULIB_WCSDUP@ +GNULIB_WCSFTIME = @GNULIB_WCSFTIME@ GNULIB_WCSLEN = @GNULIB_WCSLEN@ GNULIB_WCSNCASECMP = @GNULIB_WCSNCASECMP@ GNULIB_WCSNCAT = @GNULIB_WCSNCAT@ @@ -766,8 +783,10 @@ HAVE_ACCEPT4 = @HAVE_ACCEPT4@ HAVE_ARPA_INET_H = @HAVE_ARPA_INET_H@ HAVE_ATOLL = @HAVE_ATOLL@ HAVE_BTOWC = @HAVE_BTOWC@ +HAVE_C99_STDINT_H = @HAVE_C99_STDINT_H@ HAVE_CANONICALIZE_FILE_NAME = @HAVE_CANONICALIZE_FILE_NAME@ HAVE_CHOWN = @HAVE_CHOWN@ +HAVE_CRTDEFS_H = @HAVE_CRTDEFS_H@ HAVE_DECL_ENVIRON = @HAVE_DECL_ENVIRON@ HAVE_DECL_FCHDIR = @HAVE_DECL_FCHDIR@ HAVE_DECL_FDATASYNC = @HAVE_DECL_FDATASYNC@ @@ -778,6 +797,7 @@ HAVE_DECL_GETDELIM = @HAVE_DECL_GETDELIM@ HAVE_DECL_GETDOMAINNAME = @HAVE_DECL_GETDOMAINNAME@ HAVE_DECL_GETLINE = @HAVE_DECL_GETLINE@ HAVE_DECL_GETLOADAVG = @HAVE_DECL_GETLOADAVG@ +HAVE_DECL_GETLOGIN = @HAVE_DECL_GETLOGIN@ HAVE_DECL_GETLOGIN_R = @HAVE_DECL_GETLOGIN_R@ HAVE_DECL_GETPAGESIZE = @HAVE_DECL_GETPAGESIZE@ HAVE_DECL_GETUSERSHELL = @HAVE_DECL_GETUSERSHELL@ @@ -890,6 +910,7 @@ HAVE_PTHREAD_SIGMASK = @HAVE_PTHREAD_SIGMASK@ HAVE_PTSNAME = @HAVE_PTSNAME@ HAVE_PTSNAME_R = @HAVE_PTSNAME_R@ HAVE_PWRITE = @HAVE_PWRITE@ +HAVE_QSORT_R = @HAVE_QSORT_R@ HAVE_RAISE = @HAVE_RAISE@ HAVE_RANDOM = @HAVE_RANDOM@ HAVE_RANDOM_H = @HAVE_RANDOM_H@ @@ -934,6 +955,7 @@ HAVE_STRVERSCMP = @HAVE_STRVERSCMP@ HAVE_SYMLINK = @HAVE_SYMLINK@ HAVE_SYMLINKAT = @HAVE_SYMLINKAT@ HAVE_SYS_BITYPES_H = @HAVE_SYS_BITYPES_H@ +HAVE_SYS_CDEFS_H = @HAVE_SYS_CDEFS_H@ HAVE_SYS_INTTYPES_H = @HAVE_SYS_INTTYPES_H@ HAVE_SYS_IOCTL_H = @HAVE_SYS_IOCTL_H@ HAVE_SYS_LOADAVG_H = @HAVE_SYS_LOADAVG_H@ @@ -945,7 +967,9 @@ HAVE_SYS_TYPES_H = @HAVE_SYS_TYPES_H@ HAVE_SYS_UIO_H = @HAVE_SYS_UIO_H@ HAVE_TIMEGM = @HAVE_TIMEGM@ HAVE_TIMEZONE_T = @HAVE_TIMEZONE_T@ +HAVE_TRUNCATE = @HAVE_TRUNCATE@ HAVE_TYPE_VOLATILE_SIG_ATOMIC_T = @HAVE_TYPE_VOLATILE_SIG_ATOMIC_T@ +HAVE_TZSET = @HAVE_TZSET@ HAVE_UNISTD_H = @HAVE_UNISTD_H@ HAVE_UNLINKAT = @HAVE_UNLINKAT@ HAVE_UNLOCKPT = @HAVE_UNLOCKPT@ @@ -967,6 +991,7 @@ HAVE_WCSCOLL = @HAVE_WCSCOLL@ HAVE_WCSCPY = @HAVE_WCSCPY@ HAVE_WCSCSPN = @HAVE_WCSCSPN@ HAVE_WCSDUP = @HAVE_WCSDUP@ +HAVE_WCSFTIME = @HAVE_WCSFTIME@ HAVE_WCSLEN = @HAVE_WCSLEN@ HAVE_WCSNCASECMP = @HAVE_WCSNCASECMP@ HAVE_WCSNCAT = @HAVE_WCSNCAT@ @@ -1029,6 +1054,7 @@ LIBUNISTRING_UNIWIDTH_H = @LIBUNISTRING_UNIWIDTH_H@ LIB_CLOCK_GETTIME = @LIB_CLOCK_GETTIME@ LIB_NANOSLEEP = @LIB_NANOSLEEP@ LIB_SELECT = @LIB_SELECT@ +LIMITS_H = @LIMITS_H@ LOCALCHARSET_TESTS_ENVIRONMENT = @LOCALCHARSET_TESTS_ENVIRONMENT@ LOCALE_FR = @LOCALE_FR@ LOCALE_FR_UTF8 = @LOCALE_FR_UTF8@ @@ -1056,6 +1082,7 @@ NEXT_AS_FIRST_DIRECTIVE_GETOPT_H = @NEXT_AS_FIRST_DIRECTIVE_GETOPT_H@ NEXT_AS_FIRST_DIRECTIVE_ICONV_H = @NEXT_AS_FIRST_DIRECTIVE_ICONV_H@ NEXT_AS_FIRST_DIRECTIVE_INTTYPES_H = @NEXT_AS_FIRST_DIRECTIVE_INTTYPES_H@ NEXT_AS_FIRST_DIRECTIVE_LANGINFO_H = @NEXT_AS_FIRST_DIRECTIVE_LANGINFO_H@ +NEXT_AS_FIRST_DIRECTIVE_LIMITS_H = @NEXT_AS_FIRST_DIRECTIVE_LIMITS_H@ NEXT_AS_FIRST_DIRECTIVE_LOCALE_H = @NEXT_AS_FIRST_DIRECTIVE_LOCALE_H@ NEXT_AS_FIRST_DIRECTIVE_NETINET_IN_H = @NEXT_AS_FIRST_DIRECTIVE_NETINET_IN_H@ NEXT_AS_FIRST_DIRECTIVE_SIGNAL_H = @NEXT_AS_FIRST_DIRECTIVE_SIGNAL_H@ @@ -1086,6 +1113,7 @@ NEXT_GETOPT_H = @NEXT_GETOPT_H@ NEXT_ICONV_H = @NEXT_ICONV_H@ NEXT_INTTYPES_H = @NEXT_INTTYPES_H@ NEXT_LANGINFO_H = @NEXT_LANGINFO_H@ +NEXT_LIMITS_H = @NEXT_LIMITS_H@ NEXT_LOCALE_H = @NEXT_LOCALE_H@ NEXT_NETINET_IN_H = @NEXT_NETINET_IN_H@ NEXT_SIGNAL_H = @NEXT_SIGNAL_H@ @@ -1131,6 +1159,7 @@ REPLACE_CALLOC = @REPLACE_CALLOC@ REPLACE_CANONICALIZE_FILE_NAME = @REPLACE_CANONICALIZE_FILE_NAME@ REPLACE_CHOWN = @REPLACE_CHOWN@ REPLACE_CLOSE = @REPLACE_CLOSE@ +REPLACE_CTIME = @REPLACE_CTIME@ REPLACE_DPRINTF = @REPLACE_DPRINTF@ REPLACE_DUP = @REPLACE_DUP@ REPLACE_DUP2 = @REPLACE_DUP2@ @@ -1238,6 +1267,7 @@ REPLACE_STRCHRNUL = @REPLACE_STRCHRNUL@ REPLACE_STRDUP = @REPLACE_STRDUP@ REPLACE_STRERROR = @REPLACE_STRERROR@ REPLACE_STRERROR_R = @REPLACE_STRERROR_R@ +REPLACE_STRFTIME = @REPLACE_STRFTIME@ REPLACE_STRNCAT = @REPLACE_STRNCAT@ REPLACE_STRNDUP = @REPLACE_STRNDUP@ REPLACE_STRNLEN = @REPLACE_STRNLEN@ @@ -1254,7 +1284,9 @@ REPLACE_SYMLINKAT = @REPLACE_SYMLINKAT@ REPLACE_TIMEGM = @REPLACE_TIMEGM@ REPLACE_TMPFILE = @REPLACE_TMPFILE@ REPLACE_TOWLOWER = @REPLACE_TOWLOWER@ +REPLACE_TRUNCATE = @REPLACE_TRUNCATE@ REPLACE_TTYNAME_R = @REPLACE_TTYNAME_R@ +REPLACE_TZSET = @REPLACE_TZSET@ REPLACE_UNLINK = @REPLACE_UNLINK@ REPLACE_UNLINKAT = @REPLACE_UNLINKAT@ REPLACE_UNSETENV = @REPLACE_UNSETENV@ @@ -1267,6 +1299,7 @@ REPLACE_VPRINTF = @REPLACE_VPRINTF@ REPLACE_VSNPRINTF = @REPLACE_VSNPRINTF@ REPLACE_VSPRINTF = @REPLACE_VSPRINTF@ REPLACE_WCRTOMB = @REPLACE_WCRTOMB@ +REPLACE_WCSFTIME = @REPLACE_WCSFTIME@ REPLACE_WCSNRTOMBS = @REPLACE_WCSNRTOMBS@ REPLACE_WCSRTOMBS = @REPLACE_WCSRTOMBS@ REPLACE_WCSWIDTH = @REPLACE_WCSWIDTH@ @@ -1303,6 +1336,8 @@ WCHAR_T_SUFFIX = @WCHAR_T_SUFFIX@ WERROR_CFLAGS = @WERROR_CFLAGS@ WINDOWS_64_BIT_OFF_T = @WINDOWS_64_BIT_OFF_T@ WINDOWS_64_BIT_ST_SIZE = @WINDOWS_64_BIT_ST_SIZE@ +WINDOWS_STAT_INODES = @WINDOWS_STAT_INODES@ +WINDOWS_STAT_TIMESPEC = @WINDOWS_STAT_TIMESPEC@ WINT_T_SUFFIX = @WINT_T_SUFFIX@ XGETTEXT = @XGETTEXT@ XGETTEXT_015 = @XGETTEXT_015@ @@ -1312,7 +1347,6 @@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ abs_top_srcdir = @abs_top_srcdir@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ am__include = @am__include@ am__quote = @am__quote@ @@ -1366,31 +1400,16 @@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ AM_CFLAGS = $(GNULIB_WARN_CFLAGS) $(WERROR_CFLAGS) - -# The BUILT_SOURCES created by this Makefile snippet are not used via #include -# statements but through direct file reference. Therefore this snippet must be -# present in all Makefile.am that need it. This is ensured by the applicability -# 'all' defined above. - -# The BUILT_SOURCES created by this Makefile snippet are not used via #include -# statements but through direct file reference. Therefore this snippet must be -# present in all Makefile.am that need it. This is ensured by the applicability -# 'all' defined above. - -# The BUILT_SOURCES created by this Makefile snippet are not used via #include -# statements but through direct file reference. Therefore this snippet must be -# present in all Makefile.am that need it. This is ensured by the applicability -# 'all' defined above. BUILT_SOURCES = $(ALLOCA_H) configmake.h ctype.h $(ERRNO_H) fcntl.h \ - $(FLOAT_H) $(FNMATCH_H) $(GETOPT_H) $(ICONV_H) \ - iconv_open-aix.h iconv_open-hpux.h iconv_open-irix.h \ - iconv_open-osf.h iconv_open-solaris.h inttypes.h langinfo.h \ - locale.h signal.h arg-nonnull.h c++defs.h unused-parameter.h \ - warn-on-use.h $(STDARG_H) $(STDBOOL_H) $(STDDEF_H) $(STDINT_H) \ - stdio.h stdlib.h string.h strings.h sys/stat.h sys/time.h \ - sys/types.h sys/wait.h time.h unistd.h \ - $(LIBUNISTRING_UNISTR_H) $(LIBUNISTRING_UNITYPES_H) \ - $(LIBUNISTRING_UNIWIDTH_H) wchar.h wctype.h + $(FLOAT_H) $(FNMATCH_H) $(GETOPT_H) $(GETOPT_CDEFS_H) \ + $(ICONV_H) iconv_open-aix.h iconv_open-hpux.h \ + iconv_open-irix.h iconv_open-osf.h iconv_open-solaris.h \ + inttypes.h langinfo.h $(LIMITS_H) locale.h signal.h \ + $(STDARG_H) $(STDBOOL_H) $(STDDEF_H) $(STDINT_H) stdio.h \ + stdlib.h string.h strings.h sys/stat.h sys/time.h sys/types.h \ + sys/wait.h time.h unistd.h $(LIBUNISTRING_UNISTR_H) \ + $(LIBUNISTRING_UNITYPES_H) $(LIBUNISTRING_UNIWIDTH_H) wchar.h \ + wctype.h CLEANFILES = configmake.h configmake.h-t charset.alias ref-add.sed \ ref-del.sed @@ -1408,10 +1427,12 @@ EXTRA_DIST = alloca.c alloca.in.h allocator.h \ $(top_srcdir)/build-aux/do-release-commit-and-tag dosname.h \ dup2.c errno.in.h error.c error.h exclude.h exitfail.h fcntl.c \ fcntl.in.h fd-hook.h file-type.h filename.h filenamecat.h \ - float.c float.in.h itold.c fnmatch.c fnmatch.in.h \ + flexmember.h float.c float.in.h itold.c fnmatch.c fnmatch.in.h \ fnmatch_loop.c freopen.c stdio--.h stdio-safer.h fstat.c \ - $(top_srcdir)/build-aux/gendocs.sh getdtablesize.c getopt.c \ - getopt.in.h getopt1.c getopt_int.h gettimeofday.c \ + stat-w32.c stat-w32.h $(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 gettimeofday.c \ $(top_srcdir)/build-aux/git-version-gen \ $(top_srcdir)/build-aux/gitlog-to-changelog \ $(top_srcdir)/build-aux/gnu-web-doc-update \ @@ -1423,8 +1444,9 @@ EXTRA_DIST = alloca.c alloca.in.h allocator.h \ iconv_open-hpux.gperf iconv_open-irix.gperf \ iconv_open-osf.gperf iconv_open-solaris.gperf iconv_open.c \ ignore-value.h intprops.h anytostr.c inttostr.h inttypes.in.h \ - isblank.c iswblank.c langinfo.in.h config.charset ref-add.sin \ - ref-del.sin locale.in.h localeconv.c lstat.c \ + isblank.c iswblank.c langinfo.in.h limits.in.h config.charset \ + ref-add.sin ref-del.sin locale.in.h localeconv.c \ + localtime-buffer.c localtime-buffer.h lstat.c \ $(top_srcdir)/maint.mk malloc.c malloca.h malloca.valgrind \ mbchar.h mbrtowc.c mbsinit.c mbsrtowcs-impl.h \ mbsrtowcs-state.c mbsrtowcs.c str-kmp.h mbtowc-impl.h mbtowc.c \ @@ -1432,23 +1454,19 @@ EXTRA_DIST = alloca.c alloca.in.h allocator.h \ mktime-internal.h mktime.c msvc-inval.c msvc-inval.h \ msvc-nothrow.c msvc-nothrow.h nl_langinfo.c open.c pathmax.h \ quote.h quote.h quotearg.h raise.c rawmemchr.c \ - rawmemchr.valgrind readlink.c $(top_srcdir)/README-release \ - regcomp.c regex.c regex.h regex_internal.c regex_internal.h \ - regexec.c secure_getenv.c setenv.c sig-handler.h sigaction.c \ - signal.in.h sigprocmask.c \ - $(top_srcdir)/build-aux/snippet/_Noreturn.h \ - $(top_srcdir)/build-aux/snippet/arg-nonnull.h \ - $(top_srcdir)/build-aux/snippet/c++defs.h \ - $(top_srcdir)/build-aux/snippet/unused-parameter.h \ - $(top_srcdir)/build-aux/snippet/warn-on-use.h stat.c \ - stat-macros.h stat-time.h stdarg.in.h stdbool.in.h stddef.in.h \ - stdint.in.h stdio.in.h stdlib.in.h strcasecmp.c strncasecmp.c \ - streq.h strerror.c strerror-override.c strerror-override.h \ - strftime.h string.in.h strings.in.h strndup.c strnlen.c \ - strptime.c strtol.c strtoul.c strtoull.c strtoimax.c \ - strtoumax.c sys_stat.in.h sys_time.in.h sys_types.in.h \ - sys_wait.in.h tempname.h time.in.h time_r.c time-internal.h \ - time_rz.c mktime-internal.h timegm.c timespec.h trim.h \ + rawmemchr.valgrind readlink.c regcomp.c regex.c regex.h \ + regex_internal.c regex_internal.h regexec.c secure_getenv.c \ + setenv.c sig-handler.h sigaction.c signal.in.h sigprocmask.c \ + _Noreturn.h arg-nonnull.h c++defs.h unused-parameter.h \ + warn-on-use.h stat-w32.c stat-w32.h stat.c stat-macros.h \ + stat-time.h stdarg.in.h stdbool.in.h stddef.in.h stdint.in.h \ + stdio.in.h stdlib.in.h strcasecmp.c strncasecmp.c streq.h \ + strerror.c strerror-override.c strerror-override.h strftime.h \ + string.in.h strings.in.h strndup.c strnlen.c strptime.c \ + strtol.c strtoul.c strtoull.c strtoimax.c strtoumax.c \ + sys_stat.in.h sys_time.in.h sys_types.in.h sys_wait.in.h \ + tempname.h time.in.h time_r.c time-internal.h time_rz.c \ + mktime-internal.h timegm.c timespec.h trim.h tzset.c \ unistd.in.h unistr.in.h unitypes.in.h localcharset.h \ uniwidth.in.h uniwidth/cjk.h unlocked-io.h unsetenv.c \ $(top_srcdir)/build-aux/update-copyright \ @@ -1461,23 +1479,23 @@ EXTRA_DIST = alloca.c alloca.in.h allocator.h \ MOSTLYCLEANDIRS = sys sys MOSTLYCLEANFILES = core *.stackdump alloca.h alloca.h-t ctype.h \ ctype.h-t errno.h errno.h-t fcntl.h fcntl.h-t float.h \ - float.h-t fnmatch.h fnmatch.h-t getopt.h getopt.h-t iconv.h \ - iconv.h-t iconv_open-aix.h-t iconv_open-hpux.h-t \ - iconv_open-irix.h-t iconv_open-osf.h-t iconv_open-solaris.h-t \ - inttypes.h inttypes.h-t langinfo.h langinfo.h-t locale.h \ - locale.h-t signal.h signal.h-t arg-nonnull.h arg-nonnull.h-t \ - c++defs.h c++defs.h-t unused-parameter.h unused-parameter.h-t \ - warn-on-use.h warn-on-use.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 strings.h \ - strings.h-t sys/stat.h sys/stat.h-t sys/time.h sys/time.h-t \ - sys/types.h sys/types.h-t sys/wait.h sys/wait.h-t time.h \ - time.h-t unistd.h unistd.h-t unistr.h unistr.h-t unitypes.h \ - unitypes.h-t uniwidth.h uniwidth.h-t wchar.h wchar.h-t \ - wctype.h wctype.h-t + float.h-t fnmatch.h fnmatch.h-t getopt.h getopt.h-t \ + getopt-cdefs.h getopt-cdefs.h-t iconv.h iconv.h-t \ + iconv_open-aix.h-t iconv_open-hpux.h-t iconv_open-irix.h-t \ + iconv_open-osf.h-t iconv_open-solaris.h-t inttypes.h \ + inttypes.h-t langinfo.h langinfo.h-t limits.h limits.h-t \ + locale.h locale.h-t signal.h signal.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 \ + strings.h strings.h-t sys/stat.h sys/stat.h-t sys/time.h \ + sys/time.h-t sys/types.h sys/types.h-t sys/wait.h sys/wait.h-t \ + time.h time.h-t unistd.h unistd.h-t unistr.h unistr.h-t \ + unitypes.h unitypes.h-t uniwidth.h uniwidth.h-t wchar.h \ + wchar.h-t wctype.h wctype.h-t MAINTAINERCLEANFILES = iconv_open-aix.h iconv_open-hpux.h \ iconv_open-irix.h iconv_open-osf.h iconv_open-solaris.h SUFFIXES = .sed .sin +# No GNU Make output. noinst_LIBRARIES = libdiffutils.a noinst_HEADERS = cmpbuf.h prepargs.h libdiffutils_a_SOURCES = allocator.c areadlink.c argmatch.c \ @@ -1486,36 +1504,37 @@ libdiffutils_a_SOURCES = allocator.c areadlink.c argmatch.c \ c-strncasecmp.c careadlinkat.c diffseq.h dirname.c basename.c \ dirname-lgpl.c basename-lgpl.c stripslash.c exclude.c \ exitfail.c fd-hook.c file-type.c filenamecat.c \ - filenamecat-lgpl.c freopen-safer.c gettext.h gettime.c \ - hard-locale.c hash.c imaxtostr.c inttostr.c offtostr.c \ - uinttostr.c umaxtostr.c localcharset.h localcharset.c \ - malloca.c mbchar.c mbiter.h mbiter.c mbscasecmp.c mbslen.c \ - mbsstr.c mbuiter.h mbuiter.c progname.h progname.c \ - propername.h propername.c quotearg.c sh-quote.h sh-quote.c \ - sig-handler.c size_max.h stat-time.c strftime.c striconv.h \ - striconv.c strnlen1.h strnlen1.c system-quote.h system-quote.c \ - tempname.c timespec.c trim.c unistd.c $(am__append_1) \ - $(am__append_2) $(am__append_3) version-etc.h version-etc.c \ - version-etc-fsf.c wctype-h.c xmalloc.c xalloc-die.c xfreopen.c \ - xfreopen.h xreadlink.c xsize.h xsize.c xstriconv.h xstriconv.c \ - xstrndup.h xstrndup.c xstrtol.c xstrtoul.c xstrtol-error.c \ - xstrtoumax.c xvasprintf.h xvasprintf.c xasprintf.c cmpbuf.c \ - prepargs.c + filenamecat-lgpl.c freopen-safer.c getprogname.h getprogname.c \ + gettext.h gettime.c hard-locale.c hash.c imaxtostr.c \ + inttostr.c offtostr.c uinttostr.c umaxtostr.c localcharset.h \ + localcharset.c malloca.c mbchar.c mbiter.h mbiter.c \ + mbscasecmp.c mbslen.c mbsstr.c mbuiter.h mbuiter.c minmax.h \ + progname.h progname.c propername.h propername.c quotearg.c \ + sh-quote.h sh-quote.c sig-handler.c size_max.h stat-time.c \ + strftime.c striconv.h striconv.c strnlen1.h strnlen1.c \ + system-quote.h system-quote.c tempname.c timespec.c trim.c \ + unistd.c $(am__append_1) $(am__append_2) $(am__append_3) \ + version-etc.h version-etc.c version-etc-fsf.c wctype-h.c \ + xmalloc.c xalloc-die.c xfreopen.c xfreopen.h xreadlink.c \ + xsize.h xsize.c xstriconv.h xstriconv.c xstrndup.h xstrndup.c \ + xstrtol.c xstrtoul.c xstrtol-error.c xstrtoumax.c xvasprintf.h \ + xvasprintf.c xasprintf.c cmpbuf.c prepargs.c libdiffutils_a_LIBADD = $(gl_LIBOBJS) @ALLOCA@ libdiffutils_a_DEPENDENCIES = $(gl_LIBOBJS) @ALLOCA@ EXTRA_libdiffutils_a_SOURCES = alloca.c btowc.c close.c stripslash.c \ dup2.c error.c fcntl.c float.c itold.c fnmatch.c \ - fnmatch_loop.c freopen.c fstat.c getdtablesize.c getopt.c \ - getopt1.c gettimeofday.c iconv.c iconv_close.c iconv_open.c \ - anytostr.c isblank.c iswblank.c localeconv.c lstat.c malloc.c \ - mbrtowc.c mbsinit.c mbsrtowcs-state.c mbsrtowcs.c mbtowc.c \ - memchr.c mkstemp.c mktime.c mktime.c msvc-inval.c \ - msvc-nothrow.c nl_langinfo.c open.c raise.c rawmemchr.c \ - readlink.c regcomp.c regex.c regex_internal.c regexec.c \ - secure_getenv.c setenv.c sigaction.c sigprocmask.c stat.c \ - strcasecmp.c strncasecmp.c strerror.c strerror-override.c \ - strndup.c strnlen.c strptime.c strtol.c strtoul.c strtoull.c \ - strtoimax.c strtoumax.c time_r.c time_rz.c timegm.c unsetenv.c \ + fnmatch_loop.c freopen.c fstat.c stat-w32.c getdtablesize.c \ + getopt.c getopt1.c gettimeofday.c iconv.c iconv_close.c \ + iconv_open.c anytostr.c isblank.c iswblank.c localeconv.c \ + localtime-buffer.c lstat.c malloc.c mbrtowc.c mbsinit.c \ + mbsrtowcs-state.c mbsrtowcs.c mbtowc.c memchr.c mkstemp.c \ + mktime.c mktime.c msvc-inval.c msvc-nothrow.c nl_langinfo.c \ + open.c raise.c rawmemchr.c readlink.c regcomp.c regex.c \ + regex_internal.c regexec.c secure_getenv.c setenv.c \ + sigaction.c sigprocmask.c stat-w32.c stat.c strcasecmp.c \ + strncasecmp.c strerror.c strerror-override.c strndup.c \ + strnlen.c strptime.c strtol.c strtoul.c strtoull.c strtoimax.c \ + strtoumax.c time_r.c time_rz.c timegm.c tzset.c unsetenv.c \ asnprintf.c printf-args.c printf-parse.c vasnprintf.c \ asprintf.c vasprintf.c wcrtomb.c wcwidth.c @@ -1531,13 +1550,29 @@ charset_alias = $(DESTDIR)$(libdir)/charset.alias charset_tmp = $(DESTDIR)$(libdir)/charset.tmp # Because this Makefile snippet defines a variable used by other -# gnulib Makefile snippets, it must be present in all Makefile.am that +# gnulib Makefile snippets, it must be present in all makefiles that +# need it. This is ensured by the applicability 'all' defined above. +_NORETURN_H = $(srcdir)/_Noreturn.h + +# Because this Makefile snippet defines a variable used by other +# gnulib Makefile snippets, it must be present in all makefiles that # need it. This is ensured by the applicability 'all' defined above. -_NORETURN_H = $(top_srcdir)/build-aux/snippet/_Noreturn.h -ARG_NONNULL_H = arg-nonnull.h -CXXDEFS_H = c++defs.h -UNUSED_PARAMETER_H = unused-parameter.h -WARN_ON_USE_H = warn-on-use.h +ARG_NONNULL_H = $(srcdir)/arg-nonnull.h + +# Because this Makefile snippet defines a variable used by other +# gnulib Makefile snippets, it must be present in all makefiles that +# need it. This is ensured by the applicability 'all' defined above. +CXXDEFS_H = $(srcdir)/c++defs.h + +# Because this Makefile snippet defines a variable used by other +# gnulib Makefile snippets, it must be present in all makefiles that +# need it. This is ensured by the applicability 'all' defined above. +UNUSED_PARAMETER_H = $(srcdir)/unused-parameter.h + +# Because this Makefile snippet defines a variable used by other +# gnulib Makefile snippets, it must be present in all makefiles that +# need it. This is ensured by the applicability 'all' defined above. +WARN_ON_USE_H = $(srcdir)/warn-on-use.h all: $(BUILT_SOURCES) config.h $(MAKE) $(AM_MAKEFLAGS) all-am @@ -1625,7 +1660,6 @@ mostlyclean-compile: distclean-compile: -rm -f *.tab.c -@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/alloca.Po@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/alloca.Po@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/allocator.Po@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/anytostr.Po@am__quote@ # am--include-marker @@ -1665,6 +1699,7 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/getdtablesize.Po@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/getopt.Po@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/getopt1.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/getprogname.Po@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gettime.Po@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gettimeofday.Po@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/hard-locale.Po@am__quote@ # am--include-marker @@ -1679,6 +1714,7 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/itold.Po@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/localcharset.Po@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/localeconv.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/localtime-buffer.Po@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lstat.Po@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/malloc.Po@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/malloca.Po@am__quote@ # am--include-marker @@ -1721,6 +1757,7 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sigaction.Po@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sigprocmask.Po@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/stat-time.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/stat-w32.Po@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/stat.Po@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/strcasecmp.Po@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/strerror-override.Po@am__quote@ # am--include-marker @@ -1745,6 +1782,7 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/timegm.Po@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/timespec.Po@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/trim.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tzset.Po@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/uinttostr.Po@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/umaxtostr.Po@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/unistd.Po@am__quote@ # am--include-marker @@ -1929,8 +1967,7 @@ clean: clean-am clean-am: clean-generic clean-noinstLIBRARIES mostlyclean-am distclean: distclean-am - -rm -f $(DEPDIR)/alloca.Po - -rm -f ./$(DEPDIR)/alloca.Po + -rm -f ./$(DEPDIR)/alloca.Po -rm -f ./$(DEPDIR)/allocator.Po -rm -f ./$(DEPDIR)/anytostr.Po -rm -f ./$(DEPDIR)/areadlink.Po @@ -1969,6 +2006,7 @@ distclean: distclean-am -rm -f ./$(DEPDIR)/getdtablesize.Po -rm -f ./$(DEPDIR)/getopt.Po -rm -f ./$(DEPDIR)/getopt1.Po + -rm -f ./$(DEPDIR)/getprogname.Po -rm -f ./$(DEPDIR)/gettime.Po -rm -f ./$(DEPDIR)/gettimeofday.Po -rm -f ./$(DEPDIR)/hard-locale.Po @@ -1983,6 +2021,7 @@ distclean: distclean-am -rm -f ./$(DEPDIR)/itold.Po -rm -f ./$(DEPDIR)/localcharset.Po -rm -f ./$(DEPDIR)/localeconv.Po + -rm -f ./$(DEPDIR)/localtime-buffer.Po -rm -f ./$(DEPDIR)/lstat.Po -rm -f ./$(DEPDIR)/malloc.Po -rm -f ./$(DEPDIR)/malloca.Po @@ -2025,6 +2064,7 @@ distclean: distclean-am -rm -f ./$(DEPDIR)/sigaction.Po -rm -f ./$(DEPDIR)/sigprocmask.Po -rm -f ./$(DEPDIR)/stat-time.Po + -rm -f ./$(DEPDIR)/stat-w32.Po -rm -f ./$(DEPDIR)/stat.Po -rm -f ./$(DEPDIR)/strcasecmp.Po -rm -f ./$(DEPDIR)/strerror-override.Po @@ -2049,6 +2089,7 @@ distclean: distclean-am -rm -f ./$(DEPDIR)/timegm.Po -rm -f ./$(DEPDIR)/timespec.Po -rm -f ./$(DEPDIR)/trim.Po + -rm -f ./$(DEPDIR)/tzset.Po -rm -f ./$(DEPDIR)/uinttostr.Po -rm -f ./$(DEPDIR)/umaxtostr.Po -rm -f ./$(DEPDIR)/unistd.Po @@ -2122,8 +2163,7 @@ install-ps-am: installcheck-am: maintainer-clean: maintainer-clean-am - -rm -f $(DEPDIR)/alloca.Po - -rm -f ./$(DEPDIR)/alloca.Po + -rm -f ./$(DEPDIR)/alloca.Po -rm -f ./$(DEPDIR)/allocator.Po -rm -f ./$(DEPDIR)/anytostr.Po -rm -f ./$(DEPDIR)/areadlink.Po @@ -2162,6 +2202,7 @@ maintainer-clean: maintainer-clean-am -rm -f ./$(DEPDIR)/getdtablesize.Po -rm -f ./$(DEPDIR)/getopt.Po -rm -f ./$(DEPDIR)/getopt1.Po + -rm -f ./$(DEPDIR)/getprogname.Po -rm -f ./$(DEPDIR)/gettime.Po -rm -f ./$(DEPDIR)/gettimeofday.Po -rm -f ./$(DEPDIR)/hard-locale.Po @@ -2176,6 +2217,7 @@ maintainer-clean: maintainer-clean-am -rm -f ./$(DEPDIR)/itold.Po -rm -f ./$(DEPDIR)/localcharset.Po -rm -f ./$(DEPDIR)/localeconv.Po + -rm -f ./$(DEPDIR)/localtime-buffer.Po -rm -f ./$(DEPDIR)/lstat.Po -rm -f ./$(DEPDIR)/malloc.Po -rm -f ./$(DEPDIR)/malloca.Po @@ -2218,6 +2260,7 @@ maintainer-clean: maintainer-clean-am -rm -f ./$(DEPDIR)/sigaction.Po -rm -f ./$(DEPDIR)/sigprocmask.Po -rm -f ./$(DEPDIR)/stat-time.Po + -rm -f ./$(DEPDIR)/stat-w32.Po -rm -f ./$(DEPDIR)/stat.Po -rm -f ./$(DEPDIR)/strcasecmp.Po -rm -f ./$(DEPDIR)/strerror-override.Po @@ -2242,6 +2285,7 @@ maintainer-clean: maintainer-clean-am -rm -f ./$(DEPDIR)/timegm.Po -rm -f ./$(DEPDIR)/timespec.Po -rm -f ./$(DEPDIR)/trim.Po + -rm -f ./$(DEPDIR)/tzset.Po -rm -f ./$(DEPDIR)/uinttostr.Po -rm -f ./$(DEPDIR)/umaxtostr.Po -rm -f ./$(DEPDIR)/unistd.Po @@ -2454,7 +2498,7 @@ fcntl.h: fcntl.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) # We need the following in order to create <getopt.h> when the system # doesn't have one that works with the given compiler. -getopt.h: getopt.in.h $(top_builddir)/config.status $(ARG_NONNULL_H) +getopt.h: getopt.in.h $(top_builddir)/config.status $(AM_V_GEN)rm -f $@-t $@ && \ { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \ sed -e 's|@''GUARD_PREFIX''@|GL|g' \ @@ -2468,6 +2512,13 @@ getopt.h: getopt.in.h $(top_builddir)/config.status $(ARG_NONNULL_H) } > $@-t && \ mv -f $@-t $@ +getopt-cdefs.h: getopt-cdefs.in.h $(top_builddir)/config.status + $(AM_V_GEN)rm -f $@-t $@ && \ + { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \ + sed -e 's|@''HAVE_SYS_CDEFS_H''@|$(HAVE_SYS_CDEFS_H)|g' \ + < $(srcdir)/getopt-cdefs.in.h; \ + } > $@-t && \ + mv -f $@-t $@ distclean-local: clean-GNUmakefile clean-GNUmakefile: test '$(srcdir)' = . || rm -f $(top_builddir)/GNUmakefile @@ -2572,6 +2623,22 @@ langinfo.h: langinfo.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(WARN_ON_U } > $@-t && \ mv $@-t $@ +# We need the following in order to create <limits.h> when the system +# doesn't have one that is compatible with GNU. +@GL_GENERATE_LIMITS_H_TRUE@limits.h: limits.in.h $(top_builddir)/config.status +@GL_GENERATE_LIMITS_H_TRUE@ $(AM_V_GEN)rm -f $@-t $@ && \ +@GL_GENERATE_LIMITS_H_TRUE@ { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \ +@GL_GENERATE_LIMITS_H_TRUE@ sed -e 's|@''GUARD_PREFIX''@|GL|g' \ +@GL_GENERATE_LIMITS_H_TRUE@ -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \ +@GL_GENERATE_LIMITS_H_TRUE@ -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \ +@GL_GENERATE_LIMITS_H_TRUE@ -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \ +@GL_GENERATE_LIMITS_H_TRUE@ -e 's|@''NEXT_LIMITS_H''@|$(NEXT_LIMITS_H)|g' \ +@GL_GENERATE_LIMITS_H_TRUE@ < $(srcdir)/limits.in.h; \ +@GL_GENERATE_LIMITS_H_TRUE@ } > $@-t && \ +@GL_GENERATE_LIMITS_H_TRUE@ mv $@-t $@ +@GL_GENERATE_LIMITS_H_FALSE@limits.h: $(top_builddir)/config.status +@GL_GENERATE_LIMITS_H_FALSE@ rm -f $@ + # We need the following in order to install a simple file in $(libdir) # which is shared with other installed packages. We use a list of referencing # packages so that "make uninstall" will remove the file if and only if it @@ -2689,41 +2756,6 @@ signal.h: signal.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H < $(srcdir)/signal.in.h; \ } > $@-t && \ mv $@-t $@ -# The arg-nonnull.h that gets inserted into generated .h files is the same as -# build-aux/snippet/arg-nonnull.h, except that it has the copyright header cut -# off. -arg-nonnull.h: $(top_srcdir)/build-aux/snippet/arg-nonnull.h - $(AM_V_GEN)rm -f $@-t $@ && \ - sed -n -e '/GL_ARG_NONNULL/,$$p' \ - < $(top_srcdir)/build-aux/snippet/arg-nonnull.h \ - > $@-t && \ - mv $@-t $@ -# The c++defs.h that gets inserted into generated .h files is the same as -# build-aux/snippet/c++defs.h, except that it has the copyright header cut off. -c++defs.h: $(top_srcdir)/build-aux/snippet/c++defs.h - $(AM_V_GEN)rm -f $@-t $@ && \ - sed -n -e '/_GL_CXXDEFS/,$$p' \ - < $(top_srcdir)/build-aux/snippet/c++defs.h \ - > $@-t && \ - mv $@-t $@ -# The unused-parameter.h that gets inserted into generated .h files is the same -# as build-aux/snippet/unused-parameter.h, except that it has the copyright -# header cut off. -unused-parameter.h: $(top_srcdir)/build-aux/snippet/unused-parameter.h - $(AM_V_GEN)rm -f $@-t $@ && \ - sed -n -e '/GL_UNUSED_PARAMETER/,$$p' \ - < $(top_srcdir)/build-aux/snippet/unused-parameter.h \ - > $@-t && \ - mv $@-t $@ -# The warn-on-use.h that gets inserted into generated .h files is the same as -# build-aux/snippet/warn-on-use.h, except that it has the copyright header cut -# off. -warn-on-use.h: $(top_srcdir)/build-aux/snippet/warn-on-use.h - $(AM_V_GEN)rm -f $@-t $@ && \ - sed -n -e '/^.ifndef/,$$p' \ - < $(top_srcdir)/build-aux/snippet/warn-on-use.h \ - > $@-t && \ - mv $@-t $@ # We need the following in order to create <stdarg.h> when the system # doesn't have one that works with the given compiler. @@ -2782,6 +2814,7 @@ warn-on-use.h: $(top_srcdir)/build-aux/snippet/warn-on-use.h @GL_GENERATE_STDINT_H_TRUE@ -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \ @GL_GENERATE_STDINT_H_TRUE@ -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \ @GL_GENERATE_STDINT_H_TRUE@ -e 's|@''NEXT_STDINT_H''@|$(NEXT_STDINT_H)|g' \ +@GL_GENERATE_STDINT_H_TRUE@ -e 's/@''HAVE_C99_STDINT_H''@/$(HAVE_C99_STDINT_H)/g' \ @GL_GENERATE_STDINT_H_TRUE@ -e 's/@''HAVE_SYS_TYPES_H''@/$(HAVE_SYS_TYPES_H)/g' \ @GL_GENERATE_STDINT_H_TRUE@ -e 's/@''HAVE_INTTYPES_H''@/$(HAVE_INTTYPES_H)/g' \ @GL_GENERATE_STDINT_H_TRUE@ -e 's/@''HAVE_SYS_INTTYPES_H''@/$(HAVE_SYS_INTTYPES_H)/g' \ @@ -2803,6 +2836,7 @@ warn-on-use.h: $(top_srcdir)/build-aux/snippet/warn-on-use.h @GL_GENERATE_STDINT_H_TRUE@ -e 's/@''BITSIZEOF_WINT_T''@/$(BITSIZEOF_WINT_T)/g' \ @GL_GENERATE_STDINT_H_TRUE@ -e 's/@''HAVE_SIGNED_WINT_T''@/$(HAVE_SIGNED_WINT_T)/g' \ @GL_GENERATE_STDINT_H_TRUE@ -e 's/@''WINT_T_SUFFIX''@/$(WINT_T_SUFFIX)/g' \ +@GL_GENERATE_STDINT_H_TRUE@ -e 's/@''GNULIB_OVERRIDES_WINT_T''@/$(GNULIB_OVERRIDES_WINT_T)/g' \ @GL_GENERATE_STDINT_H_TRUE@ < $(srcdir)/stdint.in.h; \ @GL_GENERATE_STDINT_H_TRUE@ } > $@-t && \ @GL_GENERATE_STDINT_H_TRUE@ mv $@-t $@ @@ -2987,6 +3021,7 @@ stdlib.h: stdlib.in.h $(top_builddir)/config.status $(CXXDEFS_H) \ -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' \ + -e 's|@''HAVE_QSORT_R''@|$(HAVE_QSORT_R)|g' \ -e 's|@''HAVE_RANDOM''@|$(HAVE_RANDOM)|g' \ -e 's|@''HAVE_RANDOM_H''@|$(HAVE_RANDOM_H)|g' \ -e 's|@''HAVE_RANDOM_R''@|$(HAVE_RANDOM_R)|g' \ @@ -3149,6 +3184,7 @@ sys/stat.h: sys_stat.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNU -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \ -e 's|@''NEXT_SYS_STAT_H''@|$(NEXT_SYS_STAT_H)|g' \ -e 's|@''WINDOWS_64_BIT_ST_SIZE''@|$(WINDOWS_64_BIT_ST_SIZE)|g' \ + -e 's|@''WINDOWS_STAT_TIMESPEC''@|$(WINDOWS_STAT_TIMESPEC)|g' \ -e 's/@''GNULIB_FCHMODAT''@/$(GNULIB_FCHMODAT)/g' \ -e 's/@''GNULIB_FSTAT''@/$(GNULIB_FSTAT)/g' \ -e 's/@''GNULIB_FSTATAT''@/$(GNULIB_FSTATAT)/g' \ @@ -3162,6 +3198,7 @@ sys/stat.h: sys_stat.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNU -e 's/@''GNULIB_MKNODAT''@/$(GNULIB_MKNODAT)/g' \ -e 's/@''GNULIB_STAT''@/$(GNULIB_STAT)/g' \ -e 's/@''GNULIB_UTIMENSAT''@/$(GNULIB_UTIMENSAT)/g' \ + -e 's/@''GNULIB_OVERRIDES_STRUCT_STAT''@/$(GNULIB_OVERRIDES_STRUCT_STAT)/g' \ -e 's|@''HAVE_FCHMODAT''@|$(HAVE_FCHMODAT)|g' \ -e 's|@''HAVE_FSTATAT''@|$(HAVE_FSTATAT)|g' \ -e 's|@''HAVE_FUTIMENS''@|$(HAVE_FUTIMENS)|g' \ @@ -3226,6 +3263,7 @@ sys/types.h: sys_types.in.h $(top_builddir)/config.status -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \ -e 's|@''NEXT_SYS_TYPES_H''@|$(NEXT_SYS_TYPES_H)|g' \ -e 's|@''WINDOWS_64_BIT_OFF_T''@|$(WINDOWS_64_BIT_OFF_T)|g' \ + -e 's|@''WINDOWS_STAT_INODES''@|$(WINDOWS_STAT_INODES)|g' \ < $(srcdir)/sys_types.in.h; \ } > $@-t && \ mv $@-t $@ @@ -3258,24 +3296,31 @@ time.h: time.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_TIME_H''@|$(NEXT_TIME_H)|g' \ - -e 's/@''GNULIB_GETTIMEOFDAY''@/$(GNULIB_GETTIMEOFDAY)/g' \ + -e 's/@''GNULIB_CTIME''@/$(GNULIB_CTIME)/g' \ + -e 's/@''GNULIB_LOCALTIME''@/$(GNULIB_LOCALTIME)/g' \ -e 's/@''GNULIB_MKTIME''@/$(GNULIB_MKTIME)/g' \ -e 's/@''GNULIB_NANOSLEEP''@/$(GNULIB_NANOSLEEP)/g' \ + -e 's/@''GNULIB_STRFTIME''@/$(GNULIB_STRFTIME)/g' \ -e 's/@''GNULIB_STRPTIME''@/$(GNULIB_STRPTIME)/g' \ -e 's/@''GNULIB_TIMEGM''@/$(GNULIB_TIMEGM)/g' \ -e 's/@''GNULIB_TIME_R''@/$(GNULIB_TIME_R)/g' \ -e 's/@''GNULIB_TIME_RZ''@/$(GNULIB_TIME_RZ)/g' \ + -e 's/@''GNULIB_TZSET''@/$(GNULIB_TZSET)/g' \ -e 's|@''HAVE_DECL_LOCALTIME_R''@|$(HAVE_DECL_LOCALTIME_R)|g' \ -e 's|@''HAVE_NANOSLEEP''@|$(HAVE_NANOSLEEP)|g' \ -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' \ -e 's|@''REPLACE_LOCALTIME_R''@|$(REPLACE_LOCALTIME_R)|g' \ -e 's|@''REPLACE_MKTIME''@|$(REPLACE_MKTIME)|g' \ -e 's|@''REPLACE_NANOSLEEP''@|$(REPLACE_NANOSLEEP)|g' \ + -e 's|@''REPLACE_STRFTIME''@|$(REPLACE_STRFTIME)|g' \ -e 's|@''REPLACE_TIMEGM''@|$(REPLACE_TIMEGM)|g' \ + -e 's|@''REPLACE_TZSET''@|$(REPLACE_TZSET)|g' \ -e 's|@''PTHREAD_H_DEFINES_STRUCT_TIMESPEC''@|$(PTHREAD_H_DEFINES_STRUCT_TIMESPEC)|g' \ -e 's|@''SYS_TIME_H_DEFINES_STRUCT_TIMESPEC''@|$(SYS_TIME_H_DEFINES_STRUCT_TIMESPEC)|g' \ -e 's|@''TIME_H_DEFINES_STRUCT_TIMESPEC''@|$(TIME_H_DEFINES_STRUCT_TIMESPEC)|g' \ @@ -3340,6 +3385,7 @@ unistd.h: unistd.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H -e 's/@''GNULIB_SLEEP''@/$(GNULIB_SLEEP)/g' \ -e 's/@''GNULIB_SYMLINK''@/$(GNULIB_SYMLINK)/g' \ -e 's/@''GNULIB_SYMLINKAT''@/$(GNULIB_SYMLINKAT)/g' \ + -e 's/@''GNULIB_TRUNCATE''@/$(GNULIB_TRUNCATE)/g' \ -e 's/@''GNULIB_TTYNAME_R''@/$(GNULIB_TTYNAME_R)/g' \ -e 's/@''GNULIB_UNISTD_H_GETOPT''@/0$(GNULIB_GL_UNISTD_H_GETOPT)/g' \ -e 's/@''GNULIB_UNISTD_H_NONBLOCKING''@/$(GNULIB_UNISTD_H_NONBLOCKING)/g' \ @@ -3362,7 +3408,6 @@ unistd.h: unistd.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H -e 's|@''HAVE_GETDTABLESIZE''@|$(HAVE_GETDTABLESIZE)|g' \ -e 's|@''HAVE_GETGROUPS''@|$(HAVE_GETGROUPS)|g' \ -e 's|@''HAVE_GETHOSTNAME''@|$(HAVE_GETHOSTNAME)|g' \ - -e 's|@''HAVE_GETLOGIN''@|$(HAVE_GETLOGIN)|g' \ -e 's|@''HAVE_GETPAGESIZE''@|$(HAVE_GETPAGESIZE)|g' \ -e 's|@''HAVE_GROUP_MEMBER''@|$(HAVE_GROUP_MEMBER)|g' \ -e 's|@''HAVE_LCHOWN''@|$(HAVE_LCHOWN)|g' \ @@ -3378,12 +3423,14 @@ unistd.h: unistd.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H -e 's|@''HAVE_SLEEP''@|$(HAVE_SLEEP)|g' \ -e 's|@''HAVE_SYMLINK''@|$(HAVE_SYMLINK)|g' \ -e 's|@''HAVE_SYMLINKAT''@|$(HAVE_SYMLINKAT)|g' \ + -e 's|@''HAVE_TRUNCATE''@|$(HAVE_TRUNCATE)|g' \ -e 's|@''HAVE_UNLINKAT''@|$(HAVE_UNLINKAT)|g' \ -e 's|@''HAVE_USLEEP''@|$(HAVE_USLEEP)|g' \ -e 's|@''HAVE_DECL_ENVIRON''@|$(HAVE_DECL_ENVIRON)|g' \ -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' \ + -e 's|@''HAVE_DECL_GETLOGIN''@|$(HAVE_DECL_GETLOGIN)|g' \ -e 's|@''HAVE_DECL_GETLOGIN_R''@|$(HAVE_DECL_GETLOGIN_R)|g' \ -e 's|@''HAVE_DECL_GETPAGESIZE''@|$(HAVE_DECL_GETPAGESIZE)|g' \ -e 's|@''HAVE_DECL_GETUSERSHELL''@|$(HAVE_DECL_GETUSERSHELL)|g' \ @@ -3418,6 +3465,7 @@ unistd.h: unistd.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H -e 's|@''REPLACE_SLEEP''@|$(REPLACE_SLEEP)|g' \ -e 's|@''REPLACE_SYMLINK''@|$(REPLACE_SYMLINK)|g' \ -e 's|@''REPLACE_SYMLINKAT''@|$(REPLACE_SYMLINKAT)|g' \ + -e 's|@''REPLACE_TRUNCATE''@|$(REPLACE_TRUNCATE)|g' \ -e 's|@''REPLACE_TTYNAME_R''@|$(REPLACE_TTYNAME_R)|g' \ -e 's|@''REPLACE_UNLINK''@|$(REPLACE_UNLINK)|g' \ -e 's|@''REPLACE_UNLINKAT''@|$(REPLACE_UNLINKAT)|g' \ @@ -3464,6 +3512,8 @@ wchar.h: wchar.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) -e 's|@''HAVE_FEATURES_H''@|$(HAVE_FEATURES_H)|g' \ -e 's|@''NEXT_WCHAR_H''@|$(NEXT_WCHAR_H)|g' \ -e 's|@''HAVE_WCHAR_H''@|$(HAVE_WCHAR_H)|g' \ + -e 's/@''HAVE_CRTDEFS_H''@/$(HAVE_CRTDEFS_H)/g' \ + -e 's/@''GNULIB_OVERRIDES_WINT_T''@/$(GNULIB_OVERRIDES_WINT_T)/g' \ -e 's/@''GNULIB_BTOWC''@/$(GNULIB_BTOWC)/g' \ -e 's/@''GNULIB_WCTOB''@/$(GNULIB_WCTOB)/g' \ -e 's/@''GNULIB_MBSINIT''@/$(GNULIB_MBSINIT)/g' \ @@ -3503,6 +3553,7 @@ wchar.h: wchar.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) -e 's/@''GNULIB_WCSSTR''@/$(GNULIB_WCSSTR)/g' \ -e 's/@''GNULIB_WCSTOK''@/$(GNULIB_WCSTOK)/g' \ -e 's/@''GNULIB_WCSWIDTH''@/$(GNULIB_WCSWIDTH)/g' \ + -e 's/@''GNULIB_WCSFTIME''@/$(GNULIB_WCSFTIME)/g' \ < $(srcdir)/wchar.in.h | \ sed -e 's|@''HAVE_WINT_T''@|$(HAVE_WINT_T)|g' \ -e 's|@''HAVE_BTOWC''@|$(HAVE_BTOWC)|g' \ @@ -3542,6 +3593,7 @@ wchar.h: wchar.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) -e 's|@''HAVE_WCSSTR''@|$(HAVE_WCSSTR)|g' \ -e 's|@''HAVE_WCSTOK''@|$(HAVE_WCSTOK)|g' \ -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_WCWIDTH''@|$(HAVE_DECL_WCWIDTH)|g' \ | \ @@ -3558,6 +3610,7 @@ wchar.h: wchar.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) -e 's|@''REPLACE_WCSNRTOMBS''@|$(REPLACE_WCSNRTOMBS)|g' \ -e 's|@''REPLACE_WCWIDTH''@|$(REPLACE_WCWIDTH)|g' \ -e 's|@''REPLACE_WCSWIDTH''@|$(REPLACE_WCSWIDTH)|g' \ + -e 's|@''REPLACE_WCSFTIME''@|$(REPLACE_WCSFTIME)|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)'; \ @@ -3575,6 +3628,8 @@ wctype.h: wctype.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(WARN_ON_USE_H -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \ -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \ -e 's|@''NEXT_WCTYPE_H''@|$(NEXT_WCTYPE_H)|g' \ + -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_WCTYPE''@/$(GNULIB_WCTYPE)/g' \ -e 's/@''GNULIB_ISWCTYPE''@/$(GNULIB_ISWCTYPE)/g' \ diff --git a/lib/_Noreturn.h b/lib/_Noreturn.h new file mode 100644 index 0000000..c44ad89 --- /dev/null +++ b/lib/_Noreturn.h @@ -0,0 +1,10 @@ +#if !defined _Noreturn && __STDC_VERSION__ < 201112 +# if (3 <= __GNUC__ || (__GNUC__ == 2 && 8 <= __GNUC_MINOR__) \ + || 0x5110 <= __SUNPRO_C) +# define _Noreturn __attribute__ ((__noreturn__)) +# elif 1200 <= _MSC_VER +# define _Noreturn __declspec (noreturn) +# else +# define _Noreturn +# endif +#endif diff --git a/lib/alloca.in.h b/lib/alloca.in.h index d457ebb..c3dc38a 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-2016 Free Software Foundation, + Copyright (C) 1995, 1999, 2001-2004, 2006-2017 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it @@ -51,6 +51,8 @@ extern "C" void *_alloca (unsigned short); # pragma intrinsic (_alloca) # define alloca _alloca +# elif defined __MVS__ +# include <stdlib.h> # else # include <stddef.h> # ifdef __cplusplus diff --git a/lib/allocator.h b/lib/allocator.h index 1f1eab6..650f8e0 100644 --- a/lib/allocator.h +++ b/lib/allocator.h @@ -1,6 +1,6 @@ /* Memory allocators such as malloc+free. - Copyright (C) 2011-2016 Free Software Foundation, Inc. + Copyright (C) 2011-2017 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/lib/anytostr.c b/lib/anytostr.c index 39aab0e..74a3f1f 100644 --- a/lib/anytostr.c +++ b/lib/anytostr.c @@ -1,6 +1,6 @@ /* anytostr.c -- convert integers to printable strings - Copyright (C) 2001, 2006, 2008-2016 Free Software Foundation, Inc. + Copyright (C) 2001, 2006, 2008-2017 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/lib/areadlink.c b/lib/areadlink.c index fee84a3..78afb3a 100644 --- a/lib/areadlink.c +++ b/lib/areadlink.c @@ -1,7 +1,7 @@ /* areadlink.c -- readlink wrapper to return the link name in malloc'd storage Unlike xreadlink and xreadlink_with_size, don't ever call exit. - Copyright (C) 2001, 2003-2007, 2009-2016 Free Software Foundation, Inc. + Copyright (C) 2001, 2003-2007, 2009-2017 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/lib/areadlink.h b/lib/areadlink.h index 829c959..cb3b5e2 100644 --- a/lib/areadlink.h +++ b/lib/areadlink.h @@ -1,6 +1,6 @@ /* Read symbolic links without size limitation. - Copyright (C) 2001, 2003-2004, 2007, 2009-2016 Free Software Foundation, + Copyright (C) 2001, 2003-2004, 2007, 2009-2017 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify diff --git a/lib/arg-nonnull.h b/lib/arg-nonnull.h new file mode 100644 index 0000000..1e62cc8 --- /dev/null +++ b/lib/arg-nonnull.h @@ -0,0 +1,26 @@ +/* A C macro for declaring that specific arguments must not be NULL. + Copyright (C) 2009-2017 Free Software Foundation, Inc. + + This program is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation; either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see <http://www.gnu.org/licenses/>. */ + +/* _GL_ARG_NONNULL((n,...,m)) tells the compiler and static analyzer tools + that the values passed as arguments n, ..., m must be non-NULL pointers. + n = 1 stands for the first argument, n = 2 for the second argument etc. */ +#ifndef _GL_ARG_NONNULL +# if (__GNUC__ == 3 && __GNUC_MINOR__ >= 3) || __GNUC__ > 3 +# define _GL_ARG_NONNULL(params) __attribute__ ((__nonnull__ params)) +# else +# define _GL_ARG_NONNULL(params) +# endif +#endif diff --git a/lib/argmatch.c b/lib/argmatch.c index bd1ad71..67ef88c 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-2016 Free Software + Copyright (C) 1990, 1998-1999, 2001-2007, 2009-2017 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify @@ -35,6 +35,7 @@ #include "error.h" #include "quotearg.h" #include "quote.h" +#include "getprogname.h" #if USE_UNLOCKED_IO # include "unlocked-io.h" @@ -209,7 +210,6 @@ argmatch_to_argument (const char *value, /* * Based on "getversion.c" by David MacKenzie <djm@gnu.ai.mit.edu> */ -char *program_name; /* When to make backup files. */ enum backup_type @@ -253,11 +253,9 @@ main (int argc, const char *const *argv) const char *cp; enum backup_type backup_type = no_backups; - program_name = (char *) argv[0]; - if (argc > 2) { - fprintf (stderr, "Usage: %s [VERSION_CONTROL]\n", program_name); + fprintf (stderr, "Usage: %s [VERSION_CONTROL]\n", getprogname ()); exit (1); } @@ -266,7 +264,7 @@ main (int argc, const char *const *argv) backup_args, backup_vals); if (argc == 2) - backup_type = XARGMATCH (program_name, argv[1], + backup_type = XARGMATCH (getprogname (), argv[1], backup_args, backup_vals); printf ("The version control is '%s'\n", diff --git a/lib/argmatch.h b/lib/argmatch.h index 43cda5a..c7215c8 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-2016 Free Software + Copyright (C) 1990, 1998-1999, 2001-2002, 2004-2005, 2009-2017 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify diff --git a/lib/asnprintf.c b/lib/asnprintf.c index f23b776..14ab3e8 100644 --- a/lib/asnprintf.c +++ b/lib/asnprintf.c @@ -1,5 +1,5 @@ /* Formatted output to strings. - Copyright (C) 1999, 2002, 2006, 2009-2016 Free Software Foundation, Inc. + Copyright (C) 1999, 2002, 2006, 2009-2017 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/lib/asprintf.c b/lib/asprintf.c index d0ca5f2..6635f49 100644 --- a/lib/asprintf.c +++ b/lib/asprintf.c @@ -1,5 +1,5 @@ /* Formatted output to strings. - Copyright (C) 1999, 2002, 2006-2007, 2009-2016 Free Software Foundation, + Copyright (C) 1999, 2002, 2006-2007, 2009-2017 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 de1f665..2fc3043 100644 --- a/lib/assure.h +++ b/lib/assure.h @@ -1,6 +1,6 @@ /* Run-time assert-like macros. - Copyright (C) 2014-2016 Free Software Foundation, Inc. + Copyright (C) 2014-2017 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/lib/basename-lgpl.c b/lib/basename-lgpl.c index 1182109..54d3cc0 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-2016 Free Software + Copyright (C) 1990, 1998-2001, 2003-2006, 2009-2017 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify diff --git a/lib/basename.c b/lib/basename.c index ed1872d..0353635 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-2016 Free Software + Copyright (C) 1990, 1998-2001, 2003-2006, 2009-2017 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify diff --git a/lib/binary-io.c b/lib/binary-io.c index d828bcd..a7558b2 100644 --- a/lib/binary-io.c +++ b/lib/binary-io.c @@ -1,4 +1,37 @@ +/* Binary mode I/O. + Copyright 2017 Free Software Foundation, Inc. + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see <http://www.gnu.org/licenses/>. */ + #include <config.h> + #define BINARY_IO_INLINE _GL_EXTERN_INLINE #include "binary-io.h" -typedef int dummy; + +#if defined __DJGPP__ || defined __EMX__ +# include <errno.h> +# include <unistd.h> + +int +__gl_setmode_check (int fd) +{ + if (isatty (fd)) + { + errno = EINVAL; + return -1; + } + else + return 0; +} +#endif diff --git a/lib/binary-io.h b/lib/binary-io.h index 9f17c0d..9f1dde1 100644 --- a/lib/binary-io.h +++ b/lib/binary-io.h @@ -1,5 +1,5 @@ /* Binary mode I/O. - Copyright (C) 2001, 2003, 2005, 2008-2016 Free Software Foundation, Inc. + Copyright (C) 2001, 2003, 2005, 2008-2017 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -33,15 +33,12 @@ _GL_INLINE_HEADER_BEGIN # define BINARY_IO_INLINE _GL_INLINE #endif -/* set_binary_mode (fd, mode) - sets the binary/text I/O mode of file descriptor fd to the given mode - (must be O_BINARY or O_TEXT) and returns the previous mode. */ #if O_BINARY # if defined __EMX__ || defined __DJGPP__ || defined __CYGWIN__ # include <io.h> /* declares setmode() */ -# define set_binary_mode setmode +# define __gl_setmode setmode # else -# define set_binary_mode _setmode +# define __gl_setmode _setmode # undef fileno # define fileno _fileno # endif @@ -50,7 +47,7 @@ _GL_INLINE_HEADER_BEGIN /* Use a function rather than a macro, to avoid gcc warnings "warning: statement with no effect". */ BINARY_IO_INLINE int -set_binary_mode (int fd, int mode) +__gl_setmode (int fd, int mode) { (void) fd; (void) mode; @@ -58,18 +55,29 @@ set_binary_mode (int fd, int mode) } #endif -/* SET_BINARY (fd); - changes the file descriptor fd to perform binary I/O. */ #if defined __DJGPP__ || defined __EMX__ -# include <unistd.h> /* declares isatty() */ - /* Avoid putting stdin/stdout in binary mode if it is connected to - the console, because that would make it impossible for the user - to interrupt the program through Ctrl-C or Ctrl-Break. */ -# define SET_BINARY(fd) ((void) (!isatty (fd) ? (set_binary_mode (fd, O_BINARY), 0) : 0)) +extern int __gl_setmode_check (int); #else -# define SET_BINARY(fd) ((void) set_binary_mode (fd, O_BINARY)) +BINARY_IO_INLINE int +__gl_setmode_check (int fd) { return 0; } #endif +/* Set FD's mode to MODE, which should be either O_TEXT or O_BINARY. + Return the old mode if successful, -1 (setting errno) on failure. + Ordinarily this function would be called 'setmode', since that is + its name on MS-Windows, but it is called 'set_binary_mode' here + to avoid colliding with a BSD function of another name. */ + +BINARY_IO_INLINE int +set_binary_mode (int fd, int mode) +{ + int r = __gl_setmode_check (fd); + return r != 0 ? r : __gl_setmode (fd, mode); +} + +/* This macro is obsolescent. */ +#define SET_BINARY(fd) ((void) set_binary_mode (fd, O_BINARY)) + _GL_INLINE_HEADER_END #endif /* _BINARY_H */ diff --git a/lib/bitrotate.h b/lib/bitrotate.h index a259481..ea14afb 100644 --- a/lib/bitrotate.h +++ b/lib/bitrotate.h @@ -1,5 +1,5 @@ /* bitrotate.h - Rotate bits in integers - Copyright (C) 2008-2016 Free Software Foundation, Inc. + Copyright (C) 2008-2017 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/lib/btowc.c b/lib/btowc.c index e7badf9..214d2b7 100644 --- a/lib/btowc.c +++ b/lib/btowc.c @@ -1,5 +1,5 @@ /* Convert unibyte character to wide character. - Copyright (C) 2008, 2010-2016 Free Software Foundation, Inc. + Copyright (C) 2008, 2010-2017 Free Software Foundation, Inc. Written by Bruno Haible <bruno@clisp.org>, 2008. This program is free software: you can redistribute it and/or modify diff --git a/lib/c++defs.h b/lib/c++defs.h new file mode 100644 index 0000000..f03f359 --- /dev/null +++ b/lib/c++defs.h @@ -0,0 +1,316 @@ +/* C++ compatible function declaration macros. + Copyright (C) 2010-2017 Free Software Foundation, Inc. + + This program is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation; either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see <http://www.gnu.org/licenses/>. */ + +#ifndef _GL_CXXDEFS_H +#define _GL_CXXDEFS_H + +/* Begin/end the GNULIB_NAMESPACE namespace. */ +#if defined __cplusplus && defined GNULIB_NAMESPACE +# define _GL_BEGIN_NAMESPACE namespace GNULIB_NAMESPACE { +# define _GL_END_NAMESPACE } +#else +# define _GL_BEGIN_NAMESPACE +# define _GL_END_NAMESPACE +#endif + +/* The three most frequent use cases of these macros are: + + * For providing a substitute for a function that is missing on some + platforms, but is declared and works fine on the platforms on which + it exists: + + #if @GNULIB_FOO@ + # if !@HAVE_FOO@ + _GL_FUNCDECL_SYS (foo, ...); + # endif + _GL_CXXALIAS_SYS (foo, ...); + _GL_CXXALIASWARN (foo); + #elif defined GNULIB_POSIXCHECK + ... + #endif + + * For providing a replacement for a function that exists on all platforms, + but is broken/insufficient and needs to be replaced on some platforms: + + #if @GNULIB_FOO@ + # if @REPLACE_FOO@ + # if !(defined __cplusplus && defined GNULIB_NAMESPACE) + # undef foo + # define foo rpl_foo + # endif + _GL_FUNCDECL_RPL (foo, ...); + _GL_CXXALIAS_RPL (foo, ...); + # else + _GL_CXXALIAS_SYS (foo, ...); + # endif + _GL_CXXALIASWARN (foo); + #elif defined GNULIB_POSIXCHECK + ... + #endif + + * For providing a replacement for a function that exists on some platforms + but is broken/insufficient and needs to be replaced on some of them and + is additionally either missing or undeclared on some other platforms: + + #if @GNULIB_FOO@ + # if @REPLACE_FOO@ + # if !(defined __cplusplus && defined GNULIB_NAMESPACE) + # undef foo + # define foo rpl_foo + # endif + _GL_FUNCDECL_RPL (foo, ...); + _GL_CXXALIAS_RPL (foo, ...); + # else + # if !@HAVE_FOO@ or if !@HAVE_DECL_FOO@ + _GL_FUNCDECL_SYS (foo, ...); + # endif + _GL_CXXALIAS_SYS (foo, ...); + # endif + _GL_CXXALIASWARN (foo); + #elif defined GNULIB_POSIXCHECK + ... + #endif +*/ + +/* _GL_EXTERN_C declaration; + performs the declaration with C linkage. */ +#if defined __cplusplus +# define _GL_EXTERN_C extern "C" +#else +# define _GL_EXTERN_C extern +#endif + +/* _GL_FUNCDECL_RPL (func, rettype, parameters_and_attributes); + declares a replacement function, named rpl_func, with the given prototype, + consisting of return type, parameters, and attributes. + Example: + _GL_FUNCDECL_RPL (open, int, (const char *filename, int flags, ...) + _GL_ARG_NONNULL ((1))); + */ +#define _GL_FUNCDECL_RPL(func,rettype,parameters_and_attributes) \ + _GL_FUNCDECL_RPL_1 (rpl_##func, rettype, parameters_and_attributes) +#define _GL_FUNCDECL_RPL_1(rpl_func,rettype,parameters_and_attributes) \ + _GL_EXTERN_C rettype rpl_func parameters_and_attributes + +/* _GL_FUNCDECL_SYS (func, rettype, parameters_and_attributes); + declares the system function, named func, with the given prototype, + consisting of return type, parameters, and attributes. + Example: + _GL_FUNCDECL_SYS (open, int, (const char *filename, int flags, ...) + _GL_ARG_NONNULL ((1))); + */ +#define _GL_FUNCDECL_SYS(func,rettype,parameters_and_attributes) \ + _GL_EXTERN_C rettype func parameters_and_attributes + +/* _GL_CXXALIAS_RPL (func, rettype, parameters); + declares a C++ alias called GNULIB_NAMESPACE::func + that redirects to rpl_func, if GNULIB_NAMESPACE is defined. + Example: + _GL_CXXALIAS_RPL (open, int, (const char *filename, int flags, ...)); + + Wrapping rpl_func in an object with an inline conversion operator + avoids a reference to rpl_func unless GNULIB_NAMESPACE::func is + actually used in the program. */ +#define _GL_CXXALIAS_RPL(func,rettype,parameters) \ + _GL_CXXALIAS_RPL_1 (func, rpl_##func, rettype, parameters) +#if defined __cplusplus && defined GNULIB_NAMESPACE +# define _GL_CXXALIAS_RPL_1(func,rpl_func,rettype,parameters) \ + namespace GNULIB_NAMESPACE \ + { \ + static const struct _gl_ ## func ## _wrapper \ + { \ + typedef rettype (*type) parameters; \ + \ + inline operator type () const \ + { \ + return ::rpl_func; \ + } \ + } func = {}; \ + } \ + _GL_EXTERN_C int _gl_cxxalias_dummy +#else +# define _GL_CXXALIAS_RPL_1(func,rpl_func,rettype,parameters) \ + _GL_EXTERN_C int _gl_cxxalias_dummy +#endif + +/* _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 + declaration. A cast is used to silence the "invalid conversion" error + that would otherwise occur. */ +#if defined __cplusplus && defined GNULIB_NAMESPACE +# define _GL_CXXALIAS_RPL_CAST_1(func,rpl_func,rettype,parameters) \ + namespace GNULIB_NAMESPACE \ + { \ + static const struct _gl_ ## func ## _wrapper \ + { \ + typedef rettype (*type) parameters; \ + \ + inline operator type () const \ + { \ + return reinterpret_cast<type>(::rpl_func); \ + } \ + } func = {}; \ + } \ + _GL_EXTERN_C int _gl_cxxalias_dummy +#else +# define _GL_CXXALIAS_RPL_CAST_1(func,rpl_func,rettype,parameters) \ + _GL_EXTERN_C int _gl_cxxalias_dummy +#endif + +/* _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 + is defined. + Example: + _GL_CXXALIAS_SYS (open, int, (const char *filename, int flags, ...)); + + Wrapping func in an object with an inline conversion operator + avoids a reference to func unless GNULIB_NAMESPACE::func is + actually used in the program. */ +#if defined __cplusplus && defined GNULIB_NAMESPACE +# define _GL_CXXALIAS_SYS(func,rettype,parameters) \ + namespace GNULIB_NAMESPACE \ + { \ + static const struct _gl_ ## func ## _wrapper \ + { \ + typedef rettype (*type) parameters; \ + \ + inline operator type () const \ + { \ + return ::func; \ + } \ + } func = {}; \ + } \ + _GL_EXTERN_C int _gl_cxxalias_dummy +#else +# define _GL_CXXALIAS_SYS(func,rettype,parameters) \ + _GL_EXTERN_C int _gl_cxxalias_dummy +#endif + +/* _GL_CXXALIAS_SYS_CAST (func, rettype, parameters); + is like _GL_CXXALIAS_SYS (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. */ +#if defined __cplusplus && defined GNULIB_NAMESPACE +# define _GL_CXXALIAS_SYS_CAST(func,rettype,parameters) \ + namespace GNULIB_NAMESPACE \ + { \ + static const struct _gl_ ## func ## _wrapper \ + { \ + typedef rettype (*type) parameters; \ + \ + inline operator type () const \ + { \ + return reinterpret_cast<type>(::func); \ + } \ + } func = {}; \ + } \ + _GL_EXTERN_C int _gl_cxxalias_dummy +#else +# define _GL_CXXALIAS_SYS_CAST(func,rettype,parameters) \ + _GL_EXTERN_C int _gl_cxxalias_dummy +#endif + +/* _GL_CXXALIAS_SYS_CAST2 (func, rettype, parameters, rettype2, parameters2); + is like _GL_CXXALIAS_SYS (func, rettype, parameters); + except that the C function is picked among a set of overloaded functions, + namely the one with rettype2 and parameters2. Two consecutive casts + are used to silence the "cannot find a match" and "invalid conversion" + errors that would otherwise occur. */ +#if defined __cplusplus && defined GNULIB_NAMESPACE + /* The outer cast must be a reinterpret_cast. + The inner cast: When the function is defined as a set of overloaded + functions, it works as a static_cast<>, choosing the designated variant. + When the function is defined as a single variant, it works as a + reinterpret_cast<>. The parenthesized cast syntax works both ways. */ +# define _GL_CXXALIAS_SYS_CAST2(func,rettype,parameters,rettype2,parameters2) \ + namespace GNULIB_NAMESPACE \ + { \ + static const struct _gl_ ## func ## _wrapper \ + { \ + typedef rettype (*type) parameters; \ + \ + inline operator type () const \ + { \ + return reinterpret_cast<type>((rettype2 (*) parameters2)(::func)); \ + } \ + } func = {}; \ + } \ + _GL_EXTERN_C int _gl_cxxalias_dummy +#else +# define _GL_CXXALIAS_SYS_CAST2(func,rettype,parameters,rettype2,parameters2) \ + _GL_EXTERN_C int _gl_cxxalias_dummy +#endif + +/* _GL_CXXALIASWARN (func); + causes a warning to be emitted when ::func is used but not when + GNULIB_NAMESPACE::func is used. func must be defined without overloaded + variants. */ +#if defined __cplusplus && defined GNULIB_NAMESPACE +# define _GL_CXXALIASWARN(func) \ + _GL_CXXALIASWARN_1 (func, GNULIB_NAMESPACE) +# define _GL_CXXALIASWARN_1(func,namespace) \ + _GL_CXXALIASWARN_2 (func, namespace) +/* To work around GCC bug <http://gcc.gnu.org/bugzilla/show_bug.cgi?id=43881>, + we enable the warning only when not optimizing. */ +# if !__OPTIMIZE__ +# define _GL_CXXALIASWARN_2(func,namespace) \ + _GL_WARN_ON_USE (func, \ + "The symbol ::" #func " refers to the system function. " \ + "Use " #namespace "::" #func " instead.") +# elif __GNUC__ >= 3 && GNULIB_STRICT_CHECKING +# define _GL_CXXALIASWARN_2(func,namespace) \ + extern __typeof__ (func) func +# else +# define _GL_CXXALIASWARN_2(func,namespace) \ + _GL_EXTERN_C int _gl_cxxalias_dummy +# endif +#else +# define _GL_CXXALIASWARN(func) \ + _GL_EXTERN_C int _gl_cxxalias_dummy +#endif + +/* _GL_CXXALIASWARN1 (func, rettype, parameters_and_attributes); + causes a warning to be emitted when the given overloaded variant of ::func + is used but not when GNULIB_NAMESPACE::func is used. */ +#if defined __cplusplus && defined GNULIB_NAMESPACE +# define _GL_CXXALIASWARN1(func,rettype,parameters_and_attributes) \ + _GL_CXXALIASWARN1_1 (func, rettype, parameters_and_attributes, \ + GNULIB_NAMESPACE) +# define _GL_CXXALIASWARN1_1(func,rettype,parameters_and_attributes,namespace) \ + _GL_CXXALIASWARN1_2 (func, rettype, parameters_and_attributes, namespace) +/* To work around GCC bug <http://gcc.gnu.org/bugzilla/show_bug.cgi?id=43881>, + we enable the warning only when not optimizing. */ +# if !__OPTIMIZE__ +# define _GL_CXXALIASWARN1_2(func,rettype,parameters_and_attributes,namespace) \ + _GL_WARN_ON_USE_CXX (func, 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 +# endif +#else +# define _GL_CXXALIASWARN1(func,rettype,parameters_and_attributes) \ + _GL_EXTERN_C int _gl_cxxalias_dummy +#endif + +#endif /* _GL_CXXDEFS_H */ diff --git a/lib/c-ctype.h b/lib/c-ctype.h index 717ae78..bcdba6b 100644 --- a/lib/c-ctype.h +++ b/lib/c-ctype.h @@ -5,7 +5,7 @@ <ctype.h> functions' behaviour depends on the current locale set via setlocale. - Copyright (C) 2000-2003, 2006, 2008-2016 Free Software Foundation, Inc. + Copyright (C) 2000-2003, 2006, 2008-2017 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -115,16 +115,16 @@ extern "C" { /* Cases for lowercase hex letters, and lowercase letters, all offset by N. */ -#define _C_CTYPE_LOWER_A_THRU_F_N(n) \ - case 'a' + (n): case 'b' + (n): case 'c' + (n): case 'd' + (n): \ - case 'e' + (n): case 'f' + (n) -#define _C_CTYPE_LOWER_N(n) \ - _C_CTYPE_LOWER_A_THRU_F_N(n): \ - case 'g' + (n): case 'h' + (n): case 'i' + (n): case 'j' + (n): \ - case 'k' + (n): case 'l' + (n): case 'm' + (n): case 'n' + (n): \ - case 'o' + (n): case 'p' + (n): case 'q' + (n): case 'r' + (n): \ - case 's' + (n): case 't' + (n): case 'u' + (n): case 'v' + (n): \ - case 'w' + (n): case 'x' + (n): case 'y' + (n): case 'z' + (n) +#define _C_CTYPE_LOWER_A_THRU_F_N(N) \ + case 'a' + (N): case 'b' + (N): case 'c' + (N): case 'd' + (N): \ + case 'e' + (N): case 'f' + (N) +#define _C_CTYPE_LOWER_N(N) \ + _C_CTYPE_LOWER_A_THRU_F_N(N): \ + case 'g' + (N): case 'h' + (N): case 'i' + (N): case 'j' + (N): \ + case 'k' + (N): case 'l' + (N): case 'm' + (N): case 'n' + (N): \ + case 'o' + (N): case 'p' + (N): case 'q' + (N): case 'r' + (N): \ + case 's' + (N): case 't' + (N): case 'u' + (N): case 'v' + (N): \ + case 'w' + (N): case 'x' + (N): case 'y' + (N): case 'z' + (N) /* Cases for hex letters, digits, lower, punct, and upper. */ diff --git a/lib/c-stack.c b/lib/c-stack.c index baace41..656675e 100644 --- a/lib/c-stack.c +++ b/lib/c-stack.c @@ -1,6 +1,6 @@ /* Stack overflow handling. - Copyright (C) 2002, 2004, 2006, 2008-2016 Free Software Foundation, Inc. + Copyright (C) 2002, 2004, 2006, 2008-2017 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -78,6 +78,7 @@ typedef struct sigaltstack stack_t; #include "c-stack.h" #include "exitfail.h" #include "ignore-value.h" +#include "getprogname.h" #if defined SA_ONSTACK && defined SA_SIGINFO # define SIGINFO_WORKS 1 @@ -88,8 +89,6 @@ typedef struct sigaltstack stack_t; # endif #endif -extern char *program_name; - /* The user-specified action to take when a SEGV-related program error or stack overflow occurs. */ static void (* volatile segv_action) (int); @@ -116,7 +115,7 @@ die (int signo) #endif /* !SIGINFO_WORKS && !HAVE_LIBSIGSEGV */ segv_action (signo); message = signo ? program_error_message : stack_overflow_message; - ignore_value (write (STDERR_FILENO, program_name, strlen (program_name))); + ignore_value (write (STDERR_FILENO, getprogname (), strlen (getprogname ()))); ignore_value (write (STDERR_FILENO, ": ", 2)); ignore_value (write (STDERR_FILENO, message, strlen (message))); ignore_value (write (STDERR_FILENO, "\n", 1)); diff --git a/lib/c-stack.h b/lib/c-stack.h index efd3b8f..813e9d7 100644 --- a/lib/c-stack.h +++ b/lib/c-stack.h @@ -1,6 +1,6 @@ /* Stack overflow handling. - Copyright (C) 2002, 2004, 2008-2016 Free Software Foundation, Inc. + Copyright (C) 2002, 2004, 2008-2017 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/lib/c-strcase.h b/lib/c-strcase.h index 7e570f5..c82dab1 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-2016 Free Software + Copyright (C) 1995-1996, 2001, 2003, 2005, 2009-2017 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 bd113b7..5bce873 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-2016 Free Software Foundation, Inc. + Copyright (C) 1998-1999, 2005-2006, 2009-2017 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/lib/c-strcaseeq.h b/lib/c-strcaseeq.h index ed57251..aa5e71f 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-2016 Free Software Foundation, Inc. + Copyright (C) 2001-2002, 2007, 2009-2017 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published diff --git a/lib/c-strncasecmp.c b/lib/c-strncasecmp.c index c316929..ada62d7 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-2016 Free Software Foundation, Inc. + Copyright (C) 1998-1999, 2005-2006, 2009-2017 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/lib/careadlinkat.c b/lib/careadlinkat.c index 4180de9..455e00e 100644 --- a/lib/careadlinkat.c +++ b/lib/careadlinkat.c @@ -1,6 +1,6 @@ /* Read symbolic links into a buffer without size limitation, relative to fd. - Copyright (C) 2001, 2003-2004, 2007, 2009-2016 Free Software Foundation, + Copyright (C) 2001, 2003-2004, 2007, 2009-2017 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify diff --git a/lib/careadlinkat.h b/lib/careadlinkat.h index 84ede3e..528a828 100644 --- a/lib/careadlinkat.h +++ b/lib/careadlinkat.h @@ -1,6 +1,6 @@ /* Read symbolic links into a buffer without size limitation, relative to fd. - Copyright (C) 2011-2016 Free Software Foundation, Inc. + Copyright (C) 2011-2017 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/lib/close.c b/lib/close.c index 46a7aa5..6a72c32 100644 --- a/lib/close.c +++ b/lib/close.c @@ -1,5 +1,5 @@ /* close replacement. - Copyright (C) 2008-2016 Free Software Foundation, Inc. + Copyright (C) 2008-2017 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -22,7 +22,9 @@ #include <errno.h> #include "fd-hook.h" -#include "msvc-inval.h" +#if HAVE_MSVC_INVALID_PARAMETER_HANDLER +# include "msvc-inval.h" +#endif #undef close diff --git a/lib/cmpbuf.c b/lib/cmpbuf.c index fd34505..8e185bd 100644 --- a/lib/cmpbuf.c +++ b/lib/cmpbuf.c @@ -1,6 +1,6 @@ /* Buffer primitives for comparison operations. - Copyright (C) 1993, 1995, 1998, 2001-2002, 2006, 2009-2013, 2015-2016 Free + Copyright (C) 1993, 1995, 1998, 2001-2002, 2006, 2009-2013, 2015-2017 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify diff --git a/lib/cmpbuf.h b/lib/cmpbuf.h index b9333d8..cf63a3b 100644 --- a/lib/cmpbuf.h +++ b/lib/cmpbuf.h @@ -1,6 +1,6 @@ /* Buffer primitives for comparison operations. - Copyright (C) 2002, 2009-2013, 2015-2016 Free Software Foundation, Inc. + Copyright (C) 2002, 2009-2013, 2015-2017 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/lib/config.charset b/lib/config.charset index 947d916..8bedbf3 100644 --- a/lib/config.charset +++ b/lib/config.charset @@ -1,7 +1,7 @@ #! /bin/sh # Output a system dependent table of character encoding aliases. # -# Copyright (C) 2000-2004, 2006-2016 Free Software Foundation, Inc. +# Copyright (C) 2000-2004, 2006-2017 Free Software Foundation, Inc. # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/lib/config.hin b/lib/config.hin index 651da70..e28f15d 100644 --- a/lib/config.hin +++ b/lib/config.hin @@ -90,6 +90,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 msvc-nothrow shall be considered present. */ +#undef GNULIB_MSVC_NOTHROW + /* enable some gnulib portability checks */ #undef GNULIB_PORTCHECK @@ -109,6 +113,10 @@ whether the gnulib module strerror shall be considered present. */ #undef GNULIB_STRERROR +/* Define to a C preprocessor expression that evaluates to 1 or 0, depending + whether the gnulib module strerror_r-posix shall be considered present. */ +#undef GNULIB_STRERROR_R_POSIX + /* Define to 1 when the gnulib module accept should be tested. */ #undef GNULIB_TEST_ACCEPT @@ -151,9 +159,6 @@ /* Define to 1 when the gnulib module getdtablesize should be tested. */ #undef GNULIB_TEST_GETDTABLESIZE -/* Define to 1 when the gnulib module getopt-gnu should be tested. */ -#undef GNULIB_TEST_GETOPT_GNU - /* Define to 1 when the gnulib module getpagesize should be tested. */ #undef GNULIB_TEST_GETPAGESIZE @@ -298,6 +303,9 @@ /* Define to 1 when the gnulib module time_rz should be tested. */ #undef GNULIB_TEST_TIME_RZ +/* Define to 1 when the gnulib module tzset should be tested. */ +#undef GNULIB_TEST_TZSET + /* Define to 1 when the gnulib module unsetenv should be tested. */ #undef GNULIB_TEST_UNSETENV @@ -363,6 +371,9 @@ /* Define to 1 if you have the `clock_settime' function. */ #undef HAVE_CLOCK_SETTIME +/* Define to 1 if you have the <crtdefs.h> header file. */ +#undef HAVE_CRTDEFS_H + /* Define to 1 if C supports variable-length arrays. */ #undef HAVE_C_VARARRAYS @@ -422,10 +433,6 @@ don't. */ #undef HAVE_DECL_GETDTABLESIZE -/* Define to 1 if you have the declaration of `getenv', and to 0 if you don't. - */ -#undef HAVE_DECL_GETENV - /* Define to 1 if you have the declaration of `inet_pton', and to 0 if you don't. */ #undef HAVE_DECL_INET_PTON @@ -542,6 +549,10 @@ don't. */ #undef HAVE_DECL__SNPRINTF +/* Define to 1 if you have the declaration of `__argv', and to 0 if you don't. + */ +#undef HAVE_DECL___ARGV + /* Define to 1 if you have the <dirent.h> header file, and it defines `DIR'. */ #undef HAVE_DIRENT_H @@ -573,6 +584,9 @@ /* Define to 1 if you have the `geteuid' function. */ #undef HAVE_GETEUID +/* Define to 1 if you have the `getexecname' function. */ +#undef HAVE_GETEXECNAME + /* Define to 1 if you have the `getgid' function. */ #undef HAVE_GETGID @@ -585,6 +599,9 @@ /* Define to 1 if you have the `getpagesize' function. */ #undef HAVE_GETPAGESIZE +/* Define to 1 if you have the `getprogname' function. */ +#undef HAVE_GETPROGNAME + /* Define if the GNU gettext() function is already present or preinstalled. */ #undef HAVE_GETTEXT @@ -654,6 +671,9 @@ /* Define if you have the libsigsegv library. */ #undef HAVE_LIBSIGSEGV +/* Define to 1 if you have the <limits.h> header file. */ +#undef HAVE_LIMITS_H + /* Define to 1 if you have the `localtime_r' function. */ #undef HAVE_LOCALTIME_R @@ -691,6 +711,12 @@ /* Define to 1 if you have the `mempcpy' function. */ #undef HAVE_MEMPCPY +/* Define to 1 if <limits.h> defines the MIN and MAX macros. */ +#undef HAVE_MINMAX_IN_LIMITS_H + +/* Define to 1 if <sys/param.h> defines the MIN and MAX macros. */ +#undef HAVE_MINMAX_IN_SYS_PARAM_H + /* Define to 1 if you have the `mkstemp' function. */ #undef HAVE_MKSTEMP @@ -1038,6 +1064,9 @@ /* Define to 1 if pwrite is declared even after undefining macros. */ #undef HAVE_RAW_DECL_PWRITE +/* Define to 1 if qsort_r is declared even after undefining macros. */ +#undef HAVE_RAW_DECL_QSORT_R + /* Define to 1 if random is declared even after undefining macros. */ #undef HAVE_RAW_DECL_RANDOM @@ -1224,6 +1253,9 @@ /* Define to 1 if towctrans is declared even after undefining macros. */ #undef HAVE_RAW_DECL_TOWCTRANS +/* Define to 1 if truncate is declared even after undefining macros. */ +#undef HAVE_RAW_DECL_TRUNCATE + /* Define to 1 if ttyname_r is declared even after undefining macros. */ #undef HAVE_RAW_DECL_TTYNAME_R @@ -1287,6 +1319,9 @@ /* Define to 1 if wcsdup is declared even after undefining macros. */ #undef HAVE_RAW_DECL_WCSDUP +/* Define to 1 if wcsftime is declared even after undefining macros. */ +#undef HAVE_RAW_DECL_WCSFTIME + /* Define to 1 if wcslen is declared even after undefining macros. */ #undef HAVE_RAW_DECL_WCSLEN @@ -1368,6 +1403,9 @@ /* Define to 1 if you have the `readlinkat' function. */ #undef HAVE_READLINKAT +/* Define to 1 if you have run the test for working tzset. */ +#undef HAVE_RUN_TZSET_TEST + /* Define to 1 if the system has the type `sa_family_t'. */ #undef HAVE_SA_FAMILY_T @@ -1532,6 +1570,9 @@ /* Define to 1 if you have the <sys/bitypes.h> header file. */ #undef HAVE_SYS_BITYPES_H +/* Define to 1 if you have the <sys/cdefs.h> header file. */ +#undef HAVE_SYS_CDEFS_H + /* Define to 1 if you have the <sys/dir.h> header file, and it defines `DIR'. */ #undef HAVE_SYS_DIR_H @@ -1561,9 +1602,6 @@ /* Define to 1 if you have the <sys/stat.h> header file. */ #undef HAVE_SYS_STAT_H -/* Define to 1 if you have the <sys/timeb.h> header file. */ -#undef HAVE_SYS_TIMEB_H - /* Define to 1 if you have the <sys/time.h> header file. */ #undef HAVE_SYS_TIME_H @@ -1614,6 +1652,9 @@ /* Define to 1 if the system has the type 'unsigned long long int'. */ #undef HAVE_UNSIGNED_LONG_LONG_INT +/* Define if you have a global __progname variable */ +#undef HAVE_VAR___PROGNAME + /* Define to 1 if you have the `vasnprintf' function. */ #undef HAVE_VASNPRINTF @@ -1694,12 +1735,19 @@ /* Define to 1 if the system has the type `_Bool'. */ #undef HAVE__BOOL -/* Define to 1 if you have the `_ftime' function. */ -#undef HAVE__FTIME - /* Define to 1 if you have the `_set_invalid_parameter_handler' function. */ #undef HAVE__SET_INVALID_PARAMETER_HANDLER +/* Define to 1 if the compiler supports __builtin_expect, + and to 2 if <builtins.h> does. */ +#undef HAVE___BUILTIN_EXPECT +#ifndef HAVE___BUILTIN_EXPECT +# define __builtin_expect(e, c) (e) +#elif HAVE___BUILTIN_EXPECT == 2 +# include <builtins.h> +#endif + + /* Define to 1 if you have the `__secure_getenv' function. */ #undef HAVE___SECURE_GETENV @@ -1739,6 +1787,23 @@ /* Define if the mbrtowc function returns a wrong return value. */ #undef MBRTOWC_RETVAL_BUG +/* Use GNU style printf and scanf. */ +#ifndef __USE_MINGW_ANSI_STDIO +# undef __USE_MINGW_ANSI_STDIO +#endif + + +/* Define if the compilation of mktime.c should define 'mktime_internal'. */ +#undef NEED_MKTIME_INTERNAL + +/* Define if the compilation of mktime.c should define 'mktime' with the + native Windows TZ workaround. */ +#undef NEED_MKTIME_WINDOWS + +/* Define if the compilation of mktime.c should define 'mktime' with the + algorithmic workarounds. */ +#undef NEED_MKTIME_WORKING + /* Define to 1 if open() fails to recognize a trailing slash. */ #undef OPEN_TRAILING_SLASH_BUG @@ -1789,10 +1854,6 @@ /* Define to 1 if readlink fails to recognize a trailing slash. */ #undef READLINK_TRAILING_SLASH_BUG -/* Define to 1 if stat needs help when passed a directory name with a trailing - slash */ -#undef REPLACE_FUNC_STAT_DIR - /* Define to 1 if stat needs help when passed a file name with a trailing slash */ #undef REPLACE_FUNC_STAT_FILE @@ -1853,11 +1914,14 @@ timespec. */ #undef TYPEOF_STRUCT_STAT_ST_ATIM_IS_STRUCT_TIMESPEC +/* Define if tzset clobbers localtime's static buffer. */ +#undef TZSET_CLOBBERS_LOCALTIME + /* Enable extensions on AIX 3, Interix. */ #ifndef _ALL_SOURCE # undef _ALL_SOURCE #endif -/* Enable general extensions on OS X. */ +/* Enable general extensions on macOS. */ #ifndef _DARWIN_C_SOURCE # undef _DARWIN_C_SOURCE #endif @@ -1865,14 +1929,38 @@ #ifndef _GNU_SOURCE # undef _GNU_SOURCE #endif -/* Use GNU style printf and scanf. */ -#ifndef __USE_MINGW_ANSI_STDIO -# undef __USE_MINGW_ANSI_STDIO -#endif /* Enable threading extensions on Solaris. */ #ifndef _POSIX_PTHREAD_SEMANTICS # undef _POSIX_PTHREAD_SEMANTICS #endif +/* Enable extensions specified by ISO/IEC TS 18661-5:2014. */ +#ifndef __STDC_WANT_IEC_60559_ATTRIBS_EXT__ +# undef __STDC_WANT_IEC_60559_ATTRIBS_EXT__ +#endif +/* Enable extensions specified by ISO/IEC TS 18661-1:2014. */ +#ifndef __STDC_WANT_IEC_60559_BFP_EXT__ +# undef __STDC_WANT_IEC_60559_BFP_EXT__ +#endif +/* Enable extensions specified by ISO/IEC TS 18661-2:2015. */ +#ifndef __STDC_WANT_IEC_60559_DFP_EXT__ +# undef __STDC_WANT_IEC_60559_DFP_EXT__ +#endif +/* Enable extensions specified by ISO/IEC TS 18661-4:2015. */ +#ifndef __STDC_WANT_IEC_60559_FUNCS_EXT__ +# undef __STDC_WANT_IEC_60559_FUNCS_EXT__ +#endif +/* Enable extensions specified by ISO/IEC TS 18661-3:2015. */ +#ifndef __STDC_WANT_IEC_60559_TYPES_EXT__ +# undef __STDC_WANT_IEC_60559_TYPES_EXT__ +#endif +/* Enable extensions specified by ISO/IEC TR 24731-2:2010. */ +#ifndef __STDC_WANT_LIB_EXT2__ +# undef __STDC_WANT_LIB_EXT2__ +#endif +/* Enable extensions specified by ISO/IEC 24747:2009. */ +#ifndef __STDC_WANT_MATH_SPEC_FUNCS__ +# undef __STDC_WANT_MATH_SPEC_FUNCS__ +#endif /* Enable extensions on HP NonStop. */ #ifndef _TANDEM_SOURCE # undef _TANDEM_SOURCE @@ -1932,10 +2020,6 @@ /* enable compile-time and run-time bounds-checking, and some warnings */ #undef _FORTIFY_SOURCE -/* Define to 1 if Gnulib overrides 'struct stat' on Windows so that struct - stat.st_size becomes 64-bit. */ -#undef _GL_WINDOWS_64_BIT_ST_SIZE - /* Define for large files, on AIX-style hosts. */ #undef _LARGE_FILES diff --git a/lib/ctype.in.h b/lib/ctype.in.h index 217812d..0bb2721 100644 --- a/lib/ctype.in.h +++ b/lib/ctype.in.h @@ -1,6 +1,6 @@ /* A substitute for ISO C99 <ctype.h>, for platforms on which it is incomplete. - Copyright (C) 2009-2016 Free Software Foundation, Inc. + Copyright (C) 2009-2017 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/lib/diffseq.h b/lib/diffseq.h index 6be7d83..d7a3743 100644 --- a/lib/diffseq.h +++ b/lib/diffseq.h @@ -1,6 +1,6 @@ /* Analyze differences between two vectors. - Copyright (C) 1988-1989, 1992-1995, 2001-2004, 2006-2016 Free Software + Copyright (C) 1988-1989, 1992-1995, 2001-2004, 2006-2017 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify @@ -34,7 +34,12 @@ The basic algorithm was independently discovered as described in: "Algorithms for Approximate String Matching", Esko Ukkonen, Information and Control Vol. 64, 1985, pp. 100-118, - <http://dx.doi.org/10.1016/S0019-9958(85)80046-2>. */ + <http://dx.doi.org/10.1016/S0019-9958(85)80046-2>. + + Unless the 'find_minimal' flag is set, this code uses the TOO_EXPENSIVE + heuristic, by Paul Eggert, to limit the cost to O(N**1.5 log N) + at the price of producing suboptimal output for large inputs with + many differences. */ /* Before including this file, you need to define: ELEMENT The element type of the vectors being compared. @@ -123,6 +128,9 @@ struct context bool heuristic; #endif + /* Edit scripts longer than this are too expensive to compute. */ + OFFSET too_expensive; + /* Snakes bigger than this are considered "big". */ #define SNAKE_LIMIT 20 }; @@ -132,6 +140,12 @@ struct partition /* Midpoints of this partition. */ OFFSET xmid; OFFSET ymid; + + /* True if low half will be analyzed minimally. */ + bool lo_minimal; + + /* Likewise for high half. */ + bool hi_minimal; }; @@ -143,10 +157,17 @@ struct partition When the two searches meet, we have found the midpoint of the shortest edit sequence. - Set *PART to the midpoint (XMID,YMID). The diagonal number + If FIND_MINIMAL is true, find the minimal edit script regardless of + expense. Otherwise, if the search is too expensive, use heuristics to + stop the search and report a suboptimal answer. + + Set PART->(xmid,ymid) to the midpoint (XMID,YMID). The diagonal number XMID - YMID equals the number of inserted elements minus the number of deleted elements (counting only elements before the midpoint). + Set PART->lo_minimal to true iff the minimal edit script for the + left half of the partition is known; similarly for PART->hi_minimal. + This function assumes that the first elements of the specified portions of the two vectors do not match, and likewise that the last elements do not match. The caller must trim matching elements from the beginning and end @@ -156,7 +177,7 @@ struct partition suboptimal diff output. It cannot cause incorrect diff output. */ static void -diag (OFFSET xoff, OFFSET xlim, OFFSET yoff, OFFSET ylim, +diag (OFFSET xoff, OFFSET xlim, OFFSET yoff, OFFSET ylim, bool find_minimal, struct partition *part, struct context *ctxt) { OFFSET *const fd = ctxt->fdiag; /* Give the compiler a chance. */ @@ -216,6 +237,7 @@ diag (OFFSET xoff, OFFSET xlim, OFFSET yoff, OFFSET ylim, { part->xmid = x; part->ymid = y; + part->lo_minimal = part->hi_minimal = true; return; } } @@ -248,10 +270,14 @@ diag (OFFSET xoff, OFFSET xlim, OFFSET yoff, OFFSET ylim, { part->xmid = x; part->ymid = y; + part->lo_minimal = part->hi_minimal = true; return; } } + if (find_minimal) + continue; + #ifdef USE_HEURISTIC /* Heuristic: check occasionally for a diagonal that has made lots of progress compared with the edit distance. If we have any @@ -295,7 +321,11 @@ diag (OFFSET xoff, OFFSET xlim, OFFSET yoff, OFFSET ylim, } } if (best > 0) - return; + { + part->lo_minimal = true; + part->hi_minimal = false; + return; + } } { @@ -330,10 +360,77 @@ diag (OFFSET xoff, OFFSET xlim, OFFSET yoff, OFFSET ylim, } } if (best > 0) - return; + { + part->lo_minimal = false; + part->hi_minimal = true; + return; + } } } #endif /* USE_HEURISTIC */ + + /* Heuristic: if we've gone well beyond the call of duty, give up + and report halfway between our best results so far. */ + if (c >= ctxt->too_expensive) + { + OFFSET fxybest; + OFFSET fxbest IF_LINT (= 0); + OFFSET bxybest; + OFFSET bxbest IF_LINT (= 0); + + /* Find forward diagonal that maximizes X + Y. */ + fxybest = -1; + for (d = fmax; d >= fmin; d -= 2) + { + OFFSET x = MIN (fd[d], xlim); + OFFSET y = x - d; + if (ylim < y) + { + x = ylim + d; + y = ylim; + } + if (fxybest < x + y) + { + fxybest = x + y; + fxbest = x; + } + } + + /* Find backward diagonal that minimizes X + Y. */ + bxybest = OFFSET_MAX; + for (d = bmax; d >= bmin; d -= 2) + { + OFFSET x = MAX (xoff, bd[d]); + OFFSET y = x - d; + if (y < yoff) + { + x = yoff + d; + y = yoff; + } + if (x + y < bxybest) + { + bxybest = x + y; + bxbest = x; + } + } + + /* Use the better of the two diagonals. */ + if ((xlim + ylim) - bxybest < fxybest - (xoff + yoff)) + { + part->xmid = fxbest; + part->ymid = fxybest - fxbest; + part->lo_minimal = true; + part->hi_minimal = false; + } + else + { + part->xmid = bxbest; + part->ymid = bxybest - bxbest; + part->lo_minimal = false; + part->hi_minimal = true; + } + return; + } } #undef XREF_YREF_EQUAL } @@ -347,6 +444,9 @@ diag (OFFSET xoff, OFFSET xlim, OFFSET yoff, OFFSET ylim, Note that XLIM, YLIM are exclusive bounds. All indices into the vectors are origin-0. + If FIND_MINIMAL, find a minimal difference no matter how + expensive it is. + The results are recorded by invoking NOTE_DELETE and NOTE_INSERT. Return false if terminated normally, or true if terminated through early @@ -354,7 +454,7 @@ diag (OFFSET xoff, OFFSET xlim, OFFSET yoff, OFFSET ylim, static bool compareseq (OFFSET xoff, OFFSET xlim, OFFSET yoff, OFFSET ylim, - struct context *ctxt) + bool find_minimal, struct context *ctxt) { #ifdef ELEMENT ELEMENT const *xv = ctxt->xvec; /* Help the compiler. */ @@ -400,12 +500,12 @@ compareseq (OFFSET xoff, OFFSET xlim, OFFSET yoff, OFFSET ylim, struct partition part IF_LINT2 (= { .xmid = 0, .ymid = 0 }); /* Find a point of correspondence in the middle of the vectors. */ - diag (xoff, xlim, yoff, ylim, &part, ctxt); + diag (xoff, xlim, yoff, ylim, find_minimal, &part, ctxt); /* Use the partitions to split this problem into subproblems. */ - if (compareseq (xoff, part.xmid, yoff, part.ymid, ctxt)) + if (compareseq (xoff, part.xmid, yoff, part.ymid, part.lo_minimal, ctxt)) return true; - if (compareseq (part.xmid, xlim, part.ymid, ylim, ctxt)) + if (compareseq (part.xmid, xlim, part.ymid, ylim, part.hi_minimal, ctxt)) return true; } diff --git a/lib/dirname-lgpl.c b/lib/dirname-lgpl.c index a7aabf9..b549ca9 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-2016 Free Software + Copyright (C) 1990, 1998, 2000-2001, 2003-2006, 2009-2017 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 07aac13..ed57557 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-2016 Free Software + Copyright (C) 1990, 1998, 2000-2001, 2003-2006, 2009-2017 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 875b31b..dbf920b 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-2016 Free Software Foundation, + Copyright (C) 1998, 2001, 2003-2006, 2009-2017 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify diff --git a/lib/dosname.h b/lib/dosname.h index 83a953f..dd5c177 100644 --- a/lib/dosname.h +++ b/lib/dosname.h @@ -1,6 +1,6 @@ /* File names on MS-DOS/Windows systems. - Copyright (C) 2000-2001, 2004-2006, 2009-2016 Free Software Foundation, Inc. + Copyright (C) 2000-2001, 2004-2006, 2009-2017 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -1,6 +1,6 @@ /* Duplicate an open file descriptor to a specified file descriptor. - Copyright (C) 1999, 2004-2007, 2009-2016 Free Software Foundation, Inc. + Copyright (C) 1999, 2004-2007, 2009-2017 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -35,10 +35,39 @@ # define WIN32_LEAN_AND_MEAN # include <windows.h> -# include "msvc-inval.h" +# if HAVE_MSVC_INVALID_PARAMETER_HANDLER +# include "msvc-inval.h" +# endif /* Get _get_osfhandle. */ -# include "msvc-nothrow.h" +# if GNULIB_MSVC_NOTHROW +# include "msvc-nothrow.h" +# else +# include <io.h> +# 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) @@ -66,16 +95,7 @@ ms_windows_dup2 (int fd, int desired_fd) return -1; } - TRY_MSVC_INVAL - { - result = dup2 (fd, desired_fd); - } - CATCH_MSVC_INVAL - { - errno = EBADF; - result = -1; - } - DONE_MSVC_INVAL; + result = dup2_nothrow (fd, desired_fd); if (result == 0) result = desired_fd; diff --git a/lib/errno.in.h b/lib/errno.in.h index b8397ee..13194f9 100644 --- a/lib/errno.in.h +++ b/lib/errno.in.h @@ -1,6 +1,6 @@ /* A POSIX-like <errno.h>. - Copyright (C) 2008-2016 Free Software Foundation, Inc. + Copyright (C) 2008-2017 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/lib/error.c b/lib/error.c index 56ac889..418d1ab 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-2016 Free Software Foundation, Inc. + Copyright (C) 1990-1998, 2000-2007, 2009-2017 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 @@ -42,6 +42,8 @@ # define USE_UNLOCKED_IO 0 # define _GL_ATTRIBUTE_FORMAT_PRINTF(a, b) # define _GL_ARG_NONNULL(a) +#else +# include "getprogname.h" #endif #if USE_UNLOCKED_IO @@ -96,30 +98,32 @@ extern void __error_at_line (int status, int errnum, const char *file_name, # define WIN32_LEAN_AND_MEAN # include <windows.h> /* Get _get_osfhandle. */ -# include "msvc-nothrow.h" +# if GNULIB_MSVC_NOTHROW +# include "msvc-nothrow.h" +# else +# include <io.h> +# endif # endif /* The gnulib override of fcntl is not needed in this file. */ # undef fcntl -# if !HAVE_DECL_STRERROR_R +# if !(GNULIB_STRERROR_R_POSIX || HAVE_DECL_STRERROR_R) # ifndef HAVE_DECL_STRERROR_R "this configure-time declaration test was not run" # endif # if STRERROR_R_CHAR_P -char *strerror_r (); +char *strerror_r (int errnum, char *buf, size_t buflen); # else -int strerror_r (); +int strerror_r (int errnum, char *buf, size_t buflen); # endif # endif -/* The calling program should define program_name and set it to the - name of the executing program. */ -extern char *program_name; +#define program_name getprogname () -# if HAVE_STRERROR_R || defined strerror_r +# if GNULIB_STRERROR_R_POSIX || HAVE_STRERROR_R || defined strerror_r # define __strerror_r strerror_r -# endif /* HAVE_STRERROR_R || defined strerror_r */ +# endif /* GNULIB_STRERROR_R_POSIX || HAVE_STRERROR_R || defined strerror_r */ #endif /* not _LIBC */ #if !_LIBC @@ -172,9 +176,9 @@ print_errno_message (int errnum) { char const *s; -#if defined HAVE_STRERROR_R || _LIBC +#if _LIBC || GNULIB_STRERROR_R_POSIX || defined HAVE_STRERROR_R char errbuf[1024]; -# if _LIBC || STRERROR_R_CHAR_P +# if _LIBC || (!GNULIB_STRERROR_R_POSIX && STRERROR_R_CHAR_P) s = __strerror_r (errnum, errbuf, sizeof errbuf); # else if (__strerror_r (errnum, errbuf, sizeof errbuf) == 0) diff --git a/lib/error.h b/lib/error.h index 6a69db0..ef024d9 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-2016 Free Software Foundation, + Copyright (C) 1995-1997, 2003, 2006, 2008-2017 Free Software Foundation, Inc. This file is part of the GNU C Library. diff --git a/lib/exclude.c b/lib/exclude.c index 92dacc4..fb3bbc2 100644 --- a/lib/exclude.c +++ b/lib/exclude.c @@ -1,6 +1,6 @@ /* exclude.c -- exclude file names - Copyright (C) 1992-1994, 1997, 1999-2007, 2009-2016 Free Software + Copyright (C) 1992-1994, 1997, 1999-2007, 2009-2017 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify diff --git a/lib/exclude.h b/lib/exclude.h index 8cb8b36..f95ee89 100644 --- a/lib/exclude.h +++ b/lib/exclude.h @@ -1,6 +1,6 @@ /* exclude.h -- declarations for excluding file names - Copyright (C) 1992-1994, 1997, 1999, 2001-2003, 2005-2006, 2009-2016 Free + Copyright (C) 1992-1994, 1997, 1999, 2001-2003, 2005-2006, 2009-2017 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify diff --git a/lib/exitfail.c b/lib/exitfail.c index 8033c22..524eb5c 100644 --- a/lib/exitfail.c +++ b/lib/exitfail.c @@ -1,6 +1,6 @@ /* Failure exit status - Copyright (C) 2002-2003, 2005-2007, 2009-2016 Free Software Foundation, Inc. + Copyright (C) 2002-2003, 2005-2007, 2009-2017 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/lib/exitfail.h b/lib/exitfail.h index 62311bd..895511f 100644 --- a/lib/exitfail.h +++ b/lib/exitfail.h @@ -1,6 +1,6 @@ /* Failure exit status - Copyright (C) 2002, 2009-2016 Free Software Foundation, Inc. + Copyright (C) 2002, 2009-2017 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/lib/fcntl.c b/lib/fcntl.c index fd17e96..d4dd144 100644 --- a/lib/fcntl.c +++ b/lib/fcntl.c @@ -1,6 +1,6 @@ /* Provide file descriptor control. - Copyright (C) 2009-2016 Free Software Foundation, Inc. + Copyright (C) 2009-2017 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -38,7 +38,11 @@ # include <windows.h> /* Get _get_osfhandle. */ -# include "msvc-nothrow.h" +# if GNULIB_MSVC_NOTHROW +# include "msvc-nothrow.h" +# else +# include <io.h> +# endif /* Upper bound on getdtablesize(). See lib/getdtablesize.c. */ # define OPEN_MAX_MAX 0x10000 diff --git a/lib/fcntl.in.h b/lib/fcntl.in.h index b943973..4a1d40a 100644 --- a/lib/fcntl.in.h +++ b/lib/fcntl.in.h @@ -1,6 +1,6 @@ /* Like <fcntl.h>, but with non-working flags defined to 0. - Copyright (C) 2006-2016 Free Software Foundation, Inc. + Copyright (C) 2006-2017 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/lib/fd-hook.c b/lib/fd-hook.c index 8676c6b..ab5847a 100644 --- a/lib/fd-hook.c +++ b/lib/fd-hook.c @@ -1,5 +1,5 @@ /* Hook for making making file descriptor functions close(), ioctl() extensible. - Copyright (C) 2009-2016 Free Software Foundation, Inc. + Copyright (C) 2009-2017 Free Software Foundation, Inc. Written by Bruno Haible <bruno@clisp.org>, 2009. This program is free software: you can redistribute it and/or modify it diff --git a/lib/fd-hook.h b/lib/fd-hook.h index 9568d07..fe0d1b0 100644 --- a/lib/fd-hook.h +++ b/lib/fd-hook.h @@ -1,5 +1,5 @@ /* Hook for making making file descriptor functions close(), ioctl() extensible. - Copyright (C) 2009-2016 Free Software Foundation, Inc. + Copyright (C) 2009-2017 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published diff --git a/lib/file-type.c b/lib/file-type.c index b405133..1c1f49b 100644 --- a/lib/file-type.c +++ b/lib/file-type.c @@ -1,6 +1,6 @@ /* Return a string describing the type of a file. - Copyright (C) 1993-1994, 2001-2002, 2004-2006, 2009-2016 Free Software + Copyright (C) 1993-1994, 2001-2002, 2004-2006, 2009-2017 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify diff --git a/lib/file-type.h b/lib/file-type.h index 0933f7a..de66cf7 100644 --- a/lib/file-type.h +++ b/lib/file-type.h @@ -1,6 +1,6 @@ /* Return a string describing the type of a file. - Copyright (C) 1993-1994, 2001-2002, 2004-2005, 2009-2016 Free Software + Copyright (C) 1993-1994, 2001-2002, 2004-2005, 2009-2017 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify diff --git a/lib/filename.h b/lib/filename.h index 7d2c31a..0ea7e95 100644 --- a/lib/filename.h +++ b/lib/filename.h @@ -1,5 +1,5 @@ /* Basic filename support macros. - Copyright (C) 2001-2004, 2007-2016 Free Software Foundation, Inc. + Copyright (C) 2001-2004, 2007-2017 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/lib/filenamecat-lgpl.c b/lib/filenamecat-lgpl.c index 4903fbf..6dade12 100644 --- a/lib/filenamecat-lgpl.c +++ b/lib/filenamecat-lgpl.c @@ -1,6 +1,6 @@ /* Concatenate two arbitrary file names. - Copyright (C) 1996-2007, 2009-2016 Free Software Foundation, Inc. + Copyright (C) 1996-2007, 2009-2017 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/lib/filenamecat.c b/lib/filenamecat.c index 06cfeae..e245973 100644 --- a/lib/filenamecat.c +++ b/lib/filenamecat.c @@ -1,6 +1,6 @@ /* Concatenate two arbitrary file names. - Copyright (C) 1996-2007, 2009-2016 Free Software Foundation, Inc. + Copyright (C) 1996-2007, 2009-2017 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/lib/filenamecat.h b/lib/filenamecat.h index 791a0af..feb906a 100644 --- a/lib/filenamecat.h +++ b/lib/filenamecat.h @@ -1,6 +1,6 @@ /* Concatenate two arbitrary file names. - Copyright (C) 1996-1997, 2003, 2005, 2007, 2009-2016 Free Software + Copyright (C) 1996-1997, 2003, 2005, 2007, 2009-2017 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify diff --git a/lib/flexmember.h b/lib/flexmember.h new file mode 100644 index 0000000..c71ea65 --- /dev/null +++ b/lib/flexmember.h @@ -0,0 +1,42 @@ +/* Sizes of structs with flexible array members. + + Copyright 2016-2017 Free Software Foundation, Inc. + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see <http://www.gnu.org/licenses/>. + + Written by Paul Eggert. */ + +#include <stddef.h> + +/* Nonzero multiple of alignment of TYPE, suitable for FLEXSIZEOF below. + On older platforms without _Alignof, use a pessimistic bound that is + safe in practice even if FLEXIBLE_ARRAY_MEMBER is 1. + On newer platforms, use _Alignof to get a tighter bound. */ + +#if !defined __STDC_VERSION__ || __STDC_VERSION__ < 201112 +# define FLEXALIGNOF(type) (sizeof (type) & ~ (sizeof (type) - 1)) +#else +# define FLEXALIGNOF(type) _Alignof (type) +#endif + +/* Upper bound on the size of a struct of type TYPE with a flexible + array member named MEMBER that is followed by N bytes of other data. + This is not simply sizeof (TYPE) + N, since it may require + alignment on unusually picky C11 platforms, and + FLEXIBLE_ARRAY_MEMBER may be 1 on pre-C11 platforms. + Yield a value less than N if and only if arithmetic overflow occurs. */ + +#define FLEXSIZEOF(type, member, n) \ + ((offsetof (type, member) + FLEXALIGNOF (type) - 1 + (n)) \ + & ~ (FLEXALIGNOF (type) - 1)) diff --git a/lib/float+.h b/lib/float+.h index 00fcc76..ba8ecb7 100644 --- a/lib/float+.h +++ b/lib/float+.h @@ -1,5 +1,5 @@ /* Supplemental information about the floating-point formats. - Copyright (C) 2007, 2009-2016 Free Software Foundation, Inc. + Copyright (C) 2007, 2009-2017 Free Software Foundation, Inc. Written by Bruno Haible <bruno@clisp.org>, 2007. This program is free software; you can redistribute it and/or modify diff --git a/lib/float.c b/lib/float.c index 1bad2ee..b9103ec 100644 --- a/lib/float.c +++ b/lib/float.c @@ -1,5 +1,5 @@ /* Auxiliary definitions for <float.h>. - Copyright (C) 2011-2016 Free Software Foundation, Inc. + Copyright (C) 2011-2017 Free Software Foundation, Inc. Written by Bruno Haible <bruno@clisp.org>, 2011. This program is free software: you can redistribute it and/or modify diff --git a/lib/float.in.h b/lib/float.in.h index 0b93d90..3e01200 100644 --- a/lib/float.in.h +++ b/lib/float.in.h @@ -1,6 +1,6 @@ /* A correct <float.h>. - Copyright (C) 2007-2016 Free Software Foundation, Inc. + Copyright (C) 2007-2017 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/lib/fnmatch.c b/lib/fnmatch.c index cae3020..5559ba2 100644 --- a/lib/fnmatch.c +++ b/lib/fnmatch.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1991-1993, 1996-2007, 2009-2016 Free Software Foundation, Inc. +/* Copyright (C) 1991-1993, 1996-2007, 2009-2017 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -22,10 +22,6 @@ # define _GNU_SOURCE 1 #endif -#if ! defined __builtin_expect && __GNUC__ < 3 -# define __builtin_expect(expr, expected) (expr) -#endif - #include <fnmatch.h> #include <alloca.h> @@ -67,6 +63,16 @@ extern int fnmatch (const char *pattern, const char *string, int flags); # define SIZE_MAX ((size_t) -1) #endif +#include "flexmember.h" + +#ifndef FALLTHROUGH +# if __GNUC__ < 7 +# define FALLTHROUGH ((void) 0) +# else +# define FALLTHROUGH __attribute__ ((__fallthrough__)) +# endif +#endif + /* We often have to test for FNM_FILE_NAME and FNM_PERIOD being both set. */ #define NO_LEADING_PERIOD(flags) \ ((flags & (FNM_FILE_NAME | FNM_PERIOD)) == (FNM_FILE_NAME | FNM_PERIOD)) diff --git a/lib/fnmatch.in.h b/lib/fnmatch.in.h index 890ee56..1782ad2 100644 --- a/lib/fnmatch.in.h +++ b/lib/fnmatch.in.h @@ -1,4 +1,4 @@ -/* Copyright (C) 1991-1993, 1996-1999, 2001-2003, 2005, 2007, 2009-2016 Free +/* Copyright (C) 1991-1993, 1996-1999, 2001-2003, 2005, 2007, 2009-2017 Free Software Foundation, Inc. This file is part of the GNU C Library. diff --git a/lib/fnmatch_loop.c b/lib/fnmatch_loop.c index e613c91..7c2c660 100644 --- a/lib/fnmatch_loop.c +++ b/lib/fnmatch_loop.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1991-1993, 1996-2006, 2009-2016 Free Software Foundation, Inc. +/* Copyright (C) 1991-1993, 1996-2006, 2009-2017 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 @@ -960,7 +960,7 @@ FCT (const CHAR *pattern, const CHAR *string, const CHAR *string_end, new_no_leading_period = true; break; } - /* FALLTHROUGH */ + FALLTHROUGH; default: normal_match: if (n == string_end || c != FOLD ((UCHAR) *n)) @@ -1031,7 +1031,7 @@ EXT (INT opt, const CHAR *pattern, const CHAR *string, const CHAR *string_end, struct patternlist { struct patternlist *next; - CHAR str[1]; + CHAR str[FLEXIBLE_ARRAY_MEMBER]; } *list = NULL; struct patternlist **lastp = &list; size_t pattern_len = STRLEN (pattern); @@ -1083,7 +1083,7 @@ EXT (INT opt, const CHAR *pattern, const CHAR *string, const CHAR *string_end, ? pattern_len \ : p - startp + 1UL); \ plensize = plen * sizeof (CHAR); \ - newpsize = offsetof (struct patternlist, str) + plensize; \ + newpsize = FLEXSIZEOF (struct patternlist, str, plensize); \ if ((size_t) -1 / sizeof (CHAR) < plen \ || newpsize < offsetof (struct patternlist, str) \ || ALLOCA_LIMIT <= newpsize) \ @@ -1114,8 +1114,7 @@ EXT (INT opt, const CHAR *pattern, const CHAR *string, const CHAR *string_end, case L_('*'): if (FCT (p, string, string_end, no_leading_period, flags) == 0) return 0; - /* FALLTHROUGH */ - + FALLTHROUGH; case L_('+'): do { @@ -1151,8 +1150,7 @@ EXT (INT opt, const CHAR *pattern, const CHAR *string, const CHAR *string_end, case L_('?'): if (FCT (p, string, string_end, no_leading_period, flags) == 0) return 0; - /* FALLTHROUGH */ - + FALLTHROUGH; case L_('@'): do /* I cannot believe it but 'strcat' is actually acceptable diff --git a/lib/freopen-safer.c b/lib/freopen-safer.c index 0704c16..be84ae6 100644 --- a/lib/freopen-safer.c +++ b/lib/freopen-safer.c @@ -1,6 +1,6 @@ /* Invoke freopen, but avoid some glitches. - Copyright (C) 2009-2016 Free Software Foundation, Inc. + Copyright (C) 2009-2017 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -26,6 +26,14 @@ #include <stdbool.h> #include <unistd.h> +#ifndef FALLTHROUGH +# if __GNUC__ < 7 +# define FALLTHROUGH ((void) 0) +# else +# define FALLTHROUGH __attribute__ ((__fallthrough__)) +# endif +#endif + /* Guarantee that FD is open; all smaller FDs must already be open. Return true if successful. */ static bool @@ -69,15 +77,15 @@ freopen_safer (char const *name, char const *mode, FILE *f) default: /* -1 or not a standard stream. */ if (dup2 (STDERR_FILENO, STDERR_FILENO) != STDERR_FILENO) protect_err = true; - /* fall through */ + FALLTHROUGH; case STDERR_FILENO: if (dup2 (STDOUT_FILENO, STDOUT_FILENO) != STDOUT_FILENO) protect_out = true; - /* fall through */ + FALLTHROUGH; case STDOUT_FILENO: if (dup2 (STDIN_FILENO, STDIN_FILENO) != STDIN_FILENO) protect_in = true; - /* fall through */ + FALLTHROUGH; case STDIN_FILENO: /* Nothing left to protect. */ break; diff --git a/lib/freopen.c b/lib/freopen.c index 4cf7528..cf270ff 100644 --- a/lib/freopen.c +++ b/lib/freopen.c @@ -1,5 +1,5 @@ /* Open a stream to a file. - Copyright (C) 2007-2016 Free Software Foundation, Inc. + Copyright (C) 2007-2017 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -19,12 +19,12 @@ /* If the user's config.h happens to include <stdio.h>, let it include only the system's <stdio.h> here, so that orig_freopen doesn't recurse to rpl_freopen. */ -#define __need_FILE +#define _GL_ALREADY_INCLUDING_STDIO_H #include <config.h> /* Get the original definition of freopen. It might be defined as a macro. */ #include <stdio.h> -#undef __need_FILE +#undef _GL_ALREADY_INCLUDING_STDIO_H #include <errno.h> @@ -39,29 +39,54 @@ orig_freopen (const char *filename, const char *mode, FILE *stream) this include because of the preliminary #include <stdio.h> above. */ #include "stdio.h" +#include <fcntl.h> #include <string.h> +#include <unistd.h> FILE * rpl_freopen (const char *filename, const char *mode, FILE *stream) { FILE *result; - #if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__ - if (filename != NULL && strcmp (filename, "/dev/null") == 0) - filename = "NUL"; + char const *null_device = "NUL"; + if (filename && strcmp (filename, "/dev/null") == 0) + filename = null_device; +#else + char const *null_device = "/dev/null"; #endif - /* Clear errno to check the success of freopen() with it */ +#ifdef __KLIBC__ errno = 0; +#endif result = orig_freopen (filename, mode, stream); + if (!result) + { #ifdef __KLIBC__ - /* On OS/2 kLIBC, freopen() returns NULL even if it is successful - if filename is NULL. */ - if (!filename && !result && !errno) - result = stream; + /* On OS/2 kLIBC, freopen returns NULL even if it is successful + if filename is NULL. */ + if (!filename && !errno) + result = stream; #endif + } + else if (filename) + { + int fd = fileno (result); + if (dup2 (fd, fd) < 0 && errno == EBADF) + { + int nullfd = open (null_device, O_RDONLY | O_CLOEXEC); + int err = 0; + if (nullfd != fd) + { + if (dup2 (nullfd, fd) < 0) + err = 1; + close (nullfd); + } + if (!err) + result = orig_freopen (filename, mode, result); + } + } return result; } diff --git a/lib/fstat.c b/lib/fstat.c index 435c429..d2e0468 100644 --- a/lib/fstat.c +++ b/lib/fstat.c @@ -1,5 +1,5 @@ /* fstat() replacement. - Copyright (C) 2011-2016 Free Software Foundation, Inc. + Copyright (C) 2011-2017 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -23,20 +23,22 @@ /* Get the original definition of fstat. It might be defined as a macro. */ #include <sys/types.h> #include <sys/stat.h> -#if _GL_WINDOWS_64_BIT_ST_SIZE -# undef stat /* avoid warning on mingw64 with _FILE_OFFSET_BITS=64 */ -# define stat _stati64 -# undef fstat /* avoid warning on mingw64 with _FILE_OFFSET_BITS=64 */ -# define fstat _fstati64 -#endif #undef __need_system_sys_stat_h +#if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__ +# define WINDOWS_NATIVE +#endif + +#if !defined WINDOWS_NATIVE + static int orig_fstat (int fd, struct stat *buf) { return fstat (fd, buf); } +#endif + /* Specification. */ /* Write "sys/stat.h" here, not <sys/stat.h>, otherwise OSF/1 5.1 DTK cc eliminates this include because of the preliminary #include <sys/stat.h> @@ -45,32 +47,15 @@ orig_fstat (int fd, struct stat *buf) #include <errno.h> #include <unistd.h> - -#if HAVE_MSVC_INVALID_PARAMETER_HANDLER -# include "msvc-inval.h" -#endif - -#if HAVE_MSVC_INVALID_PARAMETER_HANDLER -static int -fstat_nothrow (int fd, struct stat *buf) -{ - int result; - - TRY_MSVC_INVAL - { - result = orig_fstat (fd, buf); - } - CATCH_MSVC_INVAL - { - result = -1; - errno = EBADF; - } - DONE_MSVC_INVAL; - - return result; -} -#else -# define fstat_nothrow orig_fstat +#ifdef WINDOWS_NATIVE +# define WIN32_LEAN_AND_MEAN +# include <windows.h> +# if GNULIB_MSVC_NOTHROW +# include "msvc-nothrow.h" +# else +# include <io.h> +# endif +# include "stat-w32.h" #endif int @@ -84,5 +69,20 @@ rpl_fstat (int fd, struct stat *buf) return stat (name, buf); #endif - return fstat_nothrow (fd, buf); +#ifdef WINDOWS_NATIVE + /* Fill the fields ourselves, because the original fstat function returns + values for st_atime, st_mtime, st_ctime that depend on the current time + zone. See + <https://lists.gnu.org/archive/html/bug-gnulib/2017-04/msg00134.html> */ + HANDLE h = (HANDLE) _get_osfhandle (fd); + + if (h == INVALID_HANDLE_VALUE) + { + errno = EBADF; + return -1; + } + return _gl_fstat_by_handle (h, NULL, buf); +#else + return orig_fstat (fd, buf); +#endif } diff --git a/lib/getdtablesize.c b/lib/getdtablesize.c index d234055..c356cf4 100644 --- a/lib/getdtablesize.c +++ b/lib/getdtablesize.c @@ -1,5 +1,5 @@ /* getdtablesize() function for platforms that don't have it. - Copyright (C) 2008-2016 Free Software Foundation, Inc. + Copyright (C) 2008-2017 Free Software Foundation, Inc. Written by Bruno Haible <bruno@clisp.org>, 2008. This program is free software: you can redistribute it and/or modify @@ -24,7 +24,9 @@ # include <stdio.h> -# include "msvc-inval.h" +# if HAVE_MSVC_INVALID_PARAMETER_HANDLER +# include "msvc-inval.h" +# endif # if HAVE_MSVC_INVALID_PARAMETER_HANDLER static int @@ -44,7 +46,8 @@ _setmaxstdio_nothrow (int newmax) return result; } -# define _setmaxstdio _setmaxstdio_nothrow +# else +# define _setmaxstdio_nothrow _setmaxstdio # endif /* Cache for the previous getdtablesize () result. Safe to cache because @@ -76,9 +79,9 @@ getdtablesize (void) freed when we call _setmaxstdio with the original value. */ int orig_max_stdio = _getmaxstdio (); unsigned int bound; - for (bound = 0x10000; _setmaxstdio (bound) < 0; bound = bound / 2) + for (bound = 0x10000; _setmaxstdio_nothrow (bound) < 0; bound = bound / 2) ; - _setmaxstdio (orig_max_stdio); + _setmaxstdio_nothrow (orig_max_stdio); dtablesize = bound; } return dtablesize; diff --git a/lib/getopt-cdefs.in.h b/lib/getopt-cdefs.in.h new file mode 100644 index 0000000..c71a4f1 --- /dev/null +++ b/lib/getopt-cdefs.in.h @@ -0,0 +1,67 @@ +/* getopt-on-non-glibc compatibility macros. + Copyright (C) 1989-2017 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. + + gnulib 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. + + gnulib 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 gnulib; if not, see + <http://www.gnu.org/licenses/>. */ + +#ifndef _GETOPT_CDEFS_H +#define _GETOPT_CDEFS_H 1 + +/* This header should not be used directly; include getopt.h or + unistd.h instead. It does not have a protective #error, because + the guard macro for getopt.h in gnulib is not fixed. */ + +/* getopt-core.h and getopt-ext.h are shared with GNU libc, and expect + a number of the internal macros supplied to GNU libc's headers by + sys/cdefs.h. Provide fallback definitions for all of them. */ +#if @HAVE_SYS_CDEFS_H@ +# include <sys/cdefs.h> +#endif + +#ifndef __BEGIN_DECLS +# ifdef __cplusplus +# define __BEGIN_DECLS extern "C" { +# else +# define __BEGIN_DECLS /* nothing */ +# endif +#endif +#ifndef __END_DECLS +# ifdef __cplusplus +# define __END_DECLS } +# else +# define __END_DECLS /* nothing */ +# endif +#endif + +#ifndef __GNUC_PREREQ +# if defined __GNUC__ && defined __GNUC_VERSION__ +# define __GNUC_PREREQ(maj, min) \ + ((__GNUC__ << 16) + __GNUC_MINOR__ >= ((maj) << 16) + (min)) +# else +# define __GNUC_PREREQ(maj, min) 0 +# endif +#endif + +#ifndef __THROW +# if defined __cplusplus && __GNUC_PREREQ (2,8) +# define __THROW throw () +# else +# define __THROW +# endif +#endif + +#endif /* _GETOPT_CDEFS_H */ diff --git a/lib/getopt-core.h b/lib/getopt-core.h new file mode 100644 index 0000000..d315891 --- /dev/null +++ b/lib/getopt-core.h @@ -0,0 +1,96 @@ +/* Declarations for getopt (basic, portable features only). + Copyright (C) 1989-2017 Free Software Foundation, Inc. + This file is part of the GNU C Library and is also part of gnulib. + Patches to this file should be submitted to both projects. + + The GNU C Library is free software; you can redistribute it and/or + modify it under the terms of the GNU General Public + License as published by the Free Software Foundation; either + version 3 of the License, or (at your option) any later version. + + The GNU C Library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + General Public License for more details. + + You should have received a copy of the GNU General Public + License along with the GNU C Library; if not, see + <http://www.gnu.org/licenses/>. */ + +#ifndef _GETOPT_CORE_H +#define _GETOPT_CORE_H 1 + +/* This header should not be used directly; include getopt.h or + unistd.h instead. Unlike most bits headers, it does not have + a protective #error, because the guard macro for getopt.h in + gnulib is not fixed. */ + +__BEGIN_DECLS + +/* For communication from 'getopt' to the caller. + When 'getopt' finds an option that takes an argument, + the argument value is returned here. + Also, when 'ordering' is RETURN_IN_ORDER, + each non-option ARGV-element is returned here. */ + +extern char *optarg; + +/* Index in ARGV of the next element to be scanned. + This is used for communication to and from the caller + and for communication between successive calls to 'getopt'. + + On entry to 'getopt', zero means this is the first call; initialize. + + When 'getopt' returns -1, this is the index of the first of the + non-option elements that the caller should itself scan. + + Otherwise, 'optind' communicates from one call to the next + how much of ARGV has been scanned so far. */ + +extern int optind; + +/* Callers store zero here to inhibit the error message 'getopt' prints + for unrecognized options. */ + +extern int opterr; + +/* Set to an option character which was unrecognized. */ + +extern int optopt; + +/* Get definitions and prototypes for functions to process the + arguments in ARGV (ARGC of them, minus the program name) for + options given in OPTS. + + Return the option character from OPTS just read. Return -1 when + there are no more options. For unrecognized options, or options + missing arguments, 'optopt' is set to the option letter, and '?' is + returned. + + The OPTS string is a list of characters which are recognized option + letters, optionally followed by colons, specifying that that letter + takes an argument, to be placed in 'optarg'. + + If a letter in OPTS is followed by two colons, its argument is + optional. This behavior is specific to the GNU 'getopt'. + + The argument '--' causes premature termination of argument + scanning, explicitly telling 'getopt' that there are no more + options. + + If OPTS begins with '-', then non-option arguments are treated as + arguments to the option '\1'. This behavior is specific to the GNU + 'getopt'. If OPTS begins with '+', or POSIXLY_CORRECT is set in + the environment, then do not permute arguments. + + For standards compliance, the 'argv' argument has the type + char *const *, but this is inaccurate; if argument permutation is + enabled, the argv array (not the strings it points to) must be + writable. */ + +extern int getopt (int ___argc, char *const *___argv, const char *__shortopts) + __THROW _GL_ARG_NONNULL ((2, 3)); + +__END_DECLS + +#endif /* _GETOPT_CORE_H */ diff --git a/lib/getopt-ext.h b/lib/getopt-ext.h new file mode 100644 index 0000000..e4da22f --- /dev/null +++ b/lib/getopt-ext.h @@ -0,0 +1,77 @@ +/* Declarations for getopt (GNU extensions). + Copyright (C) 1989-2017 Free Software Foundation, Inc. + This file is part of the GNU C Library and is also part of gnulib. + Patches to this file should be submitted to both projects. + + The GNU C Library is free software; you can redistribute it and/or + modify it under the terms of the GNU General Public + License as published by the Free Software Foundation; either + version 3 of the License, or (at your option) any later version. + + The GNU C Library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + General Public License for more details. + + You should have received a copy of the GNU General Public + License along with the GNU C Library; if not, see + <http://www.gnu.org/licenses/>. */ + +#ifndef _GETOPT_EXT_H +#define _GETOPT_EXT_H 1 + +/* This header should not be used directly; include getopt.h instead. + Unlike most bits headers, it does not have a protective #error, + because the guard macro for getopt.h in gnulib is not fixed. */ + +__BEGIN_DECLS + +/* Describe the long-named options requested by the application. + The LONG_OPTIONS argument to getopt_long or getopt_long_only is a vector + of 'struct option' terminated by an element containing a name which is + zero. + + The field 'has_arg' is: + no_argument (or 0) if the option does not take an argument, + required_argument (or 1) if the option requires an argument, + optional_argument (or 2) if the option takes an optional argument. + + If the field 'flag' is not NULL, it points to a variable that is set + to the value given in the field 'val' when the option is found, but + left unchanged if the option is not found. + + To have a long-named option do something other than set an 'int' to + a compiled-in constant, such as set a value from 'optarg', set the + option's 'flag' field to zero and its 'val' field to a nonzero + value (the equivalent single-letter option character, if there is + one). For long options that have a zero 'flag' field, 'getopt' + returns the contents of the 'val' field. */ + +struct option +{ + const char *name; + /* has_arg can't be an enum because some compilers complain about + type mismatches in all the code that assumes it is an int. */ + int has_arg; + int *flag; + int val; +}; + +/* Names for the values of the 'has_arg' field of 'struct option'. */ + +#define no_argument 0 +#define required_argument 1 +#define optional_argument 2 + +extern int getopt_long (int ___argc, char *__getopt_argv_const *___argv, + const char *__shortopts, + const struct option *__longopts, int *__longind) + __THROW _GL_ARG_NONNULL ((2, 3)); +extern int getopt_long_only (int ___argc, char *__getopt_argv_const *___argv, + const char *__shortopts, + const struct option *__longopts, int *__longind) + __THROW _GL_ARG_NONNULL ((2, 3)); + +__END_DECLS + +#endif /* _GETOPT_EXT_H */ diff --git a/lib/getopt-pfx-core.h b/lib/getopt-pfx-core.h new file mode 100644 index 0000000..4dc427d --- /dev/null +++ b/lib/getopt-pfx-core.h @@ -0,0 +1,54 @@ +/* getopt (basic, portable features) gnulib wrapper header. + Copyright (C) 1989-2017 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. + + gnulib 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. + + gnulib 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 gnulib; if not, see + <http://www.gnu.org/licenses/>. */ + +#ifndef _GETOPT_PFX_CORE_H +#define _GETOPT_PFX_CORE_H 1 + +/* This header should not be used directly; include getopt.h or + unistd.h instead. It does not have a protective #error, because + the guard macro for getopt.h in gnulib is not fixed. */ + +/* Standalone applications should #define __GETOPT_PREFIX to an + identifier that prefixes the external functions and variables + defined in getopt-core.h and getopt-ext.h. Systematically + rename identifiers so that they do not collide with the system + functions and variables. Renaming avoids problems with some + compilers and linkers. */ +#ifdef __GETOPT_PREFIX +# ifndef __GETOPT_ID +# define __GETOPT_CONCAT(x, y) x ## y +# define __GETOPT_XCONCAT(x, y) __GETOPT_CONCAT (x, y) +# define __GETOPT_ID(y) __GETOPT_XCONCAT (__GETOPT_PREFIX, y) +# endif +# undef getopt +# undef optarg +# undef opterr +# undef optind +# undef optopt +# define getopt __GETOPT_ID (getopt) +# define optarg __GETOPT_ID (optarg) +# define opterr __GETOPT_ID (opterr) +# define optind __GETOPT_ID (optind) +# define optopt __GETOPT_ID (optopt) +#endif + +#include <getopt-core.h> + +#endif /* _GETOPT_PFX_CORE_H */ diff --git a/lib/getopt-pfx-ext.h b/lib/getopt-pfx-ext.h new file mode 100644 index 0000000..0839759 --- /dev/null +++ b/lib/getopt-pfx-ext.h @@ -0,0 +1,66 @@ +/* getopt (GNU extensions) gnulib wrapper header. + Copyright (C) 1989-2017 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. + + gnulib 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. + + gnulib 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 gnulib; if not, see + <http://www.gnu.org/licenses/>. */ + +#ifndef _GETOPT_PFX_EXT_H +#define _GETOPT_PFX_EXT_H 1 + +/* This header should not be used directly; include getopt.h instead. + It does not have a protective #error, because the guard macro for + getopt.h in gnulib is not fixed. */ + +/* Standalone applications should #define __GETOPT_PREFIX to an + identifier that prefixes the external functions and variables + defined in getopt-core.h and getopt-ext.h. Systematically + rename identifiers so that they do not collide with the system + functions and variables. Renaming avoids problems with some + compilers and linkers. */ +#ifdef __GETOPT_PREFIX +# ifndef __GETOPT_ID +# define __GETOPT_CONCAT(x, y) x ## y +# define __GETOPT_XCONCAT(x, y) __GETOPT_CONCAT (x, y) +# define __GETOPT_ID(y) __GETOPT_XCONCAT (__GETOPT_PREFIX, y) +# endif +# undef getopt_long +# undef getopt_long_only +# undef option +# undef _getopt_internal +# define getopt_long __GETOPT_ID (getopt_long) +# define getopt_long_only __GETOPT_ID (getopt_long_only) +# define option __GETOPT_ID (option) +# define _getopt_internal __GETOPT_ID (getopt_internal) +#endif + +/* Standalone applications get correct prototypes for getopt_long and + getopt_long_only; they declare "char **argv". For backward + compatibility with old applications, if __GETOPT_PREFIX is not + defined, we supply GNU-libc-compatible, but incorrect, prototypes + using "char *const *argv". (GNU libc is stuck with the incorrect + prototypes, as they are baked into older versions of LSB.) */ +#ifndef __getopt_argv_const +# if defined __GETOPT_PREFIX +# define __getopt_argv_const /* empty */ +# else +# define __getopt_argv_const const +# endif +#endif + +#include <getopt-ext.h> + +#endif /* _GETOPT_PFX_EXT_H */ diff --git a/lib/getopt.c b/lib/getopt.c index 8ccb901..9a2867d 100644 --- a/lib/getopt.c +++ b/lib/getopt.c @@ -1,23 +1,21 @@ /* Getopt for GNU. - NOTE: getopt is part of the C library, so if you don't know what - "Keep this file name-space clean" means, talk to drepper@gnu.org - before changing it! - Copyright (C) 1987-1996, 1998-2004, 2006, 2008-2016 Free Software - Foundation, Inc. - This file is part of the GNU C Library. - - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 3 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, + Copyright (C) 1987-2017 Free Software Foundation, Inc. + This file is part of the GNU C Library and is also part of gnulib. + Patches to this file should be submitted to both projects. + + The GNU C Library is free software; you can redistribute it and/or + modify it under the terms of the GNU General Public + License as published by the Free Software Foundation; either + version 3 of the License, or (at your option) any later version. + + The GNU C Library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + General Public License for more details. - You should have received a copy of the GNU General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. */ + You should have received a copy of the GNU General Public + License along with the GNU C Library; if not, see + <http://www.gnu.org/licenses/>. */ #ifndef _LIBC # include <config.h> @@ -31,30 +29,54 @@ #include <unistd.h> #ifdef _LIBC +/* When used as part of glibc, error printing must be done differently + for standards compliance. getopt is not a cancellation point, so + it must not call functions that are, and it is specified by an + older standard than stdio locking, so it must not refer to + functions in the "user namespace" related to stdio locking. + Finally, it must use glibc's internal message translation so that + the messages are looked up in the proper text domain. */ # include <libintl.h> +# define fprintf __fxprintf_nocancel +# define flockfile(fp) _IO_flockfile (fp) +# define funlockfile(fp) _IO_funlockfile (fp) #else # include "gettext.h" # define _(msgid) gettext (msgid) +/* When used standalone, flockfile and funlockfile might not be + available. */ +# if (!defined _POSIX_THREAD_SAFE_FUNCTIONS \ + || ((defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__)) +# define flockfile(fp) /* nop */ +# define funlockfile(fp) /* nop */ +# endif +/* When used standalone, do not attempt to use alloca. */ +# define __libc_use_alloca(size) 0 +# undef alloca +# define alloca(size) (abort (), (void *)0) #endif -#if defined _LIBC && defined USE_IN_LIBIO -# include <wchar.h> -#endif - -/* This version of 'getopt' appears to the caller like standard Unix 'getopt' - but it behaves differently for the user, since it allows the user - to intersperse the options with the other arguments. - - As 'getopt_long' works, it permutes the elements of ARGV so that, - when it is done, all the options precede everything else. Thus - all application programs are extended to handle flexible argument order. - - Using 'getopt' or setting the environment variable POSIXLY_CORRECT +/* This implementation of 'getopt' has three modes for handling + options interspersed with non-option arguments. It can stop + scanning for options at the first non-option argument encountered, + as POSIX specifies. It can continue scanning for options after the + first non-option argument, but permute 'argv' as it goes so that, + after 'getopt' is done, all the options precede all the non-option + arguments and 'optind' points to the first non-option argument. + Or, it can report non-option arguments as if they were arguments to + the option character '\x01'. + + The default behavior of 'getopt_long' is to permute the argument list. + When this implementation is used standalone, the default behavior of + 'getopt' is to stop at the first non-option argument, but when it is + used as part of GNU libc it also permutes the argument list. In both + cases, setting the environment variable POSIXLY_CORRECT to any value disables permutation. - Then the behavior is completely standard. - GNU application programs can use a third alternative mode in which - they can distinguish the relative order of options and other arguments. */ + If the first character of the OPTSTRING argument to 'getopt' or + 'getopt_long' is '+', both functions will stop at the first + non-option argument. If it is '-', both functions will report + non-option arguments as arguments to the option character '\x01'. */ #include "getopt_int.h" @@ -95,42 +117,7 @@ int optopt = '?'; /* Keep a global copy of all internal members of getopt_data. */ static struct _getopt_data getopt_data; - - -#if defined HAVE_DECL_GETENV && !HAVE_DECL_GETENV -extern char *getenv (); -#endif -#ifdef _LIBC -/* Stored original parameters. - XXX This is no good solution. We should rather copy the args so - that we can compare them later. But we must not use malloc(3). */ -extern int __libc_argc; -extern char **__libc_argv; - -/* Bash 2.0 gives us an environment variable containing flags - indicating ARGV elements that should not be considered arguments. */ - -# ifdef USE_NONOPTION_FLAGS -/* Defined in getopt_init.c */ -extern char *__getopt_nonoption_flags; -# endif - -# ifdef USE_NONOPTION_FLAGS -# define SWAP_FLAGS(ch1, ch2) \ - if (d->__nonoption_flags_len > 0) \ - { \ - char __tmp = __getopt_nonoption_flags[ch1]; \ - __getopt_nonoption_flags[ch1] = __getopt_nonoption_flags[ch2]; \ - __getopt_nonoption_flags[ch2] = __tmp; \ - } -# else -# define SWAP_FLAGS(ch1, ch2) -# endif -#else /* !_LIBC */ -# define SWAP_FLAGS(ch1, ch2) -#endif /* _LIBC */ - /* Exchange two adjacent subsequences of ARGV. One subsequence is elements [first_nonopt,last_nonopt) which contains all the non-options that have been skipped so far. @@ -153,64 +140,40 @@ exchange (char **argv, struct _getopt_data *d) It leaves the longer segment in the right place overall, but it consists of two parts that need to be swapped next. */ -#if defined _LIBC && defined USE_NONOPTION_FLAGS - /* First make sure the handling of the '__getopt_nonoption_flags' - string can work normally. Our top argument must be in the range - of the string. */ - if (d->__nonoption_flags_len > 0 && top >= d->__nonoption_flags_max_len) - { - /* We must extend the array. The user plays games with us and - presents new arguments. */ - char *new_str = malloc (top + 1); - if (new_str == NULL) - d->__nonoption_flags_len = d->__nonoption_flags_max_len = 0; - else - { - memset (__mempcpy (new_str, __getopt_nonoption_flags, - d->__nonoption_flags_max_len), - '\0', top + 1 - d->__nonoption_flags_max_len); - d->__nonoption_flags_max_len = top + 1; - __getopt_nonoption_flags = new_str; - } - } -#endif - while (top > middle && middle > bottom) { if (top - middle > middle - bottom) - { - /* Bottom segment is the short one. */ - int len = middle - bottom; - register int i; - - /* Swap it with the top part of the top segment. */ - for (i = 0; i < len; i++) - { - tem = argv[bottom + i]; - argv[bottom + i] = argv[top - (middle - bottom) + i]; - argv[top - (middle - bottom) + i] = tem; - SWAP_FLAGS (bottom + i, top - (middle - bottom) + i); - } - /* Exclude the moved bottom segment from further swapping. */ - top -= len; - } + { + /* Bottom segment is the short one. */ + int len = middle - bottom; + int i; + + /* Swap it with the top part of the top segment. */ + for (i = 0; i < len; i++) + { + tem = argv[bottom + i]; + argv[bottom + i] = argv[top - (middle - bottom) + i]; + argv[top - (middle - bottom) + i] = tem; + } + /* Exclude the moved bottom segment from further swapping. */ + top -= len; + } else - { - /* Top segment is the short one. */ - int len = top - middle; - register int i; - - /* Swap it with the bottom part of the bottom segment. */ - for (i = 0; i < len; i++) - { - tem = argv[bottom + i]; - argv[bottom + i] = argv[middle + i]; - argv[middle + i] = tem; - SWAP_FLAGS (bottom + i, middle + i); - } - /* Exclude the moved top segment from further swapping. */ - bottom += len; - } + { + /* Top segment is the short one. */ + int len = top - middle; + int i; + + /* Swap it with the bottom part of the bottom segment. */ + for (i = 0; i < len; i++) + { + tem = argv[bottom + i]; + argv[bottom + i] = argv[middle + i]; + argv[middle + i] = tem; + } + /* Exclude the moved top segment from further swapping. */ + bottom += len; + } } /* Update records for the slots the non-options now occupy. */ @@ -219,25 +182,216 @@ exchange (char **argv, struct _getopt_data *d) d->__last_nonopt = d->optind; } -/* Initialize the internal data when the first call is made. */ +/* Process the argument starting with d->__nextchar as a long option. + d->optind should *not* have been advanced over this argument. + + If the value returned is -1, it was not actually a long option, the + state is unchanged, and the argument should be processed as a set + of short options (this can only happen when long_only is true). + Otherwise, the option (and its argument, if any) have been consumed + and the return value is the value to return from _getopt_internal_r. */ +static int +process_long_option (int argc, char **argv, const char *optstring, + const struct option *longopts, int *longind, + int long_only, struct _getopt_data *d, + int print_errors, const char *prefix) +{ + char *nameend; + size_t namelen; + const struct option *p; + const struct option *pfound = NULL; + int n_options; + int option_index; + + for (nameend = d->__nextchar; *nameend && *nameend != '='; nameend++) + /* Do nothing. */ ; + namelen = nameend - d->__nextchar; + + /* First look for an exact match, counting the options as a side + effect. */ + for (p = longopts, n_options = 0; p->name; p++, n_options++) + if (!strncmp (p->name, d->__nextchar, namelen) + && namelen == strlen (p->name)) + { + /* Exact match found. */ + pfound = p; + option_index = n_options; + break; + } + + if (pfound == NULL) + { + /* Didn't find an exact match, so look for abbreviations. */ + unsigned char *ambig_set = NULL; + int ambig_malloced = 0; + int ambig_fallback = 0; + int indfound = -1; + + for (p = longopts, option_index = 0; p->name; p++, option_index++) + if (!strncmp (p->name, d->__nextchar, namelen)) + { + if (pfound == NULL) + { + /* First nonexact match found. */ + pfound = p; + indfound = option_index; + } + else if (long_only + || pfound->has_arg != p->has_arg + || pfound->flag != p->flag + || pfound->val != p->val) + { + /* Second or later nonexact match found. */ + if (!ambig_fallback) + { + if (!print_errors) + /* Don't waste effort tracking the ambig set if + we're not going to print it anyway. */ + ambig_fallback = 1; + else if (!ambig_set) + { + if (__libc_use_alloca (n_options)) + ambig_set = alloca (n_options); + else if ((ambig_set = malloc (n_options)) == NULL) + /* Fall back to simpler error message. */ + ambig_fallback = 1; + else + ambig_malloced = 1; + + if (ambig_set) + { + memset (ambig_set, 0, n_options); + ambig_set[indfound] = 1; + } + } + if (ambig_set) + ambig_set[option_index] = 1; + } + } + } + + if (ambig_set || ambig_fallback) + { + if (print_errors) + { + if (ambig_fallback) + fprintf (stderr, _("%s: option '%s%s' is ambiguous\n"), + argv[0], prefix, d->__nextchar); + else + { + flockfile (stderr); + fprintf (stderr, + _("%s: option '%s%s' is ambiguous; possibilities:"), + argv[0], prefix, d->__nextchar); + + for (option_index = 0; option_index < n_options; option_index++) + if (ambig_set[option_index]) + fprintf (stderr, " '%s%s'", + prefix, longopts[option_index].name); + + /* This must use 'fprintf' even though it's only + printing a single character, so that it goes through + __fxprintf_nocancel when compiled as part of glibc. */ + fprintf (stderr, "\n"); + funlockfile (stderr); + } + } + if (ambig_malloced) + free (ambig_set); + d->__nextchar += strlen (d->__nextchar); + d->optind++; + d->optopt = 0; + return '?'; + } + + option_index = indfound; + } + + if (pfound == NULL) + { + /* Can't find it as a long option. If this is not getopt_long_only, + or the option starts with '--' or is not a valid short option, + then it's an error. */ + if (!long_only || argv[d->optind][1] == '-' + || strchr (optstring, *d->__nextchar) == NULL) + { + if (print_errors) + fprintf (stderr, _("%s: unrecognized option '%s%s'\n"), + argv[0], prefix, d->__nextchar); + + d->__nextchar = NULL; + d->optind++; + d->optopt = 0; + return '?'; + } + + /* Otherwise interpret it as a short option. */ + return -1; + } + + /* We have found a matching long option. Consume it. */ + d->optind++; + d->__nextchar = NULL; + if (*nameend) + { + /* Don't test has_arg with >, because some C compilers don't + allow it to be used on enums. */ + if (pfound->has_arg) + d->optarg = nameend + 1; + else + { + if (print_errors) + fprintf (stderr, + _("%s: option '%s%s' doesn't allow an argument\n"), + argv[0], prefix, pfound->name); + + d->optopt = pfound->val; + return '?'; + } + } + else if (pfound->has_arg == 1) + { + if (d->optind < argc) + d->optarg = argv[d->optind++]; + else + { + if (print_errors) + fprintf (stderr, + _("%s: option '%s%s' requires an argument\n"), + argv[0], prefix, pfound->name); + + d->optopt = pfound->val; + return optstring[0] == ':' ? ':' : '?'; + } + } + + if (longind != NULL) + *longind = option_index; + if (pfound->flag) + { + *(pfound->flag) = pfound->val; + return 0; + } + return pfound->val; +} + +/* Initialize internal data upon the first call to getopt. */ static const char * _getopt_initialize (int argc _GL_UNUSED, - char **argv _GL_UNUSED, const char *optstring, - struct _getopt_data *d, int posixly_correct) + char **argv _GL_UNUSED, const char *optstring, + struct _getopt_data *d, int posixly_correct) { /* Start processing options with ARGV-element 1 (since ARGV-element 0 is the program name); the sequence of previously skipped non-option ARGV-elements is empty. */ + if (d->optind == 0) + d->optind = 1; d->__first_nonopt = d->__last_nonopt = d->optind; - d->__nextchar = NULL; - d->__posixly_correct = posixly_correct || !!getenv ("POSIXLY_CORRECT"); - /* Determine how to handle the ordering of options and nonoptions. */ - if (optstring[0] == '-') { d->__ordering = RETURN_IN_ORDER; @@ -248,41 +402,12 @@ _getopt_initialize (int argc _GL_UNUSED, d->__ordering = REQUIRE_ORDER; ++optstring; } - else if (d->__posixly_correct) + else if (posixly_correct || !!getenv ("POSIXLY_CORRECT")) d->__ordering = REQUIRE_ORDER; else d->__ordering = PERMUTE; -#if defined _LIBC && defined USE_NONOPTION_FLAGS - if (!d->__posixly_correct - && argc == __libc_argc && argv == __libc_argv) - { - if (d->__nonoption_flags_max_len == 0) - { - if (__getopt_nonoption_flags == NULL - || __getopt_nonoption_flags[0] == '\0') - d->__nonoption_flags_max_len = -1; - else - { - const char *orig_str = __getopt_nonoption_flags; - int len = d->__nonoption_flags_max_len = strlen (orig_str); - if (d->__nonoption_flags_max_len < argc) - d->__nonoption_flags_max_len = argc; - __getopt_nonoption_flags = - (char *) malloc (d->__nonoption_flags_max_len); - if (__getopt_nonoption_flags == NULL) - d->__nonoption_flags_max_len = -1; - else - memset (__mempcpy (__getopt_nonoption_flags, orig_str, len), - '\0', d->__nonoption_flags_max_len - len); - } - } - d->__nonoption_flags_len = d->__nonoption_flags_max_len; - } - else - d->__nonoption_flags_len = 0; -#endif - + d->__initialized = 1; return optstring; } @@ -344,8 +469,8 @@ _getopt_initialize (int argc _GL_UNUSED, int _getopt_internal_r (int argc, char **argv, const char *optstring, - const struct option *longopts, int *longind, - int long_only, struct _getopt_data *d, int posixly_correct) + const struct option *longopts, int *longind, + int long_only, struct _getopt_data *d, int posixly_correct) { int print_errors = d->opterr; @@ -355,461 +480,129 @@ _getopt_internal_r (int argc, char **argv, const char *optstring, d->optarg = NULL; if (d->optind == 0 || !d->__initialized) - { - if (d->optind == 0) - d->optind = 1; /* Don't scan ARGV[0], the program name. */ - optstring = _getopt_initialize (argc, argv, optstring, d, - posixly_correct); - d->__initialized = 1; - } + optstring = _getopt_initialize (argc, argv, optstring, d, posixly_correct); else if (optstring[0] == '-' || optstring[0] == '+') optstring++; + if (optstring[0] == ':') print_errors = 0; - /* Test whether ARGV[optind] points to a non-option argument. - Either it does not have option syntax, or there is an environment flag - from the shell indicating it is not an option. The later information - is only used when the used in the GNU libc. */ -#if defined _LIBC && defined USE_NONOPTION_FLAGS -# define NONOPTION_P (argv[d->optind][0] != '-' || argv[d->optind][1] == '\0' \ - || (d->optind < d->__nonoption_flags_len \ - && __getopt_nonoption_flags[d->optind] == '1')) -#else -# define NONOPTION_P (argv[d->optind][0] != '-' || argv[d->optind][1] == '\0') -#endif + /* Test whether ARGV[optind] points to a non-option argument. */ +#define NONOPTION_P (argv[d->optind][0] != '-' || argv[d->optind][1] == '\0') if (d->__nextchar == NULL || *d->__nextchar == '\0') { /* Advance to the next ARGV-element. */ /* Give FIRST_NONOPT & LAST_NONOPT rational values if OPTIND has been - moved back by the user (who may also have changed the arguments). */ + moved back by the user (who may also have changed the arguments). */ if (d->__last_nonopt > d->optind) - d->__last_nonopt = d->optind; + d->__last_nonopt = d->optind; if (d->__first_nonopt > d->optind) - d->__first_nonopt = d->optind; + d->__first_nonopt = d->optind; if (d->__ordering == PERMUTE) - { - /* If we have just processed some options following some non-options, - exchange them so that the options come first. */ + { + /* If we have just processed some options following some non-options, + exchange them so that the options come first. */ - if (d->__first_nonopt != d->__last_nonopt - && d->__last_nonopt != d->optind) - exchange ((char **) argv, d); - else if (d->__last_nonopt != d->optind) - d->__first_nonopt = d->optind; + if (d->__first_nonopt != d->__last_nonopt + && d->__last_nonopt != d->optind) + exchange (argv, d); + else if (d->__last_nonopt != d->optind) + d->__first_nonopt = d->optind; - /* Skip any additional non-options - and extend the range of non-options previously skipped. */ + /* Skip any additional non-options + and extend the range of non-options previously skipped. */ - while (d->optind < argc && NONOPTION_P) - d->optind++; - d->__last_nonopt = d->optind; - } + while (d->optind < argc && NONOPTION_P) + d->optind++; + d->__last_nonopt = d->optind; + } /* The special ARGV-element '--' means premature end of options. - Skip it like a null option, - then exchange with previous non-options as if it were an option, - then skip everything else like a non-option. */ + Skip it like a null option, + then exchange with previous non-options as if it were an option, + then skip everything else like a non-option. */ if (d->optind != argc && !strcmp (argv[d->optind], "--")) - { - d->optind++; + { + d->optind++; - if (d->__first_nonopt != d->__last_nonopt - && d->__last_nonopt != d->optind) - exchange ((char **) argv, d); - else if (d->__first_nonopt == d->__last_nonopt) - d->__first_nonopt = d->optind; - d->__last_nonopt = argc; + if (d->__first_nonopt != d->__last_nonopt + && d->__last_nonopt != d->optind) + exchange (argv, d); + else if (d->__first_nonopt == d->__last_nonopt) + d->__first_nonopt = d->optind; + d->__last_nonopt = argc; - d->optind = argc; - } + d->optind = argc; + } /* If we have done all the ARGV-elements, stop the scan - and back over any non-options that we skipped and permuted. */ + and back over any non-options that we skipped and permuted. */ if (d->optind == argc) - { - /* Set the next-arg-index to point at the non-options - that we previously skipped, so the caller will digest them. */ - if (d->__first_nonopt != d->__last_nonopt) - d->optind = d->__first_nonopt; - return -1; - } + { + /* Set the next-arg-index to point at the non-options + that we previously skipped, so the caller will digest them. */ + if (d->__first_nonopt != d->__last_nonopt) + d->optind = d->__first_nonopt; + return -1; + } /* If we have come to a non-option and did not permute it, - either stop the scan or describe it to the caller and pass it by. */ + either stop the scan or describe it to the caller and pass it by. */ if (NONOPTION_P) - { - if (d->__ordering == REQUIRE_ORDER) - return -1; - d->optarg = argv[d->optind++]; - return 1; - } + { + if (d->__ordering == REQUIRE_ORDER) + return -1; + d->optarg = argv[d->optind++]; + return 1; + } /* We have found another option-ARGV-element. - Skip the initial punctuation. */ - - d->__nextchar = (argv[d->optind] + 1 - + (longopts != NULL && argv[d->optind][1] == '-')); - } - - /* Decode the current option-ARGV-element. */ - - /* Check whether the ARGV-element is a long option. - - If long_only and the ARGV-element has the form "-f", where f is - a valid short option, don't consider it an abbreviated form of - a long option that starts with f. Otherwise there would be no - way to give the -f short option. - - On the other hand, if there's a long option "fubar" and - the ARGV-element is "-fu", do consider that an abbreviation of - the long option, just like "--fu", and not "-f" with arg "u". - - This distinction seems to be the most useful approach. */ - - if (longopts != NULL - && (argv[d->optind][1] == '-' - || (long_only && (argv[d->optind][2] - || !strchr (optstring, argv[d->optind][1]))))) - { - char *nameend; - unsigned int namelen; - const struct option *p; - const struct option *pfound = NULL; - struct option_list - { - const struct option *p; - struct option_list *next; - } *ambig_list = NULL; -#ifdef _LIBC -/* malloc() not used for _LIBC to simplify failure messages. */ -# define free_option_list(l) -#else -# define free_option_list(l) \ - while (l != NULL) \ - { \ - struct option_list *pn = l->next; \ - free (l); \ - l = pn; \ - } -#endif - int exact = 0; - int ambig = 0; - int indfound = -1; - int option_index; - - for (nameend = d->__nextchar; *nameend && *nameend != '='; nameend++) - /* Do nothing. */ ; - namelen = nameend - d->__nextchar; - - /* Test all long options for either exact match - or abbreviated matches. */ - for (p = longopts, option_index = 0; p->name; p++, option_index++) - if (!strncmp (p->name, d->__nextchar, namelen)) - { - if (namelen == (unsigned int) strlen (p->name)) - { - /* Exact match found. */ - pfound = p; - indfound = option_index; - exact = 1; - break; - } - else if (pfound == NULL) - { - /* First nonexact match found. */ - pfound = p; - indfound = option_index; - } - else if (ambig) - ; /* Taking simpler path to handling ambiguities. */ - else if (long_only - || pfound->has_arg != p->has_arg - || pfound->flag != p->flag - || pfound->val != p->val) - { - /* Second or later nonexact match found. */ -#ifdef _LIBC - struct option_list *newp = alloca (sizeof (*newp)); -#else - struct option_list *newp = malloc (sizeof (*newp)); - if (newp == NULL) - { - free_option_list (ambig_list); - ambig_list = NULL; - ambig = 1; /* Use simpler fallback message. */ - } - else -#endif - { - newp->p = p; - newp->next = ambig_list; - ambig_list = newp; - } - } - } - - if ((ambig || ambig_list) && !exact) - { - if (print_errors && ambig_list) - { - struct option_list first; - first.p = pfound; - first.next = ambig_list; - ambig_list = &first; - -#if defined _LIBC && defined USE_IN_LIBIO - char *buf = NULL; - size_t buflen = 0; - - FILE *fp = open_memstream (&buf, &buflen); - if (fp != NULL) - { - fprintf (fp, - _("%s: option '%s' is ambiguous; possibilities:"), - argv[0], argv[d->optind]); - - do - { - fprintf (fp, " '--%s'", ambig_list->p->name); - ambig_list = ambig_list->next; - } - while (ambig_list != NULL); - - fputc_unlocked ('\n', fp); - - if (__builtin_expect (fclose (fp) != EOF, 1)) - { - _IO_flockfile (stderr); - - int old_flags2 = ((_IO_FILE *) stderr)->_flags2; - ((_IO_FILE *) stderr)->_flags2 |= _IO_FLAGS2_NOTCANCEL; - - __fxprintf (NULL, "%s", buf); - - ((_IO_FILE *) stderr)->_flags2 = old_flags2; - _IO_funlockfile (stderr); - - free (buf); - } - } -#else - fprintf (stderr, - _("%s: option '%s' is ambiguous; possibilities:"), - argv[0], argv[d->optind]); - do - { - fprintf (stderr, " '--%s'", ambig_list->p->name); - ambig_list = ambig_list->next; - } - while (ambig_list != NULL); - - fputc ('\n', stderr); -#endif - } - else if (print_errors && ambig) - { - fprintf (stderr, - _("%s: option '%s' is ambiguous\n"), - argv[0], argv[d->optind]); - } - d->__nextchar += strlen (d->__nextchar); - d->optind++; - d->optopt = 0; - free_option_list (ambig_list); - return '?'; - } - - free_option_list (ambig_list); - - if (pfound != NULL) - { - option_index = indfound; - d->optind++; - if (*nameend) - { - /* Don't test has_arg with >, because some C compilers don't - allow it to be used on enums. */ - if (pfound->has_arg) - d->optarg = nameend + 1; - else - { - if (print_errors) - { -#if defined _LIBC && defined USE_IN_LIBIO - char *buf; - int n; -#endif - - if (argv[d->optind - 1][1] == '-') - { - /* --option */ -#if defined _LIBC && defined USE_IN_LIBIO - n = __asprintf (&buf, _("\ -%s: option '--%s' doesn't allow an argument\n"), - argv[0], pfound->name); -#else - fprintf (stderr, _("\ -%s: option '--%s' doesn't allow an argument\n"), - argv[0], pfound->name); -#endif - } - else - { - /* +option or -option */ -#if defined _LIBC && defined USE_IN_LIBIO - n = __asprintf (&buf, _("\ -%s: option '%c%s' doesn't allow an argument\n"), - argv[0], argv[d->optind - 1][0], - pfound->name); -#else - fprintf (stderr, _("\ -%s: option '%c%s' doesn't allow an argument\n"), - argv[0], argv[d->optind - 1][0], - pfound->name); -#endif - } - -#if defined _LIBC && defined USE_IN_LIBIO - if (n >= 0) - { - _IO_flockfile (stderr); - - int old_flags2 = ((_IO_FILE *) stderr)->_flags2; - ((_IO_FILE *) stderr)->_flags2 - |= _IO_FLAGS2_NOTCANCEL; - - __fxprintf (NULL, "%s", buf); - - ((_IO_FILE *) stderr)->_flags2 = old_flags2; - _IO_funlockfile (stderr); - - free (buf); - } -#endif - } - - d->__nextchar += strlen (d->__nextchar); - - d->optopt = pfound->val; - return '?'; - } - } - else if (pfound->has_arg == 1) - { - if (d->optind < argc) - d->optarg = argv[d->optind++]; - else - { - if (print_errors) - { -#if defined _LIBC && defined USE_IN_LIBIO - char *buf; - - if (__asprintf (&buf, _("\ -%s: option '--%s' requires an argument\n"), - argv[0], pfound->name) >= 0) - { - _IO_flockfile (stderr); - - int old_flags2 = ((_IO_FILE *) stderr)->_flags2; - ((_IO_FILE *) stderr)->_flags2 - |= _IO_FLAGS2_NOTCANCEL; - - __fxprintf (NULL, "%s", buf); - - ((_IO_FILE *) stderr)->_flags2 = old_flags2; - _IO_funlockfile (stderr); - - free (buf); - } -#else - fprintf (stderr, - _("%s: option '--%s' requires an argument\n"), - argv[0], pfound->name); -#endif - } - d->__nextchar += strlen (d->__nextchar); - d->optopt = pfound->val; - return optstring[0] == ':' ? ':' : '?'; - } - } - d->__nextchar += strlen (d->__nextchar); - if (longind != NULL) - *longind = option_index; - if (pfound->flag) - { - *(pfound->flag) = pfound->val; - return 0; - } - return pfound->val; - } - - /* Can't find it as a long option. If this is not getopt_long_only, - or the option starts with '--' or is not a valid short - option, then it's an error. - Otherwise interpret it as a short option. */ - if (!long_only || argv[d->optind][1] == '-' - || strchr (optstring, *d->__nextchar) == NULL) - { - if (print_errors) - { -#if defined _LIBC && defined USE_IN_LIBIO - char *buf; - int n; -#endif - - if (argv[d->optind][1] == '-') - { - /* --option */ -#if defined _LIBC && defined USE_IN_LIBIO - n = __asprintf (&buf, _("%s: unrecognized option '--%s'\n"), - argv[0], d->__nextchar); -#else - fprintf (stderr, _("%s: unrecognized option '--%s'\n"), - argv[0], d->__nextchar); -#endif - } - else - { - /* +option or -option */ -#if defined _LIBC && defined USE_IN_LIBIO - n = __asprintf (&buf, _("%s: unrecognized option '%c%s'\n"), - argv[0], argv[d->optind][0], d->__nextchar); -#else - fprintf (stderr, _("%s: unrecognized option '%c%s'\n"), - argv[0], argv[d->optind][0], d->__nextchar); -#endif - } - -#if defined _LIBC && defined USE_IN_LIBIO - if (n >= 0) - { - _IO_flockfile (stderr); - - int old_flags2 = ((_IO_FILE *) stderr)->_flags2; - ((_IO_FILE *) stderr)->_flags2 |= _IO_FLAGS2_NOTCANCEL; - - __fxprintf (NULL, "%s", buf); - - ((_IO_FILE *) stderr)->_flags2 = old_flags2; - _IO_funlockfile (stderr); - - free (buf); - } -#endif - } - d->__nextchar = (char *) ""; - d->optind++; - d->optopt = 0; - return '?'; - } + Check whether it might be a long option. */ + if (longopts) + { + if (argv[d->optind][1] == '-') + { + /* "--foo" is always a long option. The special option + "--" was handled above. */ + d->__nextchar = argv[d->optind] + 2; + return process_long_option (argc, argv, optstring, longopts, + longind, long_only, d, + print_errors, "--"); + } + + /* If long_only and the ARGV-element has the form "-f", + where f is a valid short option, don't consider it an + abbreviated form of a long option that starts with f. + Otherwise there would be no way to give the -f short + option. + + On the other hand, if there's a long option "fubar" and + the ARGV-element is "-fu", do consider that an + abbreviation of the long option, just like "--fu", and + not "-f" with arg "u". + + This distinction seems to be the most useful approach. */ + if (long_only && (argv[d->optind][2] + || !strchr (optstring, argv[d->optind][1]))) + { + int code; + d->__nextchar = argv[d->optind] + 1; + code = process_long_option (argc, argv, optstring, longopts, + longind, long_only, d, + print_errors, "-"); + if (code != -1) + return code; + } + } + + /* It is not a long option. Skip the initial punctuation. */ + d->__nextchar = argv[d->optind] + 1; } /* Look at and handle the next short option-character. */ @@ -824,331 +617,83 @@ _getopt_internal_r (int argc, char **argv, const char *optstring, if (temp == NULL || c == ':' || c == ';') { - if (print_errors) - { -#if defined _LIBC && defined USE_IN_LIBIO - char *buf; - int n; -#endif - -#if defined _LIBC && defined USE_IN_LIBIO - n = __asprintf (&buf, _("%s: invalid option -- '%c'\n"), - argv[0], c); -#else - fprintf (stderr, _("%s: invalid option -- '%c'\n"), argv[0], c); -#endif - -#if defined _LIBC && defined USE_IN_LIBIO - if (n >= 0) - { - _IO_flockfile (stderr); - - int old_flags2 = ((_IO_FILE *) stderr)->_flags2; - ((_IO_FILE *) stderr)->_flags2 |= _IO_FLAGS2_NOTCANCEL; - - __fxprintf (NULL, "%s", buf); - - ((_IO_FILE *) stderr)->_flags2 = old_flags2; - _IO_funlockfile (stderr); - - free (buf); - } -#endif - } - d->optopt = c; - return '?'; + if (print_errors) + fprintf (stderr, _("%s: invalid option -- '%c'\n"), argv[0], c); + d->optopt = c; + return '?'; } + /* Convenience. Treat POSIX -W foo same as long option --foo */ - if (temp[0] == 'W' && temp[1] == ';') + if (temp[0] == 'W' && temp[1] == ';' && longopts != NULL) { - char *nameend; - const struct option *p; - const struct option *pfound = NULL; - int exact = 0; - int ambig = 0; - int indfound = 0; - int option_index; - - if (longopts == NULL) - goto no_longs; - - /* This is an option that requires an argument. */ - if (*d->__nextchar != '\0') - { - d->optarg = d->__nextchar; - /* If we end this ARGV-element by taking the rest as an arg, - we must advance to the next element now. */ - d->optind++; - } - else if (d->optind == argc) - { - if (print_errors) - { -#if defined _LIBC && defined USE_IN_LIBIO - char *buf; - - if (__asprintf (&buf, - _("%s: option requires an argument -- '%c'\n"), - argv[0], c) >= 0) - { - _IO_flockfile (stderr); - - int old_flags2 = ((_IO_FILE *) stderr)->_flags2; - ((_IO_FILE *) stderr)->_flags2 |= _IO_FLAGS2_NOTCANCEL; - - __fxprintf (NULL, "%s", buf); - - ((_IO_FILE *) stderr)->_flags2 = old_flags2; - _IO_funlockfile (stderr); - - free (buf); - } -#else - fprintf (stderr, - _("%s: option requires an argument -- '%c'\n"), - argv[0], c); -#endif - } - d->optopt = c; - if (optstring[0] == ':') - c = ':'; - else - c = '?'; - return c; - } - else - /* We already incremented 'd->optind' once; - increment it again when taking next ARGV-elt as argument. */ - d->optarg = argv[d->optind++]; - - /* optarg is now the argument, see if it's in the - table of longopts. */ - - for (d->__nextchar = nameend = d->optarg; *nameend && *nameend != '='; - nameend++) - /* Do nothing. */ ; - - /* Test all long options for either exact match - or abbreviated matches. */ - for (p = longopts, option_index = 0; p->name; p++, option_index++) - if (!strncmp (p->name, d->__nextchar, nameend - d->__nextchar)) - { - if ((unsigned int) (nameend - d->__nextchar) == strlen (p->name)) - { - /* Exact match found. */ - pfound = p; - indfound = option_index; - exact = 1; - break; - } - else if (pfound == NULL) - { - /* First nonexact match found. */ - pfound = p; - indfound = option_index; - } - else if (long_only - || pfound->has_arg != p->has_arg - || pfound->flag != p->flag - || pfound->val != p->val) - /* Second or later nonexact match found. */ - ambig = 1; - } - if (ambig && !exact) - { - if (print_errors) - { -#if defined _LIBC && defined USE_IN_LIBIO - char *buf; - - if (__asprintf (&buf, _("%s: option '-W %s' is ambiguous\n"), - argv[0], d->optarg) >= 0) - { - _IO_flockfile (stderr); - - int old_flags2 = ((_IO_FILE *) stderr)->_flags2; - ((_IO_FILE *) stderr)->_flags2 |= _IO_FLAGS2_NOTCANCEL; - - __fxprintf (NULL, "%s", buf); - - ((_IO_FILE *) stderr)->_flags2 = old_flags2; - _IO_funlockfile (stderr); - - free (buf); - } -#else - fprintf (stderr, _("%s: option '-W %s' is ambiguous\n"), - argv[0], d->optarg); -#endif - } - d->__nextchar += strlen (d->__nextchar); - d->optind++; - return '?'; - } - if (pfound != NULL) - { - option_index = indfound; - if (*nameend) - { - /* Don't test has_arg with >, because some C compilers don't - allow it to be used on enums. */ - if (pfound->has_arg) - d->optarg = nameend + 1; - else - { - if (print_errors) - { -#if defined _LIBC && defined USE_IN_LIBIO - char *buf; - - if (__asprintf (&buf, _("\ -%s: option '-W %s' doesn't allow an argument\n"), - argv[0], pfound->name) >= 0) - { - _IO_flockfile (stderr); - - int old_flags2 = ((_IO_FILE *) stderr)->_flags2; - ((_IO_FILE *) stderr)->_flags2 - |= _IO_FLAGS2_NOTCANCEL; - - __fxprintf (NULL, "%s", buf); - - ((_IO_FILE *) stderr)->_flags2 = old_flags2; - _IO_funlockfile (stderr); - - free (buf); - } -#else - fprintf (stderr, _("\ -%s: option '-W %s' doesn't allow an argument\n"), - argv[0], pfound->name); -#endif - } - - d->__nextchar += strlen (d->__nextchar); - return '?'; - } - } - else if (pfound->has_arg == 1) - { - if (d->optind < argc) - d->optarg = argv[d->optind++]; - else - { - if (print_errors) - { -#if defined _LIBC && defined USE_IN_LIBIO - char *buf; - - if (__asprintf (&buf, _("\ -%s: option '-W %s' requires an argument\n"), - argv[0], pfound->name) >= 0) - { - _IO_flockfile (stderr); - - int old_flags2 = ((_IO_FILE *) stderr)->_flags2; - ((_IO_FILE *) stderr)->_flags2 - |= _IO_FLAGS2_NOTCANCEL; - - __fxprintf (NULL, "%s", buf); - - ((_IO_FILE *) stderr)->_flags2 = old_flags2; - _IO_funlockfile (stderr); - - free (buf); - } -#else - fprintf (stderr, _("\ -%s: option '-W %s' requires an argument\n"), - argv[0], pfound->name); -#endif - } - d->__nextchar += strlen (d->__nextchar); - return optstring[0] == ':' ? ':' : '?'; - } - } - else - d->optarg = NULL; - d->__nextchar += strlen (d->__nextchar); - if (longind != NULL) - *longind = option_index; - if (pfound->flag) - { - *(pfound->flag) = pfound->val; - return 0; - } - return pfound->val; - } - - no_longs: - d->__nextchar = NULL; - return 'W'; /* Let the application handle it. */ + /* This is an option that requires an argument. */ + if (*d->__nextchar != '\0') + d->optarg = d->__nextchar; + else if (d->optind == argc) + { + if (print_errors) + fprintf (stderr, + _("%s: option requires an argument -- '%c'\n"), + argv[0], c); + + d->optopt = c; + if (optstring[0] == ':') + c = ':'; + else + c = '?'; + return c; + } + else + d->optarg = argv[d->optind]; + + d->__nextchar = d->optarg; + d->optarg = NULL; + return process_long_option (argc, argv, optstring, longopts, longind, + 0 /* long_only */, d, print_errors, "-W "); } if (temp[1] == ':') { - if (temp[2] == ':') - { - /* This is an option that accepts an argument optionally. */ - if (*d->__nextchar != '\0') - { - d->optarg = d->__nextchar; - d->optind++; - } - else - d->optarg = NULL; - d->__nextchar = NULL; - } - else - { - /* This is an option that requires an argument. */ - if (*d->__nextchar != '\0') - { - d->optarg = d->__nextchar; - /* If we end this ARGV-element by taking the rest as an arg, - we must advance to the next element now. */ - d->optind++; - } - else if (d->optind == argc) - { - if (print_errors) - { -#if defined _LIBC && defined USE_IN_LIBIO - char *buf; - - if (__asprintf (&buf, _("\ -%s: option requires an argument -- '%c'\n"), - argv[0], c) >= 0) - { - _IO_flockfile (stderr); - - int old_flags2 = ((_IO_FILE *) stderr)->_flags2; - ((_IO_FILE *) stderr)->_flags2 |= _IO_FLAGS2_NOTCANCEL; - - __fxprintf (NULL, "%s", buf); - - ((_IO_FILE *) stderr)->_flags2 = old_flags2; - _IO_funlockfile (stderr); - - free (buf); - } -#else - fprintf (stderr, - _("%s: option requires an argument -- '%c'\n"), - argv[0], c); -#endif - } - d->optopt = c; - if (optstring[0] == ':') - c = ':'; - else - c = '?'; - } - else - /* We already incremented 'optind' once; - increment it again when taking next ARGV-elt as argument. */ - d->optarg = argv[d->optind++]; - d->__nextchar = NULL; - } + if (temp[2] == ':') + { + /* This is an option that accepts an argument optionally. */ + if (*d->__nextchar != '\0') + { + d->optarg = d->__nextchar; + d->optind++; + } + else + d->optarg = NULL; + d->__nextchar = NULL; + } + else + { + /* This is an option that requires an argument. */ + if (*d->__nextchar != '\0') + { + d->optarg = d->__nextchar; + /* If we end this ARGV-element by taking the rest as an arg, + we must advance to the next element now. */ + d->optind++; + } + else if (d->optind == argc) + { + if (print_errors) + fprintf (stderr, + _("%s: option requires an argument -- '%c'\n"), + argv[0], c); + + d->optopt = c; + if (optstring[0] == ':') + c = ':'; + else + c = '?'; + } + else + /* We already incremented 'optind' once; + increment it again when taking next ARGV-elt as argument. */ + d->optarg = argv[d->optind++]; + d->__nextchar = NULL; + } } return c; } @@ -1156,8 +701,8 @@ _getopt_internal_r (int argc, char **argv, const char *optstring, int _getopt_internal (int argc, char **argv, const char *optstring, - const struct option *longopts, int *longind, int long_only, - int posixly_correct) + const struct option *longopts, int *longind, int long_only, + int posixly_correct) { int result; @@ -1165,8 +710,8 @@ _getopt_internal (int argc, char **argv, const char *optstring, getopt_data.opterr = opterr; result = _getopt_internal_r (argc, argv, optstring, longopts, - longind, long_only, &getopt_data, - posixly_correct); + longind, long_only, &getopt_data, + posixly_correct); optind = getopt_data.optind; optarg = getopt_data.optarg; @@ -1175,32 +720,23 @@ _getopt_internal (int argc, char **argv, const char *optstring, return result; } -/* glibc gets a LSB-compliant getopt. - Standalone applications get a POSIX-compliant getopt. */ -#if _LIBC -enum { POSIXLY_CORRECT = 0 }; -#else -enum { POSIXLY_CORRECT = 1 }; -#endif - -int -getopt (int argc, char *const *argv, const char *optstring) -{ - return _getopt_internal (argc, (char **) argv, optstring, - (const struct option *) 0, - (int *) 0, - 0, POSIXLY_CORRECT); -} +/* glibc gets a LSB-compliant getopt and a POSIX-complaint __posix_getopt. + Standalone applications just get a POSIX-compliant getopt. + POSIX and LSB both require these functions to take 'char *const *argv' + even though this is incorrect (because of the permutation). */ +#define GETOPT_ENTRY(NAME, POSIXLY_CORRECT) \ + int \ + NAME (int argc, char *const *argv, const char *optstring) \ + { \ + return _getopt_internal (argc, (char **)argv, optstring, \ + 0, 0, 0, POSIXLY_CORRECT); \ + } #ifdef _LIBC -int -__posix_getopt (int argc, char *const *argv, const char *optstring) -{ - return _getopt_internal (argc, argv, optstring, - (const struct option *) 0, - (int *) 0, - 0, 1); -} +GETOPT_ENTRY(getopt, 0) +GETOPT_ENTRY(__posix_getopt, 1) +#else +GETOPT_ENTRY(getopt, 1) #endif @@ -1221,51 +757,51 @@ main (int argc, char **argv) c = getopt (argc, argv, "abc:d:0123456789"); if (c == -1) - break; + break; switch (c) - { - case '0': - case '1': - case '2': - case '3': - case '4': - case '5': - case '6': - case '7': - case '8': - case '9': - if (digit_optind != 0 && digit_optind != this_option_optind) - printf ("digits occur in two different argv-elements.\n"); - digit_optind = this_option_optind; - printf ("option %c\n", c); - break; - - case 'a': - printf ("option a\n"); - break; - - case 'b': - printf ("option b\n"); - break; - - case 'c': - printf ("option c with value '%s'\n", optarg); - break; - - case '?': - break; - - default: - printf ("?? getopt returned character code 0%o ??\n", c); - } + { + case '0': + case '1': + case '2': + case '3': + case '4': + case '5': + case '6': + case '7': + case '8': + case '9': + if (digit_optind != 0 && digit_optind != this_option_optind) + printf ("digits occur in two different argv-elements.\n"); + digit_optind = this_option_optind; + printf ("option %c\n", c); + break; + + case 'a': + printf ("option a\n"); + break; + + case 'b': + printf ("option b\n"); + break; + + case 'c': + printf ("option c with value '%s'\n", optarg); + break; + + case '?': + break; + + default: + printf ("?? getopt returned character code 0%o ??\n", c); + } } if (optind < argc) { printf ("non-option ARGV-elements: "); while (optind < argc) - printf ("%s ", argv[optind++]); + printf ("%s ", argv[optind++]); printf ("\n"); } diff --git a/lib/getopt.in.h b/lib/getopt.in.h index 0f72182..4ce1eb4 100644 --- a/lib/getopt.in.h +++ b/lib/getopt.in.h @@ -1,20 +1,22 @@ /* Declarations for getopt. - Copyright (C) 1989-1994, 1996-1999, 2001, 2003-2007, 2009-2016 Free Software - Foundation, Inc. - This file is part of the GNU C Library. + Copyright (C) 1989-2017 Free Software Foundation, Inc. + This file is part of gnulib. + Unlike most of the getopt implementation, it is NOT shared + with the GNU C Library, which supplies a different version of + this file. - This 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. + gnulib 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. + gnulib is distributed in the hope that it will be useful, but + WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + General Public License for more details. - You should have received a copy of the GNU General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. */ + You should have received a copy of the GNU General Public + License along with gnulib; if not, see <http://www.gnu.org/licenses/>. */ #ifndef _@GUARD_PREFIX@_GETOPT_H @@ -32,22 +34,15 @@ # undef _GL_SYSTEM_GETOPT #endif -#ifndef _@GUARD_PREFIX@_GETOPT_H - -#ifndef __need_getopt -# define _@GUARD_PREFIX@_GETOPT_H 1 -#endif +#define _@GUARD_PREFIX@_GETOPT_H 1 /* Standalone applications should #define __GETOPT_PREFIX to an identifier that prefixes the external functions and variables - defined in this header. When this happens, include the - headers that might declare getopt so that they will not cause - confusion if included after this file (if the system had <getopt.h>, - we have already included it). Then systematically rename - identifiers so that they do not collide with the system functions - and variables. Renaming avoids problems with some compilers and - linkers. */ -#if defined __GETOPT_PREFIX && !defined __need_getopt + defined in getopt-core.h and getopt-ext.h. When this happens, + include the headers that might declare getopt so that they will not + cause confusion if included after this file (if the system had + <getopt.h>, we have already included it). */ +#if defined __GETOPT_PREFIX # if !@HAVE_GETOPT_H@ # define __need_system_stdlib_h # include <stdlib.h> @@ -55,201 +50,12 @@ # include <stdio.h> # include <unistd.h> # endif -# undef __need_getopt -# undef getopt -# undef getopt_long -# undef getopt_long_only -# undef optarg -# undef opterr -# undef optind -# undef optopt -# undef option -# define __GETOPT_CONCAT(x, y) x ## y -# define __GETOPT_XCONCAT(x, y) __GETOPT_CONCAT (x, y) -# define __GETOPT_ID(y) __GETOPT_XCONCAT (__GETOPT_PREFIX, y) -# define getopt __GETOPT_ID (getopt) -# define getopt_long __GETOPT_ID (getopt_long) -# define getopt_long_only __GETOPT_ID (getopt_long_only) -# define optarg __GETOPT_ID (optarg) -# define opterr __GETOPT_ID (opterr) -# define optind __GETOPT_ID (optind) -# define optopt __GETOPT_ID (optopt) -# define option __GETOPT_ID (option) -# define _getopt_internal __GETOPT_ID (getopt_internal) -#endif - -/* Standalone applications get correct prototypes for getopt_long and - getopt_long_only; they declare "char **argv". libc uses prototypes - with "char *const *argv" that are incorrect because getopt_long and - getopt_long_only can permute argv; this is required for backward - compatibility (e.g., for LSB 2.0.1). - - This used to be '#if defined __GETOPT_PREFIX && !defined __need_getopt', - but it caused redefinition warnings if both unistd.h and getopt.h were - included, since unistd.h includes getopt.h having previously defined - __need_getopt. - - The only place where __getopt_argv_const is used is in definitions - of getopt_long and getopt_long_only below, but these are visible - only if __need_getopt is not defined, so it is quite safe to rewrite - the conditional as follows: -*/ -#if !defined __need_getopt -# if defined __GETOPT_PREFIX -# define __getopt_argv_const /* empty */ -# else -# define __getopt_argv_const const -# endif -#endif - -/* If __GNU_LIBRARY__ is not already defined, either we are being used - standalone, or this is the first header included in the source file. - If we are being used with glibc, we need to include <features.h>, but - that does not exist if we are standalone. So: if __GNU_LIBRARY__ is - not defined, include <ctype.h>, which will pull in <features.h> for us - if it's from glibc. (Why ctype.h? It's guaranteed to exist and it - doesn't flood the namespace with stuff the way some other headers do.) */ -#if !defined __GNU_LIBRARY__ -# include <ctype.h> -#endif - -#ifndef __THROW -# ifndef __GNUC_PREREQ -# define __GNUC_PREREQ(maj, min) (0) -# endif -# if defined __cplusplus && __GNUC_PREREQ (2,8) -# define __THROW throw () -# else -# define __THROW -# endif #endif /* The definition of _GL_ARG_NONNULL is copied here. */ -#ifdef __cplusplus -extern "C" { -#endif - -/* For communication from 'getopt' to the caller. - When 'getopt' finds an option that takes an argument, - the argument value is returned here. - Also, when 'ordering' is RETURN_IN_ORDER, - each non-option ARGV-element is returned here. */ - -extern char *optarg; - -/* Index in ARGV of the next element to be scanned. - This is used for communication to and from the caller - and for communication between successive calls to 'getopt'. - - On entry to 'getopt', zero means this is the first call; initialize. - - When 'getopt' returns -1, this is the index of the first of the - non-option elements that the caller should itself scan. - - Otherwise, 'optind' communicates from one call to the next - how much of ARGV has been scanned so far. */ - -extern int optind; - -/* Callers store zero here to inhibit the error message 'getopt' prints - for unrecognized options. */ - -extern int opterr; - -/* Set to an option character which was unrecognized. */ +#include <getopt-cdefs.h> +#include <getopt-pfx-core.h> +#include <getopt-pfx-ext.h> -extern int optopt; - -#ifndef __need_getopt -/* Describe the long-named options requested by the application. - The LONG_OPTIONS argument to getopt_long or getopt_long_only is a vector - of 'struct option' terminated by an element containing a name which is - zero. - - The field 'has_arg' is: - no_argument (or 0) if the option does not take an argument, - required_argument (or 1) if the option requires an argument, - optional_argument (or 2) if the option takes an optional argument. - - If the field 'flag' is not NULL, it points to a variable that is set - to the value given in the field 'val' when the option is found, but - left unchanged if the option is not found. - - To have a long-named option do something other than set an 'int' to - a compiled-in constant, such as set a value from 'optarg', set the - option's 'flag' field to zero and its 'val' field to a nonzero - value (the equivalent single-letter option character, if there is - one). For long options that have a zero 'flag' field, 'getopt' - returns the contents of the 'val' field. */ - -# if !GNULIB_defined_struct_option -struct option -{ - const char *name; - /* has_arg can't be an enum because some compilers complain about - type mismatches in all the code that assumes it is an int. */ - int has_arg; - int *flag; - int val; -}; -# define GNULIB_defined_struct_option 1 -# endif - -/* Names for the values of the 'has_arg' field of 'struct option'. */ - -# define no_argument 0 -# define required_argument 1 -# define optional_argument 2 -#endif /* need getopt */ - - -/* Get definitions and prototypes for functions to process the - arguments in ARGV (ARGC of them, minus the program name) for - options given in OPTS. - - Return the option character from OPTS just read. Return -1 when - there are no more options. For unrecognized options, or options - missing arguments, 'optopt' is set to the option letter, and '?' is - returned. - - The OPTS string is a list of characters which are recognized option - letters, optionally followed by colons, specifying that that letter - takes an argument, to be placed in 'optarg'. - - If a letter in OPTS is followed by two colons, its argument is - optional. This behavior is specific to the GNU 'getopt'. - - The argument '--' causes premature termination of argument - scanning, explicitly telling 'getopt' that there are no more - options. - - If OPTS begins with '-', then non-option arguments are treated as - arguments to the option '\1'. This behavior is specific to the GNU - 'getopt'. If OPTS begins with '+', or POSIXLY_CORRECT is set in - the environment, then do not permute arguments. */ - -extern int getopt (int ___argc, char *const *___argv, const char *__shortopts) - __THROW _GL_ARG_NONNULL ((2, 3)); - -#ifndef __need_getopt -extern int getopt_long (int ___argc, char *__getopt_argv_const *___argv, - const char *__shortopts, - const struct option *__longopts, int *__longind) - __THROW _GL_ARG_NONNULL ((2, 3)); -extern int getopt_long_only (int ___argc, char *__getopt_argv_const *___argv, - const char *__shortopts, - const struct option *__longopts, int *__longind) - __THROW _GL_ARG_NONNULL ((2, 3)); - -#endif - -#ifdef __cplusplus -} -#endif - -/* Make sure we later can get all the definitions and declarations. */ -#undef __need_getopt - -#endif /* _@GUARD_PREFIX@_GETOPT_H */ #endif /* _@GUARD_PREFIX@_GETOPT_H */ diff --git a/lib/getopt1.c b/lib/getopt1.c index 63db74f..2bc5926 100644 --- a/lib/getopt1.c +++ b/lib/getopt1.c @@ -1,56 +1,44 @@ /* getopt_long and getopt_long_only entry points for GNU getopt. - Copyright (C) 1987-1994, 1996-1998, 2004, 2006, 2009-2016 Free Software - Foundation, Inc. - This file is part of the GNU C Library. + Copyright (C) 1987-2017 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. - This 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. + The GNU C Library is free software; you can redistribute it and/or + modify it under the terms of the GNU General Public + License as published by the Free Software Foundation; either + version 3 of the License, or (at your option) any later version. - This program is distributed in the hope that it will be useful, + The GNU C Library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + General Public License for more details. - You should have received a copy of the GNU General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. */ + You should have received a copy of the GNU General Public + License along with the GNU C Library; if not, see + <http://www.gnu.org/licenses/>. */ -#ifdef _LIBC -# include <getopt.h> -#else +#ifndef _LIBC # include <config.h> -# include "getopt.h" #endif -#include "getopt_int.h" - -#include <stdio.h> -/* This needs to come after some library #include - to get __GNU_LIBRARY__ defined. */ -#ifdef __GNU_LIBRARY__ -#include <stdlib.h> -#endif - -#ifndef NULL -#define NULL 0 -#endif +#include "getopt.h" +#include "getopt_int.h" int getopt_long (int argc, char *__getopt_argv_const *argv, const char *options, - const struct option *long_options, int *opt_index) + const struct option *long_options, int *opt_index) { return _getopt_internal (argc, (char **) argv, options, long_options, - opt_index, 0, 0); + opt_index, 0, 0); } int _getopt_long_r (int argc, char **argv, const char *options, - const struct option *long_options, int *opt_index, - struct _getopt_data *d) + const struct option *long_options, int *opt_index, + struct _getopt_data *d) { return _getopt_internal_r (argc, argv, options, long_options, opt_index, - 0, d, 0); + 0, d, 0); } /* Like getopt_long, but '-' as well as '--' can indicate a long option. @@ -60,26 +48,27 @@ _getopt_long_r (int argc, char **argv, const char *options, int getopt_long_only (int argc, char *__getopt_argv_const *argv, - const char *options, - const struct option *long_options, int *opt_index) + const char *options, + const struct option *long_options, int *opt_index) { return _getopt_internal (argc, (char **) argv, options, long_options, - opt_index, 1, 0); + opt_index, 1, 0); } int _getopt_long_only_r (int argc, char **argv, const char *options, - const struct option *long_options, int *opt_index, - struct _getopt_data *d) + const struct option *long_options, int *opt_index, + struct _getopt_data *d) { return _getopt_internal_r (argc, argv, options, long_options, opt_index, - 1, d, 0); + 1, d, 0); } #ifdef TEST #include <stdio.h> +#include <stdlib.h> int main (int argc, char **argv) @@ -93,74 +82,74 @@ main (int argc, char **argv) int option_index = 0; static const struct option long_options[] = { - {"add", 1, 0, 0}, - {"append", 0, 0, 0}, - {"delete", 1, 0, 0}, - {"verbose", 0, 0, 0}, - {"create", 0, 0, 0}, - {"file", 1, 0, 0}, - {0, 0, 0, 0} + {"add", 1, 0, 0}, + {"append", 0, 0, 0}, + {"delete", 1, 0, 0}, + {"verbose", 0, 0, 0}, + {"create", 0, 0, 0}, + {"file", 1, 0, 0}, + {0, 0, 0, 0} }; c = getopt_long (argc, argv, "abc:d:0123456789", - long_options, &option_index); + long_options, &option_index); if (c == -1) - break; + break; switch (c) - { - case 0: - printf ("option %s", long_options[option_index].name); - if (optarg) - printf (" with arg %s", optarg); - printf ("\n"); - break; - - case '0': - case '1': - case '2': - case '3': - case '4': - case '5': - case '6': - case '7': - case '8': - case '9': - if (digit_optind != 0 && digit_optind != this_option_optind) - printf ("digits occur in two different argv-elements.\n"); - digit_optind = this_option_optind; - printf ("option %c\n", c); - break; - - case 'a': - printf ("option a\n"); - break; - - case 'b': - printf ("option b\n"); - break; - - case 'c': - printf ("option c with value '%s'\n", optarg); - break; - - case 'd': - printf ("option d with value '%s'\n", optarg); - break; - - case '?': - break; - - default: - printf ("?? getopt returned character code 0%o ??\n", c); - } + { + case 0: + printf ("option %s", long_options[option_index].name); + if (optarg) + printf (" with arg %s", optarg); + printf ("\n"); + break; + + case '0': + case '1': + case '2': + case '3': + case '4': + case '5': + case '6': + case '7': + case '8': + case '9': + if (digit_optind != 0 && digit_optind != this_option_optind) + printf ("digits occur in two different argv-elements.\n"); + digit_optind = this_option_optind; + printf ("option %c\n", c); + break; + + case 'a': + printf ("option a\n"); + break; + + case 'b': + printf ("option b\n"); + break; + + case 'c': + printf ("option c with value '%s'\n", optarg); + break; + + case 'd': + printf ("option d with value '%s'\n", optarg); + break; + + case '?': + break; + + default: + printf ("?? getopt returned character code 0%o ??\n", c); + } } if (optind < argc) { printf ("non-option ARGV-elements: "); while (optind < argc) - printf ("%s ", argv[optind++]); + printf ("%s ", argv[optind++]); printf ("\n"); } diff --git a/lib/getopt_int.h b/lib/getopt_int.h index be4c22e..a556219 100644 --- a/lib/getopt_int.h +++ b/lib/getopt_int.h @@ -1,30 +1,31 @@ /* Internal declarations for getopt. - Copyright (C) 1989-1994, 1996-1999, 2001, 2003-2004, 2009-2016 Free Software - Foundation, Inc. - This file is part of the GNU C Library. + Copyright (C) 1989-2017 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. - This 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. + The GNU C Library is free software; you can redistribute it and/or + modify it under the terms of the GNU General Public + License as published by the Free Software Foundation; either + version 3 of the License, or (at your option) any later version. - This program is distributed in the hope that it will be useful, + The GNU C Library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + General Public License for more details. - You should have received a copy of the GNU General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. */ + You should have received a copy of the GNU General Public + License along with the GNU C Library; if not, see + <http://www.gnu.org/licenses/>. */ #ifndef _GETOPT_INT_H -#define _GETOPT_INT_H 1 +#define _GETOPT_INT_H 1 #include <getopt.h> extern int _getopt_internal (int ___argc, char **___argv, - const char *__shortopts, - const struct option *__longopts, int *__longind, - int __long_only, int __posixly_correct); + const char *__shortopts, + const struct option *__longopts, int *__longind, + int __long_only, int __posixly_correct); /* Reentrant versions which can handle parsing multiple argument @@ -32,28 +33,20 @@ extern int _getopt_internal (int ___argc, char **___argv, /* Describe how to deal with options that follow non-option ARGV-elements. - If the caller did not specify anything, - the default is REQUIRE_ORDER if the environment variable - POSIXLY_CORRECT is defined, PERMUTE otherwise. + REQUIRE_ORDER means don't recognize them as options; stop option + processing when the first non-option is seen. This is what POSIX + specifies should happen. - REQUIRE_ORDER means don't recognize them as options; - stop option processing when the first non-option is seen. - This is what Unix does. - This mode of operation is selected by either setting the environment - variable POSIXLY_CORRECT, or using '+' as the first character - of the list of option characters, or by calling getopt. - - PERMUTE is the default. We permute the contents of ARGV as we - scan, so that eventually all the non-options are at the end. - This allows options to be given in any order, even with programs - that were not written to expect this. + PERMUTE means permute the contents of ARGV as we scan, so that + eventually all the non-options are at the end. This allows options + to be given in any order, even with programs that were not written + to expect this. RETURN_IN_ORDER is an option available to programs that were written to expect options and other ARGV-elements in any order and that care about the ordering of the two. We describe each non-option ARGV-element as if it were the argument of an option - with character code 1. Using '-' as the first character of the - list of option characters selects this mode of operation. + with character code 1. The special argument '--' forces an end of option-scanning regardless of the value of 'ordering'. In the case of RETURN_IN_ORDER, only @@ -91,11 +84,6 @@ struct _getopt_data /* See __ord above. */ enum __ord __ordering; - /* If the POSIXLY_CORRECT environment variable is set - or getopt was called. */ - int __posixly_correct; - - /* Handle permutation of arguments. */ /* Describe the part of ARGV that contains non-options that have @@ -104,32 +92,27 @@ struct _getopt_data int __first_nonopt; int __last_nonopt; - -#if defined _LIBC && defined USE_NONOPTION_FLAGS - int __nonoption_flags_max_len; - int __nonoption_flags_len; -#endif }; /* The initializer is necessary to set OPTIND and OPTERR to their default values and to clear the initialization flag. */ -#define _GETOPT_DATA_INITIALIZER { 1, 1 } +#define _GETOPT_DATA_INITIALIZER { 1, 1 } extern int _getopt_internal_r (int ___argc, char **___argv, - const char *__shortopts, - const struct option *__longopts, int *__longind, - int __long_only, struct _getopt_data *__data, - int __posixly_correct); + const char *__shortopts, + const struct option *__longopts, int *__longind, + int __long_only, struct _getopt_data *__data, + int __posixly_correct); extern int _getopt_long_r (int ___argc, char **___argv, - const char *__shortopts, - const struct option *__longopts, int *__longind, - struct _getopt_data *__data); + const char *__shortopts, + const struct option *__longopts, int *__longind, + struct _getopt_data *__data); extern int _getopt_long_only_r (int ___argc, char **___argv, - const char *__shortopts, - const struct option *__longopts, - int *__longind, - struct _getopt_data *__data); + const char *__shortopts, + const struct option *__longopts, + int *__longind, + struct _getopt_data *__data); #endif /* getopt_int.h */ diff --git a/lib/getprogname.c b/lib/getprogname.c new file mode 100644 index 0000000..5295484 --- /dev/null +++ b/lib/getprogname.c @@ -0,0 +1,185 @@ +/* Program name management. + Copyright (C) 2016-2017 Free Software Foundation, Inc. + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see <http://www.gnu.org/licenses/>. */ + +#include <config.h> + +/* Specification. */ +#include "getprogname.h" + +#include <errno.h> /* get program_invocation_name declaration */ +#include <stdlib.h> /* get __argv declaration */ + +#ifdef _AIX +# include <unistd.h> +# include <procinfo.h> +# include <string.h> +#endif + +#ifdef __MVS__ +# ifndef _OPEN_SYS +# define _OPEN_SYS +# endif +# include <string.h> +# include <sys/ps.h> +#endif + +#ifdef __hpux +# include <unistd.h> +# include <sys/param.h> +# include <sys/pstat.h> +# include <string.h> +#endif + +#ifdef __sgi +# include <string.h> +# include <unistd.h> +# include <stdio.h> +# include <fcntl.h> +# include <sys/procfs.h> +#endif + +#include "dirname.h" + +#ifndef HAVE_GETPROGNAME /* not Mac OS X, FreeBSD, NetBSD, OpenBSD >= 5.4, Cygwin */ +char const * +getprogname (void) +{ +# if HAVE_DECL_PROGRAM_INVOCATION_SHORT_NAME /* glibc, BeOS */ + /* https://www.gnu.org/software/libc/manual/html_node/Error-Messages.html */ + return program_invocation_short_name; +# elif HAVE_DECL_PROGRAM_INVOCATION_NAME /* glibc, BeOS */ + /* https://www.gnu.org/software/libc/manual/html_node/Error-Messages.html */ + return last_component (program_invocation_name); +# elif HAVE_GETEXECNAME /* Solaris */ + /* http://docs.oracle.com/cd/E19253-01/816-5168/6mbb3hrb1/index.html */ + const char *p = getexecname (); + if (!p) + p = "?"; + return last_component (p); +# elif HAVE_DECL___ARGV /* mingw, MSVC */ + /* https://msdn.microsoft.com/en-us/library/dn727674.aspx */ + const char *p = __argv && __argv[0] ? __argv[0] : "?"; + return last_component (p); +# elif HAVE_VAR___PROGNAME /* OpenBSD, QNX */ + /* http://man.openbsd.org/style.9 */ + /* http://www.qnx.de/developers/docs/6.5.0/index.jsp?topic=%2Fcom.qnx.doc.neutrino_lib_ref%2Fp%2F__progname.html */ + /* Be careful to declare this only when we absolutely need it + (OpenBSD 5.1), rather than when it's available. Otherwise, + its mere declaration makes program_invocation_short_name + malfunction (have zero length) with Fedora 25's glibc. */ + extern char *__progname; + const char *p = __progname; + return p && p[0] ? p : "?"; +# elif _AIX /* AIX */ + /* Idea by Bastien ROUCARIÈS, + http://lists.gnu.org/archive/html/bug-gnulib/2010-12/msg00095.html + Reference: http:// + ibm.biz/knowctr#ssw_aix_53/com.ibm.aix.basetechref/doc/basetrf1/getprocs.htm + */ + static char *p; + static int first = 1; + if (first) + { + first = 0; + pid_t pid = getpid (); + struct procentry64 procs; + p = (0 < getprocs64 (&procs, sizeof procs, NULL, 0, &pid, 1) + ? strdup (procs.pi_comm) + : NULL); + if (!p) + p = "?"; + } + return p; +# elif defined __hpux + static char *p; + static int first = 1; + if (first) + { + first = 0; + pid_t pid = getpid (); + struct pst_status status; + p = (0 < pstat_getproc (&status, sizeof status, 0, pid) + ? strdup (status.pst_ucomm) + : NULL); + if (!p) + p = "?"; + } + return p; +# elif __MVS__ /* z/OS */ + /* https://www.ibm.com/support/knowledgecenter/SSLTBW_2.1.0/com.ibm.zos.v2r1.bpxbd00/rtwgetp.htm */ + static char *p = "?"; + static int first = 1; + if (first) + { + pid_t pid = getpid (); + int token; + W_PSPROC buf; + first = 0; + memset (&buf, 0, sizeof(buf)); + buf.ps_cmdptr = (char *) malloc (buf.ps_cmdlen = PS_CMDBLEN_LONG); + buf.ps_conttyptr = (char *) malloc (buf.ps_conttylen = PS_CONTTYBLEN); + buf.ps_pathptr = (char *) malloc (buf.ps_pathlen = PS_PATHBLEN); + if (buf.ps_cmdptr && buf.ps_conttyptr && buf.ps_pathptr) + { + for (token = 0; token >= 0; + token = w_getpsent (token, &buf, sizeof(buf))) + { + if (token > 0 && buf.ps_pid == pid) + { + char *s = strdup (last_component (buf.ps_pathptr)); + if (s) + p = s; + break; + } + } + } + free (buf.ps_cmdptr); + free (buf.ps_conttyptr); + free (buf.ps_pathptr); + } + return p; +# elif defined __sgi /* IRIX */ + char filename[50]; + int fd; + + sprintf (filename, "/proc/pinfo/%d", (int) getpid ()); + fd = open (filename, O_RDONLY); + if (0 <= fd) + { + prpsinfo_t buf; + int ioctl_ok = 0 <= ioctl (fd, PIOCPSINFO, &buf); + close (fd); + if (ioctl_ok) + { + char *name = buf.pr_fname; + char *namesize = sizeof buf.pr_fname; + char *namenul = memchr (name, '\0', namesize); + size_t namelen = namenul ? namenul - name : namesize; + char *namecopy = malloc (namelen + 1); + if (namecopy) + { + namecopy[namelen] = 0; + return memcpy (namecopy, name, namelen); + } + } + } + return NULL; +# else +# error "getprogname module not ported to this OS" +# endif +} + +#endif diff --git a/lib/getprogname.h b/lib/getprogname.h new file mode 100644 index 0000000..9ab924c --- /dev/null +++ b/lib/getprogname.h @@ -0,0 +1,40 @@ +/* Program name management. + Copyright (C) 2016-2017 Free Software Foundation, Inc. + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see <http://www.gnu.org/licenses/>. */ + +#ifndef _GL_GETPROGNAME_H +#define _GL_GETPROGNAME_H + +#include <stdlib.h> + +#ifdef __cplusplus +extern "C" { +#endif + +/* Return the base name of the executing program. + On native Windows this will usually end in ".exe" or ".EXE". */ +#ifndef HAVE_GETPROGNAME +extern char const *getprogname (void) +# ifdef HAVE_DECL_PROGRAM_INVOCATION_NAME + _GL_ATTRIBUTE_PURE +# endif + ; +#endif + +#ifdef __cplusplus +} +#endif + +#endif diff --git a/lib/gettext.h b/lib/gettext.h index 9a232cc..e7520af 100644 --- a/lib/gettext.h +++ b/lib/gettext.h @@ -1,5 +1,5 @@ /* Convenience header for conditional use of GNU <libintl.h>. - Copyright (C) 1995-1998, 2000-2002, 2004-2006, 2009-2016 Free Software + Copyright (C) 1995-1998, 2000-2002, 2004-2006, 2009-2017 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify @@ -18,8 +18,9 @@ #ifndef _LIBGETTEXT_H #define _LIBGETTEXT_H 1 -/* NLS can be disabled through the configure --disable-nls option. */ -#if ENABLE_NLS +/* NLS can be disabled through the configure --disable-nls option + or through "#define ENABLE NLS 0" before including this file. */ +#if defined ENABLE_NLS && ENABLE_NLS /* Get declarations of GNU message catalog functions. */ # include <libintl.h> diff --git a/lib/gettime.c b/lib/gettime.c index ea58eb0..4ae313e 100644 --- a/lib/gettime.c +++ b/lib/gettime.c @@ -1,6 +1,6 @@ /* gettime -- get the system clock - Copyright (C) 2002, 2004-2007, 2009-2016 Free Software Foundation, Inc. + Copyright (C) 2002, 2004-2007, 2009-2017 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/lib/gettimeofday.c b/lib/gettimeofday.c index 224ca6a..8ae7622 100644 --- a/lib/gettimeofday.c +++ b/lib/gettimeofday.c @@ -1,6 +1,6 @@ /* Provide gettimeofday for systems that don't have it or for which it's broken. - Copyright (C) 2001-2003, 2005-2007, 2009-2016 Free Software Foundation, Inc. + Copyright (C) 2001-2003, 2005-2007, 2009-2017 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -24,93 +24,95 @@ #include <time.h> -#if HAVE_SYS_TIMEB_H -# include <sys/timeb.h> +#if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__ +# define WINDOWS_NATIVE +# include <windows.h> #endif -#if GETTIMEOFDAY_CLOBBERS_LOCALTIME || TZSET_CLOBBERS_LOCALTIME +#include "localtime-buffer.h" -/* 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. The tzset replacement is necessary for at least - Solaris 2.5, 2.5.1, and 2.6. */ - -static struct tm tm_zero_buffer; -static struct tm *localtime_buffer_addr = &tm_zero_buffer; - -# undef localtime -extern struct tm *localtime (time_t const *); - -# undef gmtime -extern struct tm *gmtime (time_t const *); - -/* This is a wrapper for localtime. It is used only on systems for which - gettimeofday clobbers the static buffer used for localtime's result. +#ifdef WINDOWS_NATIVE - 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) -{ - struct tm *tm = localtime (timep); - - if (localtime_buffer_addr == &tm_zero_buffer) - localtime_buffer_addr = tm; - - return tm; -} +/* GetSystemTimePreciseAsFileTime was introduced only in Windows 8. */ +typedef void (WINAPI * GetSystemTimePreciseAsFileTimeFuncType) (FILETIME *lpTime); +static GetSystemTimePreciseAsFileTimeFuncType GetSystemTimePreciseAsFileTimeFunc = NULL; +static BOOL initialized = FALSE; -/* Same as above, since gmtime and localtime use the same buffer. */ -struct tm * -rpl_gmtime (time_t const *timep) +static void +initialize (void) { - struct tm *tm = gmtime (timep); - - if (localtime_buffer_addr == &tm_zero_buffer) - localtime_buffer_addr = tm; - - return tm; + HMODULE kernel32 = LoadLibrary ("kernel32.dll"); + if (kernel32 != NULL) + { + GetSystemTimePreciseAsFileTimeFunc = + (GetSystemTimePreciseAsFileTimeFuncType) GetProcAddress (kernel32, "GetSystemTimePreciseAsFileTime"); + } + initialized = TRUE; } -#endif /* GETTIMEOFDAY_CLOBBERS_LOCALTIME || TZSET_CLOBBERS_LOCALTIME */ - -#if TZSET_CLOBBERS_LOCALTIME - -# undef tzset -extern void tzset (void); - -/* This is a wrapper for tzset, for systems on which tzset may clobber - the static buffer used for localtime's result. */ -void -rpl_tzset (void) -{ - /* Save and restore the contents of the buffer used for localtime's - result around the call to tzset. */ - struct tm save = *localtime_buffer_addr; - tzset (); - *localtime_buffer_addr = save; -} #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. */ + 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 -#if HAVE_GETTIMEOFDAY -# if GETTIMEOFDAY_CLOBBERS_LOCALTIME +#ifdef WINDOWS_NATIVE + + /* On native Windows, there are two ways to get the current time: + GetSystemTimeAsFileTime + <https://msdn.microsoft.com/en-us/library/ms724397.aspx> + or + GetSystemTimePreciseAsFileTime + <https://msdn.microsoft.com/en-us/library/hh706895.aspx>. + 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: + <http://www.windowstimestamp.com/description>. */ + FILETIME current_time; + + if (!initialized) + initialize (); + if (GetSystemTimePreciseAsFileTimeFunc != NULL) + GetSystemTimePreciseAsFileTimeFunc (¤t_time); + else + GetSystemTimeAsFileTime (¤t_time); + + /* Convert from FILETIME to 'struct timeval'. */ + /* FILETIME: <https://msdn.microsoft.com/en-us/library/ms724284.aspx> */ + 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 +# endif -# if defined timeval /* 'struct timeval' overridden by gnulib? */ -# undef timeval +# if defined timeval /* 'struct timeval' overridden by gnulib? */ +# undef timeval struct timeval otv; int result = gettimeofday (&otv, (struct timezone *) tz); if (result == 0) @@ -118,25 +120,16 @@ gettimeofday (struct timeval *restrict tv, void *restrict tz) tv->tv_sec = otv.tv_sec; tv->tv_usec = otv.tv_usec; } -# else +# else int result = gettimeofday (tv, (struct timezone *) tz); -# endif +# endif -# if GETTIMEOFDAY_CLOBBERS_LOCALTIME +# if GETTIMEOFDAY_CLOBBERS_LOCALTIME *localtime_buffer_addr = save; -# endif +# endif return result; -#else - -# if HAVE__FTIME - - struct _timeb timebuf; - _ftime (&timebuf); - tv->tv_sec = timebuf.time; - tv->tv_usec = timebuf.millitm * 1000; - # else # if !defined OK_TO_USE_1S_CLOCK @@ -146,9 +139,8 @@ gettimeofday (struct timeval *restrict tv, void *restrict tz) tv->tv_sec = time (NULL); tv->tv_usec = 0; -# endif - return 0; +# endif #endif } diff --git a/lib/gnulib.mk b/lib/gnulib.mk index c58afd2..325c25c 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-2016 Free Software Foundation, Inc. +# Copyright (C) 2002-2017 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 @@ -25,6 +25,7 @@ MOSTLYCLEANFILES += core *.stackdump +# No GNU Make output. noinst_LIBRARIES += libdiffutils.a @@ -436,6 +437,13 @@ EXTRA_DIST += filenamecat.h ## end gnulib module filenamecat-lgpl +## begin gnulib module flexmember + + +EXTRA_DIST += flexmember.h + +## end gnulib module flexmember + ## begin gnulib module float BUILT_SOURCES += $(FLOAT_H) @@ -513,9 +521,9 @@ EXTRA_DIST += stdio--.h stdio-safer.h ## begin gnulib module fstat -EXTRA_DIST += fstat.c +EXTRA_DIST += fstat.c stat-w32.c stat-w32.h -EXTRA_libdiffutils_a_SOURCES += fstat.c +EXTRA_libdiffutils_a_SOURCES += fstat.c stat-w32.c ## end gnulib module fstat @@ -537,11 +545,11 @@ EXTRA_libdiffutils_a_SOURCES += getdtablesize.c ## begin gnulib module getopt-posix -BUILT_SOURCES += $(GETOPT_H) +BUILT_SOURCES += $(GETOPT_H) $(GETOPT_CDEFS_H) # We need the following in order to create <getopt.h> when the system # doesn't have one that works with the given compiler. -getopt.h: getopt.in.h $(top_builddir)/config.status $(ARG_NONNULL_H) +getopt.h: getopt.in.h $(top_builddir)/config.status $(AM_V_GEN)rm -f $@-t $@ && \ { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \ sed -e 's|@''GUARD_PREFIX''@|GL|g' \ @@ -554,14 +562,29 @@ getopt.h: getopt.in.h $(top_builddir)/config.status $(ARG_NONNULL_H) < $(srcdir)/getopt.in.h; \ } > $@-t && \ mv -f $@-t $@ -MOSTLYCLEANFILES += getopt.h getopt.h-t -EXTRA_DIST += getopt.c getopt.in.h getopt1.c getopt_int.h +getopt-cdefs.h: getopt-cdefs.in.h $(top_builddir)/config.status + $(AM_V_GEN)rm -f $@-t $@ && \ + { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \ + sed -e 's|@''HAVE_SYS_CDEFS_H''@|$(HAVE_SYS_CDEFS_H)|g' \ + < $(srcdir)/getopt-cdefs.in.h; \ + } > $@-t && \ + mv -f $@-t $@ + +MOSTLYCLEANFILES += getopt.h getopt.h-t getopt-cdefs.h getopt-cdefs.h-t + +EXTRA_DIST += 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 EXTRA_libdiffutils_a_SOURCES += getopt.c getopt1.c ## end gnulib module getopt-posix +## begin gnulib module getprogname + +libdiffutils_a_SOURCES += getprogname.h getprogname.c + +## end gnulib module getprogname + ## begin gnulib module gettext-h libdiffutils_a_SOURCES += gettext.h @@ -619,12 +642,11 @@ EXTRA_DIST += $(top_srcdir)/build-aux/gnu-web-doc-update ## begin gnulib module gnumakefile +EXTRA_DIST += $(top_srcdir)/GNUmakefile distclean-local: clean-GNUmakefile clean-GNUmakefile: test '$(srcdir)' = . || rm -f $(top_builddir)/GNUmakefile -EXTRA_DIST += $(top_srcdir)/GNUmakefile - ## end gnulib module gnumakefile ## begin gnulib module gnupload @@ -850,6 +872,34 @@ EXTRA_DIST += langinfo.in.h ## end gnulib module langinfo +## begin gnulib module limits-h + +BUILT_SOURCES += $(LIMITS_H) + +# We need the following in order to create <limits.h> when the system +# doesn't have one that is compatible with GNU. +if GL_GENERATE_LIMITS_H +limits.h: limits.in.h $(top_builddir)/config.status + $(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_LIMITS_H''@|$(NEXT_LIMITS_H)|g' \ + < $(srcdir)/limits.in.h; \ + } > $@-t && \ + mv $@-t $@ +else +limits.h: $(top_builddir)/config.status + rm -f $@ +endif +MOSTLYCLEANFILES += limits.h limits.h-t + +EXTRA_DIST += limits.in.h + +## end gnulib module limits-h + ## begin gnulib module localcharset libdiffutils_a_SOURCES += localcharset.h localcharset.c @@ -968,6 +1018,15 @@ EXTRA_libdiffutils_a_SOURCES += localeconv.c ## end gnulib module localeconv +## begin gnulib module localtime-buffer + + +EXTRA_DIST += localtime-buffer.c localtime-buffer.h + +EXTRA_libdiffutils_a_SOURCES += localtime-buffer.c + +## end gnulib module localtime-buffer + ## begin gnulib module lstat @@ -1085,6 +1144,12 @@ EXTRA_libdiffutils_a_SOURCES += memchr.c ## end gnulib module memchr +## begin gnulib module minmax + +libdiffutils_a_SOURCES += minmax.h + +## end gnulib module minmax + ## begin gnulib module mkstemp @@ -1209,13 +1274,6 @@ EXTRA_libdiffutils_a_SOURCES += readlink.c ## end gnulib module readlink -## begin gnulib module readme-release - - -EXTRA_DIST += $(top_srcdir)/README-release - -## end gnulib module readme-release - ## begin gnulib module regex @@ -1319,115 +1377,69 @@ libdiffutils_a_SOURCES += size_max.h ## begin gnulib module snippet/_Noreturn # Because this Makefile snippet defines a variable used by other -# gnulib Makefile snippets, it must be present in all Makefile.am that +# gnulib Makefile snippets, it must be present in all makefiles that # need it. This is ensured by the applicability 'all' defined above. -_NORETURN_H=$(top_srcdir)/build-aux/snippet/_Noreturn.h +_NORETURN_H=$(srcdir)/_Noreturn.h -EXTRA_DIST += $(top_srcdir)/build-aux/snippet/_Noreturn.h +EXTRA_DIST += _Noreturn.h ## end gnulib module snippet/_Noreturn ## begin gnulib module snippet/arg-nonnull -# The BUILT_SOURCES created by this Makefile snippet are not used via #include -# statements but through direct file reference. Therefore this snippet must be -# present in all Makefile.am that need it. This is ensured by the applicability -# 'all' defined above. - -BUILT_SOURCES += arg-nonnull.h -# The arg-nonnull.h that gets inserted into generated .h files is the same as -# build-aux/snippet/arg-nonnull.h, except that it has the copyright header cut -# off. -arg-nonnull.h: $(top_srcdir)/build-aux/snippet/arg-nonnull.h - $(AM_V_GEN)rm -f $@-t $@ && \ - sed -n -e '/GL_ARG_NONNULL/,$$p' \ - < $(top_srcdir)/build-aux/snippet/arg-nonnull.h \ - > $@-t && \ - mv $@-t $@ -MOSTLYCLEANFILES += arg-nonnull.h arg-nonnull.h-t +# Because this Makefile snippet defines a variable used by other +# gnulib Makefile snippets, it must be present in all makefiles that +# need it. This is ensured by the applicability 'all' defined above. -ARG_NONNULL_H=arg-nonnull.h +ARG_NONNULL_H=$(srcdir)/arg-nonnull.h -EXTRA_DIST += $(top_srcdir)/build-aux/snippet/arg-nonnull.h +EXTRA_DIST += arg-nonnull.h ## end gnulib module snippet/arg-nonnull ## begin gnulib module snippet/c++defs -# The BUILT_SOURCES created by this Makefile snippet are not used via #include -# statements but through direct file reference. Therefore this snippet must be -# present in all Makefile.am that need it. This is ensured by the applicability -# 'all' defined above. - -BUILT_SOURCES += c++defs.h -# The c++defs.h that gets inserted into generated .h files is the same as -# build-aux/snippet/c++defs.h, except that it has the copyright header cut off. -c++defs.h: $(top_srcdir)/build-aux/snippet/c++defs.h - $(AM_V_GEN)rm -f $@-t $@ && \ - sed -n -e '/_GL_CXXDEFS/,$$p' \ - < $(top_srcdir)/build-aux/snippet/c++defs.h \ - > $@-t && \ - mv $@-t $@ -MOSTLYCLEANFILES += c++defs.h c++defs.h-t +# Because this Makefile snippet defines a variable used by other +# gnulib Makefile snippets, it must be present in all makefiles that +# need it. This is ensured by the applicability 'all' defined above. -CXXDEFS_H=c++defs.h +CXXDEFS_H=$(srcdir)/c++defs.h -EXTRA_DIST += $(top_srcdir)/build-aux/snippet/c++defs.h +EXTRA_DIST += c++defs.h ## end gnulib module snippet/c++defs ## begin gnulib module snippet/unused-parameter -# The BUILT_SOURCES created by this Makefile snippet are not used via #include -# statements but through direct file reference. Therefore this snippet must be -# present in all Makefile.am that need it. This is ensured by the applicability -# 'all' defined above. - -BUILT_SOURCES += unused-parameter.h -# The unused-parameter.h that gets inserted into generated .h files is the same -# as build-aux/snippet/unused-parameter.h, except that it has the copyright -# header cut off. -unused-parameter.h: $(top_srcdir)/build-aux/snippet/unused-parameter.h - $(AM_V_GEN)rm -f $@-t $@ && \ - sed -n -e '/GL_UNUSED_PARAMETER/,$$p' \ - < $(top_srcdir)/build-aux/snippet/unused-parameter.h \ - > $@-t && \ - mv $@-t $@ -MOSTLYCLEANFILES += unused-parameter.h unused-parameter.h-t +# Because this Makefile snippet defines a variable used by other +# gnulib Makefile snippets, it must be present in all makefiles that +# need it. This is ensured by the applicability 'all' defined above. -UNUSED_PARAMETER_H=unused-parameter.h +UNUSED_PARAMETER_H=$(srcdir)/unused-parameter.h -EXTRA_DIST += $(top_srcdir)/build-aux/snippet/unused-parameter.h +EXTRA_DIST += unused-parameter.h ## end gnulib module snippet/unused-parameter ## begin gnulib module snippet/warn-on-use -BUILT_SOURCES += warn-on-use.h -# The warn-on-use.h that gets inserted into generated .h files is the same as -# build-aux/snippet/warn-on-use.h, except that it has the copyright header cut -# off. -warn-on-use.h: $(top_srcdir)/build-aux/snippet/warn-on-use.h - $(AM_V_GEN)rm -f $@-t $@ && \ - sed -n -e '/^.ifndef/,$$p' \ - < $(top_srcdir)/build-aux/snippet/warn-on-use.h \ - > $@-t && \ - mv $@-t $@ -MOSTLYCLEANFILES += warn-on-use.h warn-on-use.h-t +# Because this Makefile snippet defines a variable used by other +# gnulib Makefile snippets, it must be present in all makefiles that +# need it. This is ensured by the applicability 'all' defined above. -WARN_ON_USE_H=warn-on-use.h +WARN_ON_USE_H=$(srcdir)/warn-on-use.h -EXTRA_DIST += $(top_srcdir)/build-aux/snippet/warn-on-use.h +EXTRA_DIST += warn-on-use.h ## end gnulib module snippet/warn-on-use ## begin gnulib module stat -EXTRA_DIST += stat.c +EXTRA_DIST += stat-w32.c stat-w32.h stat.c -EXTRA_libdiffutils_a_SOURCES += stat.c +EXTRA_libdiffutils_a_SOURCES += stat-w32.c stat.c ## end gnulib module stat @@ -1544,6 +1556,7 @@ stdint.h: stdint.in.h $(top_builddir)/config.status -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \ -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \ -e 's|@''NEXT_STDINT_H''@|$(NEXT_STDINT_H)|g' \ + -e 's/@''HAVE_C99_STDINT_H''@/$(HAVE_C99_STDINT_H)/g' \ -e 's/@''HAVE_SYS_TYPES_H''@/$(HAVE_SYS_TYPES_H)/g' \ -e 's/@''HAVE_INTTYPES_H''@/$(HAVE_INTTYPES_H)/g' \ -e 's/@''HAVE_SYS_INTTYPES_H''@/$(HAVE_SYS_INTTYPES_H)/g' \ @@ -1565,6 +1578,7 @@ stdint.h: stdint.in.h $(top_builddir)/config.status -e 's/@''BITSIZEOF_WINT_T''@/$(BITSIZEOF_WINT_T)/g' \ -e 's/@''HAVE_SIGNED_WINT_T''@/$(HAVE_SIGNED_WINT_T)/g' \ -e 's/@''WINT_T_SUFFIX''@/$(WINT_T_SUFFIX)/g' \ + -e 's/@''GNULIB_OVERRIDES_WINT_T''@/$(GNULIB_OVERRIDES_WINT_T)/g' \ < $(srcdir)/stdint.in.h; \ } > $@-t && \ mv $@-t $@ @@ -1769,6 +1783,7 @@ stdlib.h: stdlib.in.h $(top_builddir)/config.status $(CXXDEFS_H) \ -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' \ + -e 's|@''HAVE_QSORT_R''@|$(HAVE_QSORT_R)|g' \ -e 's|@''HAVE_RANDOM''@|$(HAVE_RANDOM)|g' \ -e 's|@''HAVE_RANDOM_H''@|$(HAVE_RANDOM_H)|g' \ -e 's|@''HAVE_RANDOM_R''@|$(HAVE_RANDOM_R)|g' \ @@ -2059,6 +2074,7 @@ sys/stat.h: sys_stat.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNU -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \ -e 's|@''NEXT_SYS_STAT_H''@|$(NEXT_SYS_STAT_H)|g' \ -e 's|@''WINDOWS_64_BIT_ST_SIZE''@|$(WINDOWS_64_BIT_ST_SIZE)|g' \ + -e 's|@''WINDOWS_STAT_TIMESPEC''@|$(WINDOWS_STAT_TIMESPEC)|g' \ -e 's/@''GNULIB_FCHMODAT''@/$(GNULIB_FCHMODAT)/g' \ -e 's/@''GNULIB_FSTAT''@/$(GNULIB_FSTAT)/g' \ -e 's/@''GNULIB_FSTATAT''@/$(GNULIB_FSTATAT)/g' \ @@ -2072,6 +2088,7 @@ sys/stat.h: sys_stat.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNU -e 's/@''GNULIB_MKNODAT''@/$(GNULIB_MKNODAT)/g' \ -e 's/@''GNULIB_STAT''@/$(GNULIB_STAT)/g' \ -e 's/@''GNULIB_UTIMENSAT''@/$(GNULIB_UTIMENSAT)/g' \ + -e 's/@''GNULIB_OVERRIDES_STRUCT_STAT''@/$(GNULIB_OVERRIDES_STRUCT_STAT)/g' \ -e 's|@''HAVE_FCHMODAT''@|$(HAVE_FCHMODAT)|g' \ -e 's|@''HAVE_FSTATAT''@|$(HAVE_FSTATAT)|g' \ -e 's|@''HAVE_FUTIMENS''@|$(HAVE_FUTIMENS)|g' \ @@ -2155,6 +2172,7 @@ sys/types.h: sys_types.in.h $(top_builddir)/config.status -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \ -e 's|@''NEXT_SYS_TYPES_H''@|$(NEXT_SYS_TYPES_H)|g' \ -e 's|@''WINDOWS_64_BIT_OFF_T''@|$(WINDOWS_64_BIT_OFF_T)|g' \ + -e 's|@''WINDOWS_STAT_INODES''@|$(WINDOWS_STAT_INODES)|g' \ < $(srcdir)/sys_types.in.h; \ } > $@-t && \ mv $@-t $@ @@ -2220,24 +2238,31 @@ time.h: time.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_TIME_H''@|$(NEXT_TIME_H)|g' \ - -e 's/@''GNULIB_GETTIMEOFDAY''@/$(GNULIB_GETTIMEOFDAY)/g' \ + -e 's/@''GNULIB_CTIME''@/$(GNULIB_CTIME)/g' \ + -e 's/@''GNULIB_LOCALTIME''@/$(GNULIB_LOCALTIME)/g' \ -e 's/@''GNULIB_MKTIME''@/$(GNULIB_MKTIME)/g' \ -e 's/@''GNULIB_NANOSLEEP''@/$(GNULIB_NANOSLEEP)/g' \ + -e 's/@''GNULIB_STRFTIME''@/$(GNULIB_STRFTIME)/g' \ -e 's/@''GNULIB_STRPTIME''@/$(GNULIB_STRPTIME)/g' \ -e 's/@''GNULIB_TIMEGM''@/$(GNULIB_TIMEGM)/g' \ -e 's/@''GNULIB_TIME_R''@/$(GNULIB_TIME_R)/g' \ -e 's/@''GNULIB_TIME_RZ''@/$(GNULIB_TIME_RZ)/g' \ + -e 's/@''GNULIB_TZSET''@/$(GNULIB_TZSET)/g' \ -e 's|@''HAVE_DECL_LOCALTIME_R''@|$(HAVE_DECL_LOCALTIME_R)|g' \ -e 's|@''HAVE_NANOSLEEP''@|$(HAVE_NANOSLEEP)|g' \ -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' \ -e 's|@''REPLACE_LOCALTIME_R''@|$(REPLACE_LOCALTIME_R)|g' \ -e 's|@''REPLACE_MKTIME''@|$(REPLACE_MKTIME)|g' \ -e 's|@''REPLACE_NANOSLEEP''@|$(REPLACE_NANOSLEEP)|g' \ + -e 's|@''REPLACE_STRFTIME''@|$(REPLACE_STRFTIME)|g' \ -e 's|@''REPLACE_TIMEGM''@|$(REPLACE_TIMEGM)|g' \ + -e 's|@''REPLACE_TZSET''@|$(REPLACE_TZSET)|g' \ -e 's|@''PTHREAD_H_DEFINES_STRUCT_TIMESPEC''@|$(PTHREAD_H_DEFINES_STRUCT_TIMESPEC)|g' \ -e 's|@''SYS_TIME_H_DEFINES_STRUCT_TIMESPEC''@|$(SYS_TIME_H_DEFINES_STRUCT_TIMESPEC)|g' \ -e 's|@''TIME_H_DEFINES_STRUCT_TIMESPEC''@|$(TIME_H_DEFINES_STRUCT_TIMESPEC)|g' \ @@ -2297,6 +2322,15 @@ EXTRA_DIST += trim.h ## end gnulib module trim +## begin gnulib module tzset + + +EXTRA_DIST += tzset.c + +EXTRA_libdiffutils_a_SOURCES += tzset.c + +## end gnulib module tzset + ## begin gnulib module unistd BUILT_SOURCES += unistd.h @@ -2355,6 +2389,7 @@ unistd.h: unistd.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H -e 's/@''GNULIB_SLEEP''@/$(GNULIB_SLEEP)/g' \ -e 's/@''GNULIB_SYMLINK''@/$(GNULIB_SYMLINK)/g' \ -e 's/@''GNULIB_SYMLINKAT''@/$(GNULIB_SYMLINKAT)/g' \ + -e 's/@''GNULIB_TRUNCATE''@/$(GNULIB_TRUNCATE)/g' \ -e 's/@''GNULIB_TTYNAME_R''@/$(GNULIB_TTYNAME_R)/g' \ -e 's/@''GNULIB_UNISTD_H_GETOPT''@/0$(GNULIB_GL_UNISTD_H_GETOPT)/g' \ -e 's/@''GNULIB_UNISTD_H_NONBLOCKING''@/$(GNULIB_UNISTD_H_NONBLOCKING)/g' \ @@ -2377,7 +2412,6 @@ unistd.h: unistd.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H -e 's|@''HAVE_GETDTABLESIZE''@|$(HAVE_GETDTABLESIZE)|g' \ -e 's|@''HAVE_GETGROUPS''@|$(HAVE_GETGROUPS)|g' \ -e 's|@''HAVE_GETHOSTNAME''@|$(HAVE_GETHOSTNAME)|g' \ - -e 's|@''HAVE_GETLOGIN''@|$(HAVE_GETLOGIN)|g' \ -e 's|@''HAVE_GETPAGESIZE''@|$(HAVE_GETPAGESIZE)|g' \ -e 's|@''HAVE_GROUP_MEMBER''@|$(HAVE_GROUP_MEMBER)|g' \ -e 's|@''HAVE_LCHOWN''@|$(HAVE_LCHOWN)|g' \ @@ -2393,12 +2427,14 @@ unistd.h: unistd.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H -e 's|@''HAVE_SLEEP''@|$(HAVE_SLEEP)|g' \ -e 's|@''HAVE_SYMLINK''@|$(HAVE_SYMLINK)|g' \ -e 's|@''HAVE_SYMLINKAT''@|$(HAVE_SYMLINKAT)|g' \ + -e 's|@''HAVE_TRUNCATE''@|$(HAVE_TRUNCATE)|g' \ -e 's|@''HAVE_UNLINKAT''@|$(HAVE_UNLINKAT)|g' \ -e 's|@''HAVE_USLEEP''@|$(HAVE_USLEEP)|g' \ -e 's|@''HAVE_DECL_ENVIRON''@|$(HAVE_DECL_ENVIRON)|g' \ -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' \ + -e 's|@''HAVE_DECL_GETLOGIN''@|$(HAVE_DECL_GETLOGIN)|g' \ -e 's|@''HAVE_DECL_GETLOGIN_R''@|$(HAVE_DECL_GETLOGIN_R)|g' \ -e 's|@''HAVE_DECL_GETPAGESIZE''@|$(HAVE_DECL_GETPAGESIZE)|g' \ -e 's|@''HAVE_DECL_GETUSERSHELL''@|$(HAVE_DECL_GETUSERSHELL)|g' \ @@ -2433,6 +2469,7 @@ unistd.h: unistd.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H -e 's|@''REPLACE_SLEEP''@|$(REPLACE_SLEEP)|g' \ -e 's|@''REPLACE_SYMLINK''@|$(REPLACE_SYMLINK)|g' \ -e 's|@''REPLACE_SYMLINKAT''@|$(REPLACE_SYMLINKAT)|g' \ + -e 's|@''REPLACE_TRUNCATE''@|$(REPLACE_TRUNCATE)|g' \ -e 's|@''REPLACE_TTYNAME_R''@|$(REPLACE_TTYNAME_R)|g' \ -e 's|@''REPLACE_UNLINK''@|$(REPLACE_UNLINK)|g' \ -e 's|@''REPLACE_UNLINKAT''@|$(REPLACE_UNLINKAT)|g' \ @@ -2615,6 +2652,8 @@ wchar.h: wchar.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) -e 's|@''HAVE_FEATURES_H''@|$(HAVE_FEATURES_H)|g' \ -e 's|@''NEXT_WCHAR_H''@|$(NEXT_WCHAR_H)|g' \ -e 's|@''HAVE_WCHAR_H''@|$(HAVE_WCHAR_H)|g' \ + -e 's/@''HAVE_CRTDEFS_H''@/$(HAVE_CRTDEFS_H)/g' \ + -e 's/@''GNULIB_OVERRIDES_WINT_T''@/$(GNULIB_OVERRIDES_WINT_T)/g' \ -e 's/@''GNULIB_BTOWC''@/$(GNULIB_BTOWC)/g' \ -e 's/@''GNULIB_WCTOB''@/$(GNULIB_WCTOB)/g' \ -e 's/@''GNULIB_MBSINIT''@/$(GNULIB_MBSINIT)/g' \ @@ -2654,6 +2693,7 @@ wchar.h: wchar.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) -e 's/@''GNULIB_WCSSTR''@/$(GNULIB_WCSSTR)/g' \ -e 's/@''GNULIB_WCSTOK''@/$(GNULIB_WCSTOK)/g' \ -e 's/@''GNULIB_WCSWIDTH''@/$(GNULIB_WCSWIDTH)/g' \ + -e 's/@''GNULIB_WCSFTIME''@/$(GNULIB_WCSFTIME)/g' \ < $(srcdir)/wchar.in.h | \ sed -e 's|@''HAVE_WINT_T''@|$(HAVE_WINT_T)|g' \ -e 's|@''HAVE_BTOWC''@|$(HAVE_BTOWC)|g' \ @@ -2693,6 +2733,7 @@ wchar.h: wchar.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) -e 's|@''HAVE_WCSSTR''@|$(HAVE_WCSSTR)|g' \ -e 's|@''HAVE_WCSTOK''@|$(HAVE_WCSTOK)|g' \ -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_WCWIDTH''@|$(HAVE_DECL_WCWIDTH)|g' \ | \ @@ -2709,6 +2750,7 @@ wchar.h: wchar.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) -e 's|@''REPLACE_WCSNRTOMBS''@|$(REPLACE_WCSNRTOMBS)|g' \ -e 's|@''REPLACE_WCWIDTH''@|$(REPLACE_WCWIDTH)|g' \ -e 's|@''REPLACE_WCSWIDTH''@|$(REPLACE_WCSWIDTH)|g' \ + -e 's|@''REPLACE_WCSFTIME''@|$(REPLACE_WCSFTIME)|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)'; \ @@ -2745,6 +2787,8 @@ wctype.h: wctype.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(WARN_ON_USE_H -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \ -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \ -e 's|@''NEXT_WCTYPE_H''@|$(NEXT_WCTYPE_H)|g' \ + -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_WCTYPE''@/$(GNULIB_WCTYPE)/g' \ -e 's/@''GNULIB_ISWCTYPE''@/$(GNULIB_ISWCTYPE)/g' \ diff --git a/lib/hard-locale.c b/lib/hard-locale.c index c7d9da5..57ed42b 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-2016 Free Software + Copyright (C) 1997-1999, 2002-2004, 2006-2007, 2009-2017 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify diff --git a/lib/hard-locale.h b/lib/hard-locale.h index 7644afa..ba424af 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-2016 Free Software Foundation, Inc. + Copyright (C) 1999, 2003-2004, 2009-2017 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -1,6 +1,6 @@ /* hash - hashing table processing. - Copyright (C) 1998-2004, 2006-2007, 2009-2016 Free Software Foundation, Inc. + Copyright (C) 1998-2004, 2006-2007, 2009-2017 Free Software Foundation, Inc. Written by Jim Meyering, 1992. @@ -1,5 +1,5 @@ /* hash - hashing table processing. - Copyright (C) 1998-1999, 2001, 2003, 2009-2016 Free Software Foundation, + Copyright (C) 1998-1999, 2001, 2003, 2009-2017 Free Software Foundation, Inc. Written by Jim Meyering <meyering@ascend.com>, 1998. diff --git a/lib/iconv.c b/lib/iconv.c index 9ce9c01..89951cb 100644 --- a/lib/iconv.c +++ b/lib/iconv.c @@ -1,5 +1,5 @@ /* Character set conversion. - Copyright (C) 1999-2001, 2007, 2009-2016 Free Software Foundation, Inc. + Copyright (C) 1999-2001, 2007, 2009-2017 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/lib/iconv.in.h b/lib/iconv.in.h index cb1da14..ddaae67 100644 --- a/lib/iconv.in.h +++ b/lib/iconv.in.h @@ -1,6 +1,6 @@ /* A GNU-like <iconv.h>. - Copyright (C) 2007-2016 Free Software Foundation, Inc. + Copyright (C) 2007-2017 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/lib/iconv_close.c b/lib/iconv_close.c index d1cd793..ddadf6a 100644 --- a/lib/iconv_close.c +++ b/lib/iconv_close.c @@ -1,5 +1,5 @@ /* Character set conversion. - Copyright (C) 2007, 2009-2016 Free Software Foundation, Inc. + Copyright (C) 2007, 2009-2017 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/lib/iconv_open.c b/lib/iconv_open.c index d5c5a52..376dc41 100644 --- a/lib/iconv_open.c +++ b/lib/iconv_open.c @@ -1,5 +1,5 @@ /* Character set conversion. - Copyright (C) 2007, 2009-2016 Free Software Foundation, Inc. + Copyright (C) 2007, 2009-2017 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/lib/ignore-value.h b/lib/ignore-value.h index 6713d96..2439d95 100644 --- a/lib/ignore-value.h +++ b/lib/ignore-value.h @@ -1,6 +1,6 @@ /* ignore a function return without a compiler warning. -*- coding: utf-8 -*- - Copyright (C) 2008-2016 Free Software Foundation, Inc. + Copyright (C) 2008-2017 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/lib/intprops.h b/lib/intprops.h index e1fce5c..8f5ad54 100644 --- a/lib/intprops.h +++ b/lib/intprops.h @@ -1,6 +1,6 @@ /* intprops.h -- properties of integer types - Copyright (C) 2001-2016 Free Software Foundation, Inc. + Copyright (C) 2001-2017 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published @@ -21,7 +21,6 @@ #define _GL_INTPROPS_H #include <limits.h> -#include <verify.h> /* Return a value with the common real type of E and V and the value of V. */ #define _GL_INT_CONVERT(e, v) (0 * (e) + (v)) @@ -47,12 +46,16 @@ /* Minimum and maximum values for integer types and expressions. */ +/* The width in bits of the integer type or expression T. + Padding bits are not supported; this is checked at compile-time below. */ +#define TYPE_WIDTH(t) (sizeof (t) * CHAR_BIT) + /* The maximum and minimum values for the integer type T. */ #define TYPE_MINIMUM(t) ((t) ~ TYPE_MAXIMUM (t)) #define TYPE_MAXIMUM(t) \ ((t) (! TYPE_SIGNED (t) \ ? (t) -1 \ - : ((((t) 1 << (sizeof (t) * CHAR_BIT - 2)) - 1) * 2 + 1))) + : ((((t) 1 << (TYPE_WIDTH (t) - 2)) - 1) * 2 + 1))) /* The maximum and minimum values for the type of the expression E, after integer promotion. E should not have side effects. */ @@ -65,29 +68,23 @@ ? _GL_SIGNED_INT_MAXIMUM (e) \ : _GL_INT_NEGATE_CONVERT (e, 1)) #define _GL_SIGNED_INT_MAXIMUM(e) \ - (((_GL_INT_CONVERT (e, 1) << (sizeof ((e) + 0) * CHAR_BIT - 2)) - 1) * 2 + 1) + (((_GL_INT_CONVERT (e, 1) << (TYPE_WIDTH ((e) + 0) - 2)) - 1) * 2 + 1) + +/* Work around OpenVMS incompatibility with C99. */ +#if !defined LLONG_MAX && defined __INT64_MAX +# define LLONG_MAX __INT64_MAX +# define LLONG_MIN __INT64_MIN +#endif /* This include file assumes that signed types are two's complement without padding bits; the above macros have undefined behavior otherwise. If this is a problem for you, please let us know how to fix it for your host. - As a sanity check, test the assumption for some signed types that - <limits.h> bounds. */ -verify (TYPE_MINIMUM (signed char) == SCHAR_MIN); -verify (TYPE_MAXIMUM (signed char) == SCHAR_MAX); -verify (TYPE_MINIMUM (short int) == SHRT_MIN); -verify (TYPE_MAXIMUM (short int) == SHRT_MAX); -verify (TYPE_MINIMUM (int) == INT_MIN); -verify (TYPE_MAXIMUM (int) == INT_MAX); -verify (TYPE_MINIMUM (long int) == LONG_MIN); -verify (TYPE_MAXIMUM (long int) == LONG_MAX); -#ifdef LLONG_MAX -verify (TYPE_MINIMUM (long long int) == LLONG_MIN); -verify (TYPE_MAXIMUM (long long int) == LLONG_MAX); -#endif + This assumption is tested by the intprops-tests module. */ /* Does the __typeof__ keyword work? This could be done by 'configure', but for now it's easier to do it by hand. */ -#if (2 <= __GNUC__ || defined __IBM__TYPEOF__ \ +#if (2 <= __GNUC__ \ + || (1210 <= __IBMC__ && defined __IBM__TYPEOF__) \ || (0x5110 <= __SUNPRO_C && !__STDC__)) # define _GL_HAVE___TYPEOF__ 1 #else @@ -116,8 +113,7 @@ verify (TYPE_MAXIMUM (long long int) == LLONG_MAX); signed, 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 (sizeof (t) * CHAR_BIT \ - - _GL_SIGNED_TYPE_OR_EXPR (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, @@ -222,20 +218,23 @@ verify (TYPE_MAXIMUM (long long int) == LLONG_MAX); ? (a) < (min) >> (b) \ : (max) >> (b) < (a)) -/* True if __builtin_add_overflow (A, B, P) works when P is null. */ -#define _GL_HAS_BUILTIN_OVERFLOW_WITH_NULL (7 <= __GNUC__) +/* True if __builtin_add_overflow (A, B, P) works when P is non-null. */ +#define _GL_HAS_BUILTIN_OVERFLOW (5 <= __GNUC__) + +/* True if __builtin_add_overflow_p (A, B, C) works. */ +#define _GL_HAS_BUILTIN_OVERFLOW_P (7 <= __GNUC__) /* The _GL*_OVERFLOW macros have the same restrictions as the *_RANGE_OVERFLOW macros, except that they do not assume that operands (e.g., A and B) have the same type as MIN and MAX. Instead, they assume that the result (e.g., A + B) has that type. */ -#if _GL_HAS_BUILTIN_OVERFLOW_WITH_NULL -# define _GL_ADD_OVERFLOW(a, b, min, max) - __builtin_add_overflow (a, b, (__typeof__ ((a) + (b)) *) 0) -# define _GL_SUBTRACT_OVERFLOW(a, b, min, max) - __builtin_sub_overflow (a, b, (__typeof__ ((a) - (b)) *) 0) -# define _GL_MULTIPLY_OVERFLOW(a, b, min, max) - __builtin_mul_overflow (a, b, (__typeof__ ((a) * (b)) *) 0) +#if _GL_HAS_BUILTIN_OVERFLOW_P +# define _GL_ADD_OVERFLOW(a, b, min, max) \ + __builtin_add_overflow_p (a, b, (__typeof__ ((a) + (b))) 0) +# define _GL_SUBTRACT_OVERFLOW(a, b, min, max) \ + __builtin_sub_overflow_p (a, b, (__typeof__ ((a) - (b))) 0) +# define _GL_MULTIPLY_OVERFLOW(a, b, min, max) \ + __builtin_mul_overflow_p (a, b, (__typeof__ ((a) * (b))) 0) #else # define _GL_ADD_OVERFLOW(a, b, min, max) \ ((min) < 0 ? INT_ADD_RANGE_OVERFLOW (a, b, min, max) \ @@ -315,7 +314,7 @@ verify (TYPE_MAXIMUM (long long int) == LLONG_MAX); _GL_BINARY_OP_OVERFLOW (a, b, _GL_ADD_OVERFLOW) #define INT_SUBTRACT_OVERFLOW(a, b) \ _GL_BINARY_OP_OVERFLOW (a, b, _GL_SUBTRACT_OVERFLOW) -#if _GL_HAS_BUILTIN_OVERFLOW_WITH_NULL +#if _GL_HAS_BUILTIN_OVERFLOW_P # define INT_NEGATE_OVERFLOW(a) INT_SUBTRACT_OVERFLOW (0, a) #else # define INT_NEGATE_OVERFLOW(a) \ @@ -349,10 +348,6 @@ verify (TYPE_MAXIMUM (long long int) == LLONG_MAX); #define INT_MULTIPLY_WRAPV(a, b, r) \ _GL_INT_OP_WRAPV (a, b, r, *, __builtin_mul_overflow, INT_MULTIPLY_OVERFLOW) -#ifndef __has_builtin -# define __has_builtin(x) 0 -#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 @@ -369,17 +364,17 @@ verify (TYPE_MAXIMUM (long long int) == LLONG_MAX); the operation. BUILTIN is the builtin operation, and OVERFLOW the overflow predicate. Return 1 if the result overflows. See above for restrictions. */ -#if 5 <= __GNUC__ || __has_builtin (__builtin_add_overflow) +#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) \ (_Generic \ (*(r), \ signed char: \ - _GL_INT_OP_CALC (a, b, r, op, overflow, unsigned char, \ + _GL_INT_OP_CALC (a, b, r, op, overflow, unsigned int, \ signed char, SCHAR_MIN, SCHAR_MAX), \ short int: \ - _GL_INT_OP_CALC (a, b, r, op, overflow, unsigned short int, \ + _GL_INT_OP_CALC (a, b, r, op, overflow, unsigned int, \ short int, SHRT_MIN, SHRT_MAX), \ int: \ _GL_INT_OP_CALC (a, b, r, op, overflow, unsigned int, \ @@ -393,10 +388,10 @@ verify (TYPE_MAXIMUM (long long int) == LLONG_MAX); #else # define _GL_INT_OP_WRAPV(a, b, r, op, builtin, overflow) \ (sizeof *(r) == sizeof (signed char) \ - ? _GL_INT_OP_CALC (a, b, r, op, overflow, unsigned char, \ + ? _GL_INT_OP_CALC (a, b, r, op, overflow, unsigned int, \ signed char, SCHAR_MIN, SCHAR_MAX) \ : sizeof *(r) == sizeof (short int) \ - ? _GL_INT_OP_CALC (a, b, r, op, overflow, unsigned short int, \ + ? _GL_INT_OP_CALC (a, b, r, op, overflow, unsigned int, \ short int, SHRT_MIN, SHRT_MAX) \ : sizeof *(r) == sizeof (int) \ ? _GL_INT_OP_CALC (a, b, r, op, overflow, unsigned int, \ @@ -412,15 +407,14 @@ verify (TYPE_MAXIMUM (long long int) == LLONG_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)) + long int, LONG_MIN, LONG_MAX) # endif #endif /* Store the low-order bits of A <op> B into *R, where the operation is given by OP. Use the unsigned type UT for calculation to avoid - overflow problems. *R's type is T, with extremal values TMIN and - TMAX. T must be a signed integer type. Return 1 if the result - overflows. */ + 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) \ @@ -429,17 +423,27 @@ verify (TYPE_MAXIMUM (long long int) == LLONG_MAX); ((overflow (a, b) \ || (EXPR_SIGNED ((a) op (b)) && ((a) op (b)) < (tmin)) \ || (tmax) < ((a) op (b))) \ - ? (*(r) = _GL_INT_OP_WRAPV_VIA_UNSIGNED (a, b, op, ut, t, tmin, tmax), 1) \ - : (*(r) = _GL_INT_OP_WRAPV_VIA_UNSIGNED (a, b, op, ut, t, tmin, tmax), 0)) - -/* Return A <op> B, where the operation is given by OP. Use the - unsigned type UT for calculation to avoid overflow problems. - Convert the result to type T without overflow by subtracting TMIN - from large values before converting, and adding it afterwards. - Compilers can optimize all the operations except OP. */ -#define _GL_INT_OP_WRAPV_VIA_UNSIGNED(a, b, op, ut, t, tmin, tmax) \ - (((ut) (a) op (ut) (b)) <= (tmax) \ - ? (t) ((ut) (a) op (ut) (b)) \ - : ((t) (((ut) (a) op (ut) (b)) - (tmin)) + (tmin))) + ? (*(r) = _GL_INT_OP_WRAPV_VIA_UNSIGNED (a, b, op, ut, t), 1) \ + : (*(r) = _GL_INT_OP_WRAPV_VIA_UNSIGNED (a, b, op, ut, t), 0)) + +/* Return the low-order bits of A <op> B, where the operation is given + by OP. Use the unsigned type UT for calculation to avoid undefined + behavior on signed integer overflow, and convert the result to type T. + UT is at least as wide as T and is no narrower than unsigned int, + T is two's complement, and there is no padding or trap representations. + Assume that converting UT to T yields the low-order bits, as is + done in all known two's-complement C compilers. E.g., see: + https://gcc.gnu.org/onlinedocs/gcc/Integers-implementation.html + + According to the C standard, converting UT to T yields an + implementation-defined result or signal for values outside T's + range. However, code that works around this theoretical problem + runs afoul of a compiler bug in Oracle Studio 12.3 x86. See: + http://lists.gnu.org/archive/html/bug-gnulib/2017-04/msg00049.html + As the compiler bug is real, don't try to work around the + theoretical problem. */ + +#define _GL_INT_OP_WRAPV_VIA_UNSIGNED(a, b, op, ut, t) \ + ((t) ((ut) (a) op (ut) (b))) #endif /* _GL_INTPROPS_H */ diff --git a/lib/inttostr.h b/lib/inttostr.h index 781ee6e..a322260 100644 --- a/lib/inttostr.h +++ b/lib/inttostr.h @@ -1,6 +1,6 @@ /* inttostr.h -- convert integers to printable strings - Copyright (C) 2001-2006, 2009-2016 Free Software Foundation, Inc. + Copyright (C) 2001-2006, 2009-2017 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/lib/inttypes.in.h b/lib/inttypes.in.h index ed09db6..69b12a8 100644 --- a/lib/inttypes.in.h +++ b/lib/inttypes.in.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2006-2016 Free Software Foundation, Inc. +/* Copyright (C) 2006-2017 Free Software Foundation, Inc. Written by Paul Eggert, Bruno Haible, Derek Price. This file is part of gnulib. diff --git a/lib/isblank.c b/lib/isblank.c index 6cc7379..63ed962 100644 --- a/lib/isblank.c +++ b/lib/isblank.c @@ -1,6 +1,6 @@ /* Test whether a character is a blank. - Copyright (C) 2009-2016 Free Software Foundation, Inc. + Copyright (C) 2009-2017 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/lib/iswblank.c b/lib/iswblank.c index 8d47ee5..14f4595 100644 --- a/lib/iswblank.c +++ b/lib/iswblank.c @@ -1,5 +1,5 @@ /* Test wide character for being blank. - Copyright (C) 2008-2016 Free Software Foundation, Inc. + Copyright (C) 2008-2017 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/lib/itold.c b/lib/itold.c index 5533392..9eb9507 100644 --- a/lib/itold.c +++ b/lib/itold.c @@ -1,5 +1,5 @@ /* Replacement for 'int' to 'long double' conversion routine. - Copyright (C) 2011-2016 Free Software Foundation, Inc. + Copyright (C) 2011-2017 Free Software Foundation, Inc. Written by Bruno Haible <bruno@clisp.org>, 2011. This program is free software: you can redistribute it and/or modify diff --git a/lib/langinfo.in.h b/lib/langinfo.in.h index e11617c..7981cbf 100644 --- a/lib/langinfo.in.h +++ b/lib/langinfo.in.h @@ -1,5 +1,5 @@ /* Substitute for and wrapper around <langinfo.h>. - Copyright (C) 2009-2016 Free Software Foundation, Inc. + Copyright (C) 2009-2017 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/lib/limits.in.h b/lib/limits.in.h new file mode 100644 index 0000000..08d3c32 --- /dev/null +++ b/lib/limits.in.h @@ -0,0 +1,74 @@ +/* A GNU-like <limits.h>. + + Copyright 2016-2017 Free Software Foundation, Inc. + + This program is free software; you can redistribute it and/or + modify it under the terms of the GNU General Public License + as published by the Free Software Foundation; either version 3, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, see <http://www.gnu.org/licenses/>. */ + +#ifndef _@GUARD_PREFIX@_LIMITS_H + +#if __GNUC__ >= 3 +@PRAGMA_SYSTEM_HEADER@ +#endif +@PRAGMA_COLUMNS@ + +/* The include_next requires a split double-inclusion guard. */ +#@INCLUDE_NEXT@ @NEXT_LIMITS_H@ + +#ifndef _@GUARD_PREFIX@_LIMITS_H +#define _@GUARD_PREFIX@_LIMITS_H + +/* For HP-UX 11.31. */ +#if defined LONG_LONG_MIN && !defined LLONG_MIN +# define LLONG_MIN LONG_LONG_MIN +#endif +#if defined LONG_LONG_MAX && !defined LLONG_MAX +# define LLONG_MAX LONG_LONG_MAX +#endif +#if defined ULONG_LONG_MAX && !defined ULLONG_MAX +# define ULLONG_MAX ULONG_LONG_MAX +#endif + +/* The number of usable bits in an unsigned or signed integer type + with minimum value MIN and 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 _GL_INTEGER_WIDTH(min, max) (((min) < 0) + _GL_COB128 (max)) +#define _GL_COB128(n) (_GL_COB64 ((n) >> 31 >> 31 >> 2) + _GL_COB64 (n)) +#define _GL_COB64(n) (_GL_COB32 ((n) >> 31 >> 1) + _GL_COB32 (n)) +#define _GL_COB32(n) (_GL_COB16 ((n) >> 16) + _GL_COB16 (n)) +#define _GL_COB16(n) (_GL_COB8 ((n) >> 8) + _GL_COB8 (n)) +#define _GL_COB8(n) (_GL_COB4 ((n) >> 4) + _GL_COB4 (n)) +#define _GL_COB4(n) (!!((n) & 8) + !!((n) & 4) + !!((n) & 2) + !!((n) & 1)) + +/* Macros specified by ISO/IEC TS 18661-1:2014. */ + +#if (! defined ULLONG_WIDTH \ + && (defined _GNU_SOURCE || defined __STDC_WANT_IEC_60559_BFP_EXT__)) +# define CHAR_WIDTH _GL_INTEGER_WIDTH (CHAR_MIN, CHAR_MAX) +# define SCHAR_WIDTH _GL_INTEGER_WIDTH (SCHAR_MIN, SCHAR_MAX) +# define UCHAR_WIDTH _GL_INTEGER_WIDTH (0, UCHAR_MAX) +# define SHRT_WIDTH _GL_INTEGER_WIDTH (SHRT_MIN, SHRT_MAX) +# define USHRT_WIDTH _GL_INTEGER_WIDTH (0, USHRT_MAX) +# define INT_WIDTH _GL_INTEGER_WIDTH (INT_MIN, INT_MAX) +# define UINT_WIDTH _GL_INTEGER_WIDTH (0, UINT_MAX) +# define LONG_WIDTH _GL_INTEGER_WIDTH (LONG_MIN, LONG_MAX) +# define ULONG_WIDTH _GL_INTEGER_WIDTH (0, ULONG_MAX) +# define LLONG_WIDTH _GL_INTEGER_WIDTH (LLONG_MIN, LLONG_MAX) +# define ULLONG_WIDTH _GL_INTEGER_WIDTH (0, ULLONG_MAX) +#endif /* !ULLONG_WIDTH && (_GNU_SOURCE || __STDC_WANT_IEC_60559_BFP_EXT__) */ + +#endif /* _@GUARD_PREFIX@_LIMITS_H */ +#endif /* _@GUARD_PREFIX@_LIMITS_H */ diff --git a/lib/localcharset.c b/lib/localcharset.c index b2a0369..9b7e6cb 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-2016 Free Software Foundation, Inc. + Copyright (C) 2000-2006, 2008-2017 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -32,7 +32,7 @@ # define DARWIN7 /* Darwin 7 or newer, i.e. Mac OS X 10.3 or newer */ #endif -#if defined _WIN32 || defined __WIN32__ +#if (defined _WIN32 || defined __WIN32__) && !defined __CYGWIN__ # define WINDOWS_NATIVE # include <locale.h> #endif @@ -75,6 +75,7 @@ # include "relocatable.h" #else # define relocate(pathname) (pathname) +# define relocate2(pathname,allocatedp) (*(allocatedp) = NULL, (pathname)) #endif /* Get LIBDIR. */ @@ -129,6 +130,7 @@ get_charset_aliases (void) if (cp == NULL) { #if !(defined DARWIN7 || defined VMS || defined WINDOWS_NATIVE || defined __CYGWIN__ || defined OS2) + char *malloc_dir = NULL; const char *dir; const char *base = "charset.alias"; char *file_name; @@ -137,7 +139,7 @@ get_charset_aliases (void) necessary for running the testsuite before "make install". */ dir = getenv ("CHARSETALIASDIR"); if (dir == NULL || dir[0] == '\0') - dir = relocate (LIBDIR); + dir = relocate2 (LIBDIR, &malloc_dir); /* Concatenate dir and base into freshly allocated file_name. */ { @@ -154,6 +156,8 @@ get_charset_aliases (void) } } + free (malloc_dir); + if (file_name == NULL) /* Out of memory. Treat the file as empty. */ cp = ""; @@ -507,7 +511,7 @@ locale_charset (void) current_locale = setlocale (LC_CTYPE, NULL); pdot = strrchr (current_locale, '.'); - if (pdot) + if (pdot && 2 + strlen (pdot + 1) + 1 <= sizeof (buf)) sprintf (buf, "CP%s", pdot + 1); else { diff --git a/lib/localcharset.h b/lib/localcharset.h index 915182e..a2e2a7b 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-2016 Free Software Foundation, Inc. + Copyright (C) 2000-2003, 2009-2017 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 diff --git a/lib/locale.in.h b/lib/locale.in.h index 4083507..9eb43f9 100644 --- a/lib/locale.in.h +++ b/lib/locale.in.h @@ -1,5 +1,5 @@ /* A POSIX <locale.h>. - Copyright (C) 2007-2016 Free Software Foundation, Inc. + Copyright (C) 2007-2017 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/lib/localeconv.c b/lib/localeconv.c index 8a1d6d7..bc1960b 100644 --- a/lib/localeconv.c +++ b/lib/localeconv.c @@ -1,5 +1,5 @@ /* Query locale dependent information for formatting numbers. - Copyright (C) 2012-2016 Free Software Foundation, Inc. + Copyright (C) 2012-2017 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/lib/localtime-buffer.c b/lib/localtime-buffer.c new file mode 100644 index 0000000..f84ad3e --- /dev/null +++ b/lib/localtime-buffer.c @@ -0,0 +1,58 @@ +/* Provide access to the last buffer returned by localtime() or gmtime(). + + Copyright (C) 2001-2003, 2005-2007, 2009-2017 Free Software Foundation, Inc. + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 3, or (at your option) + any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, see <http://www.gnu.org/licenses/>. */ + +/* written by Jim Meyering */ + +#include <config.h> + +/* 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) +{ + 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) +{ + 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 new file mode 100644 index 0000000..483a579 --- /dev/null +++ b/lib/localtime-buffer.h @@ -0,0 +1,27 @@ +/* Provide access to the last buffer returned by localtime() or gmtime(). + + Copyright (C) 2001-2003, 2005-2007, 2009-2017 Free Software Foundation, Inc. + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 3, or (at your option) + any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, see <http://www.gnu.org/licenses/>. */ + +/* written by Jim Meyering */ + +#include <time.h> + +#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/lstat.c b/lib/lstat.c index 03b0634..f4dc43e 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-2016 Free Software Foundation, Inc. + Copyright (C) 1997-2006, 2008-2017 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/lib/malloc.c b/lib/malloc.c index e9b01d2..eeaf12b 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-2016 Free Software Foundation, Inc. + Copyright (C) 1997-1998, 2006-2007, 2009-2017 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/lib/malloca.c b/lib/malloca.c index a613277..0bf4adc 100644 --- a/lib/malloca.c +++ b/lib/malloca.c @@ -1,5 +1,5 @@ /* Safe automatic memory allocation. - Copyright (C) 2003, 2006-2007, 2009-2016 Free Software Foundation, Inc. + Copyright (C) 2003, 2006-2007, 2009-2017 Free Software Foundation, Inc. Written by Bruno Haible <bruno@clisp.org>, 2003. This program is free software; you can redistribute it and/or modify diff --git a/lib/malloca.h b/lib/malloca.h index fa27a9e..a9078fc 100644 --- a/lib/malloca.h +++ b/lib/malloca.h @@ -1,5 +1,5 @@ /* Safe automatic memory allocation. - Copyright (C) 2003-2007, 2009-2016 Free Software Foundation, Inc. + Copyright (C) 2003-2007, 2009-2017 Free Software Foundation, Inc. Written by Bruno Haible <bruno@clisp.org>, 2003. This program is free software; you can redistribute it and/or modify @@ -21,6 +21,9 @@ #include <alloca.h> #include <stddef.h> #include <stdlib.h> +#include <stdint.h> + +#include "xalloc-oversized.h" #ifdef __cplusplus @@ -73,15 +76,7 @@ extern void freea (void *p); It allocates an array of N objects, each with S bytes of memory, on the stack. S must be positive and N must be nonnegative. The array must be freed using freea() before the function returns. */ -#if 1 -/* Cf. the definition of xalloc_oversized. */ -# define nmalloca(n, s) \ - ((n) > (size_t) (sizeof (ptrdiff_t) <= sizeof (size_t) ? -1 : -2) / (s) \ - ? NULL \ - : malloca ((n) * (s))) -#else -extern void * nmalloca (size_t n, size_t s); -#endif +#define nmalloca(n, s) (xalloc_oversized (n, s) ? NULL : malloca ((n) * (s))) #ifdef __cplusplus diff --git a/lib/mbchar.c b/lib/mbchar.c index 27796c3..69675bf 100644 --- a/lib/mbchar.c +++ b/lib/mbchar.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2001, 2006, 2009-2016 Free Software Foundation, Inc. +/* Copyright (C) 2001, 2006, 2009-2017 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/lib/mbchar.h b/lib/mbchar.h index 2017d86..ec24068 100644 --- a/lib/mbchar.h +++ b/lib/mbchar.h @@ -1,5 +1,5 @@ /* Multibyte character data type. - Copyright (C) 2001, 2005-2007, 2009-2016 Free Software Foundation, Inc. + Copyright (C) 2001, 2005-2007, 2009-2017 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/lib/mbiter.h b/lib/mbiter.h index d72b0a7..c3e6f76 100644 --- a/lib/mbiter.h +++ b/lib/mbiter.h @@ -1,5 +1,5 @@ /* Iterating through multibyte strings: macros for multi-byte encodings. - Copyright (C) 2001, 2005, 2007, 2009-2016 Free Software Foundation, Inc. + Copyright (C) 2001, 2005, 2007, 2009-2017 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/lib/mbrtowc.c b/lib/mbrtowc.c index cdd874b..7415fff 100644 --- a/lib/mbrtowc.c +++ b/lib/mbrtowc.c @@ -1,5 +1,5 @@ /* Convert multibyte character to wide character. - Copyright (C) 1999-2002, 2005-2016 Free Software Foundation, Inc. + Copyright (C) 1999-2002, 2005-2017 Free Software Foundation, Inc. Written by Bruno Haible <bruno@clisp.org>, 2008. This program is free software: you can redistribute it and/or modify @@ -35,6 +35,13 @@ # include "streq.h" # include "verify.h" +#ifndef FALLTHROUGH +# if __GNUC__ < 7 +# define FALLTHROUGH ((void) 0) +# else +# define FALLTHROUGH __attribute__ ((__fallthrough__)) +# endif +#endif verify (sizeof (mbstate_t) >= 4); @@ -74,10 +81,10 @@ mbrtowc (wchar_t *pwc, const char *s, size_t n, mbstate_t *ps) break; case 3: buf[2] = pstate[3]; - /*FALLTHROUGH*/ + FALLTHROUGH; case 2: buf[1] = pstate[2]; - /*FALLTHROUGH*/ + FALLTHROUGH; case 1: buf[0] = pstate[1]; p = buf; diff --git a/lib/mbscasecmp.c b/lib/mbscasecmp.c index 7e7c941..f14a7c0 100644 --- a/lib/mbscasecmp.c +++ b/lib/mbscasecmp.c @@ -1,5 +1,5 @@ /* Case-insensitive string comparison function. - Copyright (C) 1998-1999, 2005-2016 Free Software Foundation, Inc. + Copyright (C) 1998-1999, 2005-2017 Free Software Foundation, Inc. Written by Bruno Haible <bruno@clisp.org>, 2005, based on earlier glibc code. diff --git a/lib/mbsinit.c b/lib/mbsinit.c index 372b523..7580126 100644 --- a/lib/mbsinit.c +++ b/lib/mbsinit.c @@ -1,5 +1,5 @@ /* Test for initial conversion state. - Copyright (C) 2008-2016 Free Software Foundation, Inc. + Copyright (C) 2008-2017 Free Software Foundation, Inc. Written by Bruno Haible <bruno@clisp.org>, 2008. This program is free software: you can redistribute it and/or modify @@ -22,17 +22,7 @@ #include "verify.h" -#if (defined _WIN32 || defined __WIN32__) && !defined __CYGWIN__ - -/* On native Windows, 'mbstate_t' is defined as 'int'. */ - -int -mbsinit (const mbstate_t *ps) -{ - return ps == NULL || *ps == 0; -} - -#else +#if GNULIB_defined_mbstate_t /* Platforms that lack mbsinit() also lack mbrlen(), mbrtowc(), mbsrtowcs() and wcrtomb(), wcsrtombs(). @@ -45,6 +35,7 @@ mbsinit (const mbstate_t *ps) We define the meaning of mbstate_t as follows: - In mb -> wc direction, mbstate_t's first byte contains the number of buffered bytes (in the range 0..3), followed by up to 3 buffered bytes. + See mbrtowc.c. - In wc -> mb direction, mbstate_t contains no information. In other words, it is always in the initial state. */ @@ -58,4 +49,25 @@ mbsinit (const mbstate_t *ps) return pstate == NULL || pstate[0] == 0; } +#else + +int +mbsinit (const mbstate_t *ps) +{ +# if (defined _WIN32 || 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. */ + 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... */ + return ps == NULL || *(const char *)ps == 0; +# endif +} + #endif diff --git a/lib/mbslen.c b/lib/mbslen.c index ed13a42..29f412d 100644 --- a/lib/mbslen.c +++ b/lib/mbslen.c @@ -1,5 +1,5 @@ /* Counting the multibyte characters in a string. - Copyright (C) 2007-2016 Free Software Foundation, Inc. + Copyright (C) 2007-2017 Free Software Foundation, Inc. Written by Bruno Haible <bruno@clisp.org>, 2007. This program is free software: you can redistribute it and/or modify diff --git a/lib/mbsrtowcs-impl.h b/lib/mbsrtowcs-impl.h index f99fa34..d787c07 100644 --- a/lib/mbsrtowcs-impl.h +++ b/lib/mbsrtowcs-impl.h @@ -1,5 +1,5 @@ /* Convert string to wide string. - Copyright (C) 2008-2016 Free Software Foundation, Inc. + Copyright (C) 2008-2017 Free Software Foundation, Inc. Written by Bruno Haible <bruno@clisp.org>, 2008. This program is free software: you can redistribute it and/or modify diff --git a/lib/mbsrtowcs-state.c b/lib/mbsrtowcs-state.c index 905547a..4c213e4 100644 --- a/lib/mbsrtowcs-state.c +++ b/lib/mbsrtowcs-state.c @@ -1,5 +1,5 @@ /* Convert string to wide string. - Copyright (C) 2008-2016 Free Software Foundation, Inc. + Copyright (C) 2008-2017 Free Software Foundation, Inc. Written by Bruno Haible <bruno@clisp.org>, 2008. This program is free software: you can redistribute it and/or modify diff --git a/lib/mbsrtowcs.c b/lib/mbsrtowcs.c index 54bf6f7..7896e94 100644 --- a/lib/mbsrtowcs.c +++ b/lib/mbsrtowcs.c @@ -1,5 +1,5 @@ /* Convert string to wide string. - Copyright (C) 2008-2016 Free Software Foundation, Inc. + Copyright (C) 2008-2017 Free Software Foundation, Inc. Written by Bruno Haible <bruno@clisp.org>, 2008. This program is free software: you can redistribute it and/or modify diff --git a/lib/mbsstr.c b/lib/mbsstr.c index bc738d4..ab3d263 100644 --- a/lib/mbsstr.c +++ b/lib/mbsstr.c @@ -1,5 +1,5 @@ /* Searching in a string. -*- coding: utf-8 -*- - Copyright (C) 2005-2016 Free Software Foundation, Inc. + Copyright (C) 2005-2017 Free Software Foundation, Inc. Written by Bruno Haible <bruno@clisp.org>, 2005. This program is free software: you can redistribute it and/or modify diff --git a/lib/mbtowc-impl.h b/lib/mbtowc-impl.h index 4be2994..b53b2eb 100644 --- a/lib/mbtowc-impl.h +++ b/lib/mbtowc-impl.h @@ -1,5 +1,5 @@ /* Convert multibyte character to wide character. - Copyright (C) 2011-2016 Free Software Foundation, Inc. + Copyright (C) 2011-2017 Free Software Foundation, Inc. Written by Bruno Haible <bruno@clisp.org>, 2011. This program is free software: you can redistribute it and/or modify diff --git a/lib/mbtowc.c b/lib/mbtowc.c index fb2b651..118754f 100644 --- a/lib/mbtowc.c +++ b/lib/mbtowc.c @@ -1,5 +1,5 @@ /* Convert multibyte character to wide character. - Copyright (C) 2011-2016 Free Software Foundation, Inc. + Copyright (C) 2011-2017 Free Software Foundation, Inc. Written by Bruno Haible <bruno@clisp.org>, 2011. This program is free software: you can redistribute it and/or modify diff --git a/lib/mbuiter.h b/lib/mbuiter.h index aad4fea..c025e44 100644 --- a/lib/mbuiter.h +++ b/lib/mbuiter.h @@ -1,5 +1,5 @@ /* Iterating through multibyte strings: macros for multi-byte encodings. - Copyright (C) 2001, 2005, 2007, 2009-2016 Free Software Foundation, Inc. + Copyright (C) 2001, 2005, 2007, 2009-2017 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/lib/memchr.c b/lib/memchr.c index b565542..3481260 100644 --- a/lib/memchr.c +++ b/lib/memchr.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1991, 1993, 1996-1997, 1999-2000, 2003-2004, 2006, 2008-2016 +/* Copyright (C) 1991, 1993, 1996-1997, 1999-2000, 2003-2004, 2006, 2008-2017 Free Software Foundation, Inc. Based on strlen implementation by Torbjorn Granlund (tege@sics.se), diff --git a/lib/minmax.h b/lib/minmax.h new file mode 100644 index 0000000..6b602a9 --- /dev/null +++ b/lib/minmax.h @@ -0,0 +1,60 @@ +/* MIN, MAX macros. + Copyright (C) 1995, 1998, 2001, 2003, 2005, 2009-2017 Free Software + Foundation, Inc. + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 3, or (at your option) + any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, see <http://www.gnu.org/licenses/>. */ + +#ifndef _MINMAX_H +#define _MINMAX_H + +/* Note: MIN, MAX are also defined in <sys/param.h> on some systems + (glibc, IRIX, HP-UX, OSF/1). Therefore you might get warnings about + MIN, MAX macro redefinitions on some systems; the workaround is to + #include this file as the last one among the #include list. */ + +/* Before we define the following symbols we get the <limits.h> file + since otherwise we get redefinitions on some systems if <limits.h> is + included after this file. Likewise for <sys/param.h>. + If more than one of these system headers define MIN and MAX, pick just + one of the headers (because the definitions most likely are the same). */ +#if HAVE_MINMAX_IN_LIMITS_H +# include <limits.h> +#elif HAVE_MINMAX_IN_SYS_PARAM_H +# include <sys/param.h> +#endif + +/* Note: MIN and MAX should be used with two arguments of the + same type. They might not return the minimum and maximum of their two + arguments, if the arguments have different types or have unusual + floating-point values. For example, on a typical host with 32-bit 'int', + 64-bit 'long long', and 64-bit IEEE 754 'double' types: + + MAX (-1, 2147483648) returns 4294967295. + MAX (9007199254740992.0, 9007199254740993) returns 9007199254740992.0. + MAX (NaN, 0.0) returns 0.0. + MAX (+0.0, -0.0) returns -0.0. + + and in each case the answer is in some sense bogus. */ + +/* MAX(a,b) returns the maximum of A and B. */ +#ifndef MAX +# define MAX(a,b) ((a) > (b) ? (a) : (b)) +#endif + +/* MIN(a,b) returns the minimum of A and B. */ +#ifndef MIN +# define MIN(a,b) ((a) < (b) ? (a) : (b)) +#endif + +#endif /* _MINMAX_H */ diff --git a/lib/mkstemp.c b/lib/mkstemp.c index 90ed78e..8083e18 100644 --- a/lib/mkstemp.c +++ b/lib/mkstemp.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1998-1999, 2001, 2005-2007, 2009-2016 Free Software +/* Copyright (C) 1998-1999, 2001, 2005-2007, 2009-2017 Free Software Foundation, Inc. This file is derived from the one in the GNU C Library. diff --git a/lib/mktime-internal.h b/lib/mktime-internal.h index 2f586ae..6c8b2e7 100644 --- a/lib/mktime-internal.h +++ b/lib/mktime-internal.h @@ -1,6 +1,6 @@ /* mktime variant that also uses an offset guess - Copyright 2016 Free Software Foundation, Inc. + Copyright 2016-2017 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public diff --git a/lib/mktime.c b/lib/mktime.c index 8ee4e5e..058ab65 100644 --- a/lib/mktime.c +++ b/lib/mktime.c @@ -1,5 +1,5 @@ /* Convert a 'struct tm' to a time_t value. - Copyright (C) 1993-2016 Free Software Foundation, Inc. + Copyright (C) 1993-2017 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Paul Eggert <eggert@twinsun.com>. @@ -23,6 +23,19 @@ # define DEBUG_MKTIME 0 #endif +/* The following macros influence what gets defined when this file is compiled: + + Macro/expression Which gnulib module This compilation unit + should define + + NEED_MKTIME_WORKING mktime rpl_mktime + || NEED_MKTIME_WINDOWS + + NEED_MKTIME_INTERNAL mktime-internal mktime_internal + + DEBUG_MKTIME (defined manually) my_mktime, main + */ + #if !defined _LIBC && !DEBUG_MKTIME # include <config.h> #endif @@ -51,6 +64,13 @@ # define mktime my_mktime #endif +#if NEED_MKTIME_WINDOWS /* on native Windows */ +# include <stdlib.h> +# include <string.h> +#endif + +#if NEED_MKTIME_WORKING || NEED_MKTIME_INTERNAL || DEBUG_MKTIME + /* A signed type that can represent an integer number of years multiplied by three times the number of seconds in a year. It is needed when converting a tm_year value times the number of seconds @@ -153,7 +173,7 @@ isdst_differ (int a, int b) /* Return an integer value measuring (YEAR1-YDAY1 HOUR1:MIN1:SEC1) - (YEAR0-YDAY0 HOUR0:MIN0:SEC0) in seconds, assuming that the clocks - were not adjusted between the time stamps. + were not adjusted between the timestamps. The YEAR values uses the same numbering as TP->tm_year. Values need not be in the usual range. However, YEAR1 must not overflow @@ -458,25 +478,65 @@ __mktime_internal (struct tm *tp, return t; } +#endif /* NEED_MKTIME_WORKING || NEED_MKTIME_INTERNAL || DEBUG_MKTIME */ + +#if NEED_MKTIME_WORKING || NEED_MKTIME_WINDOWS || DEBUG_MKTIME +# if NEED_MKTIME_WORKING || DEBUG_MKTIME static mktime_offset_t localtime_offset; +# endif /* Convert *TP to a time_t value. */ time_t mktime (struct tm *tp) { -#ifdef _LIBC +# if NEED_MKTIME_WINDOWS + /* Rectify the value of the environment variable TZ. + There are four possible kinds of such values: + - Traditional US time zone names, e.g. "PST8PDT". Syntax: see + <https://msdn.microsoft.com/en-us/library/90s5c885.aspx> + - Time zone names based on geography, that contain one or more + slashes, e.g. "Europe/Moscow". + - Time zone names based on geography, without slashes, e.g. + "Singapore". + - Time zone names that contain explicit DST rules. Syntax: see + <http://pubs.opengroup.org/onlinepubs/9699919799/basedefs/V1_chap08.html#tag_08_03> + The Microsoft CRT understands only the first kind. It produces incorrect + results if the value of TZ is of the other kinds. + But in a Cygwin environment, /etc/profile.d/tzset.sh sets TZ to a value + of the second kind for most geographies, or of the first kind in a few + other geographies. If it is of the second kind, neutralize it. For the + Microsoft CRT, an absent or empty TZ means the time zone that the user + has set in the Windows Control Panel. + If the value of TZ is of the third or fourth kind -- Cygwin programs + understand these syntaxes as well --, it does not matter whether we + neutralize it or not, since these values occur only when a Cygwin user + has set TZ explicitly; this case is 1. rare and 2. under the user's + responsibility. */ + const char *tz = getenv ("TZ"); + if (tz != NULL && strchr (tz, '/') != NULL) + _putenv ("TZ="); +# endif + +# if NEED_MKTIME_WORKING || DEBUG_MKTIME +# ifdef _LIBC /* POSIX.1 8.1.1 requires that whenever mktime() is called, the time zone names contained in the external variable 'tzname' shall be set as if the tzset() function had been called. */ __tzset (); -#elif HAVE_TZSET +# elif HAVE_TZSET tzset (); -#endif +# endif return __mktime_internal (tp, __localtime_r, &localtime_offset); +# else +# undef mktime + return mktime (tp); +# endif } +#endif /* NEED_MKTIME_WORKING || NEED_MKTIME_WINDOWS || DEBUG_MKTIME */ + #ifdef weak_alias weak_alias (mktime, timelocal) #endif diff --git a/lib/msvc-inval.c b/lib/msvc-inval.c index baaf39e..7139e93 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-2016 Free Software Foundation, Inc. + Copyright (C) 2011-2017 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/lib/msvc-inval.h b/lib/msvc-inval.h index 027c949..6e216d6 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-2016 Free Software Foundation, Inc. + Copyright (C) 2011-2017 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/lib/msvc-nothrow.c b/lib/msvc-nothrow.c index ba75bbf..3e1eba3 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-2016 Free Software Foundation, Inc. + Copyright (C) 2011-2017 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -24,7 +24,9 @@ #define WIN32_LEAN_AND_MEAN #include <windows.h> -#include "msvc-inval.h" +#if HAVE_MSVC_INVALID_PARAMETER_HANDLER +# include "msvc-inval.h" +#endif #undef _get_osfhandle diff --git a/lib/msvc-nothrow.h b/lib/msvc-nothrow.h index 3493b84..c70efc7 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-2016 Free Software Foundation, Inc. + Copyright (C) 2011-2017 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/lib/nl_langinfo.c b/lib/nl_langinfo.c index 699511a..270570f 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-2016 Free Software Foundation, Inc. + Copyright (C) 2007-2017 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -34,7 +34,6 @@ static char * ctype_codeset (void) { static char buf[2 + 10 + 1]; - size_t buflen = 0; char const *locale = setlocale (LC_CTYPE, NULL); char *codeset = buf; size_t codesetlen; @@ -99,14 +98,14 @@ rpl_nl_langinfo (nl_item item) # endif # if GNULIB_defined_T_FMT_AMPM case T_FMT_AMPM: - return "%I:%M:%S %p"; + return (char *) "%I:%M:%S %p"; # endif # if GNULIB_defined_ERA case ERA: /* The format is not standardized. In glibc it is a sequence of strings of the form "direction:offset:start_date:end_date:era_name:era_format" with an empty string at the end. */ - return ""; + return (char *) ""; case ERA_D_FMT: /* The %Ex conversion in strftime behaves like %x if the locale does not have an alternative time format. */ @@ -125,13 +124,13 @@ rpl_nl_langinfo (nl_item item) case ALT_DIGITS: /* The format is not standardized. In glibc it is a sequence of 10 strings, appended in memory. */ - return "\0\0\0\0\0\0\0\0\0\0"; + return (char *) "\0\0\0\0\0\0\0\0\0\0"; # endif # if GNULIB_defined_YESEXPR || !FUNC_NL_LANGINFO_YESEXPR_WORKS case YESEXPR: - return "^[yY]"; + return (char *) "^[yY]"; case NOEXPR: - return "^[nN]"; + return (char *) "^[nN]"; # endif default: break; @@ -163,9 +162,9 @@ nl_langinfo (nl_item item) return codeset; } # ifdef __BEOS__ - return "UTF-8"; + return (char *) "UTF-8"; # else - return "ISO-8859-1"; + return (char *) "ISO-8859-1"; # endif /* nl_langinfo items of the LC_NUMERIC category */ case RADIXCHAR: @@ -178,23 +177,23 @@ nl_langinfo (nl_item item) TODO: Really use the locale. */ case D_T_FMT: case ERA_D_T_FMT: - return "%a %b %e %H:%M:%S %Y"; + return (char *) "%a %b %e %H:%M:%S %Y"; case D_FMT: case ERA_D_FMT: - return "%m/%d/%y"; + return (char *) "%m/%d/%y"; case T_FMT: case ERA_T_FMT: - return "%H:%M:%S"; + return (char *) "%H:%M:%S"; case T_FMT_AMPM: - return "%I:%M:%S %p"; + return (char *) "%I:%M:%S %p"; case AM_STR: if (!strftime (nlbuf, sizeof nlbuf, "%p", &tmm)) - return "AM"; + return (char *) "AM"; return nlbuf; case PM_STR: tmm.tm_hour = 12; if (!strftime (nlbuf, sizeof nlbuf, "%p", &tmm)) - return "PM"; + return (char *) "PM"; return nlbuf; case DAY_1: case DAY_2: @@ -274,9 +273,9 @@ nl_langinfo (nl_item item) return nlbuf; } case ERA: - return ""; + return (char *) ""; case ALT_DIGITS: - return "\0\0\0\0\0\0\0\0\0\0"; + return (char *) "\0\0\0\0\0\0\0\0\0\0"; /* nl_langinfo items of the LC_MONETARY category. */ case CRNCYSTR: return localeconv () ->currency_symbol; @@ -311,11 +310,11 @@ nl_langinfo (nl_item item) /* nl_langinfo items of the LC_MESSAGES category TODO: Really use the locale. */ case YESEXPR: - return "^[yY]"; + return (char *) "^[yY]"; case NOEXPR: - return "^[nN]"; + return (char *) "^[nN]"; default: - return ""; + return (char *) ""; } } @@ -1,5 +1,5 @@ /* Open a descriptor to a file. - Copyright (C) 2007-2016 Free Software Foundation, Inc. + Copyright (C) 2007-2017 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/lib/pathmax.h b/lib/pathmax.h index aee22f8..aa0730e 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-2016 Free Software + Copyright (C) 1992, 1999, 2001, 2003, 2005, 2009-2017 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify diff --git a/lib/prepargs.c b/lib/prepargs.c index f4a2f12..c4928cd 100644 --- a/lib/prepargs.c +++ b/lib/prepargs.c @@ -1,6 +1,6 @@ /* Parse arguments from a string and prepend them to an argv. - Copyright (C) 1999-2002, 2006, 2009-2013, 2015-2016 Free Software + Copyright (C) 1999-2002, 2006, 2009-2013, 2015-2017 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify diff --git a/lib/printf-args.c b/lib/printf-args.c index cfaed99..fec7e62 100644 --- a/lib/printf-args.c +++ b/lib/printf-args.c @@ -1,5 +1,5 @@ /* Decomposed printf argument list. - Copyright (C) 1999, 2002-2003, 2005-2007, 2009-2016 Free Software + Copyright (C) 1999, 2002-2003, 2005-2007, 2009-2017 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify diff --git a/lib/printf-args.h b/lib/printf-args.h index 256c413..36cab2a 100644 --- a/lib/printf-args.h +++ b/lib/printf-args.h @@ -1,5 +1,5 @@ /* Decomposed printf argument list. - Copyright (C) 1999, 2002-2003, 2006-2007, 2011-2016 Free Software + Copyright (C) 1999, 2002-2003, 2006-2007, 2011-2017 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify diff --git a/lib/printf-parse.c b/lib/printf-parse.c index fad5d3d..b9e04ae 100644 --- a/lib/printf-parse.c +++ b/lib/printf-parse.c @@ -1,5 +1,5 @@ /* Formatted output to strings. - Copyright (C) 1999-2000, 2002-2003, 2006-2016 Free Software Foundation, Inc. + Copyright (C) 1999-2000, 2002-2003, 2006-2017 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/lib/printf-parse.h b/lib/printf-parse.h index a46d946..b9bfa85 100644 --- a/lib/printf-parse.h +++ b/lib/printf-parse.h @@ -1,5 +1,5 @@ /* Parse printf format string. - Copyright (C) 1999, 2002-2003, 2005, 2007, 2010-2016 Free Software + Copyright (C) 1999, 2002-2003, 2005, 2007, 2010-2017 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify diff --git a/lib/progname.c b/lib/progname.c index debb760..05b2a7f 100644 --- a/lib/progname.c +++ b/lib/progname.c @@ -1,5 +1,5 @@ /* Program name management. - Copyright (C) 2001-2003, 2005-2016 Free Software Foundation, Inc. + Copyright (C) 2001-2003, 2005-2017 Free Software Foundation, Inc. Written by Bruno Haible <bruno@clisp.org>, 2001. This program is free software: you can redistribute it and/or modify diff --git a/lib/progname.h b/lib/progname.h index 0a57407..f33881c 100644 --- a/lib/progname.h +++ b/lib/progname.h @@ -1,5 +1,5 @@ /* Program name management. - Copyright (C) 2001-2004, 2006, 2009-2016 Free Software Foundation, Inc. + Copyright (C) 2001-2004, 2006, 2009-2017 Free Software Foundation, Inc. Written by Bruno Haible <bruno@clisp.org>, 2001. This program is free software: you can redistribute it and/or modify diff --git a/lib/propername.c b/lib/propername.c index 90ad284..1e5e28b 100644 --- a/lib/propername.c +++ b/lib/propername.c @@ -1,5 +1,5 @@ /* Localization of proper names. - Copyright (C) 2006-2016 Free Software Foundation, Inc. + Copyright (C) 2006-2017 Free Software Foundation, Inc. Written by Bruno Haible <bruno@clisp.org>, 2006. This program is free software: you can redistribute it and/or modify diff --git a/lib/propername.h b/lib/propername.h index 83fac08..dcacb8c 100644 --- a/lib/propername.h +++ b/lib/propername.h @@ -1,5 +1,5 @@ /* Localization of proper names. -*- coding: utf-8 -*- - Copyright (C) 2006, 2008-2016 Free Software Foundation, Inc. + Copyright (C) 2006, 2008-2017 Free Software Foundation, Inc. Written by Bruno Haible <bruno@clisp.org>, 2006. This program is free software: you can redistribute it and/or modify diff --git a/lib/quote.h b/lib/quote.h index b53d0ea..2e58fb5 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-2016 Free Software Foundation, Inc. + Copyright (C) 1998-2001, 2003, 2009-2017 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/lib/quotearg.c b/lib/quotearg.c index 73a5084..f657033 100644 --- a/lib/quotearg.c +++ b/lib/quotearg.c @@ -1,6 +1,6 @@ /* quotearg.c - quote arguments for output - Copyright (C) 1998-2002, 2004-2016 Free Software Foundation, Inc. + Copyright (C) 1998-2002, 2004-2017 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -29,6 +29,7 @@ #include "quotearg.h" #include "quote.h" +#include "minmax.h" #include "xalloc.h" #include "c-strcaseeq.h" #include "localcharset.h" @@ -37,6 +38,7 @@ #include <errno.h> #include <limits.h> #include <stdbool.h> +#include <stdint.h> #include <stdlib.h> #include <string.h> #include <wchar.h> @@ -52,6 +54,14 @@ #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. */ @@ -252,12 +262,15 @@ quotearg_buffer_restyled (char *buffer, size_t buffersize, { size_t i; size_t len = 0; + size_t orig_buffersize = 0; char const *quote_string = 0; size_t quote_string_len = 0; bool backslash_escapes = false; bool unibyte_locale = MB_CUR_MAX == 1; bool elide_outer_quotes = (flags & QA_ELIDE_OUTER_QUOTES) != 0; bool pending_shell_escape_end = false; + bool encountered_single_quote = false; + bool all_c_and_shell_quote_compat = true; #define STORE(c) \ do \ @@ -298,12 +311,14 @@ quotearg_buffer_restyled (char *buffer, size_t buffersize, } \ while (0) + process_input: + switch (quoting_style) { case c_maybe_quoting_style: quoting_style = c_quoting_style; elide_outer_quotes = true; - /* Fall through. */ + FALLTHROUGH; case c_quoting_style: if (!elide_outer_quotes) STORE ('"'); @@ -358,14 +373,14 @@ quotearg_buffer_restyled (char *buffer, size_t buffersize, case shell_escape_quoting_style: backslash_escapes = true; - /* Fall through. */ + FALLTHROUGH; case shell_quoting_style: elide_outer_quotes = true; - /* Fall through. */ + FALLTHROUGH; case shell_escape_always_quoting_style: if (!elide_outer_quotes) backslash_escapes = true; - /* Fall through. */ + FALLTHROUGH; case shell_always_quoting_style: quoting_style = shell_always_quoting_style; if (!elide_outer_quotes) @@ -388,6 +403,7 @@ quotearg_buffer_restyled (char *buffer, size_t buffersize, unsigned char esc; bool is_right_quote = false; bool escaping = false; + bool c_and_shell_quote_compat = false; if (backslash_escapes && quoting_style != shell_always_quoting_style @@ -497,7 +513,6 @@ quotearg_buffer_restyled (char *buffer, size_t buffersize, if (quoting_style == shell_always_quoting_style && elide_outer_quotes) goto force_outer_quoting_style; - /* Fall through. */ c_escape: if (backslash_escapes) { @@ -509,12 +524,14 @@ quotearg_buffer_restyled (char *buffer, size_t buffersize, case '{': case '}': /* sometimes special if isolated */ if (! (argsize == SIZE_MAX ? arg[1] == '\0' : argsize == 1)) break; - /* Fall through. */ + FALLTHROUGH; case '#': case '~': if (i != 0) break; - /* Fall through. */ + FALLTHROUGH; case ' ': + c_and_shell_quote_compat = true; + FALLTHROUGH; case '!': /* special in bash */ case '"': case '$': case '&': case '(': case ')': case '*': case ';': @@ -533,10 +550,22 @@ quotearg_buffer_restyled (char *buffer, size_t buffersize, break; case '\'': + encountered_single_quote = true; + c_and_shell_quote_compat = true; if (quoting_style == shell_always_quoting_style) { if (elide_outer_quotes) goto force_outer_quoting_style; + + if (buffersize && ! orig_buffersize) + { + /* Just scan string to see if supports a more concise + representation, rather than writing a longer string + but returning the length of the more concise form. */ + orig_buffersize = buffersize; + buffersize = 0; + } + STORE ('\''); STORE ('\\'); STORE ('\''); @@ -566,6 +595,7 @@ quotearg_buffer_restyled (char *buffer, size_t buffersize, them. Also, a digit or a special letter would cause trouble if it appeared in quote_these_too, but that's also documented as not accepting them. */ + c_and_shell_quote_compat = true; break; default: @@ -644,6 +674,8 @@ quotearg_buffer_restyled (char *buffer, size_t buffersize, while (! mbsinit (&mbstate)); } + c_and_shell_quote_compat = printable; + if (1 < m || (backslash_escapes && ! printable)) { /* Output a multibyte sequence, or an escaped @@ -689,12 +721,36 @@ quotearg_buffer_restyled (char *buffer, size_t buffersize, store_c: END_ESC (); STORE (c); + + if (! c_and_shell_quote_compat) + all_c_and_shell_quote_compat = false; } if (len == 0 && quoting_style == shell_always_quoting_style && elide_outer_quotes) goto force_outer_quoting_style; + /* Single shell quotes (') are commonly enough used as an apostrophe, + that we attempt to minimize the quoting in this case. Note itʼs + better to use the apostrophe modifier "\u02BC" if possible, as that + renders better and works with the word match regex \W+ etc. */ + if (quoting_style == shell_always_quoting_style && ! elide_outer_quotes + && encountered_single_quote) + { + if (all_c_and_shell_quote_compat) + return quotearg_buffer_restyled (buffer, orig_buffersize, arg, argsize, + c_quoting_style, + flags, quote_these_too, + left_quote, right_quote); + else if (! buffersize && orig_buffersize) + { + /* Disable read-only scan, and reprocess to write quoted string. */ + buffersize = orig_buffersize; + len = 0; + goto process_input; + } + } + if (quote_string && !elide_outer_quotes) for (; *quote_string; quote_string++) STORE (*quote_string); @@ -783,7 +839,7 @@ struct slotvec /* Preallocate a slot 0 buffer, so that the caller can always quote one small component of a "memory exhausted" message in slot 0. */ static char slot0[256]; -static unsigned int nslots = 1; +static int nslots = 1; static struct slotvec slotvec0 = {sizeof slot0, slot0}; static struct slotvec *slotvec = &slotvec0; @@ -791,7 +847,7 @@ void quotearg_free (void) { struct slotvec *sv = slotvec; - unsigned int i; + int i; for (i = 1; i < nslots; i++) free (sv[i].val); if (sv[0].val != slot0) @@ -822,30 +878,23 @@ quotearg_n_options (int n, char const *arg, size_t argsize, { int e = errno; - unsigned int n0 = n; struct slotvec *sv = slotvec; if (n < 0) abort (); - if (nslots <= n0) + if (nslots <= n) { - /* FIXME: technically, the type of n1 should be 'unsigned int', - but that evokes an unsuppressible warning from gcc-4.0.1 and - older. If gcc ever provides an option to suppress that warning, - revert to the original type, so that the test in xalloc_oversized - is once again performed only at compile time. */ - size_t n1 = n0 + 1; bool preallocated = (sv == &slotvec0); - if (xalloc_oversized (n1, sizeof *sv)) + if (MIN (INT_MAX, MIN (PTRDIFF_MAX, SIZE_MAX) / sizeof *sv) <= n) xalloc_die (); - slotvec = sv = xrealloc (preallocated ? NULL : sv, n1 * sizeof *sv); + slotvec = sv = xrealloc (preallocated ? NULL : sv, (n + 1) * sizeof *sv); if (preallocated) *sv = slotvec0; - memset (sv + nslots, 0, (n1 - nslots) * sizeof *sv); - nslots = n1; + memset (sv + nslots, 0, (n + 1 - nslots) * sizeof *sv); + nslots = n + 1; } { diff --git a/lib/quotearg.h b/lib/quotearg.h index bc29052..b82aa00 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-2016 Free Software Foundation, + Copyright (C) 1998-2002, 2004, 2006, 2008-2017 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify diff --git a/lib/raise.c b/lib/raise.c index bf24c3e..0a6d8ca 100644 --- a/lib/raise.c +++ b/lib/raise.c @@ -1,6 +1,6 @@ /* Provide a non-threads replacement for the POSIX raise function. - Copyright (C) 2002-2003, 2005-2006, 2009-2016 Free Software Foundation, Inc. + Copyright (C) 2002-2003, 2005-2006, 2009-2017 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -27,7 +27,9 @@ # include <errno.h> -# include "msvc-inval.h" +# if HAVE_MSVC_INVALID_PARAMETER_HANDLER +# include "msvc-inval.h" +# endif # undef raise diff --git a/lib/rawmemchr.c b/lib/rawmemchr.c index dbe01bd..bba95b6 100644 --- a/lib/rawmemchr.c +++ b/lib/rawmemchr.c @@ -1,5 +1,5 @@ /* Searching in a string. - Copyright (C) 2008-2016 Free Software Foundation, Inc. + Copyright (C) 2008-2017 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/lib/readlink.c b/lib/readlink.c index e6c3925..bf0cedc 100644 --- a/lib/readlink.c +++ b/lib/readlink.c @@ -1,5 +1,5 @@ /* Stub for readlink(). - Copyright (C) 2003-2007, 2009-2016 Free Software Foundation, Inc. + Copyright (C) 2003-2007, 2009-2017 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/lib/ref-add.sin b/lib/ref-add.sin index 42d3ab0..3913e99 100644 --- a/lib/ref-add.sin +++ b/lib/ref-add.sin @@ -1,6 +1,6 @@ # Add this package to a list of references stored in a text file. # -# Copyright (C) 2000, 2009-2016 Free Software Foundation, Inc. +# Copyright (C) 2000, 2009-2017 Free Software Foundation, Inc. # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/lib/ref-del.sin b/lib/ref-del.sin index c77b33b..eeff947 100644 --- a/lib/ref-del.sin +++ b/lib/ref-del.sin @@ -1,6 +1,6 @@ # Remove this package from a list of references stored in a text file. # -# Copyright (C) 2000, 2009-2016 Free Software Foundation, Inc. +# Copyright (C) 2000, 2009-2017 Free Software Foundation, Inc. # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/lib/regcomp.c b/lib/regcomp.c index aaa66b9..6aaa6b1 100644 --- a/lib/regcomp.c +++ b/lib/regcomp.c @@ -1,5 +1,5 @@ /* Extended regular expression matching and search library. - Copyright (C) 2002-2016 Free Software Foundation, Inc. + Copyright (C) 2002-2017 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Isamu Hasegawa <isamu@yamato.ibm.com>. diff --git a/lib/regex.c b/lib/regex.c index 432b465..b46308b 100644 --- a/lib/regex.c +++ b/lib/regex.c @@ -1,5 +1,5 @@ /* Extended regular expression matching and search library. - Copyright (C) 2002-2016 Free Software Foundation, Inc. + Copyright (C) 2002-2017 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Isamu Hasegawa <isamu@yamato.ibm.com>. diff --git a/lib/regex.h b/lib/regex.h index 31f4e4d..18b8cbd 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-1993, 1995-1998, 2000-2003, 2005-2016 Free Software + Copyright (C) 1985, 1989-1993, 1995-1998, 2000-2003, 2005-2017 Free Software Foundation, Inc. This file is part of the GNU C Library. @@ -552,7 +552,7 @@ extern int re_compile_fastmap (struct re_pattern_buffer *__buffer); match, or -2 for an internal error. Also return register information in REGS (if REGS and BUFFER->no_sub are nonzero). */ extern regoff_t re_search (struct re_pattern_buffer *__buffer, - const char *__string, regoff_t __length, + const char *__String, regoff_t __length, regoff_t __start, regoff_t __range, struct re_registers *__regs); @@ -570,7 +570,7 @@ extern regoff_t re_search_2 (struct re_pattern_buffer *__buffer, /* Like 're_search', but return how many characters in STRING the regexp in BUFFER matched, starting at position START. */ extern regoff_t re_match (struct re_pattern_buffer *__buffer, - const char *__string, regoff_t __length, + const char *__String, regoff_t __length, regoff_t __start, struct re_registers *__regs); @@ -642,7 +642,7 @@ extern int regcomp (regex_t *_Restrict_ __preg, int __cflags); extern int regexec (const regex_t *_Restrict_ __preg, - const char *_Restrict_ __string, size_t __nmatch, + const char *_Restrict_ __String, size_t __nmatch, regmatch_t __pmatch[_Restrict_arr_], int __eflags); diff --git a/lib/regex_internal.c b/lib/regex_internal.c index a3b10dd..9546b78 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-2016 Free Software Foundation, Inc. + Copyright (C) 2002-2017 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Isamu Hasegawa <isamu@yamato.ibm.com>. diff --git a/lib/regex_internal.h b/lib/regex_internal.h index ec074be..7b1e551 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-2016 Free Software Foundation, Inc. + Copyright (C) 2002-2017 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Isamu Hasegawa <isamu@yamato.ibm.com>. @@ -33,6 +33,8 @@ #include <stdbool.h> #include <stdint.h> +#include "intprops.h" + #ifdef _LIBC # include <libc-lock.h> # define lock_define(name) __libc_lock_define (, name) @@ -100,6 +102,7 @@ __dcgettext (_libc_intl_domainname, msgid, LC_MESSAGES) # endif #else +# undef gettext # define gettext(msgid) (msgid) #endif @@ -113,11 +116,7 @@ # define RE_ENABLE_I18N #endif -#if __GNUC__ >= 3 -# define BE(expr, val) __builtin_expect (expr, val) -#else -# define BE(expr, val) (expr) -#endif +#define BE(expr, val) __builtin_expect (expr, val) /* Number of ASCII characters. */ #define ASCII_CHARS 0x80 diff --git a/lib/regexec.c b/lib/regexec.c index fd10911..45bc796 100644 --- a/lib/regexec.c +++ b/lib/regexec.c @@ -1,5 +1,5 @@ /* Extended regular expression matching and search library. - Copyright (C) 2002-2016 Free Software Foundation, Inc. + Copyright (C) 2002-2017 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Isamu Hasegawa <isamu@yamato.ibm.com>. @@ -354,10 +354,12 @@ re_search_2_stub (struct re_pattern_buffer *bufp, const char *string1, { const char *str; regoff_t rval; - Idx len = length1 + length2; + Idx len; char *s = NULL; - if (BE (length1 < 0 || length2 < 0 || stop < 0 || len < length1, 0)) + if (BE ((length1 < 0 || length2 < 0 || stop < 0 + || INT_ADD_WRAPV (length1, length2, &len)), + 0)) return -2; /* Concatenate the strings. */ diff --git a/lib/secure_getenv.c b/lib/secure_getenv.c index 88a60dc..df53dea 100644 --- a/lib/secure_getenv.c +++ b/lib/secure_getenv.c @@ -1,6 +1,6 @@ /* Look up an environment variable, returning NULL in insecure situations. - Copyright 2013-2016 Free Software Foundation, Inc. + Copyright 2013-2017 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published diff --git a/lib/setenv.c b/lib/setenv.c index 85c32cb..edc6a0a 100644 --- a/lib/setenv.c +++ b/lib/setenv.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1992, 1995-2003, 2005-2016 Free Software Foundation, Inc. +/* Copyright (C) 1992, 1995-2003, 2005-2017 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/sh-quote.c b/lib/sh-quote.c index 2db6d0d..fe47ad3 100644 --- a/lib/sh-quote.c +++ b/lib/sh-quote.c @@ -1,5 +1,5 @@ /* Shell quoting. - Copyright (C) 2001-2004, 2006, 2009-2016 Free Software Foundation, Inc. + Copyright (C) 2001-2004, 2006, 2009-2017 Free Software Foundation, Inc. Written by Bruno Haible <haible@clisp.cons.org>, 2001. This program is free software: you can redistribute it and/or modify diff --git a/lib/sh-quote.h b/lib/sh-quote.h index 1708d95..b7f6461 100644 --- a/lib/sh-quote.h +++ b/lib/sh-quote.h @@ -1,5 +1,5 @@ /* Shell quoting. - Copyright (C) 2001-2002, 2004, 2009-2016 Free Software Foundation, Inc. + Copyright (C) 2001-2002, 2004, 2009-2017 Free Software Foundation, Inc. Written by Bruno Haible <haible@clisp.cons.org>, 2001. This program is free software: you can redistribute it and/or modify diff --git a/lib/sig-handler.h b/lib/sig-handler.h index ad8c1dd..b6fd841 100644 --- a/lib/sig-handler.h +++ b/lib/sig-handler.h @@ -1,6 +1,6 @@ /* Convenience declarations when working with <signal.h>. - Copyright (C) 2008-2016 Free Software Foundation, Inc. + Copyright (C) 2008-2017 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/lib/sigaction.c b/lib/sigaction.c index 529b612..380f9fc 100644 --- a/lib/sigaction.c +++ b/lib/sigaction.c @@ -1,5 +1,5 @@ /* POSIX compatible signal blocking. - Copyright (C) 2008-2016 Free Software Foundation, Inc. + Copyright (C) 2008-2017 Free Software Foundation, Inc. Written by Eric Blake <ebb9@byu.net>, 2008. This program is free software: you can redistribute it and/or modify diff --git a/lib/signal.in.h b/lib/signal.in.h index ab0a049..1ffba37 100644 --- a/lib/signal.in.h +++ b/lib/signal.in.h @@ -1,6 +1,6 @@ /* A GNU-like <signal.h>. - Copyright (C) 2006-2016 Free Software Foundation, Inc. + Copyright (C) 2006-2017 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/lib/sigprocmask.c b/lib/sigprocmask.c index fcbf032..ec4cfeb 100644 --- a/lib/sigprocmask.c +++ b/lib/sigprocmask.c @@ -1,5 +1,5 @@ /* POSIX compatible signal blocking. - Copyright (C) 2006-2016 Free Software Foundation, Inc. + Copyright (C) 2006-2017 Free Software Foundation, Inc. Written by Bruno Haible <bruno@clisp.org>, 2006. This program is free software: you can redistribute it and/or modify diff --git a/lib/size_max.h b/lib/size_max.h index 2f2792c..f0c00b4 100644 --- a/lib/size_max.h +++ b/lib/size_max.h @@ -1,5 +1,5 @@ /* size_max.h -- declare SIZE_MAX through system headers - Copyright (C) 2005-2006, 2009-2016 Free Software Foundation, Inc. + Copyright (C) 2005-2006, 2009-2017 Free Software Foundation, Inc. Written by Simon Josefsson. 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 f5c4cd2..9e45e85 100644 --- a/lib/stat-time.h +++ b/lib/stat-time.h @@ -1,6 +1,6 @@ /* stat-related time functions. - Copyright (C) 2005, 2007, 2009-2016 Free Software Foundation, Inc. + Copyright (C) 2005, 2007, 2009-2017 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -31,6 +31,10 @@ _GL_INLINE_HEADER_BEGIN # define _GL_STAT_TIME_INLINE _GL_INLINE #endif +#ifdef __cplusplus +extern "C" { +#endif + /* STAT_TIMESPEC (ST, ST_XTIM) is the ST_XTIM member for *ST of type struct timespec, if available. If not, then STAT_TIMESPEC_NS (ST, ST_XTIM) is the nanosecond component of the ST_XTIM member for *ST, @@ -39,8 +43,8 @@ _GL_INLINE_HEADER_BEGIN time respectively. These macros are private to stat-time.h. */ -#if defined HAVE_STRUCT_STAT_ST_ATIM_TV_NSEC -# ifdef TYPEOF_STRUCT_STAT_ST_ATIM_IS_STRUCT_TIMESPEC +#if _GL_WINDOWS_STAT_TIMESPEC || defined HAVE_STRUCT_STAT_ST_ATIM_TV_NSEC +# if _GL_WINDOWS_STAT_TIMESPEC || defined TYPEOF_STRUCT_STAT_ST_ATIM_IS_STRUCT_TIMESPEC # define STAT_TIMESPEC(st, st_xtim) ((st)->st_xtim) # else # define STAT_TIMESPEC_NS(st, st_xtim) ((st)->st_xtim.tv_nsec) @@ -165,9 +169,13 @@ get_stat_birthtime (struct stat const *st) #elif (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__ /* Native Windows platforms (but not Cygwin) put the "file creation time" in st_ctime (!). See - <http://msdn2.microsoft.com/de-de/library/14h5k7ff(VS.80).aspx>. */ + <https://msdn.microsoft.com/en-us/library/14h5k7ff(VS.80).aspx>. */ +# if _GL_WINDOWS_STAT_TIMESPEC + t = st->st_ctim; +# else t.tv_sec = st->st_ctime; t.tv_nsec = 0; +# endif #else /* Birth time is not supported. */ t.tv_sec = -1; @@ -181,7 +189,7 @@ get_stat_birthtime (struct stat const *st) || defined HAVE_STRUCT_STAT_ST_BIRTHTIMENSEC) /* FreeBSD and NetBSD sometimes signal the absence of knowledge by using zero. Attempt to work around this problem. Alas, this can - report failure even for valid time stamps. Also, NetBSD + report failure even for valid timestamps. Also, NetBSD sometimes returns junk in the birth time fields; work around this bug if it is detected. */ if (! (t.tv_sec && 0 <= t.tv_nsec && t.tv_nsec < 1000000000)) @@ -194,6 +202,10 @@ get_stat_birthtime (struct stat const *st) return t; } +#ifdef __cplusplus +} +#endif + _GL_INLINE_HEADER_END #endif diff --git a/lib/stat-w32.c b/lib/stat-w32.c new file mode 100644 index 0000000..b4c762c --- /dev/null +++ b/lib/stat-w32.c @@ -0,0 +1,415 @@ +/* Core of implementation of fstat and stat for native Windows. + Copyright (C) 2017 Free Software Foundation, Inc. + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see <http://www.gnu.org/licenses/>. */ + +/* Written by Bruno Haible. */ + +#include <config.h> + +#if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__ + +/* Ensure that <windows.h> defines FILE_ID_INFO. */ +#undef _WIN32_WINNT +#define _WIN32_WINNT _WIN32_WINNT_WIN8 + +#include <sys/types.h> +#include <sys/stat.h> +#include <errno.h> +#include <limits.h> +#include <string.h> +#include <unistd.h> +#include <windows.h> + +/* Specification. */ +#include "stat-w32.h" + +#include "pathmax.h" +#include "verify.h" + +#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 +/* GetFinalPathNameByHandle was introduced only in Windows Vista. */ +typedef DWORD (WINAPI * GetFinalPathNameByHandleFuncType) (HANDLE hFile, + LPTSTR lpFilePath, + DWORD lenFilePath, + DWORD dwFlags); +static GetFinalPathNameByHandleFuncType GetFinalPathNameByHandleFunc = NULL; +static BOOL initialized = FALSE; + +static void +initialize (void) +{ + HMODULE kernel32 = LoadLibrary ("kernel32.dll"); + if (kernel32 != NULL) + { +#if _GL_WINDOWS_STAT_INODES == 2 + GetFileInformationByHandleExFunc = + (GetFileInformationByHandleExFuncType) GetProcAddress (kernel32, "GetFileInformationByHandleEx"); +#endif + GetFinalPathNameByHandleFunc = + (GetFinalPathNameByHandleFuncType) GetProcAddress (kernel32, "GetFinalPathNameByHandleA"); + } + initialized = TRUE; +} + +/* Converts a FILETIME to GMT time since 1970-01-01 00:00:00. */ +#if _GL_WINDOWS_STAT_TIMESPEC +struct timespec +_gl_convert_FILETIME_to_timespec (const FILETIME *ft) +{ + struct timespec result; + /* FILETIME: <https://msdn.microsoft.com/en-us/library/ms724284.aspx> */ + unsigned long long since_1601 = + ((unsigned long long) ft->dwHighDateTime << 32) + | (unsigned long long) ft->dwLowDateTime; + if (since_1601 == 0) + { + result.tv_sec = 0; + result.tv_nsec = 0; + } + else + { + /* Between 1601-01-01 and 1970-01-01 there were 280 normal years and 89 + leap years, in total 134774 days. */ + unsigned long long since_1970 = + since_1601 - (unsigned long long) 134774 * (unsigned long long) 86400 * (unsigned long long) 10000000; + result.tv_sec = since_1970 / (unsigned long long) 10000000; + result.tv_nsec = (unsigned long) (since_1970 % (unsigned long long) 10000000) * 100; + } + return result; +} +#else +time_t +_gl_convert_FILETIME_to_POSIX (const FILETIME *ft) +{ + /* FILETIME: <https://msdn.microsoft.com/en-us/library/ms724284.aspx> */ + unsigned long long since_1601 = + ((unsigned long long) ft->dwHighDateTime << 32) + | (unsigned long long) ft->dwLowDateTime; + if (since_1601 == 0) + return 0; + else + { + /* Between 1601-01-01 and 1970-01-01 there were 280 normal years and 89 + leap years, in total 134774 days. */ + unsigned long long since_1970 = + since_1601 - (unsigned long long) 134774 * (unsigned long long) 86400 * (unsigned long long) 10000000; + return since_1970 / (unsigned long long) 10000000; + } +} +#endif + +/* Fill *BUF with information about the file designated by H. + PATH is the file name, if known, otherwise NULL. + Return 0 if successful, or -1 with errno set upon failure. */ +int +_gl_fstat_by_handle (HANDLE h, const char *path, struct stat *buf) +{ + /* GetFileType + <https://msdn.microsoft.com/en-us/library/aa364960.aspx> */ + DWORD type = GetFileType (h); + if (type == FILE_TYPE_DISK) + { + if (!initialized) + initialize (); + + /* st_mode can be determined through + GetFileAttributesEx + <https://msdn.microsoft.com/en-us/library/aa364946.aspx> + <https://msdn.microsoft.com/en-us/library/aa365739.aspx> + or through + GetFileInformationByHandle + <https://msdn.microsoft.com/en-us/library/aa364952.aspx> + <https://msdn.microsoft.com/en-us/library/aa363788.aspx> + or through + GetFileInformationByHandleEx with argument FileBasicInfo + <https://msdn.microsoft.com/en-us/library/aa364953.aspx> + <https://msdn.microsoft.com/en-us/library/aa364217.aspx> + The latter requires -D_WIN32_WINNT=_WIN32_WINNT_VISTA or higher. */ + BY_HANDLE_FILE_INFORMATION info; + if (! GetFileInformationByHandle (h, &info)) + goto failed; + + /* Test for error conditions before starting to fill *buf. */ + if (sizeof (buf->st_size) <= 4 && info.nFileSizeHigh > 0) + { + errno = EOVERFLOW; + return -1; + } + +#if _GL_WINDOWS_STAT_INODES + /* st_ino can be determined through + GetFileInformationByHandle + <https://msdn.microsoft.com/en-us/library/aa364952.aspx> + <https://msdn.microsoft.com/en-us/library/aa363788.aspx> + as 64 bits, or through + GetFileInformationByHandleEx with argument FileIdInfo + <https://msdn.microsoft.com/en-us/library/aa364953.aspx> + <https://msdn.microsoft.com/en-us/library/hh802691.aspx> + as 128 bits. + The latter requires -D_WIN32_WINNT=_WIN32_WINNT_WIN8 or higher. */ + /* Experiments show that GetFileInformationByHandleEx does not provide + much more information than GetFileInformationByHandle: + * The dwVolumeSerialNumber from GetFileInformationByHandle is equal + to the low 32 bits of the 64-bit VolumeSerialNumber from + GetFileInformationByHandleEx, and is apparently sufficient for + identifying the device. + * The nFileIndex from GetFileInformationByHandle is equal to the low + 64 bits of the 128-bit FileId from GetFileInformationByHandleEx, + and the high 64 bits of this 128-bit FileId are zero. + * On a FAT file system, GetFileInformationByHandleEx fails with error + ERROR_INVALID_PARAMETER, whereas GetFileInformationByHandle + succeeds. + * On a CIFS/SMB file system, GetFileInformationByHandleEx fails with + error ERROR_INVALID_LEVEL, whereas GetFileInformationByHandle + succeeds. */ +# if _GL_WINDOWS_STAT_INODES == 2 + if (GetFileInformationByHandleExFunc != NULL) + { + FILE_ID_INFO id; + if (GetFileInformationByHandleExFunc (h, FileIdInfo, &id, sizeof (id))) + { + buf->st_dev = id.VolumeSerialNumber; + verify (sizeof (ino_t) == sizeof (id.FileId)); + memcpy (&buf->st_ino, &id.FileId, sizeof (ino_t)); + goto ino_done; + } + else + { + switch (GetLastError ()) + { + case ERROR_INVALID_PARAMETER: /* older Windows version, or FAT */ + case ERROR_INVALID_LEVEL: /* CIFS/SMB file system */ + goto fallback; + default: + goto failed; + } + } + } + fallback: ; + /* Fallback for older Windows versions. */ + buf->st_dev = info.dwVolumeSerialNumber; + buf->st_ino._gl_ino[0] = ((ULONGLONG) info.nFileIndexHigh << 32) | (ULONGLONG) info.nFileIndexLow; + buf->st_ino._gl_ino[1] = 0; + ino_done: ; +# else /* _GL_WINDOWS_STAT_INODES == 1 */ + buf->st_dev = info.dwVolumeSerialNumber; + buf->st_ino = ((ULONGLONG) info.nFileIndexHigh << 32) | (ULONGLONG) info.nFileIndexLow; +# endif +#else + /* st_ino is not wide enough for identifying a file on a device. + Without st_ino, st_dev is pointless. */ + buf->st_dev = 0; + buf->st_ino = 0; +#endif + + /* st_mode. */ + unsigned int mode = + /* XXX How to handle FILE_ATTRIBUTE_REPARSE_POINT ? */ + ((info.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) ? _S_IFDIR | S_IEXEC_UGO : _S_IFREG) + | S_IREAD_UGO + | ((info.dwFileAttributes & FILE_ATTRIBUTE_READONLY) ? 0 : S_IWRITE_UGO); + if (!(info.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY)) + { + /* Determine whether the file is executable by looking at the file + name suffix. + If the file name is already known, use it. Otherwise, for + non-empty files, it can be determined through + GetFinalPathNameByHandle + <https://msdn.microsoft.com/en-us/library/aa364962.aspx> + or through + GetFileInformationByHandleEx with argument FileNameInfo + <https://msdn.microsoft.com/en-us/library/aa364953.aspx> + <https://msdn.microsoft.com/en-us/library/aa364388.aspx> + Both require -D_WIN32_WINNT=_WIN32_WINNT_VISTA or higher. */ + if (info.nFileSizeHigh > 0 || info.nFileSizeLow > 0) + { + char fpath[PATH_MAX]; + if (path != NULL + || (GetFinalPathNameByHandleFunc != NULL + && GetFinalPathNameByHandleFunc (h, fpath, sizeof (fpath), VOLUME_NAME_NONE) + < sizeof (fpath) + && (path = fpath, 1))) + { + const char *last_dot = NULL; + const char *p; + for (p = path; *p != '\0'; p++) + if (*p == '.') + last_dot = p; + if (last_dot != NULL) + { + const char *suffix = last_dot + 1; + if (_stricmp (suffix, "exe") == 0 + || _stricmp (suffix, "bat") == 0 + || _stricmp (suffix, "cmd") == 0 + || _stricmp (suffix, "com") == 0) + mode |= S_IEXEC_UGO; + } + } + else + /* Cannot determine file name. Pretend that it is executable. */ + mode |= S_IEXEC_UGO; + } + } + buf->st_mode = mode; + + /* st_nlink can be determined through + GetFileInformationByHandle + <https://msdn.microsoft.com/en-us/library/aa364952.aspx> + <https://msdn.microsoft.com/en-us/library/aa363788.aspx> + or through + GetFileInformationByHandleEx with argument FileStandardInfo + <https://msdn.microsoft.com/en-us/library/aa364953.aspx> + <https://msdn.microsoft.com/en-us/library/aa364401.aspx> + The latter requires -D_WIN32_WINNT=_WIN32_WINNT_VISTA or higher. */ + buf->st_nlink = (info.nNumberOfLinks > SHRT_MAX ? SHRT_MAX : info.nNumberOfLinks); + + /* There's no easy way to map the Windows SID concept to an integer. */ + buf->st_uid = 0; + buf->st_gid = 0; + + /* st_rdev is irrelevant for normal files and directories. */ + buf->st_rdev = 0; + + /* st_size can be determined through + GetFileSizeEx + <https://msdn.microsoft.com/en-us/library/aa364957.aspx> + or through + GetFileAttributesEx + <https://msdn.microsoft.com/en-us/library/aa364946.aspx> + <https://msdn.microsoft.com/en-us/library/aa365739.aspx> + or through + GetFileInformationByHandle + <https://msdn.microsoft.com/en-us/library/aa364952.aspx> + <https://msdn.microsoft.com/en-us/library/aa363788.aspx> + or through + GetFileInformationByHandleEx with argument FileStandardInfo + <https://msdn.microsoft.com/en-us/library/aa364953.aspx> + <https://msdn.microsoft.com/en-us/library/aa364401.aspx> + The latter requires -D_WIN32_WINNT=_WIN32_WINNT_VISTA or higher. */ + if (sizeof (buf->st_size) <= 4) + /* Range check already done above. */ + buf->st_size = info.nFileSizeLow; + else + buf->st_size = ((long long) info.nFileSizeHigh << 32) | (long long) info.nFileSizeLow; + + /* st_atime, st_mtime, st_ctime can be determined through + GetFileTime + <https://msdn.microsoft.com/en-us/library/ms724320.aspx> + or through + GetFileAttributesEx + <https://msdn.microsoft.com/en-us/library/aa364946.aspx> + <https://msdn.microsoft.com/en-us/library/aa365739.aspx> + or through + GetFileInformationByHandle + <https://msdn.microsoft.com/en-us/library/aa364952.aspx> + <https://msdn.microsoft.com/en-us/library/aa363788.aspx> + or through + GetFileInformationByHandleEx with argument FileBasicInfo + <https://msdn.microsoft.com/en-us/library/aa364953.aspx> + <https://msdn.microsoft.com/en-us/library/aa364217.aspx> + The latter requires -D_WIN32_WINNT=_WIN32_WINNT_VISTA or higher. */ +#if _GL_WINDOWS_STAT_TIMESPEC + buf->st_atim = _gl_convert_FILETIME_to_timespec (&info.ftLastAccessTime); + buf->st_mtim = _gl_convert_FILETIME_to_timespec (&info.ftLastWriteTime); + buf->st_ctim = _gl_convert_FILETIME_to_timespec (&info.ftCreationTime); +#else + buf->st_atime = _gl_convert_FILETIME_to_POSIX (&info.ftLastAccessTime); + buf->st_mtime = _gl_convert_FILETIME_to_POSIX (&info.ftLastWriteTime); + buf->st_ctime = _gl_convert_FILETIME_to_POSIX (&info.ftCreationTime); +#endif + + return 0; + } + else if (type == FILE_TYPE_CHAR || type == FILE_TYPE_PIPE) + { + buf->st_dev = 0; +#if _GL_WINDOWS_STAT_INODES == 2 + buf->st_ino._gl_ino[0] = buf->st_ino._gl_ino[1] = 0; +#else + buf->st_ino = 0; +#endif + buf->st_mode = (type == FILE_TYPE_PIPE ? _S_IFIFO : _S_IFCHR); + buf->st_nlink = 1; + buf->st_uid = 0; + buf->st_gid = 0; + buf->st_rdev = 0; + if (type == FILE_TYPE_PIPE) + { + /* PeekNamedPipe + <https://msdn.microsoft.com/en-us/library/aa365779.aspx> */ + DWORD bytes_available; + if (PeekNamedPipe (h, NULL, 0, NULL, &bytes_available, NULL)) + buf->st_size = bytes_available; + else + buf->st_size = 0; + } + else + buf->st_size = 0; +#if _GL_WINDOWS_STAT_TIMESPEC + buf->st_atim.tv_sec = 0; buf->st_atim.tv_nsec = 0; + buf->st_mtim.tv_sec = 0; buf->st_mtim.tv_nsec = 0; + buf->st_ctim.tv_sec = 0; buf->st_ctim.tv_nsec = 0; +#else + buf->st_atime = 0; + buf->st_mtime = 0; + buf->st_ctime = 0; +#endif + return 0; + } + else + { + errno = ENOENT; + return -1; + } + + failed: + { + DWORD error = GetLastError (); + #if 0 + fprintf (stderr, "_gl_fstat_by_handle error 0x%x\n", (unsigned int) error); + #endif + switch (error) + { + case ERROR_ACCESS_DENIED: + case ERROR_SHARING_VIOLATION: + errno = EACCES; + break; + + case ERROR_OUTOFMEMORY: + errno = ENOMEM; + break; + + case ERROR_WRITE_FAULT: + case ERROR_READ_FAULT: + case ERROR_GEN_FAILURE: + errno = EIO; + break; + + default: + errno = EINVAL; + break; + } + return -1; + } +} + +#endif diff --git a/lib/stat-w32.h b/lib/stat-w32.h new file mode 100644 index 0000000..5426843 --- /dev/null +++ b/lib/stat-w32.h @@ -0,0 +1,37 @@ +/* Core of implementation of fstat and stat for native Windows. + Copyright (C) 2017 Free Software Foundation, Inc. + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see <http://www.gnu.org/licenses/>. */ + +#ifndef _STAT_W32_H +#define _STAT_W32_H 1 + +/* Converts a FILETIME to GMT time since 1970-01-01 00:00:00. */ +#if _GL_WINDOWS_STAT_TIMESPEC +extern struct timespec _gl_convert_FILETIME_to_timespec (const FILETIME *ft); +#else +extern time_t _gl_convert_FILETIME_to_POSIX (const FILETIME *ft); +#endif + +/* Fill *BUF with information about the file designated by H. + PATH is the file name, if known, otherwise NULL. + Return 0 if successful, or -1 with errno set upon failure. */ +extern int _gl_fstat_by_handle (HANDLE h, const char *path, struct stat *buf); + +/* Bitmasks for st_mode. */ +#define S_IREAD_UGO (_S_IREAD | (_S_IREAD >> 3) | (_S_IREAD >> 6)) +#define S_IWRITE_UGO (_S_IWRITE | (_S_IWRITE >> 3) | (_S_IWRITE >> 6)) +#define S_IEXEC_UGO (_S_IEXEC | (_S_IEXEC >> 3) | (_S_IEXEC >> 6)) + +#endif /* _STAT_W32_H */ @@ -1,5 +1,5 @@ /* Work around platform bugs in stat. - Copyright (C) 2009-2016 Free Software Foundation, Inc. + Copyright (C) 2009-2017 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -14,7 +14,7 @@ You should have received a copy of the GNU General Public License along with this program. If not, see <http://www.gnu.org/licenses/>. */ -/* written by Eric Blake */ +/* Written by Eric Blake and Bruno Haible. */ /* If the user's config.h happens to include <sys/stat.h>, let it include only the system's <sys/stat.h> here, so that orig_stat doesn't recurse to @@ -28,26 +28,19 @@ #undef __need_system_sys_stat_h #if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__ -# if _GL_WINDOWS_64_BIT_ST_SIZE -# undef stat /* avoid warning on mingw64 with _FILE_OFFSET_BITS=64 */ -# define stat _stati64 -# define REPLACE_FUNC_STAT_DIR 1 -# undef REPLACE_FUNC_STAT_FILE -# elif REPLACE_FUNC_STAT_FILE -/* mingw64 has a broken stat() function, based on _stat(), in libmingwex.a. - Bypass it. */ -# define stat _stat -# define REPLACE_FUNC_STAT_DIR 1 -# undef REPLACE_FUNC_STAT_FILE -# endif +# define WINDOWS_NATIVE #endif +#if !defined WINDOWS_NATIVE + static int orig_stat (const char *filename, struct stat *buf) { return stat (filename, buf); } +#endif + /* Specification. */ /* Write "sys/stat.h" here, not <sys/stat.h>, otherwise OSF/1 5.1 DTK cc eliminates this include because of the preliminary #include <sys/stat.h> @@ -58,16 +51,42 @@ orig_stat (const char *filename, struct stat *buf) #include <limits.h> #include <stdbool.h> #include <string.h> -#include "dosname.h" +#include "filename.h" +#include "malloca.h" #include "verify.h" -#if REPLACE_FUNC_STAT_DIR -# include "pathmax.h" - /* The only known systems where REPLACE_FUNC_STAT_DIR is needed also - have a constant PATH_MAX. */ -# ifndef PATH_MAX -# error "Please port this replacement to your platform" -# endif +#ifdef WINDOWS_NATIVE +# define WIN32_LEAN_AND_MEAN +# include <windows.h> +# include "stat-w32.h" +#endif + +#ifdef WINDOWS_NATIVE +/* Return TRUE if the given file name denotes an UNC root. */ +static BOOL +is_unc_root (const char *rname) +{ + /* Test whether it has the syntax '\\server\share'. */ + if (ISSLASH (rname[0]) && ISSLASH (rname[1])) + { + /* It starts with two slashes. Find the next slash. */ + const char *p = rname + 2; + const char *q = p; + while (*q != '\0' && !ISSLASH (*q)) + q++; + if (q > p && *q != '\0') + { + /* Found the next slash at q. */ + q++; + const char *r = q; + while (*r != '\0' && !ISSLASH (*r)) + r++; + if (r > q && *r == '\0') + return TRUE; + } + } + return FALSE; +} #endif /* Store information about NAME into ST. Work around bugs with @@ -77,62 +96,328 @@ orig_stat (const char *filename, struct stat *buf) correctly. */ int -rpl_stat (char const *name, struct stat *st) +rpl_stat (char const *name, struct stat *buf) { - int result = orig_stat (name, st); -#if REPLACE_FUNC_STAT_FILE - /* Solaris 9 mistakenly succeeds when given a non-directory with a - trailing slash. */ - if (result == 0 && !S_ISDIR (st->st_mode)) +#ifdef WINDOWS_NATIVE + /* Fill the fields ourselves, because the original stat function returns + values for st_atime, st_mtime, st_ctime that depend on the current time + zone. See + <https://lists.gnu.org/archive/html/bug-gnulib/2017-04/msg00134.html> */ + /* XXX Should we convert to wchar_t* and prepend '\\?\', in order to work + around length limitations + <https://msdn.microsoft.com/en-us/library/aa365247.aspx> ? */ + + /* POSIX <http://pubs.opengroup.org/onlinepubs/9699919799/basedefs/V1_chap04.html#tag_04_13> + specifies: "More than two leading <slash> characters shall be treated as + a single <slash> character." */ + if (ISSLASH (name[0]) && ISSLASH (name[1]) && ISSLASH (name[2])) { - size_t len = strlen (name); - if (ISSLASH (name[len - 1])) + name += 2; + while (ISSLASH (name[1])) + name++; + } + + size_t len = strlen (name); + size_t drive_prefix_len = (HAS_DEVICE (name) ? 2 : 0); + + /* Remove trailing slashes (except the very first one, at position + drive_prefix_len), but remember their presence. */ + size_t rlen; + bool check_dir = false; + + rlen = len; + while (rlen > drive_prefix_len && ISSLASH (name[rlen-1])) + { + check_dir = true; + if (rlen == drive_prefix_len + 1) + break; + rlen--; + } + + /* Handle '' and 'C:'. */ + if (!check_dir && rlen == drive_prefix_len) + { + errno = ENOENT; + return -1; + } + + /* Handle '\\'. */ + if (rlen == 1 && ISSLASH (name[0]) && len >= 2) + { + errno = ENOENT; + return -1; + } + + const char *rname; + char *malloca_rname; + if (rlen == len) + { + rname = name; + malloca_rname = NULL; + } + else + { + malloca_rname = malloca (rlen + 1); + if (malloca_rname == NULL) { - errno = ENOTDIR; + errno = ENOMEM; return -1; } + memcpy (malloca_rname, name, rlen); + malloca_rname[rlen] = '\0'; + rname = malloca_rname; } -#endif /* REPLACE_FUNC_STAT_FILE */ -#if REPLACE_FUNC_STAT_DIR - if (result == -1 && errno == ENOENT) + /* There are two ways to get at the requested information: + - by scanning the parent directory and examining the relevant + directory entry, + - by opening the file directly. + The first approach fails for root directories (e.g. 'C:\') and + UNC root directories (e.g. '\\server\share'). + The second approach fails for some system files (e.g. 'C:\pagefile.sys' + and 'C:\hiberfil.sys'): ERROR_SHARING_VIOLATION. + The second approach gives more information (in particular, correct + st_dev, st_ino, st_nlink fields). + So we use the second approach and, as a fallback except for root and + UNC root directories, also the first approach. */ + { + int ret; + { - /* Due to mingw's oddities, there are some directories (like - c:\) where stat() only succeeds with a trailing slash, and - other directories (like c:\windows) where stat() only - succeeds without a trailing slash. But we want the two to be - synonymous, since chdir() manages either style. Likewise, Mingw also - reports ENOENT for names longer than PATH_MAX, when we want - ENAMETOOLONG, and for stat("file/"), when we want ENOTDIR. - Fortunately, mingw PATH_MAX is small enough for stack - allocation. */ - char fixed_name[PATH_MAX + 1] = {0}; - size_t len = strlen (name); - bool check_dir = false; - verify (PATH_MAX <= 4096); - if (PATH_MAX <= len) - errno = ENAMETOOLONG; - else if (len) + /* Approach based on the file. */ + + /* Open a handle to the file. + CreateFile + <https://msdn.microsoft.com/en-us/library/aa363858.aspx> + <https://msdn.microsoft.com/en-us/library/aa363874.aspx> */ + HANDLE h = + CreateFile (rname, + FILE_READ_ATTRIBUTES, + FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE, + NULL, + OPEN_EXISTING, + /* FILE_FLAG_POSIX_SEMANTICS (treat file names that differ only + in case as different) makes sense only when applied to *all* + filesystem operations. */ + FILE_FLAG_BACKUP_SEMANTICS /* | FILE_FLAG_POSIX_SEMANTICS */, + NULL); + if (h != INVALID_HANDLE_VALUE) { - strcpy (fixed_name, name); - if (ISSLASH (fixed_name[len - 1])) - { - check_dir = true; - while (len && ISSLASH (fixed_name[len - 1])) - fixed_name[--len] = '\0'; - if (!len) - fixed_name[0] = '/'; - } - else - fixed_name[len++] = '/'; - result = orig_stat (fixed_name, st); - if (result == 0 && check_dir && !S_ISDIR (st->st_mode)) + ret = _gl_fstat_by_handle (h, rname, buf); + CloseHandle (h); + goto done; + } + } + + /* Test for root and UNC root directories. */ + if ((rlen == drive_prefix_len + 1 && ISSLASH (rname[drive_prefix_len])) + || is_unc_root (rname)) + goto failed; + + /* Fallback. */ + { + /* Approach based on the directory entry. */ + + if (strchr (rname, '?') != NULL || strchr (rname, '*') != NULL) + { + /* Other Windows API functions would fail with error + ERROR_INVALID_NAME. */ + if (malloca_rname != NULL) + freea (malloca_rname); + errno = ENOENT; + return -1; + } + + /* Get the details about the directory entry. This can be done through + FindFirstFile + <https://msdn.microsoft.com/en-us/library/aa364418.aspx> + <https://msdn.microsoft.com/en-us/library/aa365740.aspx> + or through + FindFirstFileEx with argument FindExInfoBasic + <https://msdn.microsoft.com/en-us/library/aa364419.aspx> + <https://msdn.microsoft.com/en-us/library/aa364415.aspx> + <https://msdn.microsoft.com/en-us/library/aa365740.aspx> */ + WIN32_FIND_DATA info; + HANDLE h = FindFirstFile (rname, &info); + if (h == INVALID_HANDLE_VALUE) + goto failed; + + /* Test for error conditions before starting to fill *buf. */ + if (sizeof (buf->st_size) <= 4 && info.nFileSizeHigh > 0) + { + FindClose (h); + if (malloca_rname != NULL) + freea (malloca_rname); + errno = EOVERFLOW; + return -1; + } + +# if _GL_WINDOWS_STAT_INODES + buf->st_dev = 0; +# if _GL_WINDOWS_STAT_INODES == 2 + buf->st_ino._gl_ino[0] = buf->st_ino._gl_ino[1] = 0; +# else /* _GL_WINDOWS_STAT_INODES == 1 */ + buf->st_ino = 0; +# endif +# else + /* st_ino is not wide enough for identifying a file on a device. + Without st_ino, st_dev is pointless. */ + buf->st_dev = 0; + buf->st_ino = 0; +# endif + + /* st_mode. */ + unsigned int mode = + /* XXX How to handle FILE_ATTRIBUTE_REPARSE_POINT ? */ + ((info.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) ? _S_IFDIR | S_IEXEC_UGO : _S_IFREG) + | S_IREAD_UGO + | ((info.dwFileAttributes & FILE_ATTRIBUTE_READONLY) ? 0 : S_IWRITE_UGO); + if (!(info.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY)) + { + /* Determine whether the file is executable by looking at the file + name suffix. */ + if (info.nFileSizeHigh > 0 || info.nFileSizeLow > 0) { - result = -1; - errno = ENOTDIR; + const char *last_dot = NULL; + const char *p; + for (p = info.cFileName; *p != '\0'; p++) + if (*p == '.') + last_dot = p; + if (last_dot != NULL) + { + const char *suffix = last_dot + 1; + if (_stricmp (suffix, "exe") == 0 + || _stricmp (suffix, "bat") == 0 + || _stricmp (suffix, "cmd") == 0 + || _stricmp (suffix, "com") == 0) + mode |= S_IEXEC_UGO; + } } } + buf->st_mode = mode; + + /* st_nlink. Ignore hard links here. */ + buf->st_nlink = 1; + + /* There's no easy way to map the Windows SID concept to an integer. */ + buf->st_uid = 0; + buf->st_gid = 0; + + /* st_rdev is irrelevant for normal files and directories. */ + buf->st_rdev = 0; + + /* st_size. */ + if (sizeof (buf->st_size) <= 4) + /* Range check already done above. */ + buf->st_size = info.nFileSizeLow; + else + buf->st_size = ((long long) info.nFileSizeHigh << 32) | (long long) info.nFileSizeLow; + + /* st_atime, st_mtime, st_ctime. */ +# if _GL_WINDOWS_STAT_TIMESPEC + buf->st_atim = _gl_convert_FILETIME_to_timespec (&info.ftLastAccessTime); + buf->st_mtim = _gl_convert_FILETIME_to_timespec (&info.ftLastWriteTime); + buf->st_ctim = _gl_convert_FILETIME_to_timespec (&info.ftCreationTime); +# else + buf->st_atime = _gl_convert_FILETIME_to_POSIX (&info.ftLastAccessTime); + buf->st_mtime = _gl_convert_FILETIME_to_POSIX (&info.ftLastWriteTime); + buf->st_ctime = _gl_convert_FILETIME_to_POSIX (&info.ftCreationTime); +# endif + + FindClose (h); + + ret = 0; } -#endif /* REPLACE_FUNC_STAT_DIR */ + + done: + if (ret >= 0 && check_dir && !S_ISDIR (buf->st_mode)) + { + errno = ENOTDIR; + ret = -1; + } + if (malloca_rname != NULL) + { + int saved_errno = errno; + freea (malloca_rname); + errno = saved_errno; + } + return ret; + } + + failed: + { + DWORD error = GetLastError (); + #if 0 + fprintf (stderr, "rpl_stat error 0x%x\n", (unsigned int) error); + #endif + + if (malloca_rname != NULL) + freea (malloca_rname); + + switch (error) + { + /* Some of these errors probably cannot happen with the specific flags + that we pass to CreateFile. But who knows... */ + case ERROR_FILE_NOT_FOUND: /* The last component of rname does not exist. */ + case ERROR_PATH_NOT_FOUND: /* Some directory component in rname does not exist. */ + case ERROR_BAD_PATHNAME: /* rname is such as '\\server'. */ + case ERROR_BAD_NET_NAME: /* rname is such as '\\server\nonexistentshare'. */ + case ERROR_INVALID_NAME: /* rname contains wildcards, misplaced colon, etc. */ + case ERROR_DIRECTORY: + errno = ENOENT; + break; + + 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? */ + errno = EACCES; + break; + + case ERROR_OUTOFMEMORY: + errno = ENOMEM; + break; + + case ERROR_WRITE_PROTECT: + errno = EROFS; + break; + + case ERROR_WRITE_FAULT: + case ERROR_READ_FAULT: + case ERROR_GEN_FAILURE: + errno = EIO; + break; + + case ERROR_BUFFER_OVERFLOW: + case ERROR_FILENAME_EXCED_RANGE: + errno = ENAMETOOLONG; + break; + + case ERROR_DELETE_PENDING: /* XXX map to EACCESS or EPERM? */ + errno = EPERM; + break; + + default: + errno = EINVAL; + break; + } + + return -1; + } +#else + int result = orig_stat (name, buf); +# if REPLACE_FUNC_STAT_FILE + /* Solaris 9 mistakenly succeeds when given a non-directory with a + trailing slash. */ + if (result == 0 && !S_ISDIR (buf->st_mode)) + { + size_t len = strlen (name); + if (ISSLASH (name[len - 1])) + { + errno = ENOTDIR; + return -1; + } + } +# endif /* REPLACE_FUNC_STAT_FILE */ return result; +#endif } diff --git a/lib/stdarg.in.h b/lib/stdarg.in.h index 63371e2..3785cd1 100644 --- a/lib/stdarg.in.h +++ b/lib/stdarg.in.h @@ -1,5 +1,5 @@ /* Substitute for and wrapper around <stdarg.h>. - Copyright (C) 2008-2016 Free Software Foundation, Inc. + Copyright (C) 2008-2017 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/lib/stdbool.in.h b/lib/stdbool.in.h index 7ecf203..1067ed2 100644 --- a/lib/stdbool.in.h +++ b/lib/stdbool.in.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2001-2003, 2006-2016 Free Software Foundation, Inc. +/* Copyright (C) 2001-2003, 2006-2017 Free Software Foundation, Inc. Written by Bruno Haible <haible@clisp.cons.org>, 2001. This program is free software; you can redistribute it and/or modify diff --git a/lib/stddef.in.h b/lib/stddef.in.h index f4c4a10..5b496a6 100644 --- a/lib/stddef.in.h +++ b/lib/stddef.in.h @@ -1,6 +1,6 @@ /* A substitute for POSIX 2008 <stddef.h>, for platforms that have issues. - Copyright (C) 2009-2016 Free Software Foundation, Inc. + Copyright (C) 2009-2017 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/lib/stdint.in.h b/lib/stdint.in.h index cf65ec6..5fbec34 100644 --- a/lib/stdint.in.h +++ b/lib/stdint.in.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2001-2002, 2004-2016 Free Software Foundation, Inc. +/* Copyright (C) 2001-2002, 2004-2017 Free Software Foundation, Inc. Written by Paul Eggert, Bruno Haible, Sam Steingold, Peter Burwood. This file is part of gnulib. @@ -79,49 +79,65 @@ #if ! defined _@GUARD_PREFIX@_STDINT_H && ! defined _GL_JUST_INCLUDE_SYSTEM_STDINT_H #define _@GUARD_PREFIX@_STDINT_H +/* Get SCHAR_MIN, SCHAR_MAX, UCHAR_MAX, INT_MIN, INT_MAX, + LONG_MIN, LONG_MAX, ULONG_MAX, _GL_INTEGER_WIDTH. */ +#include <limits.h> + +/* Override WINT_MIN and WINT_MAX if gnulib's <wchar.h> or <wctype.h> overrides + wint_t. */ +#if @GNULIB_OVERRIDES_WINT_T@ +# undef WINT_MIN +# undef WINT_MAX +# define WINT_MIN 0x0U +# define WINT_MAX 0xffffffffU +#endif + +#if ! @HAVE_C99_STDINT_H@ + /* <sys/types.h> defines some of the stdint.h types as well, on glibc, IRIX 6.5, and OpenBSD 3.8 (via <machine/types.h>). AIX 5.2 <sys/types.h> isn't needed and causes troubles. Mac OS X 10.4.6 <sys/types.h> includes <stdint.h> (which is us), but relies on the system <stdint.h> definitions, so include <sys/types.h> after @NEXT_STDINT_H@. */ -#if @HAVE_SYS_TYPES_H@ && ! defined _AIX -# include <sys/types.h> -#endif - -/* Get SCHAR_MIN, SCHAR_MAX, UCHAR_MAX, INT_MIN, INT_MAX, - LONG_MIN, LONG_MAX, ULONG_MAX. */ -#include <limits.h> +# if @HAVE_SYS_TYPES_H@ && ! defined _AIX +# include <sys/types.h> +# endif -#if @HAVE_INTTYPES_H@ +# if @HAVE_INTTYPES_H@ /* In OpenBSD 3.8, <inttypes.h> includes <machine/types.h>, which defines int{8,16,32,64}_t, uint{8,16,32,64}_t and __BIT_TYPES_DEFINED__. <inttypes.h> also defines intptr_t and uintptr_t. */ -# include <inttypes.h> -#elif @HAVE_SYS_INTTYPES_H@ +# include <inttypes.h> +# elif @HAVE_SYS_INTTYPES_H@ /* Solaris 7 <sys/inttypes.h> has the types except the *_fast*_t types, and the macros except for *_FAST*_*, INTPTR_MIN, PTRDIFF_MIN, PTRDIFF_MAX. */ -# include <sys/inttypes.h> -#endif +# include <sys/inttypes.h> +# endif -#if @HAVE_SYS_BITYPES_H@ && ! defined __BIT_TYPES_DEFINED__ +# if @HAVE_SYS_BITYPES_H@ && ! defined __BIT_TYPES_DEFINED__ /* Linux libc4 >= 4.6.7 and libc5 have a <sys/bitypes.h> that defines int{8,16,32,64}_t and __BIT_TYPES_DEFINED__. In libc5 >= 5.2.2 it is included by <sys/types.h>. */ -# include <sys/bitypes.h> -#endif +# include <sys/bitypes.h> +# endif -#undef _GL_JUST_INCLUDE_SYSTEM_INTTYPES_H +# undef _GL_JUST_INCLUDE_SYSTEM_INTTYPES_H /* Minimum and maximum values for an integer type under the usual assumption. Return an unspecified value if BITS == 0, adding a check to pacify picky compilers. */ -#define _STDINT_MIN(signed, bits, zero) \ - ((signed) ? ~ _STDINT_MAX (signed, bits, zero) : (zero)) +/* These are separate macros, because if you try to merge these macros into + a single one, HP-UX cc rejects the resulting expression in constant + expressions. */ +# define _STDINT_UNSIGNED_MIN(bits, zero) \ + (zero) +# define _STDINT_SIGNED_MIN(bits, zero) \ + (~ _STDINT_MAX (1, bits, zero)) -#define _STDINT_MAX(signed, bits, zero) \ - (((((zero) + 1) << ((bits) ? (bits) - 1 - (signed) : 0)) - 1) * 2 + 1) +# define _STDINT_MAX(signed, bits, zero) \ + (((((zero) + 1) << ((bits) ? (bits) - 1 - (signed) : 0)) - 1) * 2 + 1) #if !GNULIB_defined_stdint_types @@ -130,26 +146,26 @@ /* Here we assume a standard architecture where the hardware integer types have 8, 16, 32, optionally 64 bits. */ -#undef int8_t -#undef uint8_t +# undef int8_t +# undef uint8_t typedef signed char gl_int8_t; typedef unsigned char gl_uint8_t; -#define int8_t gl_int8_t -#define uint8_t gl_uint8_t +# define int8_t gl_int8_t +# define uint8_t gl_uint8_t -#undef int16_t -#undef uint16_t +# undef int16_t +# undef uint16_t typedef short int gl_int16_t; typedef unsigned short int gl_uint16_t; -#define int16_t gl_int16_t -#define uint16_t gl_uint16_t +# define int16_t gl_int16_t +# define uint16_t gl_uint16_t -#undef int32_t -#undef uint32_t +# undef int32_t +# undef uint32_t typedef int gl_int32_t; typedef unsigned int gl_uint32_t; -#define int32_t gl_int32_t -#define uint32_t gl_uint32_t +# define int32_t gl_int32_t +# define uint32_t gl_uint32_t /* If the system defines INT64_MAX, assume int64_t works. That way, if the underlying platform defines int64_t to be a 64-bit long long @@ -157,54 +173,54 @@ typedef unsigned int gl_uint32_t; int, which would mess up C++ name mangling. We must use #ifdef rather than #if, to avoid an error with HP-UX 10.20 cc. */ -#ifdef INT64_MAX -# define GL_INT64_T -#else +# ifdef INT64_MAX +# define GL_INT64_T +# else /* Do not undefine int64_t if gnulib is not being used with 64-bit types, since otherwise it breaks platforms like Tandem/NSK. */ -# if LONG_MAX >> 31 >> 31 == 1 -# undef int64_t +# if LONG_MAX >> 31 >> 31 == 1 +# undef int64_t typedef long int gl_int64_t; -# define int64_t gl_int64_t -# define GL_INT64_T -# elif defined _MSC_VER -# undef int64_t +# define int64_t gl_int64_t +# define GL_INT64_T +# elif defined _MSC_VER +# undef int64_t typedef __int64 gl_int64_t; -# define int64_t gl_int64_t -# define GL_INT64_T -# elif @HAVE_LONG_LONG_INT@ -# undef int64_t +# define int64_t gl_int64_t +# define GL_INT64_T +# elif @HAVE_LONG_LONG_INT@ +# undef int64_t typedef long long int gl_int64_t; -# define int64_t gl_int64_t -# define GL_INT64_T +# define int64_t gl_int64_t +# define GL_INT64_T +# endif # endif -#endif -#ifdef UINT64_MAX -# define GL_UINT64_T -#else -# if ULONG_MAX >> 31 >> 31 >> 1 == 1 -# undef uint64_t -typedef unsigned long int gl_uint64_t; -# define uint64_t gl_uint64_t +# ifdef UINT64_MAX # define GL_UINT64_T -# elif defined _MSC_VER -# undef uint64_t +# else +# if ULONG_MAX >> 31 >> 31 >> 1 == 1 +# undef uint64_t +typedef unsigned long int gl_uint64_t; +# define uint64_t gl_uint64_t +# define GL_UINT64_T +# elif defined _MSC_VER +# undef uint64_t typedef unsigned __int64 gl_uint64_t; -# define uint64_t gl_uint64_t -# define GL_UINT64_T -# elif @HAVE_UNSIGNED_LONG_LONG_INT@ -# undef uint64_t +# define uint64_t gl_uint64_t +# define GL_UINT64_T +# elif @HAVE_UNSIGNED_LONG_LONG_INT@ +# undef uint64_t typedef unsigned long long int gl_uint64_t; -# define uint64_t gl_uint64_t -# define GL_UINT64_T +# define uint64_t gl_uint64_t +# define GL_UINT64_T +# endif # endif -#endif /* Avoid collision with Solaris 2.5.1 <pthread.h> etc. */ -#define _UINT8_T -#define _UINT32_T -#define _UINT64_T +# define _UINT8_T +# define _UINT32_T +# define _UINT64_T /* 7.18.1.2. Minimum-width integer types */ @@ -213,26 +229,26 @@ typedef unsigned long long int gl_uint64_t; types have 8, 16, 32, optionally 64 bits. Therefore the leastN_t types are the same as the corresponding N_t types. */ -#undef int_least8_t -#undef uint_least8_t -#undef int_least16_t -#undef uint_least16_t -#undef int_least32_t -#undef uint_least32_t -#undef int_least64_t -#undef uint_least64_t -#define int_least8_t int8_t -#define uint_least8_t uint8_t -#define int_least16_t int16_t -#define uint_least16_t uint16_t -#define int_least32_t int32_t -#define uint_least32_t uint32_t -#ifdef GL_INT64_T -# define int_least64_t int64_t -#endif -#ifdef GL_UINT64_T -# define uint_least64_t uint64_t -#endif +# undef int_least8_t +# undef uint_least8_t +# undef int_least16_t +# undef uint_least16_t +# undef int_least32_t +# undef uint_least32_t +# undef int_least64_t +# undef uint_least64_t +# define int_least8_t int8_t +# define uint_least8_t uint8_t +# define int_least16_t int16_t +# define uint_least16_t uint16_t +# define int_least32_t int32_t +# define uint_least32_t uint32_t +# ifdef GL_INT64_T +# define int_least64_t int64_t +# endif +# ifdef GL_UINT64_T +# define uint_least64_t uint64_t +# endif /* 7.18.1.3. Fastest minimum-width integer types */ @@ -245,55 +261,55 @@ typedef unsigned long long int gl_uint64_t; uses types consistent with glibc, as that lessens the chance of incompatibility with older GNU hosts. */ -#undef int_fast8_t -#undef uint_fast8_t -#undef int_fast16_t -#undef uint_fast16_t -#undef int_fast32_t -#undef uint_fast32_t -#undef int_fast64_t -#undef uint_fast64_t +# undef int_fast8_t +# undef uint_fast8_t +# undef int_fast16_t +# undef uint_fast16_t +# undef int_fast32_t +# undef uint_fast32_t +# undef int_fast64_t +# undef uint_fast64_t typedef signed char gl_int_fast8_t; typedef unsigned char gl_uint_fast8_t; -#ifdef __sun +# ifdef __sun /* Define types compatible with SunOS 5.10, so that code compiled under earlier SunOS versions works with code compiled under SunOS 5.10. */ typedef int gl_int_fast32_t; typedef unsigned int gl_uint_fast32_t; -#else +# else typedef long int gl_int_fast32_t; typedef unsigned long int gl_uint_fast32_t; -#endif +# endif typedef gl_int_fast32_t gl_int_fast16_t; typedef gl_uint_fast32_t gl_uint_fast16_t; -#define int_fast8_t gl_int_fast8_t -#define uint_fast8_t gl_uint_fast8_t -#define int_fast16_t gl_int_fast16_t -#define uint_fast16_t gl_uint_fast16_t -#define int_fast32_t gl_int_fast32_t -#define uint_fast32_t gl_uint_fast32_t -#ifdef GL_INT64_T -# define int_fast64_t int64_t -#endif -#ifdef GL_UINT64_T -# define uint_fast64_t uint64_t -#endif +# define int_fast8_t gl_int_fast8_t +# define uint_fast8_t gl_uint_fast8_t +# define int_fast16_t gl_int_fast16_t +# define uint_fast16_t gl_uint_fast16_t +# define int_fast32_t gl_int_fast32_t +# define uint_fast32_t gl_uint_fast32_t +# ifdef GL_INT64_T +# define int_fast64_t int64_t +# endif +# ifdef GL_UINT64_T +# define uint_fast64_t uint64_t +# endif /* 7.18.1.4. Integer types capable of holding object pointers */ /* kLIBC's stdint.h 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 +# ifndef _INTPTR_T_DECLARED +# undef intptr_t +# undef uintptr_t 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 */ @@ -304,33 +320,33 @@ typedef unsigned long int gl_uintptr_t; similarly for UINTMAX_MAX and uintmax_t. This avoids problems with assuming one type where another is used by the system. */ -#ifndef INTMAX_MAX -# undef INTMAX_C -# undef intmax_t -# if @HAVE_LONG_LONG_INT@ && LONG_MAX >> 30 == 1 +# ifndef INTMAX_MAX +# undef INTMAX_C +# undef intmax_t +# if @HAVE_LONG_LONG_INT@ && LONG_MAX >> 30 == 1 typedef long long int gl_intmax_t; -# define intmax_t gl_intmax_t -# elif defined GL_INT64_T -# define intmax_t int64_t -# else +# define intmax_t gl_intmax_t +# elif defined GL_INT64_T +# define intmax_t int64_t +# else typedef long int gl_intmax_t; -# define intmax_t gl_intmax_t +# define intmax_t gl_intmax_t +# endif # endif -#endif -#ifndef UINTMAX_MAX -# undef UINTMAX_C -# undef uintmax_t -# if @HAVE_UNSIGNED_LONG_LONG_INT@ && ULONG_MAX >> 31 == 1 +# ifndef UINTMAX_MAX +# undef UINTMAX_C +# undef uintmax_t +# if @HAVE_UNSIGNED_LONG_LONG_INT@ && ULONG_MAX >> 31 == 1 typedef unsigned long long int gl_uintmax_t; -# define uintmax_t gl_uintmax_t -# elif defined GL_UINT64_T -# define uintmax_t uint64_t -# else +# define uintmax_t gl_uintmax_t +# elif defined GL_UINT64_T +# define uintmax_t uint64_t +# else typedef unsigned long int gl_uintmax_t; -# define uintmax_t gl_uintmax_t +# define uintmax_t gl_uintmax_t +# endif # endif -#endif /* Verify that intmax_t and uintmax_t have the same size. Too much code breaks if this is not the case. If this check fails, the reason is likely @@ -338,8 +354,8 @@ typedef unsigned long int gl_uintmax_t; typedef int _verify_intmax_size[sizeof (intmax_t) == sizeof (uintmax_t) ? 1 : -1]; -#define GNULIB_defined_stdint_types 1 -#endif /* !GNULIB_defined_stdint_types */ +# define GNULIB_defined_stdint_types 1 +# endif /* !GNULIB_defined_stdint_types */ /* 7.18.2. Limits of specified-width integer types */ @@ -348,37 +364,37 @@ typedef int _verify_intmax_size[sizeof (intmax_t) == sizeof (uintmax_t) /* Here we assume a standard architecture where the hardware integer types have 8, 16, 32, optionally 64 bits. */ -#undef INT8_MIN -#undef INT8_MAX -#undef UINT8_MAX -#define INT8_MIN (~ INT8_MAX) -#define INT8_MAX 127 -#define UINT8_MAX 255 - -#undef INT16_MIN -#undef INT16_MAX -#undef UINT16_MAX -#define INT16_MIN (~ INT16_MAX) -#define INT16_MAX 32767 -#define UINT16_MAX 65535 - -#undef INT32_MIN -#undef INT32_MAX -#undef UINT32_MAX -#define INT32_MIN (~ INT32_MAX) -#define INT32_MAX 2147483647 -#define UINT32_MAX 4294967295U - -#if defined GL_INT64_T && ! defined INT64_MAX +# undef INT8_MIN +# undef INT8_MAX +# undef UINT8_MAX +# define INT8_MIN (~ INT8_MAX) +# define INT8_MAX 127 +# define UINT8_MAX 255 + +# undef INT16_MIN +# undef INT16_MAX +# undef UINT16_MAX +# define INT16_MIN (~ INT16_MAX) +# define INT16_MAX 32767 +# define UINT16_MAX 65535 + +# undef INT32_MIN +# undef INT32_MAX +# undef UINT32_MAX +# define INT32_MIN (~ INT32_MAX) +# define INT32_MAX 2147483647 +# define UINT32_MAX 4294967295U + +# if defined GL_INT64_T && ! defined INT64_MAX /* Prefer (- INTMAX_C (1) << 63) over (~ INT64_MAX) because SunPRO C 5.0 evaluates the latter incorrectly in preprocessor expressions. */ -# define INT64_MIN (- INTMAX_C (1) << 63) -# define INT64_MAX INTMAX_C (9223372036854775807) -#endif +# define INT64_MIN (- INTMAX_C (1) << 63) +# define INT64_MAX INTMAX_C (9223372036854775807) +# endif -#if defined GL_UINT64_T && ! defined UINT64_MAX -# define UINT64_MAX UINTMAX_C (18446744073709551615) -#endif +# if defined GL_UINT64_T && ! defined UINT64_MAX +# define UINT64_MAX UINTMAX_C (18446744073709551615) +# endif /* 7.18.2.2. Limits of minimum-width integer types */ @@ -386,38 +402,38 @@ typedef int _verify_intmax_size[sizeof (intmax_t) == sizeof (uintmax_t) types have 8, 16, 32, optionally 64 bits. Therefore the leastN_t types are the same as the corresponding N_t types. */ -#undef INT_LEAST8_MIN -#undef INT_LEAST8_MAX -#undef UINT_LEAST8_MAX -#define INT_LEAST8_MIN INT8_MIN -#define INT_LEAST8_MAX INT8_MAX -#define UINT_LEAST8_MAX UINT8_MAX - -#undef INT_LEAST16_MIN -#undef INT_LEAST16_MAX -#undef UINT_LEAST16_MAX -#define INT_LEAST16_MIN INT16_MIN -#define INT_LEAST16_MAX INT16_MAX -#define UINT_LEAST16_MAX UINT16_MAX - -#undef INT_LEAST32_MIN -#undef INT_LEAST32_MAX -#undef UINT_LEAST32_MAX -#define INT_LEAST32_MIN INT32_MIN -#define INT_LEAST32_MAX INT32_MAX -#define UINT_LEAST32_MAX UINT32_MAX - -#undef INT_LEAST64_MIN -#undef INT_LEAST64_MAX -#ifdef GL_INT64_T -# define INT_LEAST64_MIN INT64_MIN -# define INT_LEAST64_MAX INT64_MAX -#endif +# undef INT_LEAST8_MIN +# undef INT_LEAST8_MAX +# undef UINT_LEAST8_MAX +# define INT_LEAST8_MIN INT8_MIN +# define INT_LEAST8_MAX INT8_MAX +# define UINT_LEAST8_MAX UINT8_MAX + +# undef INT_LEAST16_MIN +# undef INT_LEAST16_MAX +# undef UINT_LEAST16_MAX +# define INT_LEAST16_MIN INT16_MIN +# define INT_LEAST16_MAX INT16_MAX +# define UINT_LEAST16_MAX UINT16_MAX + +# undef INT_LEAST32_MIN +# undef INT_LEAST32_MAX +# undef UINT_LEAST32_MAX +# define INT_LEAST32_MIN INT32_MIN +# define INT_LEAST32_MAX INT32_MAX +# define UINT_LEAST32_MAX UINT32_MAX + +# undef INT_LEAST64_MIN +# undef INT_LEAST64_MAX +# ifdef GL_INT64_T +# define INT_LEAST64_MIN INT64_MIN +# define INT_LEAST64_MAX INT64_MAX +# endif -#undef UINT_LEAST64_MAX -#ifdef GL_UINT64_T -# define UINT_LEAST64_MAX UINT64_MAX -#endif +# undef UINT_LEAST64_MAX +# ifdef GL_UINT64_T +# define UINT_LEAST64_MAX UINT64_MAX +# endif /* 7.18.2.3. Limits of fastest minimum-width integer types */ @@ -425,117 +441,121 @@ typedef int _verify_intmax_size[sizeof (intmax_t) == sizeof (uintmax_t) types have 8, 16, 32, optionally 64 bits. Therefore the fastN_t types are taken from the same list of types. */ -#undef INT_FAST8_MIN -#undef INT_FAST8_MAX -#undef UINT_FAST8_MAX -#define INT_FAST8_MIN SCHAR_MIN -#define INT_FAST8_MAX SCHAR_MAX -#define UINT_FAST8_MAX UCHAR_MAX - -#undef INT_FAST16_MIN -#undef INT_FAST16_MAX -#undef UINT_FAST16_MAX -#define INT_FAST16_MIN INT_FAST32_MIN -#define INT_FAST16_MAX INT_FAST32_MAX -#define UINT_FAST16_MAX UINT_FAST32_MAX - -#undef INT_FAST32_MIN -#undef INT_FAST32_MAX -#undef UINT_FAST32_MAX -#ifdef __sun -# define INT_FAST32_MIN INT_MIN -# define INT_FAST32_MAX INT_MAX -# define UINT_FAST32_MAX UINT_MAX -#else -# define INT_FAST32_MIN LONG_MIN -# define INT_FAST32_MAX LONG_MAX -# define UINT_FAST32_MAX ULONG_MAX -#endif +# undef INT_FAST8_MIN +# undef INT_FAST8_MAX +# undef UINT_FAST8_MAX +# define INT_FAST8_MIN SCHAR_MIN +# define INT_FAST8_MAX SCHAR_MAX +# define UINT_FAST8_MAX UCHAR_MAX + +# undef INT_FAST16_MIN +# undef INT_FAST16_MAX +# undef UINT_FAST16_MAX +# define INT_FAST16_MIN INT_FAST32_MIN +# define INT_FAST16_MAX INT_FAST32_MAX +# define UINT_FAST16_MAX UINT_FAST32_MAX + +# undef INT_FAST32_MIN +# undef INT_FAST32_MAX +# undef UINT_FAST32_MAX +# ifdef __sun +# define INT_FAST32_MIN INT_MIN +# define INT_FAST32_MAX INT_MAX +# define UINT_FAST32_MAX UINT_MAX +# else +# define INT_FAST32_MIN LONG_MIN +# define INT_FAST32_MAX LONG_MAX +# define UINT_FAST32_MAX ULONG_MAX +# endif -#undef INT_FAST64_MIN -#undef INT_FAST64_MAX -#ifdef GL_INT64_T -# define INT_FAST64_MIN INT64_MIN -# define INT_FAST64_MAX INT64_MAX -#endif +# undef INT_FAST64_MIN +# undef INT_FAST64_MAX +# ifdef GL_INT64_T +# define INT_FAST64_MIN INT64_MIN +# define INT_FAST64_MAX INT64_MAX +# endif -#undef UINT_FAST64_MAX -#ifdef GL_UINT64_T -# define UINT_FAST64_MAX UINT64_MAX -#endif +# undef UINT_FAST64_MAX +# ifdef GL_UINT64_T +# define UINT_FAST64_MAX UINT64_MAX +# endif /* 7.18.2.4. Limits of integer types capable of holding object pointers */ -#undef INTPTR_MIN -#undef INTPTR_MAX -#undef UINTPTR_MAX -#define INTPTR_MIN LONG_MIN -#define INTPTR_MAX LONG_MAX -#define UINTPTR_MAX ULONG_MAX +# undef INTPTR_MIN +# undef INTPTR_MAX +# undef UINTPTR_MAX +# define INTPTR_MIN LONG_MIN +# define INTPTR_MAX LONG_MAX +# define UINTPTR_MAX ULONG_MAX /* 7.18.2.5. Limits of greatest-width integer types */ -#ifndef INTMAX_MAX -# undef INTMAX_MIN -# ifdef INT64_MAX -# define INTMAX_MIN INT64_MIN -# define INTMAX_MAX INT64_MAX -# else -# define INTMAX_MIN INT32_MIN -# define INTMAX_MAX INT32_MAX +# ifndef INTMAX_MAX +# undef INTMAX_MIN +# ifdef INT64_MAX +# define INTMAX_MIN INT64_MIN +# define INTMAX_MAX INT64_MAX +# else +# define INTMAX_MIN INT32_MIN +# define INTMAX_MAX INT32_MAX +# endif # endif -#endif -#ifndef UINTMAX_MAX -# ifdef UINT64_MAX -# define UINTMAX_MAX UINT64_MAX -# else -# define UINTMAX_MAX UINT32_MAX +# ifndef UINTMAX_MAX +# ifdef UINT64_MAX +# define UINTMAX_MAX UINT64_MAX +# else +# define UINTMAX_MAX UINT32_MAX +# endif # endif -#endif /* 7.18.3. Limits of other integer types */ /* ptrdiff_t limits */ -#undef PTRDIFF_MIN -#undef PTRDIFF_MAX -#if @APPLE_UNIVERSAL_BUILD@ -# ifdef _LP64 -# define PTRDIFF_MIN _STDINT_MIN (1, 64, 0l) -# define PTRDIFF_MAX _STDINT_MAX (1, 64, 0l) +# undef PTRDIFF_MIN +# undef PTRDIFF_MAX +# if @APPLE_UNIVERSAL_BUILD@ +# ifdef _LP64 +# define PTRDIFF_MIN _STDINT_SIGNED_MIN (64, 0l) +# define PTRDIFF_MAX _STDINT_MAX (1, 64, 0l) +# else +# define PTRDIFF_MIN _STDINT_SIGNED_MIN (32, 0) +# define PTRDIFF_MAX _STDINT_MAX (1, 32, 0) +# endif # else -# define PTRDIFF_MIN _STDINT_MIN (1, 32, 0) -# define PTRDIFF_MAX _STDINT_MAX (1, 32, 0) -# endif -#else -# define PTRDIFF_MIN \ - _STDINT_MIN (1, @BITSIZEOF_PTRDIFF_T@, 0@PTRDIFF_T_SUFFIX@) -# define PTRDIFF_MAX \ +# define PTRDIFF_MIN \ + _STDINT_SIGNED_MIN (@BITSIZEOF_PTRDIFF_T@, 0@PTRDIFF_T_SUFFIX@) +# define PTRDIFF_MAX \ _STDINT_MAX (1, @BITSIZEOF_PTRDIFF_T@, 0@PTRDIFF_T_SUFFIX@) -#endif +# endif /* sig_atomic_t limits */ -#undef SIG_ATOMIC_MIN -#undef SIG_ATOMIC_MAX -#define SIG_ATOMIC_MIN \ - _STDINT_MIN (@HAVE_SIGNED_SIG_ATOMIC_T@, @BITSIZEOF_SIG_ATOMIC_T@, \ - 0@SIG_ATOMIC_T_SUFFIX@) -#define SIG_ATOMIC_MAX \ +# undef SIG_ATOMIC_MIN +# undef SIG_ATOMIC_MAX +# if @HAVE_SIGNED_SIG_ATOMIC_T@ +# define SIG_ATOMIC_MIN \ + _STDINT_SIGNED_MIN (@BITSIZEOF_SIG_ATOMIC_T@, 0@SIG_ATOMIC_T_SUFFIX@) +# else +# define SIG_ATOMIC_MIN \ + _STDINT_UNSIGNED_MIN (@BITSIZEOF_SIG_ATOMIC_T@, 0@SIG_ATOMIC_T_SUFFIX@) +# endif +# define SIG_ATOMIC_MAX \ _STDINT_MAX (@HAVE_SIGNED_SIG_ATOMIC_T@, @BITSIZEOF_SIG_ATOMIC_T@, \ 0@SIG_ATOMIC_T_SUFFIX@) /* size_t limit */ -#undef SIZE_MAX -#if @APPLE_UNIVERSAL_BUILD@ -# ifdef _LP64 -# define SIZE_MAX _STDINT_MAX (0, 64, 0ul) +# undef SIZE_MAX +# if @APPLE_UNIVERSAL_BUILD@ +# ifdef _LP64 +# define SIZE_MAX _STDINT_MAX (0, 64, 0ul) +# else +# define SIZE_MAX _STDINT_MAX (0, 32, 0ul) +# endif # else -# define SIZE_MAX _STDINT_MAX (0, 32, 0ul) +# define SIZE_MAX _STDINT_MAX (0, @BITSIZEOF_SIZE_T@, 0@SIZE_T_SUFFIX@) # endif -#else -# define SIZE_MAX _STDINT_MAX (0, @BITSIZEOF_SIZE_T@, 0@SIZE_T_SUFFIX@) -#endif /* wchar_t limits */ /* Get WCHAR_MIN, WCHAR_MAX. @@ -543,29 +563,39 @@ typedef int _verify_intmax_size[sizeof (intmax_t) == sizeof (uintmax_t) sequence of nested includes <wchar.h> -> <stdio.h> -> <getopt.h> -> <stdlib.h>, and the latter includes <stdint.h> and assumes its types are already defined. */ -#if @HAVE_WCHAR_H@ && ! (defined WCHAR_MIN && defined WCHAR_MAX) +# if @HAVE_WCHAR_H@ && ! (defined WCHAR_MIN && defined WCHAR_MAX) /* BSD/OS 4.0.1 has a bug: <stddef.h>, <stdio.h> and <time.h> must be included before <wchar.h>. */ -# include <stddef.h> -# include <stdio.h> -# include <time.h> -# define _GL_JUST_INCLUDE_SYSTEM_WCHAR_H -# include <wchar.h> -# undef _GL_JUST_INCLUDE_SYSTEM_WCHAR_H -#endif -#undef WCHAR_MIN -#undef WCHAR_MAX -#define WCHAR_MIN \ - _STDINT_MIN (@HAVE_SIGNED_WCHAR_T@, @BITSIZEOF_WCHAR_T@, 0@WCHAR_T_SUFFIX@) -#define WCHAR_MAX \ +# include <stddef.h> +# include <stdio.h> +# include <time.h> +# define _GL_JUST_INCLUDE_SYSTEM_WCHAR_H +# include <wchar.h> +# undef _GL_JUST_INCLUDE_SYSTEM_WCHAR_H +# endif +# undef WCHAR_MIN +# undef WCHAR_MAX +# if @HAVE_SIGNED_WCHAR_T@ +# define WCHAR_MIN \ + _STDINT_SIGNED_MIN (@BITSIZEOF_WCHAR_T@, 0@WCHAR_T_SUFFIX@) +# else +# define WCHAR_MIN \ + _STDINT_UNSIGNED_MIN (@BITSIZEOF_WCHAR_T@, 0@WCHAR_T_SUFFIX@) +# endif +# define WCHAR_MAX \ _STDINT_MAX (@HAVE_SIGNED_WCHAR_T@, @BITSIZEOF_WCHAR_T@, 0@WCHAR_T_SUFFIX@) /* wint_t limits */ -#undef WINT_MIN -#undef WINT_MAX -#define WINT_MIN \ - _STDINT_MIN (@HAVE_SIGNED_WINT_T@, @BITSIZEOF_WINT_T@, 0@WINT_T_SUFFIX@) -#define WINT_MAX \ +# 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@) /* 7.18.4. Macros for integer constants */ @@ -576,59 +606,120 @@ typedef int _verify_intmax_size[sizeof (intmax_t) == sizeof (uintmax_t) /* Here we assume a standard architecture where the hardware integer types have 8, 16, 32, optionally 64 bits, and int is 32 bits. */ -#undef INT8_C -#undef UINT8_C -#define INT8_C(x) x -#define UINT8_C(x) x - -#undef INT16_C -#undef UINT16_C -#define INT16_C(x) x -#define UINT16_C(x) x - -#undef INT32_C -#undef UINT32_C -#define INT32_C(x) x -#define UINT32_C(x) x ## U - -#undef INT64_C -#undef UINT64_C -#if LONG_MAX >> 31 >> 31 == 1 -# define INT64_C(x) x##L -#elif defined _MSC_VER -# define INT64_C(x) x##i64 -#elif @HAVE_LONG_LONG_INT@ -# 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@ -# define UINT64_C(x) x##ULL -#endif +# undef INT8_C +# undef UINT8_C +# define INT8_C(x) x +# define UINT8_C(x) x + +# undef INT16_C +# undef UINT16_C +# define INT16_C(x) x +# define UINT16_C(x) x + +# undef INT32_C +# undef UINT32_C +# define INT32_C(x) x +# define UINT32_C(x) x ## U + +# undef INT64_C +# undef UINT64_C +# if LONG_MAX >> 31 >> 31 == 1 +# define INT64_C(x) x##L +# elif defined _MSC_VER +# define INT64_C(x) x##i64 +# elif @HAVE_LONG_LONG_INT@ +# 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@ +# 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 -# define INTMAX_C(x) x##LL -# elif defined GL_INT64_T -# define INTMAX_C(x) INT64_C(x) -# else -# define INTMAX_C(x) x##L +# ifndef INTMAX_C +# if @HAVE_LONG_LONG_INT@ && LONG_MAX >> 30 == 1 +# define INTMAX_C(x) x##LL +# elif defined GL_INT64_T +# define INTMAX_C(x) INT64_C(x) +# else +# define INTMAX_C(x) x##L +# endif # endif -#endif -#ifndef UINTMAX_C -# if @HAVE_UNSIGNED_LONG_LONG_INT@ && ULONG_MAX >> 31 == 1 -# define UINTMAX_C(x) x##ULL -# elif defined GL_UINT64_T -# define UINTMAX_C(x) UINT64_C(x) -# else -# define UINTMAX_C(x) x##UL +# ifndef UINTMAX_C +# if @HAVE_UNSIGNED_LONG_LONG_INT@ && ULONG_MAX >> 31 == 1 +# define UINTMAX_C(x) x##ULL +# elif defined GL_UINT64_T +# define UINTMAX_C(x) UINT64_C(x) +# else +# define UINTMAX_C(x) x##UL +# endif # endif -#endif + +#endif /* !@HAVE_C99_STDINT_H@ */ + +/* Macros specified by ISO/IEC TS 18661-1:2014. */ + +#if (!defined UINTMAX_WIDTH \ + && (defined _GNU_SOURCE || defined __STDC_WANT_IEC_60559_BFP_EXT__)) +# ifdef INT8_MAX +# define INT8_WIDTH _GL_INTEGER_WIDTH (INT8_MIN, INT8_MAX) +# endif +# ifdef UINT8_MAX +# define UINT8_WIDTH _GL_INTEGER_WIDTH (0, UINT8_MAX) +# endif +# ifdef INT16_MAX +# define INT16_WIDTH _GL_INTEGER_WIDTH (INT16_MIN, INT16_MAX) +# endif +# ifdef UINT16_MAX +# define UINT16_WIDTH _GL_INTEGER_WIDTH (0, UINT16_MAX) +# endif +# ifdef INT32_MAX +# define INT32_WIDTH _GL_INTEGER_WIDTH (INT32_MIN, INT32_MAX) +# endif +# ifdef UINT32_MAX +# define UINT32_WIDTH _GL_INTEGER_WIDTH (0, UINT32_MAX) +# endif +# ifdef INT64_MAX +# define INT64_WIDTH _GL_INTEGER_WIDTH (INT64_MIN, INT64_MAX) +# endif +# ifdef UINT64_MAX +# define UINT64_WIDTH _GL_INTEGER_WIDTH (0, UINT64_MAX) +# endif +# define INT_LEAST8_WIDTH _GL_INTEGER_WIDTH (INT_LEAST8_MIN, INT_LEAST8_MAX) +# define UINT_LEAST8_WIDTH _GL_INTEGER_WIDTH (0, UINT_LEAST8_MAX) +# define INT_LEAST16_WIDTH _GL_INTEGER_WIDTH (INT_LEAST16_MIN, INT_LEAST16_MAX) +# define UINT_LEAST16_WIDTH _GL_INTEGER_WIDTH (0, UINT_LEAST16_MAX) +# define INT_LEAST32_WIDTH _GL_INTEGER_WIDTH (INT_LEAST32_MIN, INT_LEAST32_MAX) +# define UINT_LEAST32_WIDTH _GL_INTEGER_WIDTH (0, UINT_LEAST32_MAX) +# define INT_LEAST64_WIDTH _GL_INTEGER_WIDTH (INT_LEAST64_MIN, INT_LEAST64_MAX) +# define UINT_LEAST64_WIDTH _GL_INTEGER_WIDTH (0, UINT_LEAST64_MAX) +# define INT_FAST8_WIDTH _GL_INTEGER_WIDTH (INT_FAST8_MIN, INT_FAST8_MAX) +# define UINT_FAST8_WIDTH _GL_INTEGER_WIDTH (0, UINT_FAST8_MAX) +# define INT_FAST16_WIDTH _GL_INTEGER_WIDTH (INT_FAST16_MIN, INT_FAST16_MAX) +# define UINT_FAST16_WIDTH _GL_INTEGER_WIDTH (0, UINT_FAST16_MAX) +# define INT_FAST32_WIDTH _GL_INTEGER_WIDTH (INT_FAST32_MIN, INT_FAST32_MAX) +# define UINT_FAST32_WIDTH _GL_INTEGER_WIDTH (0, UINT_FAST32_MAX) +# define INT_FAST64_WIDTH _GL_INTEGER_WIDTH (INT_FAST64_MIN, INT_FAST64_MAX) +# define UINT_FAST64_WIDTH _GL_INTEGER_WIDTH (0, UINT_FAST64_MAX) +# define INTPTR_WIDTH _GL_INTEGER_WIDTH (INTPTR_MIN, INTPTR_MAX) +# define UINTPTR_WIDTH _GL_INTEGER_WIDTH (0, UINTPTR_MAX) +# define INTMAX_WIDTH _GL_INTEGER_WIDTH (INTMAX_MIN, INTMAX_MAX) +# define UINTMAX_WIDTH _GL_INTEGER_WIDTH (0, UINTMAX_MAX) +# define PTRDIFF_WIDTH _GL_INTEGER_WIDTH (PTRDIFF_MIN, PTRDIFF_MAX) +# define SIZE_WIDTH _GL_INTEGER_WIDTH (0, SIZE_MAX) +# define WCHAR_WIDTH _GL_INTEGER_WIDTH (WCHAR_MIN, WCHAR_MAX) +# ifdef WINT_MAX +# define WINT_WIDTH _GL_INTEGER_WIDTH (WINT_MIN, WINT_MAX) +# endif +# ifdef SIG_ATOMIC_MAX +# define SIG_ATOMIC_WIDTH _GL_INTEGER_WIDTH (SIG_ATOMIC_MIN, SIG_ATOMIC_MAX) +# endif +#endif /* !WINT_WIDTH && (_GNU_SOURCE || __STDC_WANT_IEC_60559_BFP_EXT__) */ #endif /* _@GUARD_PREFIX@_STDINT_H */ #endif /* !(defined __ANDROID__ && ...) */ diff --git a/lib/stdio--.h b/lib/stdio--.h index 8e23817..d46d8b0 100644 --- a/lib/stdio--.h +++ b/lib/stdio--.h @@ -1,6 +1,6 @@ /* Like stdio.h, but redefine some names to avoid glitches. - Copyright (C) 2005-2006, 2009-2016 Free Software Foundation, Inc. + Copyright (C) 2005-2006, 2009-2017 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/lib/stdio-safer.h b/lib/stdio-safer.h index 4231609..cfb5e4d 100644 --- a/lib/stdio-safer.h +++ b/lib/stdio-safer.h @@ -1,6 +1,6 @@ /* Invoke stdio functions, but avoid some glitches. - Copyright (C) 2001, 2003, 2006, 2009-2016 Free Software Foundation, Inc. + Copyright (C) 2001, 2003, 2006, 2009-2017 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/lib/stdio.in.h b/lib/stdio.in.h index 9b31365..d706377 100644 --- a/lib/stdio.in.h +++ b/lib/stdio.in.h @@ -1,6 +1,6 @@ /* A GNU-like <stdio.h>. - Copyright (C) 2004, 2007-2016 Free Software Foundation, Inc. + Copyright (C) 2004, 2007-2017 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -118,6 +118,26 @@ # include <unistd.h> #endif +/* MSVC declares 'perror' in <stdlib.h>, not in <stdio.h>. We must include + it before we #define perror rpl_perror. */ +/* But in any case avoid namespace pollution on glibc systems. */ +#if (@GNULIB_PERROR@ || defined GNULIB_POSIXCHECK) \ + && ((defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__) \ + && ! defined __GLIBC__ +# include <stdlib.h> +#endif + +/* MSVC declares 'remove' in <io.h>, not in <stdio.h>. We must include + it before we #define remove rpl_remove. */ +/* MSVC declares 'rename' in <io.h>, not in <stdio.h>. We must include + it before we #define rename rpl_rename. */ +/* But in any case avoid namespace pollution on glibc systems. */ +#if (@GNULIB_REMOVE@ || @GNULIB_RENAME@ || defined GNULIB_POSIXCHECK) \ + && ((defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__) \ + && ! defined __GLIBC__ +# include <io.h> +#endif + /* The definitions of _GL_FUNCDECL_RPL etc. are copied here. */ diff --git a/lib/stdlib.in.h b/lib/stdlib.in.h index 70dc88d..b5cf9d3 100644 --- a/lib/stdlib.in.h +++ b/lib/stdlib.in.h @@ -1,6 +1,6 @@ /* A GNU-like <stdlib.h>. - Copyright (C) 1995, 2001-2004, 2006-2016 Free Software Foundation, Inc. + Copyright (C) 1995, 2001-2004, 2006-2017 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -521,6 +521,9 @@ _GL_CXXALIASWARN (putenv); #endif #if @GNULIB_QSORT_R@ +/* Sort an array of NMEMB elements, starting at address BASE, each element + occupying SIZE bytes, in ascending order according to the comparison + function COMPARE. */ # if @REPLACE_QSORT_R@ # if !(defined __cplusplus && defined GNULIB_NAMESPACE) # undef qsort_r @@ -535,12 +538,24 @@ _GL_CXXALIAS_RPL (qsort_r, void, (void *base, size_t nmemb, size_t size, void *), void *arg)); # else +# if !@HAVE_QSORT_R@ +_GL_FUNCDECL_SYS (qsort_r, void, (void *base, size_t nmemb, size_t size, + int (*compare) (void const *, void const *, + void *), + void *arg) _GL_ARG_NONNULL ((1, 4))); +# endif _GL_CXXALIAS_SYS (qsort_r, void, (void *base, size_t nmemb, size_t size, int (*compare) (void const *, void const *, void *), void *arg)); # endif _GL_CXXALIASWARN (qsort_r); +#elif defined GNULIB_POSIXCHECK +# undef qsort_r +# if HAVE_RAW_DECL_QSORT_R +_GL_WARN_ON_USE (qsort_r, "qsort_r is not portable - " + "use gnulib module qsort_r for portability"); +# endif #endif diff --git a/lib/str-kmp.h b/lib/str-kmp.h index fcb2813..f7fc612 100644 --- a/lib/str-kmp.h +++ b/lib/str-kmp.h @@ -1,6 +1,6 @@ /* Substring search in a NUL terminated string of UNIT elements, using the Knuth-Morris-Pratt algorithm. - Copyright (C) 2005-2016 Free Software Foundation, Inc. + Copyright (C) 2005-2017 Free Software Foundation, Inc. Written by Bruno Haible <bruno@clisp.org>, 2005. This program is free software; you can redistribute it and/or modify diff --git a/lib/strcasecmp.c b/lib/strcasecmp.c index ac9f84f..8548f4d 100644 --- a/lib/strcasecmp.c +++ b/lib/strcasecmp.c @@ -1,5 +1,5 @@ /* Case-insensitive string comparison function. - Copyright (C) 1998-1999, 2005-2007, 2009-2016 Free Software Foundation, Inc. + Copyright (C) 1998-1999, 2005-2007, 2009-2017 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/lib/streq.h b/lib/streq.h index 234f075..d40fc48 100644 --- a/lib/streq.h +++ b/lib/streq.h @@ -1,5 +1,5 @@ /* Optimized string comparison. - Copyright (C) 2001-2002, 2007, 2009-2016 Free Software Foundation, Inc. + Copyright (C) 2001-2002, 2007, 2009-2017 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published diff --git a/lib/strerror-override.c b/lib/strerror-override.c index 9bc9b18..fb2c74f 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-2016 Free Software Foundation, Inc. + Copyright (C) 2010-2017 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/lib/strerror-override.h b/lib/strerror-override.h index 5264fd5..c22d303 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-2016 Free Software Foundation, Inc. + Copyright (C) 2010-2017 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/lib/strerror.c b/lib/strerror.c index 45c7633..afeb9c8 100644 --- a/lib/strerror.c +++ b/lib/strerror.c @@ -1,6 +1,6 @@ /* strerror.c --- POSIX compatible system error routine - Copyright (C) 2007-2016 Free Software Foundation, Inc. + Copyright (C) 2007-2017 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -66,5 +66,6 @@ strerror (int n) if (sizeof buf <= len) abort (); - return memcpy (buf, msg, len + 1); + memcpy (buf, msg, len + 1); + return buf; } diff --git a/lib/strftime.c b/lib/strftime.c index 4e65190..99bee4e 100644 --- a/lib/strftime.c +++ b/lib/strftime.c @@ -1,22 +1,22 @@ -/* Copyright (C) 1991-2001, 2003-2007, 2009-2016 Free Software Foundation, Inc. +/* Copyright (C) 1991-2017 Free Software Foundation, Inc. + This file is part of the GNU C Library. - NOTE: The canonical source of this file is maintained with the GNU C Library. - Bugs can be reported to bug-glibc@prep.ai.mit.edu. + 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. + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + General Public License for more details. - You should have received a copy of the GNU General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. */ + You should have received a copy of the GNU General Public + License along with the GNU C Library; if not, see + <http://www.gnu.org/licenses/>. */ #ifdef _LIBC +# define USE_IN_EXTENDED_LOCALE_MODEL 1 # define HAVE_STRUCT_ERA_ENTRY 1 # define HAVE_TM_GMTOFF 1 # define HAVE_TM_ZONE 1 @@ -63,10 +63,18 @@ extern char *tzname[]; #endif #include <limits.h> -#include <stdbool.h> #include <stddef.h> #include <stdlib.h> #include <string.h> +#include <stdbool.h> + +#ifndef FALLTHROUGH +# if __GNUC__ < 7 +# define FALLTHROUGH ((void) 0) +# else +# define FALLTHROUGH __attribute__ ((__fallthrough__)) +# endif +#endif #ifdef COMPILE_WIDE # include <endian.h> @@ -247,11 +255,11 @@ extern char *tzname[]; # undef _NL_CURRENT # define _NL_CURRENT(category, item) \ (current->values[_NL_ITEM_INDEX (item)].string) +# define LOCALE_PARAM , __locale_t loc # define LOCALE_ARG , loc -# define LOCALE_PARAM_PROTO , __locale_t loc # define HELPER_LOCALE_ARG , current #else -# define LOCALE_PARAM_PROTO +# define LOCALE_PARAM # define LOCALE_ARG # ifdef _LIBC # define HELPER_LOCALE_ARG , _NL_CURRENT_DATA (LC_TIME) @@ -304,18 +312,22 @@ fwrite_uppcase (FILE *fp, const CHAR_T *src, size_t len) } } #else +static CHAR_T *memcpy_lowcase (CHAR_T *dest, const CHAR_T *src, + size_t len LOCALE_PARAM); + static CHAR_T * -memcpy_lowcase (CHAR_T *dest, const CHAR_T *src, - size_t len LOCALE_PARAM_PROTO) +memcpy_lowcase (CHAR_T *dest, const CHAR_T *src, size_t len LOCALE_PARAM) { while (len-- > 0) dest[len] = TOLOWER ((UCHAR_T) src[len], loc); return dest; } +static CHAR_T *memcpy_uppcase (CHAR_T *dest, const CHAR_T *src, + size_t len LOCALE_PARAM); + static CHAR_T * -memcpy_uppcase (CHAR_T *dest, const CHAR_T *src, - size_t len LOCALE_PARAM_PROTO) +memcpy_uppcase (CHAR_T *dest, const CHAR_T *src, size_t len LOCALE_PARAM) { while (len-- > 0) dest[len] = TOUPPER ((UCHAR_T) src[len], loc); @@ -328,6 +340,7 @@ memcpy_uppcase (CHAR_T *dest, const CHAR_T *src, /* Yield the difference between *A and *B, measured in seconds, ignoring leap seconds. */ # define tm_diff ftime_tm_diff +static int tm_diff (const struct tm *, const struct tm *); static int tm_diff (const struct tm *a, const struct tm *b) { @@ -359,6 +372,7 @@ tm_diff (const struct tm *a, const struct tm *b) #define ISO_WEEK_START_WDAY 1 /* Monday */ #define ISO_WEEK1_WDAY 4 /* Thursday */ #define YDAY_MINIMUM (-366) +static int iso_week_days (int, int); #ifdef __GNUC__ __inline__ #endif @@ -401,17 +415,41 @@ iso_week_days (int yday, int wday) # define ns 0 #endif +static size_t __strftime_internal (STREAM_OR_CHAR_T *, STRFTIME_ARG (size_t) + const CHAR_T *, const struct tm *, + bool, bool * + extra_args_spec LOCALE_PARAM); + +/* Write information from TP into S according to the format + string FORMAT, writing no more that MAXSIZE characters + (including the terminating '\0') and returning number of + characters written. If S is NULL, nothing will be written + anywhere, so to determine how many characters would be + written, use NULL for S and (size_t) -1 for MAXSIZE. */ +size_t +my_strftime (STREAM_OR_CHAR_T *s, STRFTIME_ARG (size_t maxsize) + const CHAR_T *format, + const struct tm *tp extra_args_spec LOCALE_PARAM) +{ + bool tzset_called = false; + return __strftime_internal (s, STRFTIME_ARG (maxsize) format, tp, + false, &tzset_called extra_args LOCALE_ARG); +} +#if defined _LIBC && ! FPRINTFTIME +libc_hidden_def (my_strftime) +#endif -/* Just like my_strftime, below, but with one more parameter, UPCASE, - to indicate that the result should be converted to upper case. */ +/* Just like my_strftime, above, but with two more parameters. + UPCASE indicate that the result should be converted to upper case, + and *TZSET_CALLED indicates whether tzset has been called here. */ static size_t -strftime_case_ (bool upcase, STREAM_OR_CHAR_T *s, - STRFTIME_ARG (size_t maxsize) - const CHAR_T *format, - const struct tm *tp extra_args_spec LOCALE_PARAM_PROTO) +__strftime_internal (STREAM_OR_CHAR_T *s, STRFTIME_ARG (size_t maxsize) + const CHAR_T *format, + const struct tm *tp, bool upcase, bool *tzset_called + extra_args_spec LOCALE_PARAM) { #if defined _LIBC && defined USE_IN_EXTENDED_LOCALE_MODEL - struct locale_data *const current = loc->__locales[LC_TIME]; + struct __locale_data *const current = loc->__locales[LC_TIME]; #endif #if FPRINTFTIME size_t maxsize = (size_t) -1; @@ -426,13 +464,17 @@ strftime_case_ (bool upcase, STREAM_OR_CHAR_T *s, only a few elements. Dereference the pointers only if the format requires this. Then it is ok to fail if the pointers are invalid. */ # define a_wkday \ - ((const CHAR_T *) _NL_CURRENT (LC_TIME, NLW(ABDAY_1) + tp->tm_wday)) + ((const CHAR_T *) (tp->tm_wday < 0 || tp->tm_wday > 6 \ + ? "?" : _NL_CURRENT (LC_TIME, NLW(ABDAY_1) + tp->tm_wday))) # define f_wkday \ - ((const CHAR_T *) _NL_CURRENT (LC_TIME, NLW(DAY_1) + tp->tm_wday)) + ((const CHAR_T *) (tp->tm_wday < 0 || tp->tm_wday > 6 \ + ? "?" : _NL_CURRENT (LC_TIME, NLW(DAY_1) + tp->tm_wday))) # define a_month \ - ((const CHAR_T *) _NL_CURRENT (LC_TIME, NLW(ABMON_1) + tp->tm_mon)) + ((const CHAR_T *) (tp->tm_mon < 0 || tp->tm_mon > 11 \ + ? "?" : _NL_CURRENT (LC_TIME, NLW(ABMON_1) + tp->tm_mon))) # define f_month \ - ((const CHAR_T *) _NL_CURRENT (LC_TIME, NLW(MON_1) + tp->tm_mon)) + ((const CHAR_T *) (tp->tm_mon < 0 || tp->tm_mon > 11 \ + ? "?" : _NL_CURRENT (LC_TIME, NLW(MON_1) + tp->tm_mon))) # define ampm \ ((const CHAR_T *) _NL_CURRENT (LC_TIME, tp->tm_hour > 11 \ ? NLW(PM_STR) : NLW(AM_STR))) @@ -483,15 +525,21 @@ strftime_case_ (bool upcase, STREAM_OR_CHAR_T *s, /* Infer the zone name from *TZ instead of from TZNAME. */ tzname_vec = tz->tzname_copy; # endif + } + /* The tzset() call might have changed the value. */ + if (!(zone && *zone) && tp->tm_isdst >= 0) + { /* POSIX.1 requires that local time zone information be used as though strftime called tzset. */ # if HAVE_TZSET - tzset (); + if (!*tzset_called) + { + tzset (); + *tzset_called = true; + } # endif + zone = tzname_vec[tp->tm_isdst != 0]; } - /* The tzset() call might have changed the value. */ - if (!(zone && *zone) && tp->tm_isdst >= 0) - zone = tzname_vec[tp->tm_isdst != 0]; #endif if (! zone) zone = ""; @@ -699,11 +747,10 @@ strftime_case_ (bool upcase, STREAM_OR_CHAR_T *s, /* The mask is not what you might think. When the ordinal i'th bit is set, insert a colon before the i'th digit of the time zone representation. */ -#define DO_TZ_OFFSET(d, negative, mask, v) \ +#define DO_TZ_OFFSET(d, mask, v) \ do \ { \ digits = d; \ - negative_number = negative; \ tz_colon_mask = mask; \ u_number_value = v; \ goto do_tz_offset; \ @@ -801,14 +848,15 @@ strftime_case_ (bool upcase, STREAM_OR_CHAR_T *s, subformat: { - size_t len = strftime_case_ (to_uppcase, - NULL, STRFTIME_ARG ((size_t) -1) - subfmt, - tp extra_args LOCALE_ARG); - add (len, strftime_case_ (to_uppcase, p, - STRFTIME_ARG (maxsize - i) - subfmt, - tp extra_args LOCALE_ARG)); + size_t len = __strftime_internal (NULL, STRFTIME_ARG ((size_t) -1) + subfmt, + tp, to_uppcase, tzset_called + extra_args LOCALE_ARG); + add (len, __strftime_internal (p, + STRFTIME_ARG (maxsize - i) + subfmt, + tp, to_uppcase, tzset_called + extra_args LOCALE_ARG)); } break; @@ -845,8 +893,6 @@ strftime_case_ (bool upcase, STREAM_OR_CHAR_T *s, #endif case L_('C'): - if (modifier == L_('O')) - goto bad_format; if (modifier == L_('E')) { #if HAVE_STRUCT_ERA_ENTRY @@ -1100,8 +1146,7 @@ strftime_case_ (bool upcase, STREAM_OR_CHAR_T *s, #ifndef _NL_CURRENT format_char = L_('p'); #endif - /* FALLTHROUGH */ - + FALLTHROUGH; case L_('p'): if (change_case) { @@ -1115,6 +1160,10 @@ strftime_case_ (bool upcase, STREAM_OR_CHAR_T *s, goto underlying_strftime; #endif + case L_('q'): /* GNU extension. */ + DO_SIGNED_NUMBER (1, false, ((tp->tm_mon * 11) >> 5) + 1); + break; + case L_('R'): subfmt = L_("%H:%M"); goto subformat; @@ -1364,6 +1413,16 @@ strftime_case_ (bool upcase, STREAM_OR_CHAR_T *s, struct tm ltm; time_t lt; + /* POSIX.1 requires that local time zone information be used as + though strftime called tzset. */ +# if HAVE_TZSET + if (!*tzset_called) + { + tzset (); + *tzset_called = true; + } +# endif + ltm = *tp; lt = mktime_z (tz, <m); @@ -1391,6 +1450,7 @@ strftime_case_ (bool upcase, STREAM_OR_CHAR_T *s, } #endif + negative_number = diff < 0 || (diff == 0 && *zone == '-'); hour_diff = diff / 60 / 60; min_diff = diff / 60 % 60; sec_diff = diff % 60; @@ -1398,13 +1458,13 @@ strftime_case_ (bool upcase, STREAM_OR_CHAR_T *s, switch (colons) { case 0: /* +hhmm */ - DO_TZ_OFFSET (5, diff < 0, 0, hour_diff * 100 + min_diff); + DO_TZ_OFFSET (5, 0, hour_diff * 100 + min_diff); case 1: tz_hh_mm: /* +hh:mm */ - DO_TZ_OFFSET (6, diff < 0, 04, hour_diff * 100 + min_diff); + DO_TZ_OFFSET (6, 04, hour_diff * 100 + min_diff); case 2: tz_hh_mm_ss: /* +hh:mm:ss */ - DO_TZ_OFFSET (9, diff < 0, 024, + DO_TZ_OFFSET (9, 024, hour_diff * 10000 + min_diff * 100 + sec_diff); case 3: /* +hh if possible, else +hh:mm, else +hh:mm:ss */ @@ -1412,7 +1472,7 @@ strftime_case_ (bool upcase, STREAM_OR_CHAR_T *s, goto tz_hh_mm_ss; if (min_diff != 0) goto tz_hh_mm; - DO_TZ_OFFSET (3, diff < 0, 0, hour_diff); + DO_TZ_OFFSET (3, 0, hour_diff); default: goto bad_format; @@ -1421,7 +1481,7 @@ strftime_case_ (bool upcase, STREAM_OR_CHAR_T *s, case L_('\0'): /* GNU extension: % at end of format. */ --f; - /* Fall through. */ + FALLTHROUGH; default: /* Unknown format; output the format, including the '%', since this is most likely the right thing to do if a @@ -1444,22 +1504,3 @@ strftime_case_ (bool upcase, STREAM_OR_CHAR_T *s, return i; } - -/* Write information from TP into S according to the format - string FORMAT, writing no more that MAXSIZE characters - (including the terminating '\0') and returning number of - characters written. If S is NULL, nothing will be written - anywhere, so to determine how many characters would be - written, use NULL for S and (size_t) -1 for MAXSIZE. */ -size_t -my_strftime (STREAM_OR_CHAR_T *s, STRFTIME_ARG (size_t maxsize) - const CHAR_T *format, - const struct tm *tp extra_args_spec LOCALE_PARAM_PROTO) -{ - return strftime_case_ (false, s, STRFTIME_ARG (maxsize) - format, tp extra_args LOCALE_ARG); -} - -#if defined _LIBC && ! FPRINTFTIME -libc_hidden_def (my_strftime) -#endif diff --git a/lib/strftime.h b/lib/strftime.h index 17445e1..27a8d62 100644 --- a/lib/strftime.h +++ b/lib/strftime.h @@ -1,6 +1,6 @@ /* declarations for strftime.c - Copyright (C) 2002, 2004, 2008-2016 Free Software Foundation, Inc. + Copyright (C) 2002, 2004, 2008-2017 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/lib/striconv.c b/lib/striconv.c index 0d9ccdc..d4efad2 100644 --- a/lib/striconv.c +++ b/lib/striconv.c @@ -1,5 +1,5 @@ /* Charset conversion. - Copyright (C) 2001-2007, 2010-2016 Free Software Foundation, Inc. + Copyright (C) 2001-2007, 2010-2017 Free Software Foundation, Inc. Written by Bruno Haible and Simon Josefsson. This program is free software; you can redistribute it and/or modify diff --git a/lib/striconv.h b/lib/striconv.h index e5217d7..fd3854c 100644 --- a/lib/striconv.h +++ b/lib/striconv.h @@ -1,5 +1,5 @@ /* Charset conversion. - Copyright (C) 2001-2004, 2006-2007, 2009-2016 Free Software Foundation, Inc. + Copyright (C) 2001-2004, 2006-2007, 2009-2017 Free Software Foundation, Inc. Written by Bruno Haible and Simon Josefsson. This program is free software; you can redistribute it and/or modify diff --git a/lib/string.in.h b/lib/string.in.h index 7fb00c1..9a6b311 100644 --- a/lib/string.in.h +++ b/lib/string.in.h @@ -1,6 +1,6 @@ /* A GNU-like <string.h>. - Copyright (C) 1995-1996, 2001-2016 Free Software Foundation, Inc. + Copyright (C) 1995-1996, 2001-2017 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -416,15 +416,15 @@ _GL_WARN_ON_USE (strncat, "strncat is unportable - " # undef strndup # define strndup rpl_strndup # endif -_GL_FUNCDECL_RPL (strndup, char *, (char const *__string, size_t __n) +_GL_FUNCDECL_RPL (strndup, char *, (char const *__s, size_t __n) _GL_ARG_NONNULL ((1))); -_GL_CXXALIAS_RPL (strndup, char *, (char const *__string, size_t __n)); +_GL_CXXALIAS_RPL (strndup, char *, (char const *__s, size_t __n)); # else # if ! @HAVE_DECL_STRNDUP@ -_GL_FUNCDECL_SYS (strndup, char *, (char const *__string, size_t __n) +_GL_FUNCDECL_SYS (strndup, char *, (char const *__s, size_t __n) _GL_ARG_NONNULL ((1))); # endif -_GL_CXXALIAS_SYS (strndup, char *, (char const *__string, size_t __n)); +_GL_CXXALIAS_SYS (strndup, char *, (char const *__s, size_t __n)); # endif _GL_CXXALIASWARN (strndup); #elif defined GNULIB_POSIXCHECK @@ -444,17 +444,17 @@ _GL_WARN_ON_USE (strndup, "strndup is unportable - " # undef strnlen # define strnlen rpl_strnlen # endif -_GL_FUNCDECL_RPL (strnlen, size_t, (char const *__string, size_t __maxlen) +_GL_FUNCDECL_RPL (strnlen, size_t, (char const *__s, size_t __maxlen) _GL_ATTRIBUTE_PURE _GL_ARG_NONNULL ((1))); -_GL_CXXALIAS_RPL (strnlen, size_t, (char const *__string, size_t __maxlen)); +_GL_CXXALIAS_RPL (strnlen, size_t, (char const *__s, size_t __maxlen)); # else # if ! @HAVE_DECL_STRNLEN@ -_GL_FUNCDECL_SYS (strnlen, size_t, (char const *__string, size_t __maxlen) +_GL_FUNCDECL_SYS (strnlen, size_t, (char const *__s, size_t __maxlen) _GL_ATTRIBUTE_PURE _GL_ARG_NONNULL ((1))); # endif -_GL_CXXALIAS_SYS (strnlen, size_t, (char const *__string, size_t __maxlen)); +_GL_CXXALIAS_SYS (strnlen, size_t, (char const *__s, size_t __maxlen)); # endif _GL_CXXALIASWARN (strnlen); #elif defined GNULIB_POSIXCHECK diff --git a/lib/strings.in.h b/lib/strings.in.h index d5cabc5..0374c94 100644 --- a/lib/strings.in.h +++ b/lib/strings.in.h @@ -1,6 +1,6 @@ /* A substitute <strings.h>. - Copyright (C) 2007-2016 Free Software Foundation, Inc. + Copyright (C) 2007-2017 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/lib/stripslash.c b/lib/stripslash.c index 0453e36..2d9d166 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-2016 Free Software Foundation, + Copyright (C) 1990, 2001, 2003-2006, 2009-2017 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify diff --git a/lib/strncasecmp.c b/lib/strncasecmp.c index 07a55ea..2bb02d9 100644 --- a/lib/strncasecmp.c +++ b/lib/strncasecmp.c @@ -1,5 +1,5 @@ /* strncasecmp.c -- case insensitive string comparator - Copyright (C) 1998-1999, 2005-2007, 2009-2016 Free Software Foundation, Inc. + Copyright (C) 1998-1999, 2005-2007, 2009-2017 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/lib/strndup.c b/lib/strndup.c index 6250fcd..546e58c 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-2016 Free Software + Copyright (C) 1996-1998, 2001-2003, 2005-2007, 2009-2017 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 1bd7936..4cb1ca3 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-2016 Free Software Foundation, Inc. + Copyright (C) 2005-2007, 2009-2017 Free Software Foundation, Inc. Written by Simon Josefsson. This program is free software; you can redistribute it and/or modify diff --git a/lib/strnlen1.c b/lib/strnlen1.c index f5e0ffc..63f78a6 100644 --- a/lib/strnlen1.c +++ b/lib/strnlen1.c @@ -1,5 +1,5 @@ /* Find the length of STRING + 1, but scan at most MAXLEN bytes. - Copyright (C) 2005-2006, 2009-2016 Free Software Foundation, Inc. + Copyright (C) 2005-2006, 2009-2017 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/lib/strnlen1.h b/lib/strnlen1.h index d3cd7c1..86cb177 100644 --- a/lib/strnlen1.h +++ b/lib/strnlen1.h @@ -1,5 +1,5 @@ /* Find the length of STRING + 1, but scan at most MAXLEN bytes. - Copyright (C) 2005, 2009-2016 Free Software Foundation, Inc. + Copyright (C) 2005, 2009-2017 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/lib/strptime.c b/lib/strptime.c index a6a306c..c8e436e 100644 --- a/lib/strptime.c +++ b/lib/strptime.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2002, 2004-2005, 2007, 2009-2016 Free Software Foundation, +/* Copyright (C) 2002, 2004-2005, 2007, 2009-2017 Free Software Foundation, Inc. This file is part of the GNU C Library. @@ -525,6 +525,15 @@ __strptime_internal (rp, fmt, tm, decided, era_cnt LOCALE_PARAM) return NULL; } break; + case 'q': + /* Match quarter of year. GNU extension. */ + get_number (1, 4, 1); + tm->tm_mon = (val - 1) * 3; + tm->tm_mday = 1; + have_mon = 1; + have_mday = 1; + want_xday = 1; + break; case 'r': #ifdef _NL_CURRENT if (*decided != raw) @@ -982,6 +991,15 @@ __strptime_internal (rp, fmt, tm, decided, era_cnt LOCALE_PARAM) get_alt_number (0, 59, 2); tm->tm_min = val; break; + case 'q': + /* Match quarter using alternate numeric symbols. */ + get_alt_number (1, 4, 1); + tm->tm_mon = (val - 1) * 3; + tm->tm_mday = 1; + have_mon = 1; + have_mday = 1; + want_xday = 1; + break; case 'S': /* Match seconds using alternate numeric symbols. */ get_alt_number (0, 61, 2); diff --git a/lib/strtoimax.c b/lib/strtoimax.c index 223412b..3f31fe9 100644 --- a/lib/strtoimax.c +++ b/lib/strtoimax.c @@ -1,6 +1,6 @@ /* Convert string representation of a number into an intmax_t value. - Copyright (C) 1999, 2001-2004, 2006, 2009-2016 Free Software Foundation, + Copyright (C) 1999, 2001-2004, 2006, 2009-2017 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify diff --git a/lib/strtol.c b/lib/strtol.c index 6ef8a96..751d1e0 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-2016 Free Software + Copyright (C) 1991-1992, 1994-1999, 2003, 2005-2007, 2009-2017 Free Software Foundation, Inc. NOTE: The canonical source of this file is maintained with the GNU C diff --git a/lib/strtoul.c b/lib/strtoul.c index 6a5d4dd..c4974e0 100644 --- a/lib/strtoul.c +++ b/lib/strtoul.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1991, 1997, 2009-2016 Free Software Foundation, Inc. +/* Copyright (C) 1991, 1997, 2009-2017 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 16da823..51ae3ac 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-2016 Free Software Foundation, Inc. + Copyright (C) 1995-1997, 1999, 2009-2017 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_stat.in.h b/lib/sys_stat.in.h index 72d9537..1831740 100644 --- a/lib/sys_stat.in.h +++ b/lib/sys_stat.in.h @@ -1,5 +1,5 @@ -/* Provide a more complete sys/stat header file. - Copyright (C) 2005-2016 Free Software Foundation, Inc. +/* Provide a more complete sys/stat.h header file. + Copyright (C) 2005-2017 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -72,6 +72,75 @@ # define stat _stati64 #endif +/* Optionally, override 'struct stat' on native Windows. */ +#if @GNULIB_OVERRIDES_STRUCT_STAT@ + +# undef stat +# if @GNULIB_STAT@ +# define stat rpl_stat +# else + /* Provoke a clear link error if stat() is used as a function and + module 'stat' is not in use. */ +# define stat stat_used_without_requesting_gnulib_module_stat +# endif + +# if !GNULIB_defined_struct_stat +struct stat +{ + dev_t st_dev; + ino_t st_ino; + mode_t st_mode; + nlink_t st_nlink; +# if 0 + uid_t st_uid; +# else /* uid_t is not defined by default on native Windows. */ + short st_uid; +# endif +# if 0 + gid_t st_gid; +# else /* gid_t is not defined by default on native Windows. */ + short st_gid; +# endif + dev_t st_rdev; + off_t st_size; +# if 0 + blksize_t st_blksize; + blkcnt_t st_blocks; +# endif + +# if @WINDOWS_STAT_TIMESPEC@ + struct timespec st_atim; + struct timespec st_mtim; + struct timespec st_ctim; +# else + time_t st_atime; + time_t st_mtime; + time_t st_ctime; +# endif +}; +# if @WINDOWS_STAT_TIMESPEC@ +# define st_atime st_atim.tv_sec +# define st_mtime st_mtim.tv_sec +# define st_ctime st_ctim.tv_sec + /* Indicator, for gnulib internal purposes. */ +# define _GL_WINDOWS_STAT_TIMESPEC 1 +# endif +# define GNULIB_defined_struct_stat 1 +# endif + +/* Other possible values of st_mode. */ +# if 0 +# define _S_IFBLK 0x6000 +# endif +# if 0 +# define _S_IFLNK 0xA000 +# endif +# if 0 +# define _S_IFSOCK 0xC000 +# endif + +#endif + #ifndef S_IFIFO # ifdef _S_IFIFO # define S_IFIFO _S_IFIFO @@ -345,6 +414,9 @@ _GL_CXXALIAS_RPL (fstat, int, (int fd, struct stat *buf)); _GL_CXXALIAS_SYS (fstat, int, (int fd, struct stat *buf)); # endif _GL_CXXALIASWARN (fstat); +#elif @GNULIB_OVERRIDES_STRUCT_STAT@ +# undef fstat +# define fstat fstat_used_without_requesting_gnulib_module_fstat #elif @WINDOWS_64_BIT_ST_SIZE@ /* Above, we define stat to _stati64. */ # define fstat _fstati64 @@ -378,6 +450,9 @@ _GL_CXXALIAS_SYS (fstatat, int, (int fd, char const *name, struct stat *st, int flags)); # endif _GL_CXXALIASWARN (fstatat); +#elif @GNULIB_OVERRIDES_STRUCT_STAT@ +# undef fstatat +# define fstatat fstatat_used_without_requesting_gnulib_module_fstatat #elif defined GNULIB_POSIXCHECK # undef fstatat # if HAVE_RAW_DECL_FSTATAT @@ -476,6 +551,9 @@ _GL_CXXALIAS_SYS (lstat, int, (const char *name, struct stat *buf)); # if @HAVE_LSTAT@ _GL_CXXALIASWARN (lstat); # endif +#elif @GNULIB_OVERRIDES_STRUCT_STAT@ +# undef lstat +# define lstat lstat_used_without_requesting_gnulib_module_lstat #elif defined GNULIB_POSIXCHECK # undef lstat # if HAVE_RAW_DECL_LSTAT @@ -625,63 +703,69 @@ _GL_WARN_ON_USE (mknodat, "mknodat is not portable - " #if @GNULIB_STAT@ # if @REPLACE_STAT@ -/* We can't use the object-like #define stat rpl_stat, because of - struct stat. This means that rpl_stat will not be used if the user - does (stat)(a,b). Oh well. */ -# if defined _AIX && defined stat && defined _LARGE_FILES - /* With _LARGE_FILES defined, AIX (only) defines stat to stat64, - so we have to replace stat64() instead of stat(). */ -# undef stat64 -# define stat64(name, st) rpl_stat (name, st) -# elif @WINDOWS_64_BIT_ST_SIZE@ - /* Above, we define stat to _stati64. */ -# if defined __MINGW32__ && defined _stati64 -# ifndef _USE_32BIT_TIME_T - /* The system headers define _stati64 to _stat64. */ -# undef _stat64 -# define _stat64(name, st) rpl_stat (name, st) +# if !@GNULIB_OVERRIDES_STRUCT_STAT@ + /* We can't use the object-like #define stat rpl_stat, because of + struct stat. This means that rpl_stat will not be used if the user + does (stat)(a,b). Oh well. */ +# if defined _AIX && defined stat && defined _LARGE_FILES + /* With _LARGE_FILES defined, AIX (only) defines stat to stat64, + so we have to replace stat64() instead of stat(). */ +# undef stat64 +# define stat64(name, st) rpl_stat (name, st) +# elif @WINDOWS_64_BIT_ST_SIZE@ + /* Above, we define stat to _stati64. */ +# if defined __MINGW32__ && defined _stati64 +# ifndef _USE_32BIT_TIME_T + /* The system headers define _stati64 to _stat64. */ +# undef _stat64 +# define _stat64(name, st) rpl_stat (name, st) +# endif +# elif defined _MSC_VER && defined _stati64 +# ifdef _USE_32BIT_TIME_T + /* The system headers define _stati64 to _stat32i64. */ +# undef _stat32i64 +# define _stat32i64(name, st) rpl_stat (name, st) +# else + /* The system headers define _stati64 to _stat64. */ +# undef _stat64 +# define _stat64(name, st) rpl_stat (name, st) +# endif +# else +# undef _stati64 +# define _stati64(name, st) rpl_stat (name, st) # endif -# elif defined _MSC_VER && defined _stati64 +# elif defined __MINGW32__ && defined stat # ifdef _USE_32BIT_TIME_T - /* The system headers define _stati64 to _stat32i64. */ + /* The system headers define stat to _stat32i64. */ # undef _stat32i64 # define _stat32i64(name, st) rpl_stat (name, st) # else - /* The system headers define _stati64 to _stat64. */ + /* The system headers define stat to _stat64. */ # undef _stat64 # define _stat64(name, st) rpl_stat (name, st) # endif -# else -# undef _stati64 -# define _stati64(name, st) rpl_stat (name, st) -# endif -# elif defined __MINGW32__ && defined stat -# ifdef _USE_32BIT_TIME_T - /* The system headers define stat to _stat32i64. */ -# undef _stat32i64 -# define _stat32i64(name, st) rpl_stat (name, st) -# else - /* The system headers define stat to _stat64. */ -# undef _stat64 -# define _stat64(name, st) rpl_stat (name, st) -# endif -# elif defined _MSC_VER && defined stat -# ifdef _USE_32BIT_TIME_T - /* The system headers define stat to _stat32. */ -# undef _stat32 -# define _stat32(name, st) rpl_stat (name, st) -# else - /* The system headers define stat to _stat64i32. */ -# undef _stat64i32 -# define _stat64i32(name, st) rpl_stat (name, st) -# endif -# else /* !(_AIX ||__MINGW32__ || _MSC_VER) */ -# undef stat -# define stat(name, st) rpl_stat (name, st) -# endif /* !_LARGE_FILES */ +# elif defined _MSC_VER && defined stat +# ifdef _USE_32BIT_TIME_T + /* The system headers define stat to _stat32. */ +# undef _stat32 +# define _stat32(name, st) rpl_stat (name, st) +# else + /* The system headers define stat to _stat64i32. */ +# undef _stat64i32 +# define _stat64i32(name, st) rpl_stat (name, st) +# endif +# else /* !(_AIX || __MINGW32__ || _MSC_VER) */ +# undef stat +# 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_ARG_NONNULL ((1, 2)); # endif +#elif @GNULIB_OVERRIDES_STRUCT_STAT@ +/* see above: + #define stat stat_used_without_requesting_gnulib_module_stat + */ #elif defined GNULIB_POSIXCHECK # undef stat # if HAVE_RAW_DECL_STAT diff --git a/lib/sys_time.in.h b/lib/sys_time.in.h index 1623a1d..57739bc 100644 --- a/lib/sys_time.in.h +++ b/lib/sys_time.in.h @@ -1,6 +1,6 @@ /* Provide a more complete sys/time.h. - Copyright (C) 2007-2016 Free Software Foundation, Inc. + Copyright (C) 2007-2017 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -109,6 +109,13 @@ _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 diff --git a/lib/sys_types.in.h b/lib/sys_types.in.h index 8ab0545..3cea448 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-2016 Free Software Foundation, Inc. + Copyright (C) 2011-2017 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -42,6 +42,48 @@ # define _GL_WINDOWS_64_BIT_OFF_T 1 #endif +/* Override dev_t and ino_t if distinguishable inodes support is requested + on native Windows. */ +#if @WINDOWS_STAT_INODES@ + +# if @WINDOWS_STAT_INODES@ == 2 +/* Experimental, not useful in Windows 10. */ + +/* Define dev_t to a 64-bit type. */ +# if !defined GNULIB_defined_dev_t +typedef unsigned long long int rpl_dev_t; +# undef dev_t +# define dev_t rpl_dev_t +# define GNULIB_defined_dev_t 1 +# endif + +/* Define ino_t to a 128-bit type. */ +# if !defined GNULIB_defined_ino_t +/* MSVC does not have a 128-bit integer type. + GCC has a 128-bit integer type __int128, but only on 64-bit targets. */ +typedef struct { unsigned long long int _gl_ino[2]; } rpl_ino_t; +# undef ino_t +# define ino_t rpl_ino_t +# define GNULIB_defined_ino_t 1 +# endif + +# else /* @WINDOWS_STAT_INODES@ == 1 */ + +/* Define ino_t to a 64-bit type. */ +# if !defined GNULIB_defined_ino_t +typedef unsigned long long int rpl_ino_t; +# undef ino_t +# define ino_t rpl_ino_t +# define GNULIB_defined_ino_t 1 +# endif + +# endif + +/* Indicator, for gnulib internal purposes. */ +# define _GL_WINDOWS_STAT_INODES @WINDOWS_STAT_INODES@ + +#endif + /* MSVC 9 defines size_t in <stddef.h>, not in <sys/types.h>. */ /* But avoid namespace pollution on glibc systems. */ #if ((defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__) \ diff --git a/lib/sys_wait.in.h b/lib/sys_wait.in.h index 3982b2b..1458d26 100644 --- a/lib/sys_wait.in.h +++ b/lib/sys_wait.in.h @@ -1,5 +1,5 @@ /* A POSIX-like <sys/wait.h>. - Copyright (C) 2001-2003, 2005-2016 Free Software Foundation, Inc. + Copyright (C) 2001-2003, 2005-2017 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/lib/system-quote.c b/lib/system-quote.c index 5cb6fde..c114f7f 100644 --- a/lib/system-quote.c +++ b/lib/system-quote.c @@ -1,5 +1,5 @@ /* Quoting for a system command. - Copyright (C) 2012-2016 Free Software Foundation, Inc. + Copyright (C) 2012-2017 Free Software Foundation, Inc. Written by Bruno Haible <bruno@clisp.org>, 2012. This program is free software: you can redistribute it and/or modify diff --git a/lib/system-quote.h b/lib/system-quote.h index b56f467..f45292f 100644 --- a/lib/system-quote.h +++ b/lib/system-quote.h @@ -1,5 +1,5 @@ /* Quoting for a system command. - Copyright (C) 2001-2016 Free Software Foundation, Inc. + Copyright (C) 2001-2017 Free Software Foundation, Inc. Written by Bruno Haible <bruno@clisp.org>, 2012. This program is free software: you can redistribute it and/or modify diff --git a/lib/tempname.c b/lib/tempname.c index b1e9880..2cd9032 100644 --- a/lib/tempname.c +++ b/lib/tempname.c @@ -1,6 +1,6 @@ /* tempname.c - generate the name of a temporary file. - Copyright (C) 1991-2003, 2005-2007, 2009-2016 Free Software Foundation, Inc. + Copyright (C) 1991-2003, 2005-2007, 2009-2017 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/lib/tempname.h b/lib/tempname.h index be01c51..1ca9748 100644 --- a/lib/tempname.h +++ b/lib/tempname.h @@ -1,6 +1,6 @@ /* Create a temporary file or directory. - Copyright (C) 2006, 2009-2016 Free Software Foundation, Inc. + Copyright (C) 2006, 2009-2017 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/lib/time-internal.h b/lib/time-internal.h index 0635f28..bf22834 100644 --- a/lib/time-internal.h +++ b/lib/time-internal.h @@ -1,6 +1,6 @@ /* Time internal interface - Copyright 2015-2016 Free Software Foundation, Inc. + Copyright 2015-2017 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -38,8 +38,8 @@ struct tm_zone /* A sequence of null-terminated strings packed next to each other. The strings are followed by an extra null byte. If TZ_IS_SET, there must be at least one string and the first string (which is - actually a TZ environment value value) may be empty. Otherwise - all strings must be nonempty. + actually a TZ environment value) may be empty. Otherwise all + strings must be nonempty. Abbreviations are stored here because otherwise the values of tm_zone and/or tzname would be dead after changing TZ and calling diff --git a/lib/time.in.h b/lib/time.in.h index 865c114..f0c7ef8 100644 --- a/lib/time.in.h +++ b/lib/time.in.h @@ -1,6 +1,6 @@ /* A more-standard <time.h>. - Copyright (C) 2007-2016 Free Software Foundation, Inc. + Copyright (C) 2007-2017 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -120,6 +120,24 @@ _GL_CXXALIAS_SYS (nanosleep, int, _GL_CXXALIASWARN (nanosleep); # endif +/* Initialize time conversion information. */ +# if @GNULIB_TZSET@ +# if @REPLACE_TZSET@ +# if !(defined __cplusplus && defined GNULIB_NAMESPACE) +# undef tzset +# define tzset rpl_tzset +# endif +_GL_FUNCDECL_RPL (tzset, void, (void)); +_GL_CXXALIAS_RPL (tzset, void, (void)); +# else +# if ! @HAVE_TZSET@ +_GL_FUNCDECL_SYS (tzset, void, (void)); +# endif +_GL_CXXALIAS_SYS (tzset, void, (void)); +# endif +_GL_CXXALIASWARN (tzset); +# endif + /* Return the 'time_t' representation of TP and normalize TP. */ # if @GNULIB_MKTIME@ # if @REPLACE_MKTIME@ @@ -187,7 +205,7 @@ _GL_CXXALIASWARN (gmtime_r); /* Convert TIMER to RESULT, assuming local time and UTC respectively. See <http://www.opengroup.org/susv3xsh/localtime.html> and <http://www.opengroup.org/susv3xsh/gmtime.html>. */ -# if @GNULIB_GETTIMEOFDAY@ +# if @GNULIB_LOCALTIME@ || @REPLACE_LOCALTIME@ # if @REPLACE_LOCALTIME@ # if !(defined __cplusplus && defined GNULIB_NAMESPACE) # undef localtime @@ -202,7 +220,7 @@ _GL_CXXALIAS_SYS (localtime, struct tm *, (time_t const *__timer)); _GL_CXXALIASWARN (localtime); # endif -# if @GNULIB_GETTIMEOFDAY@ +# if 0 || @REPLACE_GMTIME@ # if @REPLACE_GMTIME@ # if !(defined __cplusplus && defined GNULIB_NAMESPACE) # undef gmtime @@ -217,7 +235,7 @@ _GL_CXXALIAS_SYS (gmtime, struct tm *, (time_t const *__timer)); _GL_CXXALIASWARN (gmtime); # endif -/* Parse BUF as a time stamp, assuming FORMAT specifies its layout, and store +/* Parse BUF as a timestamp, assuming FORMAT specifies its layout, and store the resulting broken-down time into TM. See <http://www.opengroup.org/susv3xsh/strptime.html>. */ # if @GNULIB_STRPTIME@ @@ -233,6 +251,41 @@ _GL_CXXALIAS_SYS (strptime, char *, (char const *restrict __buf, _GL_CXXALIASWARN (strptime); # endif +/* Convert *TP to a date and time string. See + <http://pubs.opengroup.org/onlinepubs/9699919799/functions/ctime.html>. */ +# if @GNULIB_CTIME@ +# if @REPLACE_CTIME@ +# if !(defined __cplusplus && defined GNULIB_NAMESPACE) +# define ctime rpl_ctime +# endif +_GL_FUNCDECL_RPL (ctime, char *, (time_t const *__tp) + _GL_ARG_NONNULL ((1))); +_GL_CXXALIAS_RPL (ctime, char *, (time_t const *__tp)); +# else +_GL_CXXALIAS_SYS (ctime, char *, (time_t const *__tp)); +# endif +_GL_CXXALIASWARN (ctime); +# endif + +/* Convert *TP to a date and time string. See + <http://pubs.opengroup.org/onlinepubs/9699919799/functions/strftime.html>. */ +# 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)); +# else +_GL_CXXALIAS_SYS (strftime, size_t, (char *__buf, size_t __bufsize, + const char *__fmt, const struct tm *__tp)); +# endif +_GL_CXXALIASWARN (strftime); +# endif + # if defined _GNU_SOURCE && @GNULIB_TIME_RZ@ && ! @HAVE_TIMEZONE_T@ typedef struct tm_zone *timezone_t; _GL_FUNCDECL_SYS (tzalloc, timezone_t, (char const *__name)); diff --git a/lib/time_r.c b/lib/time_r.c index dc1e161..708a98b 100644 --- a/lib/time_r.c +++ b/lib/time_r.c @@ -1,6 +1,6 @@ /* Reentrant time functions like localtime_r. - Copyright (C) 2003, 2006-2007, 2010-2016 Free Software Foundation, Inc. + Copyright (C) 2003, 2006-2007, 2010-2017 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/lib/time_rz.c b/lib/time_rz.c index 55b764e..17bc11c 100644 --- a/lib/time_rz.c +++ b/lib/time_rz.c @@ -1,6 +1,6 @@ /* Time zone functions such as tzalloc and localtime_rz - Copyright 2015-2016 Free Software Foundation, Inc. + Copyright 2015-2017 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -27,22 +27,24 @@ #include <time.h> #include <errno.h> +#include <limits.h> #include <stdbool.h> #include <stddef.h> #include <stdlib.h> #include <string.h> +#include "flexmember.h" #include "time-internal.h" -#if !HAVE_TZSET -static void tzset (void) { } +#ifndef SIZE_MAX +# define SIZE_MAX ((size_t) -1) #endif /* The approximate size to use for small allocation requests. This is the largest "small" request for the GNU C library malloc. */ enum { DEFAULT_MXFAST = 64 * sizeof (size_t) / 4 }; -/* Minimum size of the ABBRS member of struct abbr. ABBRS is larger +/* Minimum size of the ABBRS member of struct tm_zone. ABBRS is larger only in the unlikely case where an abbreviation longer than this is used. */ enum { ABBR_SIZE_MIN = DEFAULT_MXFAST - offsetof (struct tm_zone, abbrs) }; @@ -94,7 +96,7 @@ tzalloc (char const *name) { size_t name_size = name ? strlen (name) + 1 : 0; size_t abbr_size = name_size < ABBR_SIZE_MIN ? ABBR_SIZE_MIN : name_size + 1; - timezone_t tz = malloc (offsetof (struct tm_zone, abbrs) + abbr_size); + timezone_t tz = malloc (FLEXSIZEOF (struct tm_zone, abbrs, abbr_size)); if (tz) { tz->next = NULL; @@ -149,7 +151,13 @@ save_abbr (timezone_t tz, struct tm *tm) if (! (*zone_copy || (zone_copy == tz->abbrs && tz->tz_is_set))) { size_t zone_size = strlen (zone) + 1; - if (zone_size < tz->abbrs + ABBR_SIZE_MIN - zone_copy) + size_t zone_used = zone_copy - tz->abbrs; + if (SIZE_MAX - zone_used < zone_size) + { + errno = ENOMEM; + return false; + } + if (zone_used + zone_size < ABBR_SIZE_MIN) extend_abbrs (zone_copy, zone, zone_size); else { diff --git a/lib/timegm.c b/lib/timegm.c index bf61244..957a3b8 100644 --- a/lib/timegm.c +++ b/lib/timegm.c @@ -1,6 +1,6 @@ /* Convert UTC calendar time to simple time. Like mktime but assumes UTC. - Copyright (C) 1994, 1997, 2003-2004, 2006-2007, 2009-2016 Free Software + Copyright (C) 1994, 1997, 2003-2004, 2006-2007, 2009-2017 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/timespec.h b/lib/timespec.h index 601394b..f5d823a 100644 --- a/lib/timespec.h +++ b/lib/timespec.h @@ -1,6 +1,6 @@ /* timespec -- System time interface - Copyright (C) 2000, 2002, 2004-2005, 2007, 2009-2016 Free Software + Copyright (C) 2000, 2002, 2004-2005, 2007, 2009-2017 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify @@ -29,7 +29,11 @@ _GL_INLINE_HEADER_BEGIN # define _GL_TIMESPEC_INLINE _GL_INLINE #endif -/* Resolution of timespec time stamps (in units per second), and log +#ifdef __cplusplus +extern "C" { +#endif + +/* Resolution of timespec timestamps (in units per second), and log base 10 of the resolution. */ enum { TIMESPEC_RESOLUTION = 1000000000 }; @@ -48,7 +52,7 @@ make_timespec (time_t s, long int ns) /* Return negative, zero, positive if A < B, A == B, A > B, respectively. - For each time stamp T, this code assumes that either: + For each timestamp T, this code assumes that either: * T.tv_nsec is in the range 0..999999999; or * T.tv_sec corresponds to a valid leap second on a host that supports @@ -56,7 +60,7 @@ make_timespec (time_t s, long int ns) * T.tv_sec is the minimum time_t value and T.tv_nsec is -1; or T.tv_sec is the maximum time_t value and T.tv_nsec is 2000000000. This allows for special struct timespec values that are less or - greater than all possible valid time stamps. + greater than all possible valid timestamps. In all these cases, it is safe to subtract two tv_nsec values and convert the result to integer without worrying about overflow on @@ -107,6 +111,10 @@ timespectod (struct timespec a) void gettime (struct timespec *); int settime (struct timespec const *); +#ifdef __cplusplus +} +#endif + _GL_INLINE_HEADER_END #endif @@ -1,5 +1,5 @@ /* Removes leading and/or trailing whitespaces - Copyright (C) 2006-2016 Free Software Foundation, Inc. + Copyright (C) 2006-2017 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -1,5 +1,5 @@ /* Removes leading and/or trailing whitespaces - Copyright (C) 2006, 2009-2016 Free Software Foundation, Inc. + Copyright (C) 2006, 2009-2017 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/lib/tzset.c b/lib/tzset.c new file mode 100644 index 0000000..038a515 --- /dev/null +++ b/lib/tzset.c @@ -0,0 +1,83 @@ +/* Provide tzset for systems that don't have it or for which it's broken. + + Copyright (C) 2001-2003, 2005-2007, 2009-2017 Free Software Foundation, Inc. + + This 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 <http://www.gnu.org/licenses/>. */ + +/* written by Jim Meyering */ + +#include <config.h> + +/* Specification. */ +#include <time.h> + +#include "localtime-buffer.h" + +/* This is a wrapper for tzset, for systems on which tzset may clobber + the static buffer used for localtime's result. + Work around the bug in some systems whereby tzset clobbers the + static buffer that localtime uses for its return value. The + tzset function from Solaris 2.5, 2.5.1, and 2.6 has this problem. */ + +void +tzset (void) +#undef tzset +{ +#if TZSET_CLOBBERS_LOCALTIME + /* Save and restore the contents of the buffer used for localtime's + result around the call to tzset. */ + struct tm save = *localtime_buffer_addr; +#endif + +#if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__ + /* Rectify the value of the environment variable TZ. + There are four possible kinds of such values: + - Traditional US time zone names, e.g. "PST8PDT". Syntax: see + <https://msdn.microsoft.com/en-us/library/90s5c885.aspx> + - Time zone names based on geography, that contain one or more + slashes, e.g. "Europe/Moscow". + - Time zone names based on geography, without slashes, e.g. + "Singapore". + - Time zone names that contain explicit DST rules. Syntax: see + <http://pubs.opengroup.org/onlinepubs/9699919799/basedefs/V1_chap08.html#tag_08_03> + The Microsoft CRT understands only the first kind. It produces incorrect + results if the value of TZ is of the other kinds. + But in a Cygwin environment, /etc/profile.d/tzset.sh sets TZ to a value + of the second kind for most geographies, or of the first kind in a few + other geographies. If it is of the second kind, neutralize it. For the + Microsoft CRT, an absent or empty TZ means the time zone that the user + has set in the Windows Control Panel. + If the value of TZ is of the third or fourth kind -- Cygwin programs + understand these syntaxes as well --, it does not matter whether we + neutralize it or not, since these values occur only when a Cygwin user + has set TZ explicitly; this case is 1. rare and 2. under the user's + responsibility. */ + const char *tz = getenv ("TZ"); + if (tz != NULL && strchr (tz, '/') != NULL) + _putenv ("TZ="); + + /* On native Windows, tzset() is deprecated. Use _tzset() instead. See + https://msdn.microsoft.com/en-us/library/ms235451.aspx + https://msdn.microsoft.com/en-us/library/90s5c885.aspx */ + _tzset (); +#elif HAVE_TZSET + tzset (); +#else + /* Do nothing. Avoid infinite recursion. */ +#endif + +#if TZSET_CLOBBERS_LOCALTIME + *localtime_buffer_addr = save; +#endif +} diff --git a/lib/unistd.in.h b/lib/unistd.in.h index c3af07a..f366caf 100644 --- a/lib/unistd.in.h +++ b/lib/unistd.in.h @@ -1,5 +1,5 @@ /* Substitute for and wrapper around <unistd.h>. - Copyright (C) 2003-2016 Free Software Foundation, Inc. + Copyright (C) 2003-2017 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -55,9 +55,13 @@ #include <stddef.h> /* mingw doesn't define the SEEK_* or *_FILENO macros in <unistd.h>. */ +/* MSVC declares 'unlink' in <stdio.h>, not in <unistd.h>. We must include + it before we #define unlink rpl_unlink. */ /* Cygwin 1.7.1 declares symlinkat in <stdio.h>, not in <unistd.h>. */ /* But avoid namespace pollution on glibc systems. */ #if (!(defined SEEK_CUR && defined SEEK_END && defined SEEK_SET) \ + || ((@GNULIB_UNLINK@ || defined GNULIB_POSIXCHECK) \ + && ((defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__)) \ || ((@GNULIB_SYMLINKAT@ || defined GNULIB_POSIXCHECK) \ && defined __CYGWIN__)) \ && ! defined __GLIBC__ @@ -123,11 +127,18 @@ # include <sys/types.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. */ + + /* Get getopt(), optarg, optind, opterr, optopt. But avoid namespace pollution on glibc systems. */ #if @GNULIB_UNISTD_H_GETOPT@ && !defined __GLIBC__ && !defined _GL_SYSTEM_GETOPT -# define __need_getopt -# include <getopt.h> +# include <getopt-cdefs.h> +# include <getopt-pfx-core.h> #endif #ifndef _GL_INLINE_HEADER_BEGIN @@ -138,13 +149,6 @@ _GL_INLINE_HEADER_BEGIN # define _GL_UNISTD_INLINE _GL_INLINE #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. */ - - /* Hide some function declarations from <winsock2.h>. */ #if @GNULIB_GETHOSTNAME@ && @UNISTD_H_HAVE_WINSOCK2_H@ @@ -776,7 +780,7 @@ _GL_WARN_ON_USE (gethostname, "gethostname is unportable - " ${LOGNAME-$USER} on Unix platforms, $USERNAME on native Windows platforms. */ -# if !@HAVE_GETLOGIN@ +# if !@HAVE_DECL_GETLOGIN@ _GL_FUNCDECL_SYS (getlogin, char *, (void)); # endif _GL_CXXALIAS_SYS (getlogin, char *, (void)); @@ -1453,6 +1457,36 @@ _GL_WARN_ON_USE (symlinkat, "symlinkat is not portable - " #endif +#if @GNULIB_TRUNCATE@ +/* 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 + <http://pubs.opengroup.org/onlinepubs/9699919799/functions/truncate.html>. */ +# if @REPLACE_TRUNCATE@ +# if !(defined __cplusplus && defined GNULIB_NAMESPACE) +# undef truncate +# define truncate rpl_truncate +# endif +_GL_FUNCDECL_RPL (truncate, int, (const char *filename, off_t length) + _GL_ARG_NONNULL ((1))); +_GL_CXXALIAS_RPL (truncate, int, (const char *filename, off_t length)); +# else +# if !@HAVE_TRUNCATE@ +_GL_FUNCDECL_SYS (truncate, int, (const char *filename, off_t length) + _GL_ARG_NONNULL ((1))); +# endif +_GL_CXXALIAS_SYS (truncate, int, (const char *filename, off_t length)); +# endif +_GL_CXXALIASWARN (truncate); +#elif defined GNULIB_POSIXCHECK +# undef truncate +# if HAVE_RAW_DECL_TRUNCATE +_GL_WARN_ON_USE (truncate, "truncate is unportable - " + "use gnulib module truncate for portability"); +# endif +#endif + + #if @GNULIB_TTYNAME_R@ /* Store at most BUFLEN characters of the pathname of the terminal FD is open on in BUF. Return 0 on success, otherwise an error number. */ diff --git a/lib/unistr.in.h b/lib/unistr.in.h index 70aa9cb..0f330af 100644 --- a/lib/unistr.in.h +++ b/lib/unistr.in.h @@ -1,5 +1,5 @@ /* Elementary Unicode string functions. - Copyright (C) 2001-2002, 2005-2016 Free Software Foundation, Inc. + Copyright (C) 2001-2002, 2005-2017 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published @@ -197,15 +197,11 @@ u32_mbtouc_unsafe (ucs4_t *puc, { uint32_t c = *s; -# if CONFIG_UNICODE_SAFETY if (c < 0xd800 || (c >= 0xe000 && c < 0x110000)) -# endif *puc = c; -# if CONFIG_UNICODE_SAFETY else /* invalid multibyte character */ *puc = 0xfffd; -# endif return 1; } # endif diff --git a/lib/unistr/u8-mbtoucr.c b/lib/unistr/u8-mbtoucr.c index 48f9ca3..3f2f386 100644 --- a/lib/unistr/u8-mbtoucr.c +++ b/lib/unistr/u8-mbtoucr.c @@ -1,5 +1,5 @@ /* Look at first character in UTF-8 string, returning an error code. - Copyright (C) 1999-2002, 2006-2007, 2009-2016 Free Software Foundation, Inc. + Copyright (C) 1999-2002, 2006-2007, 2009-2017 Free Software Foundation, Inc. Written by Bruno Haible <bruno@clisp.org>, 2001. This program is free software: you can redistribute it and/or modify it @@ -92,10 +92,7 @@ u8_mbtoucr (ucs4_t *puc, const uint8_t *s, size_t n) { if ((s[1] ^ 0x80) < 0x40 && (c >= 0xf1 || s[1] >= 0x90) -#if 1 - && (c < 0xf4 || (c == 0xf4 && s[1] < 0x90)) -#endif - ) + && (c < 0xf4 || (c == 0xf4 && s[1] < 0x90))) { if (n >= 3) { @@ -138,146 +135,6 @@ u8_mbtoucr (ucs4_t *puc, const uint8_t *s, size_t n) return -2; } } -#if 0 - else if (c < 0xfc) - { - if (n >= 2) - { - if ((s[1] ^ 0x80) < 0x40 - && (c >= 0xf9 || s[1] >= 0x88)) - { - if (n >= 3) - { - if ((s[2] ^ 0x80) < 0x40) - { - if (n >= 4) - { - if ((s[3] ^ 0x80) < 0x40) - { - if (n >= 5) - { - if ((s[4] ^ 0x80) < 0x40) - { - *puc = ((unsigned int) (c & 0x03) << 24) - | ((unsigned int) (s[1] ^ 0x80) << 18) - | ((unsigned int) (s[2] ^ 0x80) << 12) - | ((unsigned int) (s[3] ^ 0x80) << 6) - | (unsigned int) (s[4] ^ 0x80); - return 5; - } - /* invalid multibyte character */ - } - else - { - /* incomplete multibyte character */ - *puc = 0xfffd; - return -2; - } - } - /* invalid multibyte character */ - } - else - { - /* incomplete multibyte character */ - *puc = 0xfffd; - return -2; - } - } - /* invalid multibyte character */ - } - else - { - /* incomplete multibyte character */ - *puc = 0xfffd; - return -2; - } - } - /* invalid multibyte character */ - } - else - { - /* incomplete multibyte character */ - *puc = 0xfffd; - return -2; - } - } - else if (c < 0xfe) - { - if (n >= 2) - { - if ((s[1] ^ 0x80) < 0x40 - && (c >= 0xfd || s[1] >= 0x84)) - { - if (n >= 3) - { - if ((s[2] ^ 0x80) < 0x40) - { - if (n >= 4) - { - if ((s[3] ^ 0x80) < 0x40) - { - if (n >= 5) - { - if ((s[4] ^ 0x80) < 0x40) - { - if (n >= 6) - { - if ((s[5] ^ 0x80) < 0x40) - { - *puc = ((unsigned int) (c & 0x01) << 30) - | ((unsigned int) (s[1] ^ 0x80) << 24) - | ((unsigned int) (s[2] ^ 0x80) << 18) - | ((unsigned int) (s[3] ^ 0x80) << 12) - | ((unsigned int) (s[4] ^ 0x80) << 6) - | (unsigned int) (s[5] ^ 0x80); - return 6; - } - /* invalid multibyte character */ - } - else - { - /* incomplete multibyte character */ - *puc = 0xfffd; - return -2; - } - } - /* invalid multibyte character */ - } - else - { - /* incomplete multibyte character */ - *puc = 0xfffd; - return -2; - } - } - /* invalid multibyte character */ - } - else - { - /* incomplete multibyte character */ - *puc = 0xfffd; - return -2; - } - } - /* invalid multibyte character */ - } - else - { - /* incomplete multibyte character */ - *puc = 0xfffd; - return -2; - } - } - /* invalid multibyte character */ - } - else - { - /* incomplete multibyte character */ - *puc = 0xfffd; - return -2; - } - } -#endif } /* invalid multibyte character */ *puc = 0xfffd; diff --git a/lib/unistr/u8-uctomb-aux.c b/lib/unistr/u8-uctomb-aux.c index d5ff1d6..ba358ed 100644 --- a/lib/unistr/u8-uctomb-aux.c +++ b/lib/unistr/u8-uctomb-aux.c @@ -1,5 +1,5 @@ /* Conversion UCS-4 to UTF-8. - Copyright (C) 2002, 2006-2007, 2009-2016 Free Software Foundation, Inc. + Copyright (C) 2002, 2006-2007, 2009-2017 Free Software Foundation, Inc. Written by Bruno Haible <bruno@clisp.org>, 2002. This program is free software: you can redistribute it and/or modify it @@ -20,6 +20,14 @@ /* Specification. */ #include "unistr.h" +#ifndef FALLTHROUGH +# if __GNUC__ < 7 +# define FALLTHROUGH ((void) 0) +# else +# define FALLTHROUGH __attribute__ ((__fallthrough__)) +# endif +#endif + int u8_uctomb_aux (uint8_t *s, ucs4_t uc, int n) { @@ -37,17 +45,8 @@ u8_uctomb_aux (uint8_t *s, ucs4_t uc, int n) else return -1; } -#if 0 - else if (uc < 0x200000) - count = 4; - else if (uc < 0x4000000) - count = 5; - else if (uc <= 0x7fffffff) - count = 6; -#else else if (uc < 0x110000) count = 4; -#endif else return -1; @@ -56,12 +55,10 @@ u8_uctomb_aux (uint8_t *s, ucs4_t uc, int n) switch (count) /* note: code falls through cases! */ { -#if 0 - case 6: s[5] = 0x80 | (uc & 0x3f); uc = uc >> 6; uc |= 0x4000000; - case 5: s[4] = 0x80 | (uc & 0x3f); uc = uc >> 6; uc |= 0x200000; -#endif case 4: s[3] = 0x80 | (uc & 0x3f); uc = uc >> 6; uc |= 0x10000; + FALLTHROUGH; case 3: s[2] = 0x80 | (uc & 0x3f); uc = uc >> 6; uc |= 0x800; + FALLTHROUGH; case 2: s[1] = 0x80 | (uc & 0x3f); uc = uc >> 6; uc |= 0xc0; /*case 1:*/ s[0] = uc; } diff --git a/lib/unistr/u8-uctomb.c b/lib/unistr/u8-uctomb.c index 419a6b4..685b6f1 100644 --- a/lib/unistr/u8-uctomb.c +++ b/lib/unistr/u8-uctomb.c @@ -1,5 +1,5 @@ /* Store a character in UTF-8 string. - Copyright (C) 2002, 2005-2006, 2009-2016 Free Software Foundation, Inc. + Copyright (C) 2002, 2005-2006, 2009-2017 Free Software Foundation, Inc. Written by Bruno Haible <bruno@clisp.org>, 2002. This program is free software: you can redistribute it and/or modify it @@ -52,17 +52,8 @@ u8_uctomb (uint8_t *s, ucs4_t uc, int n) else return -1; } -#if 0 - else if (uc < 0x200000) - count = 4; - else if (uc < 0x4000000) - count = 5; - else if (uc <= 0x7fffffff) - count = 6; -#else else if (uc < 0x110000) count = 4; -#endif else return -1; @@ -70,10 +61,6 @@ u8_uctomb (uint8_t *s, ucs4_t uc, int n) { switch (count) /* note: code falls through cases! */ { -#if 0 - case 6: s[5] = 0x80 | (uc & 0x3f); uc = uc >> 6; uc |= 0x4000000; - case 5: s[4] = 0x80 | (uc & 0x3f); uc = uc >> 6; uc |= 0x200000; -#endif case 4: s[3] = 0x80 | (uc & 0x3f); uc = uc >> 6; uc |= 0x10000; case 3: s[2] = 0x80 | (uc & 0x3f); uc = uc >> 6; uc |= 0x800; case 2: s[1] = 0x80 | (uc & 0x3f); uc = uc >> 6; uc |= 0xc0; diff --git a/lib/unitypes.in.h b/lib/unitypes.in.h index c6ca0ba..8733079 100644 --- a/lib/unitypes.in.h +++ b/lib/unitypes.in.h @@ -1,5 +1,5 @@ /* Elementary types and macros for the GNU UniString library. - Copyright (C) 2002, 2005-2006, 2009-2016 Free Software Foundation, Inc. + Copyright (C) 2002, 2005-2006, 2009-2017 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published diff --git a/lib/uniwidth.in.h b/lib/uniwidth.in.h index 0ab6d25..fc85e96 100644 --- a/lib/uniwidth.in.h +++ b/lib/uniwidth.in.h @@ -1,5 +1,5 @@ /* Display width functions. - Copyright (C) 2001-2002, 2005, 2007, 2009-2016 Free Software Foundation, + Copyright (C) 2001-2002, 2005, 2007, 2009-2017 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it diff --git a/lib/uniwidth/cjk.h b/lib/uniwidth/cjk.h index 0eac6fe..c354608 100644 --- a/lib/uniwidth/cjk.h +++ b/lib/uniwidth/cjk.h @@ -1,5 +1,5 @@ /* Test for CJK encoding. - Copyright (C) 2001-2002, 2005-2007, 2009-2016 Free Software Foundation, Inc. + Copyright (C) 2001-2002, 2005-2007, 2009-2017 Free Software Foundation, Inc. Written by Bruno Haible <bruno@clisp.org>, 2002. This program is free software: you can redistribute it and/or modify it diff --git a/lib/uniwidth/width.c b/lib/uniwidth/width.c index bd3b3fc..0817d39 100644 --- a/lib/uniwidth/width.c +++ b/lib/uniwidth/width.c @@ -1,5 +1,5 @@ /* Determine display width of Unicode character. - Copyright (C) 2001-2002, 2006-2016 Free Software Foundation, Inc. + Copyright (C) 2001-2002, 2006-2017 Free Software Foundation, Inc. Written by Bruno Haible <bruno@clisp.org>, 2002. This program is free software: you can redistribute it and/or modify it diff --git a/lib/unlocked-io.h b/lib/unlocked-io.h index c0ece50..aaf60a0 100644 --- a/lib/unlocked-io.h +++ b/lib/unlocked-io.h @@ -1,6 +1,6 @@ /* Prefer faster, non-thread-safe stdio functions if available. - Copyright (C) 2001-2004, 2009-2016 Free Software Foundation, Inc. + Copyright (C) 2001-2004, 2009-2017 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/lib/unsetenv.c b/lib/unsetenv.c index 8368744..e8f9a80 100644 --- a/lib/unsetenv.c +++ b/lib/unsetenv.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1992, 1995-2002, 2005-2016 Free Software Foundation, Inc. +/* Copyright (C) 1992, 1995-2002, 2005-2017 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/unused-parameter.h b/lib/unused-parameter.h new file mode 100644 index 0000000..b300055 --- /dev/null +++ b/lib/unused-parameter.h @@ -0,0 +1,36 @@ +/* A C macro for declaring that specific function parameters are not used. + Copyright (C) 2008-2017 Free Software Foundation, Inc. + + This program is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation; either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see <http://www.gnu.org/licenses/>. */ + +/* _GL_UNUSED_PARAMETER is a marker that can be appended to function parameter + declarations for parameters that are not used. This helps to reduce + warnings, such as from GCC -Wunused-parameter. The syntax is as follows: + type param _GL_UNUSED_PARAMETER + or more generally + param_decl _GL_UNUSED_PARAMETER + For example: + int param _GL_UNUSED_PARAMETER + int *(*param)(void) _GL_UNUSED_PARAMETER + Other possible, but obscure and discouraged syntaxes: + int _GL_UNUSED_PARAMETER *(*param)(void) + _GL_UNUSED_PARAMETER int *(*param)(void) + */ +#ifndef _GL_UNUSED_PARAMETER +# if __GNUC__ >= 3 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 7) +# define _GL_UNUSED_PARAMETER __attribute__ ((__unused__)) +# else +# define _GL_UNUSED_PARAMETER +# endif +#endif diff --git a/lib/vasnprintf.c b/lib/vasnprintf.c index de8965f..2d02414 100644 --- a/lib/vasnprintf.c +++ b/lib/vasnprintf.c @@ -1,5 +1,5 @@ /* vsprintf with automatic memory allocation. - Copyright (C) 1999, 2002-2016 Free Software Foundation, Inc. + Copyright (C) 1999, 2002-2017 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -118,6 +118,14 @@ # include "fpucw.h" #endif +#ifndef FALLTHROUGH +# if __GNUC__ < 7 +# define FALLTHROUGH ((void) 0) +# else +# define FALLTHROUGH __attribute__ ((__fallthrough__)) +# endif +#endif + /* Default parameters. */ #ifndef VASNPRINTF # if WIDE_CHAR_VERSION @@ -156,6 +164,7 @@ # define SNPRINTF snwprintf # else # define SNPRINTF _snwprintf +# define USE_MSVC__SNPRINTF 1 # endif # else /* Unix. */ @@ -181,7 +190,9 @@ /* Here we need to call the native snprintf, not rpl_snprintf. */ # undef snprintf # else + /* MSVC versions < 14 did not have snprintf, only _snprintf. */ # define SNPRINTF _snprintf +# define USE_MSVC__SNPRINTF 1 # endif # else /* Unix. */ @@ -208,7 +219,7 @@ #undef remainder #define remainder rem -#if (!USE_SNPRINTF || !HAVE_SNPRINTF_RETVAL_C99) && !WIDE_CHAR_VERSION +#if (!USE_SNPRINTF || !HAVE_SNPRINTF_RETVAL_C99 || USE_MSVC__SNPRINTF) && !WIDE_CHAR_VERSION # if (HAVE_STRNLEN && !defined _AIX) # define local_strnlen strnlen # else @@ -224,7 +235,7 @@ local_strnlen (const char *string, size_t maxlen) # endif #endif -#if (((!USE_SNPRINTF || !HAVE_SNPRINTF_RETVAL_C99) && WIDE_CHAR_VERSION) || ((!USE_SNPRINTF || !HAVE_SNPRINTF_RETVAL_C99 || (NEED_PRINTF_DIRECTIVE_LS && !defined IN_LIBINTL)) && !WIDE_CHAR_VERSION && DCHAR_IS_TCHAR)) && HAVE_WCHAR_T +#if (((!USE_SNPRINTF || !HAVE_SNPRINTF_RETVAL_C99 || USE_MSVC__SNPRINTF) && WIDE_CHAR_VERSION) || ((!USE_SNPRINTF || !HAVE_SNPRINTF_RETVAL_C99 || USE_MSVC__SNPRINTF || (NEED_PRINTF_DIRECTIVE_LS && !defined IN_LIBINTL)) && !WIDE_CHAR_VERSION && DCHAR_IS_TCHAR)) && HAVE_WCHAR_T # if HAVE_WCSLEN # define local_wcslen wcslen # else @@ -247,7 +258,7 @@ local_wcslen (const wchar_t *s) # endif #endif -#if (!USE_SNPRINTF || !HAVE_SNPRINTF_RETVAL_C99) && HAVE_WCHAR_T && WIDE_CHAR_VERSION +#if (!USE_SNPRINTF || !HAVE_SNPRINTF_RETVAL_C99 || USE_MSVC__SNPRINTF) && HAVE_WCHAR_T && WIDE_CHAR_VERSION # if HAVE_WCSNLEN # define local_wcsnlen wcsnlen # else @@ -1517,7 +1528,7 @@ is_borderline (const char *digits, size_t precision) #endif -#if !USE_SNPRINTF || !HAVE_SNPRINTF_RETVAL_C99 +#if !USE_SNPRINTF || !HAVE_SNPRINTF_RETVAL_C99 || USE_MSVC__SNPRINTF /* Use a different function name, to make it possible that the 'wchar_t' parametrization and the 'char' parametrization get compiled in the same @@ -2392,7 +2403,7 @@ VASNPRINTF (DCHAR_T *resultbuf, size_t *lengthp, } } #endif -#if (!USE_SNPRINTF || !HAVE_SNPRINTF_RETVAL_C99 || (NEED_PRINTF_DIRECTIVE_LS && !defined IN_LIBINTL)) && HAVE_WCHAR_T +#if (!USE_SNPRINTF || !HAVE_SNPRINTF_RETVAL_C99 || USE_MSVC__SNPRINTF || (NEED_PRINTF_DIRECTIVE_LS && !defined IN_LIBINTL)) && HAVE_WCHAR_T else if (dp->conversion == 's' # if WIDE_CHAR_VERSION && a.arg[dp->arg_index].type != TYPE_WIDE_STRING @@ -4591,10 +4602,10 @@ VASNPRINTF (DCHAR_T *resultbuf, size_t *lengthp, #if !DCHAR_IS_TCHAR || ENABLE_UNISTDIO || NEED_PRINTF_FLAG_LEFTADJUST || NEED_PRINTF_FLAG_ZERO || NEED_PRINTF_UNBOUNDED_PRECISION int has_width; #endif -#if !USE_SNPRINTF || !HAVE_SNPRINTF_RETVAL_C99 || !DCHAR_IS_TCHAR || ENABLE_UNISTDIO || NEED_PRINTF_FLAG_LEFTADJUST || NEED_PRINTF_FLAG_ZERO || NEED_PRINTF_UNBOUNDED_PRECISION +#if !USE_SNPRINTF || !HAVE_SNPRINTF_RETVAL_C99 || USE_MSVC__SNPRINTF || !DCHAR_IS_TCHAR || ENABLE_UNISTDIO || NEED_PRINTF_FLAG_LEFTADJUST || NEED_PRINTF_FLAG_ZERO || NEED_PRINTF_UNBOUNDED_PRECISION size_t width; #endif -#if !USE_SNPRINTF || !HAVE_SNPRINTF_RETVAL_C99 || NEED_PRINTF_UNBOUNDED_PRECISION +#if !USE_SNPRINTF || !HAVE_SNPRINTF_RETVAL_C99 || USE_MSVC__SNPRINTF || NEED_PRINTF_UNBOUNDED_PRECISION int has_precision; size_t precision; #endif @@ -4623,7 +4634,7 @@ VASNPRINTF (DCHAR_T *resultbuf, size_t *lengthp, #if !DCHAR_IS_TCHAR || ENABLE_UNISTDIO || NEED_PRINTF_FLAG_LEFTADJUST || NEED_PRINTF_FLAG_ZERO || NEED_PRINTF_UNBOUNDED_PRECISION has_width = 0; #endif -#if !USE_SNPRINTF || !HAVE_SNPRINTF_RETVAL_C99 || !DCHAR_IS_TCHAR || ENABLE_UNISTDIO || NEED_PRINTF_FLAG_LEFTADJUST || NEED_PRINTF_FLAG_ZERO || NEED_PRINTF_UNBOUNDED_PRECISION +#if !USE_SNPRINTF || !HAVE_SNPRINTF_RETVAL_C99 || USE_MSVC__SNPRINTF || !DCHAR_IS_TCHAR || ENABLE_UNISTDIO || NEED_PRINTF_FLAG_LEFTADJUST || NEED_PRINTF_FLAG_ZERO || NEED_PRINTF_UNBOUNDED_PRECISION width = 0; if (dp->width_start != dp->width_end) { @@ -4657,7 +4668,7 @@ VASNPRINTF (DCHAR_T *resultbuf, size_t *lengthp, } #endif -#if !USE_SNPRINTF || !HAVE_SNPRINTF_RETVAL_C99 || NEED_PRINTF_UNBOUNDED_PRECISION +#if !USE_SNPRINTF || !HAVE_SNPRINTF_RETVAL_C99 || USE_MSVC__SNPRINTF || NEED_PRINTF_UNBOUNDED_PRECISION has_precision = 0; precision = 6; if (dp->precision_start != dp->precision_end) @@ -4832,9 +4843,9 @@ VASNPRINTF (DCHAR_T *resultbuf, size_t *lengthp, break; # else *fbp++ = 'l'; - /*FALLTHROUGH*/ # endif #endif + FALLTHROUGH; case TYPE_LONGINT: case TYPE_ULONGINT: #if HAVE_WINT_T @@ -5127,7 +5138,7 @@ VASNPRINTF (DCHAR_T *resultbuf, size_t *lengthp, /* Look at the snprintf() return value. */ if (retcount < 0) { -# if !HAVE_SNPRINTF_RETVAL_C99 +# if !HAVE_SNPRINTF_RETVAL_C99 || USE_MSVC__SNPRINTF /* HP-UX 10.20 snprintf() is doubly deficient: It doesn't understand the '%n' directive, *and* it returns -1 (rather than the length diff --git a/lib/vasnprintf.h b/lib/vasnprintf.h index 8e9d84f..c227825 100644 --- a/lib/vasnprintf.h +++ b/lib/vasnprintf.h @@ -1,5 +1,5 @@ /* vsprintf with automatic memory allocation. - Copyright (C) 2002-2004, 2007-2016 Free Software Foundation, Inc. + Copyright (C) 2002-2004, 2007-2017 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/lib/vasprintf.c b/lib/vasprintf.c index a5dc1be..2dd6e3f 100644 --- a/lib/vasprintf.c +++ b/lib/vasprintf.c @@ -1,5 +1,5 @@ /* Formatted output to strings. - Copyright (C) 1999, 2002, 2006-2016 Free Software Foundation, Inc. + Copyright (C) 1999, 2002, 2006-2017 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/lib/verify.h b/lib/verify.h index 5c8381d..dcba9c8 100644 --- a/lib/verify.h +++ b/lib/verify.h @@ -1,6 +1,6 @@ /* Compile-time assert-like macros. - Copyright (C) 2005-2006, 2009-2016 Free Software Foundation, Inc. + Copyright (C) 2005-2006, 2009-2017 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -248,7 +248,12 @@ template <int w> /* Verify requirement R at compile-time, as a declaration without a trailing ';'. */ -#define verify(R) _GL_VERIFY (R, "verify (" #R ")") +#ifdef __GNUC__ +# define verify(R) _GL_VERIFY (R, "verify (" #R ")") +#else +/* PGI barfs if R is long. Play it safe. */ +# define verify(R) _GL_VERIFY (R, "verify (...)") +#endif #ifndef __has_builtin # define __has_builtin(x) 0 diff --git a/lib/version-etc-fsf.c b/lib/version-etc-fsf.c index baaebb6..6b6f582 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-2016 Free Software Foundation, Inc. + Copyright (C) 1999-2006, 2009-2017 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/lib/version-etc.c b/lib/version-etc.c index a9a0fdb..ce84af3 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-2016 Free Software Foundation, Inc. + Copyright (C) 1999-2017 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -38,7 +38,7 @@ # define PACKAGE PACKAGE_TARNAME #endif -enum { COPYRIGHT_YEAR = 2016 }; +enum { COPYRIGHT_YEAR = 2017 }; /* The three functions below display the --version information the standard way. diff --git a/lib/version-etc.h b/lib/version-etc.h index 1a5f603..b931de8 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-2016 Free Software Foundation, Inc. + Copyright (C) 1999, 2003, 2005, 2009-2017 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/lib/warn-on-use.h b/lib/warn-on-use.h new file mode 100644 index 0000000..3c0eb57 --- /dev/null +++ b/lib/warn-on-use.h @@ -0,0 +1,109 @@ +/* A C macro for emitting warnings if a function is used. + Copyright (C) 2010-2017 Free Software Foundation, Inc. + + This program is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation; either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see <http://www.gnu.org/licenses/>. */ + +/* _GL_WARN_ON_USE (function, "literal string") issues a declaration + for FUNCTION which will then trigger a compiler warning containing + the text of "literal string" anywhere that function is called, if + supported by the compiler. If the compiler does not support this + feature, the macro expands to an unused extern declaration. + + This macro is useful for marking a function as a potential + portability trap, with the intent that "literal string" include + instructions on the replacement function that should be used + instead. However, one of the reasons that a function is a + portability trap is if it has the wrong signature. Declaring + FUNCTION with a different signature in C is a compilation error, so + this macro must use the same type as any existing declaration so + that programs that avoid the problematic FUNCTION do not fail to + compile merely because they included a header that poisoned the + function. But this implies that _GL_WARN_ON_USE is only safe to + use if FUNCTION is known to already have a declaration. Use of + this macro implies that there must not be any other macro hiding + the declaration of FUNCTION; but undefining FUNCTION first is part + of the poisoning process anyway (although for symbols that are + provided only via a macro, the result is a compilation error rather + than a warning containing "literal string"). Also note that in + C++, it is only safe to use if FUNCTION has no overloads. + + For an example, it is possible to poison 'getline' by: + - adding a call to gl_WARN_ON_USE_PREPARE([[#include <stdio.h>]], + [getline]) in configure.ac, which potentially defines + HAVE_RAW_DECL_GETLINE + - adding this code to a header that wraps the system <stdio.h>: + #undef getline + #if HAVE_RAW_DECL_GETLINE + _GL_WARN_ON_USE (getline, "getline is required by POSIX 2008, but" + "not universally present; use the gnulib module getline"); + #endif + + It is not possible to directly poison global variables. But it is + possible to write a wrapper accessor function, and poison that + (less common usage, like &environ, will cause a compilation error + rather than issue the nice warning, but the end result of informing + the developer about their portability problem is still achieved): + #if HAVE_RAW_DECL_ENVIRON + static char ***rpl_environ (void) { return &environ; } + _GL_WARN_ON_USE (rpl_environ, "environ is not always properly declared"); + # undef environ + # define environ (*rpl_environ ()) + #endif + */ +#ifndef _GL_WARN_ON_USE + +# 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(function, message) \ +extern __typeof__ (function) function __attribute__ ((__warning__ (message))) +# elif __GNUC__ >= 3 && GNULIB_STRICT_CHECKING +/* Verify the existence of the function. */ +# define _GL_WARN_ON_USE(function, message) \ +extern __typeof__ (function) function +# else /* Unsupported. */ +# define _GL_WARN_ON_USE(function, message) \ +_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. + 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 +/* 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) \ +_GL_WARN_EXTERN_C int _gl_warn_on_use +# endif +#endif + +/* _GL_WARN_EXTERN_C declaration; + performs the declaration with C linkage. */ +#ifndef _GL_WARN_EXTERN_C +# if defined __cplusplus +# define _GL_WARN_EXTERN_C extern "C" +# else +# define _GL_WARN_EXTERN_C extern +# endif +#endif diff --git a/lib/wchar.in.h b/lib/wchar.in.h index 755600f..56eba3c 100644 --- a/lib/wchar.in.h +++ b/lib/wchar.in.h @@ -1,6 +1,6 @@ /* A substitute for ISO C99 <wchar.h>, for platforms that have issues. - Copyright (C) 2007-2016 Free Software Foundation, Inc. + Copyright (C) 2007-2017 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -35,6 +35,7 @@ || (defined __hpux \ && ((defined _INTTYPES_INCLUDED && !defined strtoimax) \ || defined _GL_JUST_INCLUDE_SYSTEM_WCHAR_H)) \ + || (defined __MINGW32__ && defined __STRING_H_SOURCED__) \ || defined _GL_ALREADY_INCLUDING_WCHAR_H) /* Special invocation convention: - Inside glibc and uClibc header files, but not MinGW. @@ -44,6 +45,8 @@ and once directly. In both situations 'wint_t' is not yet defined, therefore we cannot provide the function overrides; instead include only the system's <wchar.h>. + - With MinGW 3.22, when <string.h> includes <wchar.h>, only some part of + <wchar.h> is actually processed, and that doesn't include 'mbstate_t'. - On IRIX 6.5, similarly, we have an include <wchar.h> -> <wctype.h>, and the latter includes <wchar.h>. But here, we have no way to detect whether <wctype.h> is completely included or is still being included. */ @@ -110,12 +113,16 @@ # define WEOF -1 # endif #else -/* MSVC defines wint_t as 'unsigned short' in <crtdefs.h>. - This is too small: ISO C 99 section 7.24.1.(2) says that wint_t must be - "unchanged by default argument promotions". Override it. */ -# if defined _MSC_VER +/* mingw and MSVC define wint_t as 'unsigned short' in <crtdefs.h> or + <stddef.h>. This is too small: ISO C 99 section 7.24.1.(2) says that + wint_t must be "unchanged by default argument promotions". Override it. */ +# if @GNULIB_OVERRIDES_WINT_T@ # if !GNULIB_defined_wint_t -# include <crtdefs.h> +# if @HAVE_CRTDEFS_H@ +# include <crtdefs.h> +# else +# include <stddef.h> +# endif typedef unsigned int rpl_wint_t; # undef wint_t # define wint_t rpl_wint_t @@ -1033,6 +1040,38 @@ _GL_WARN_ON_USE (wcswidth, "wcswidth is unportable - " #endif +/* Convert *TP to a date and time wide string. See + <http://pubs.opengroup.org/onlinepubs/9699919799/functions/wcsftime.html>. */ +#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)); +# 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))); +# endif +_GL_CXXALIAS_SYS (wcsftime, size_t, (wchar_t *__buf, size_t __bufsize, + const wchar_t *__fmt, const struct tm *__tp)); +# endif +_GL_CXXALIASWARN (wcsftime); +#elif defined GNULIB_POSIXCHECK +# undef wcsftime +# if HAVE_RAW_DECL_WCSFTIME +_GL_WARN_ON_USE (wcsftime, "wcsftime is unportable - " + "use gnulib module wcsftime for portability"); +# endif +#endif + + #endif /* _@GUARD_PREFIX@_WCHAR_H */ #endif /* _@GUARD_PREFIX@_WCHAR_H */ #endif diff --git a/lib/wcrtomb.c b/lib/wcrtomb.c index b931ee9..f956ecf 100644 --- a/lib/wcrtomb.c +++ b/lib/wcrtomb.c @@ -1,5 +1,5 @@ /* Convert wide character to multibyte character. - Copyright (C) 2008-2016 Free Software Foundation, Inc. + Copyright (C) 2008-2017 Free Software Foundation, Inc. Written by Bruno Haible <bruno@clisp.org>, 2008. This program is free software: you can redistribute it and/or modify diff --git a/lib/wctype.in.h b/lib/wctype.in.h index 3431854..3a9e26c 100644 --- a/lib/wctype.in.h +++ b/lib/wctype.in.h @@ -1,6 +1,6 @@ /* A substitute for ISO C99 <wctype.h>, for platforms that lack it. - Copyright (C) 2006-2016 Free Software Foundation, Inc. + Copyright (C) 2006-2017 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -25,13 +25,25 @@ * wctrans_t, and wctype_t are not yet implemented. */ -#ifndef _@GUARD_PREFIX@_WCTYPE_H - #if __GNUC__ >= 3 @PRAGMA_SYSTEM_HEADER@ #endif @PRAGMA_COLUMNS@ +#if (defined __MINGW32__ && defined __CTYPE_H_SOURCED__) + +/* Special invocation convention: + - With MinGW 3.22, when <ctype.h> includes <wctype.h>, only some part of + <wctype.h> is being processed, which doesn't include the idempotency + guard. */ + +#@INCLUDE_NEXT@ @NEXT_WCTYPE_H@ + +#else +/* Normal invocation convention. */ + +#ifndef _@GUARD_PREFIX@_WCTYPE_H + #if @HAVE_WINT_T@ /* Solaris 2.5 has a bug: <wchar.h> must be included before <wctype.h>. Tru64 with Desktop Toolkit C has a bug: <stdio.h> must be included before @@ -44,11 +56,13 @@ # include <wchar.h> #endif -/* mingw has declarations of towupper and towlower in <ctype.h> as - well <wctype.h>. Include <ctype.h> in advance to avoid rpl_ prefix - being added to the declarations. */ -#ifdef __MINGW32__ +/* Native Windows (mingw, MSVC) have declarations of towupper, towlower, and + isw* functions in <ctype.h>, <wchar.h> as well as in <wctype.h>. Include + <ctype.h>, <wchar.h> in advance to avoid rpl_ prefix being added to the + declarations. */ +#if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__ # include <ctype.h> +# include <wchar.h> #endif /* Include the original <wctype.h> if it exists. @@ -93,12 +107,16 @@ _GL_INLINE_HEADER_BEGIN # define WEOF -1 # endif #else -/* MSVC defines wint_t as 'unsigned short' in <crtdefs.h>. - This is too small: ISO C 99 section 7.24.1.(2) says that wint_t must be - "unchanged by default argument promotions". Override it. */ -# if defined _MSC_VER +/* mingw and MSVC define wint_t as 'unsigned short' in <crtdefs.h> or + <stddef.h>. This is too small: ISO C 99 section 7.24.1.(2) says that + wint_t must be "unchanged by default argument promotions". Override it. */ +# if @GNULIB_OVERRIDES_WINT_T@ # if !GNULIB_defined_wint_t -# include <crtdefs.h> +# if @HAVE_CRTDEFS_H@ +# include <crtdefs.h> +# else +# include <stddef.h> +# endif typedef unsigned int rpl_wint_t; # undef wint_t # define wint_t rpl_wint_t @@ -512,3 +530,4 @@ _GL_INLINE_HEADER_END #endif /* _@GUARD_PREFIX@_WCTYPE_H */ #endif /* _@GUARD_PREFIX@_WCTYPE_H */ +#endif diff --git a/lib/wcwidth.c b/lib/wcwidth.c index b94fad0..038e865 100644 --- a/lib/wcwidth.c +++ b/lib/wcwidth.c @@ -1,5 +1,5 @@ /* Determine the number of screen columns needed for a character. - Copyright (C) 2006-2007, 2010-2016 Free Software Foundation, Inc. + Copyright (C) 2006-2007, 2010-2017 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/lib/xalloc-die.c b/lib/xalloc-die.c index 4c7994b..3a64aa5 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-2016 Free Software + Copyright (C) 1997-2000, 2002-2004, 2006, 2009-2017 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 44f1644..ff0efc6 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-2016 Free Software Foundation, Inc. + Copyright (C) 1990-2000, 2003-2004, 2006-2017 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -19,48 +19,37 @@ #define XALLOC_OVERSIZED_H_ #include <stddef.h> +#include <stdint.h> -/* Default for (non-Clang) compilers that lack __has_builtin. */ -#ifndef __has_builtin -# define __has_builtin(x) 0 -#endif - -/* True if N * S would overflow in a size calculation. +/* True if N * S would overflow in a size_t calculation, + or would generate a value larger than PTRDIFF_MAX. This expands to a constant expression if N and S are both constants. By gnulib convention, SIZE_MAX represents overflow in size - calculations, so the conservative dividend to use here is - SIZE_MAX - 1, since SIZE_MAX might represent an overflowed value. - However, malloc (SIZE_MAX) fails on all known hosts where - sizeof (ptrdiff_t) <= sizeof (size_t), so do not bother to test for - exactly-SIZE_MAX allocations on such hosts; this avoids a test and - branch when S is known to be 1. */ + calculations, so the conservative size_t-based dividend to use here + is SIZE_MAX - 1. */ #define __xalloc_oversized(n, s) \ - ((size_t) (sizeof (ptrdiff_t) <= sizeof (size_t) ? -1 : -2) / (s) < (n)) + ((size_t) (PTRDIFF_MAX < SIZE_MAX ? PTRDIFF_MAX : SIZE_MAX - 1) / (s) < (n)) +#if PTRDIFF_MAX < SIZE_MAX +typedef ptrdiff_t __xalloc_count_type; +#else +typedef size_t __xalloc_count_type; +#endif -/* Return 1 if an array of N objects, each of size S, cannot exist due - to size arithmetic overflow. S must be positive and N must be - nonnegative. This is a macro, not a function, so that it - works correctly even when SIZE_MAX < N. */ +/* Return 1 if an array of N objects, each of size S, cannot exist + reliably due to size or ptrdiff_t arithmetic overflow. S must be + positive and N must be nonnegative. This is a macro, not a + function, so that it works correctly even when SIZE_MAX < N. */ -/* GCC 7 __builtin_mul_overflow should easily compute this. See: - https://gcc.gnu.org/bugzilla/show_bug.cgi?id=68120 */ #if 7 <= __GNUC__ -# define xalloc_oversized(n, s) __builtin_mul_overflow (n, s, (size_t *) NULL) - -/* GCC 5 and Clang __builtin_mul_overflow needs a temporary, and - should be used only for non-constant operands, so that - xalloc_oversized is a constant expression if both arguments are. - Do not use this if pedantic, since pedantic GCC issues a diagnostic - for ({ ... }). */ -#elif ((5 <= __GNUC__ \ - || (__has_builtin (__builtin_mul_overflow) \ - && __has_builtin (__builtin_constant_p))) \ - && !__STRICT_ANSI__) +# define xalloc_oversized(n, s) \ + __builtin_mul_overflow_p (n, s, (__xalloc_count_type) 1) +#elif 5 <= __GNUC__ && !__STRICT_ANSI__ # define xalloc_oversized(n, s) \ (__builtin_constant_p (n) && __builtin_constant_p (s) \ ? __xalloc_oversized (n, s) \ - : ({ size_t __xalloc_size; __builtin_mul_overflow (n, s, &__xalloc_size); })) + : ({ __xalloc_count_type __xalloc_count; \ + __builtin_mul_overflow (n, s, &__xalloc_count); })) /* Other compilers use integer division; this may be slower but is more portable. */ diff --git a/lib/xalloc.h b/lib/xalloc.h index a4fddbf..5cf804b 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-2016 Free Software Foundation, Inc. + Copyright (C) 1990-2000, 2003-2004, 2006-2017 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -19,6 +19,7 @@ #define XALLOC_H_ #include <stddef.h> +#include <stdint.h> #include "xalloc-oversized.h" @@ -193,14 +194,17 @@ x2nrealloc (void *p, size_t *pn, size_t s) n = DEFAULT_MXFAST / s; n += !n; } + if (xalloc_oversized (n, s)) + xalloc_die (); } else { /* Set N = floor (1.5 * N) + 1 so that progress is made even if N == 0. - Check for overflow, so that N * S stays in size_t range. - The check may be slightly conservative, but an exact check isn't - worth the trouble. */ - if ((size_t) -1 / 3 * 2 / s <= n) + Check for overflow, so that N * S stays in both ptrdiff_t and + size_t range. The check may be slightly conservative, but an + exact check isn't worth the trouble. */ + if ((PTRDIFF_MAX < SIZE_MAX ? PTRDIFF_MAX : SIZE_MAX) / 3 * 2 / s + <= n) xalloc_die (); n += n / 2 + 1; } diff --git a/lib/xasprintf.c b/lib/xasprintf.c index e9e83ef..b4c2a00 100644 --- a/lib/xasprintf.c +++ b/lib/xasprintf.c @@ -1,5 +1,5 @@ /* vasprintf and asprintf with out-of-memory checking. - Copyright (C) 1999, 2002-2004, 2006, 2009-2016 Free Software Foundation, + Copyright (C) 1999, 2002-2004, 2006, 2009-2017 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify diff --git a/lib/xfreopen.c b/lib/xfreopen.c index c02843a..5e7163a 100644 --- a/lib/xfreopen.c +++ b/lib/xfreopen.c @@ -1,5 +1,5 @@ /* a wrapper for freopen - Copyright (C) 2008-2016 Free Software Foundation, Inc. + Copyright (C) 2008-2017 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/lib/xmalloc.c b/lib/xmalloc.c index 429b50d..a4d308d 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-2016 Free Software Foundation, Inc. + Copyright (C) 1990-2000, 2002-2006, 2008-2017 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -93,11 +93,11 @@ void * xcalloc (size_t n, size_t s) { void *p; - /* Test for overflow, since some calloc implementations don't have - proper overflow checks. But omit overflow and size-zero tests if - HAVE_GNU_CALLOC, since GNU calloc catches overflow and never - returns NULL if successful. */ - if ((! HAVE_GNU_CALLOC && xalloc_oversized (n, s)) + /* Test for overflow, since objects with size greater than + PTRDIFF_MAX cause pointer subtraction to go awry. Omit size-zero + tests if HAVE_GNU_CALLOC, since GNU calloc never returns NULL if + successful. */ + if (xalloc_oversized (n, s) || (! (p = calloc (n, s)) && (HAVE_GNU_CALLOC || n != 0))) xalloc_die (); return p; diff --git a/lib/xreadlink.c b/lib/xreadlink.c index 901f946..b7257e8 100644 --- a/lib/xreadlink.c +++ b/lib/xreadlink.c @@ -1,6 +1,6 @@ /* xreadlink.c -- readlink wrapper to return the link name in malloc'd storage - Copyright (C) 2001, 2003-2007, 2009-2016 Free Software Foundation, Inc. + Copyright (C) 2001, 2003-2007, 2009-2017 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/lib/xreadlink.h b/lib/xreadlink.h index 555c27d..e5eed6e 100644 --- a/lib/xreadlink.h +++ b/lib/xreadlink.h @@ -1,6 +1,6 @@ /* Reading symbolic links without size limitation. - Copyright (C) 2001, 2003-2004, 2007, 2009-2016 Free Software Foundation, + Copyright (C) 2001, 2003-2004, 2007, 2009-2017 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify diff --git a/lib/xsize.h b/lib/xsize.h index 202a87e..daf78d6 100644 --- a/lib/xsize.h +++ b/lib/xsize.h @@ -1,6 +1,6 @@ /* xsize.h -- Checked size_t computations. - Copyright (C) 2003, 2008-2016 Free Software Foundation, Inc. + Copyright (C) 2003, 2008-2017 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/lib/xstriconv.c b/lib/xstriconv.c index 2dbee18..21546b6 100644 --- a/lib/xstriconv.c +++ b/lib/xstriconv.c @@ -1,5 +1,5 @@ /* Charset conversion with out-of-memory checking. - Copyright (C) 2001-2004, 2006, 2009-2016 Free Software Foundation, Inc. + Copyright (C) 2001-2004, 2006, 2009-2017 Free Software Foundation, Inc. Written by Bruno Haible. This program is free software: you can redistribute it and/or modify diff --git a/lib/xstriconv.h b/lib/xstriconv.h index 61e7c75..d93c268 100644 --- a/lib/xstriconv.h +++ b/lib/xstriconv.h @@ -1,5 +1,5 @@ /* Charset conversion with out-of-memory checking. - Copyright (C) 2001-2004, 2006-2007, 2009-2016 Free Software Foundation, Inc. + Copyright (C) 2001-2004, 2006-2007, 2009-2017 Free Software Foundation, Inc. Written by Bruno Haible and Simon Josefsson. This program is free software: you can redistribute it and/or modify diff --git a/lib/xstrndup.c b/lib/xstrndup.c index 3d605ef..8fbef7f 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-2016 Free Software Foundation, Inc. + Copyright (C) 2003, 2006-2007, 2009-2017 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/lib/xstrndup.h b/lib/xstrndup.h index 0d3021c..d901c2c 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-2016 Free Software Foundation, Inc. + Copyright (C) 2003, 2009-2017 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/lib/xstrtol-error.c b/lib/xstrtol-error.c index 30b51cb..18bf5af 100644 --- a/lib/xstrtol-error.c +++ b/lib/xstrtol-error.c @@ -1,6 +1,6 @@ /* A more useful interface to strtol. - Copyright (C) 1995-1996, 1998-1999, 2001-2004, 2006-2016 Free Software + Copyright (C) 1995-1996, 1998-1999, 2001-2004, 2006-2017 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify diff --git a/lib/xstrtol.c b/lib/xstrtol.c index c5b1692..2ec26f0 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-2016 Free Software + Copyright (C) 1995-1996, 1998-2001, 2003-2007, 2009-2017 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 6f51d6e..7d2e8cf 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-2016 Free Software + Copyright (C) 1995-1996, 1998-1999, 2001-2004, 2006-2017 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify diff --git a/lib/xvasprintf.c b/lib/xvasprintf.c index 9deaad0..c04cfd6 100644 --- a/lib/xvasprintf.c +++ b/lib/xvasprintf.c @@ -1,5 +1,5 @@ /* vasprintf and asprintf with out-of-memory checking. - Copyright (C) 1999, 2002-2004, 2006-2016 Free Software Foundation, Inc. + Copyright (C) 1999, 2002-2004, 2006-2017 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/lib/xvasprintf.h b/lib/xvasprintf.h index d62d7b7..9481574 100644 --- a/lib/xvasprintf.h +++ b/lib/xvasprintf.h @@ -1,5 +1,5 @@ /* vasprintf and asprintf with out-of-memory checking. - Copyright (C) 2002-2004, 2006-2016 Free Software Foundation, Inc. + Copyright (C) 2002-2004, 2006-2017 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/m4/00gnulib.m4 b/m4/00gnulib.m4 index bb37e32..bb3512f 100644 --- a/m4/00gnulib.m4 +++ b/m4/00gnulib.m4 @@ -1,5 +1,5 @@ # 00gnulib.m4 serial 3 -dnl Copyright (C) 2009-2016 Free Software Foundation, Inc. +dnl Copyright (C) 2009-2017 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/absolute-header.m4 b/m4/absolute-header.m4 index 7ffc38d..c73adc8 100644 --- a/m4/absolute-header.m4 +++ b/m4/absolute-header.m4 @@ -1,5 +1,5 @@ # absolute-header.m4 serial 16 -dnl Copyright (C) 2006-2016 Free Software Foundation, Inc. +dnl Copyright (C) 2006-2017 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/alloca.m4 b/m4/alloca.m4 index 2382ff1..7f0604c 100644 --- a/m4/alloca.m4 +++ b/m4/alloca.m4 @@ -1,5 +1,5 @@ # alloca.m4 serial 14 -dnl Copyright (C) 2002-2004, 2006-2007, 2009-2016 Free Software Foundation, +dnl Copyright (C) 2002-2004, 2006-2007, 2009-2017 Free Software Foundation, dnl Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, diff --git a/m4/arpa_inet_h.m4 b/m4/arpa_inet_h.m4 index 5387f28..d655455 100644 --- a/m4/arpa_inet_h.m4 +++ b/m4/arpa_inet_h.m4 @@ -1,5 +1,5 @@ # arpa_inet_h.m4 serial 13 -dnl Copyright (C) 2006, 2008-2016 Free Software Foundation, Inc. +dnl Copyright (C) 2006, 2008-2017 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/btowc.m4 b/m4/btowc.m4 index 47e8fd8..1021809 100644 --- a/m4/btowc.m4 +++ b/m4/btowc.m4 @@ -1,5 +1,5 @@ # btowc.m4 serial 10 -dnl Copyright (C) 2008-2016 Free Software Foundation, Inc. +dnl Copyright (C) 2008-2017 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/builtin-expect.m4 b/m4/builtin-expect.m4 new file mode 100644 index 0000000..aa3364b --- /dev/null +++ b/m4/builtin-expect.m4 @@ -0,0 +1,49 @@ +dnl Check for __builtin_expect. + +dnl Copyright 2016-2017 Free Software Foundation, Inc. +dnl This file is free software; the Free Software Foundation +dnl gives unlimited permission to copy and/or distribute it, +dnl with or without modifications, as long as this notice is preserved. + +dnl Written by Paul Eggert. + +AC_DEFUN([gl___BUILTIN_EXPECT], +[ + AC_CACHE_CHECK([for __builtin_expect], + [gl_cv___builtin_expect], + [AC_LINK_IFELSE( + [AC_LANG_SOURCE([[ + int + main (int argc, char **argv) + { + argc = __builtin_expect (argc, 100); + return argv[argc != 100][0]; + }]])], + [gl_cv___builtin_expect=yes], + [AC_LINK_IFELSE( + [AC_LANG_SOURCE([[ + #include <builtins.h> + int + main (int argc, char **argv) + { + argc = __builtin_expect (argc, 100); + return argv[argc != 100][0]; + }]])], + [gl_cv___builtin_expect="in <builtins.h>"], + [gl_cv___builtin_expect=no])])]) + if test "$gl_cv___builtin_expect" = yes; then + AC_DEFINE([HAVE___BUILTIN_EXPECT], [1]) + elif test "$gl_cv___builtin_expect" = "in <builtins.h>"; then + AC_DEFINE([HAVE___BUILTIN_EXPECT], [2]) + fi + AH_VERBATIM([HAVE___BUILTIN_EXPECT], + [/* Define to 1 if the compiler supports __builtin_expect, + and to 2 if <builtins.h> does. */ +#undef HAVE___BUILTIN_EXPECT +#ifndef HAVE___BUILTIN_EXPECT +# define __builtin_expect(e, c) (e) +#elif HAVE___BUILTIN_EXPECT == 2 +# include <builtins.h> +#endif + ]) +]) diff --git a/m4/c-stack.m4 b/m4/c-stack.m4 index aa9895e..3a85ee9 100644 --- a/m4/c-stack.m4 +++ b/m4/c-stack.m4 @@ -1,6 +1,6 @@ # Check prerequisites for compiling lib/c-stack.c. -# Copyright (C) 2002-2004, 2008-2016 Free Software Foundation, Inc. +# Copyright (C) 2002-2004, 2008-2017 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/clock_time.m4 b/m4/clock_time.m4 index bb20344..21b6f25 100644 --- a/m4/clock_time.m4 +++ b/m4/clock_time.m4 @@ -1,5 +1,5 @@ # clock_time.m4 serial 10 -dnl Copyright (C) 2002-2006, 2009-2016 Free Software Foundation, Inc. +dnl Copyright (C) 2002-2006, 2009-2017 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/close.m4 b/m4/close.m4 index 310f076..ed357ab 100644 --- a/m4/close.m4 +++ b/m4/close.m4 @@ -1,5 +1,5 @@ -# close.m4 serial 8 -dnl Copyright (C) 2008-2016 Free Software Foundation, Inc. +# close.m4 serial 9 +dnl Copyright (C) 2008-2017 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -7,10 +7,12 @@ dnl with or without modifications, as long as this notice is preserved. AC_DEFUN([gl_FUNC_CLOSE], [ AC_REQUIRE([gl_UNISTD_H_DEFAULTS]) - AC_REQUIRE([gl_MSVC_INVAL]) - if test $HAVE_MSVC_INVALID_PARAMETER_HANDLER = 1; then - REPLACE_CLOSE=1 - fi + m4_ifdef([gl_MSVC_INVAL], [ + AC_REQUIRE([gl_MSVC_INVAL]) + if test $HAVE_MSVC_INVALID_PARAMETER_HANDLER = 1; then + REPLACE_CLOSE=1 + fi + ]) m4_ifdef([gl_PREREQ_SYS_H_WINSOCK2], [ gl_PREREQ_SYS_H_WINSOCK2 if test $UNISTD_H_HAVE_WINSOCK2_H = 1; then diff --git a/m4/config-h.m4 b/m4/config-h.m4 index d6664b7..6e6e661 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-2016 Free Software Foundation, Inc. +dnl Copyright (C) 2006, 2009-2017 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/configmake.m4 b/m4/configmake.m4 index 80b9254..b783296 100644 --- a/m4/configmake.m4 +++ b/m4/configmake.m4 @@ -1,5 +1,5 @@ # configmake.m4 serial 2 -dnl Copyright (C) 2010-2016 Free Software Foundation, Inc. +dnl Copyright (C) 2010-2017 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/ctype.m4 b/m4/ctype.m4 index a2165aa..3791f46 100644 --- a/m4/ctype.m4 +++ b/m4/ctype.m4 @@ -1,5 +1,5 @@ # ctype_h.m4 serial 6 -dnl Copyright (C) 2009-2016 Free Software Foundation, Inc. +dnl Copyright (C) 2009-2017 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/dirname.m4 b/m4/dirname.m4 index 6f8bec3..46f5394 100644 --- a/m4/dirname.m4 +++ b/m4/dirname.m4 @@ -1,5 +1,5 @@ #serial 10 -*- autoconf -*- -dnl Copyright (C) 2002-2006, 2009-2016 Free Software Foundation, Inc. +dnl Copyright (C) 2002-2006, 2009-2017 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/double-slash-root.m4 b/m4/double-slash-root.m4 index dfd3921..c80f9ea 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-2016 Free Software Foundation, Inc. +dnl Copyright (C) 2006, 2008-2017 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -1,5 +1,5 @@ #serial 25 -dnl Copyright (C) 2002, 2005, 2007, 2009-2016 Free Software Foundation, Inc. +dnl Copyright (C) 2002, 2005, 2007, 2009-2017 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/eealloc.m4 b/m4/eealloc.m4 index 63d74de..96b9bca 100644 --- a/m4/eealloc.m4 +++ b/m4/eealloc.m4 @@ -1,5 +1,5 @@ # eealloc.m4 serial 3 -dnl Copyright (C) 2003, 2009-2016 Free Software Foundation, Inc. +dnl Copyright (C) 2003, 2009-2017 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/environ.m4 b/m4/environ.m4 index 9a0ea7e..3b9fa5f 100644 --- a/m4/environ.m4 +++ b/m4/environ.m4 @@ -1,5 +1,5 @@ # environ.m4 serial 6 -dnl Copyright (C) 2001-2004, 2006-2016 Free Software Foundation, Inc. +dnl Copyright (C) 2001-2004, 2006-2017 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/errno_h.m4 b/m4/errno_h.m4 index b111fce..9f0f2f2 100644 --- a/m4/errno_h.m4 +++ b/m4/errno_h.m4 @@ -1,5 +1,5 @@ # errno_h.m4 serial 12 -dnl Copyright (C) 2004, 2006, 2008-2016 Free Software Foundation, Inc. +dnl Copyright (C) 2004, 2006, 2008-2017 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/error.m4 b/m4/error.m4 index f772bcf..57c6f12 100644 --- a/m4/error.m4 +++ b/m4/error.m4 @@ -1,6 +1,6 @@ #serial 14 -# Copyright (C) 1996-1998, 2001-2004, 2009-2016 Free Software Foundation, Inc. +# Copyright (C) 1996-1998, 2001-2004, 2009-2017 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/exponentd.m4 b/m4/exponentd.m4 index 7869a7d..cd64b92 100644 --- a/m4/exponentd.m4 +++ b/m4/exponentd.m4 @@ -1,5 +1,5 @@ # exponentd.m4 serial 3 -dnl Copyright (C) 2007-2008, 2010-2016 Free Software Foundation, Inc. +dnl Copyright (C) 2007-2008, 2010-2017 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/extensions.m4 b/m4/extensions.m4 index 6d378ec..c60f537 100644 --- a/m4/extensions.m4 +++ b/m4/extensions.m4 @@ -1,7 +1,7 @@ -# serial 13 -*- Autoconf -*- +# serial 15 -*- Autoconf -*- # Enable extensions on systems that normally disable them. -# Copyright (C) 2003, 2006-2016 Free Software Foundation, Inc. +# Copyright (C) 2003, 2006-2017 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. @@ -60,7 +60,7 @@ dnl configure.ac when using autoheader 2.62. #ifndef _ALL_SOURCE # undef _ALL_SOURCE #endif -/* Enable general extensions on OS X. */ +/* Enable general extensions on macOS. */ #ifndef _DARWIN_C_SOURCE # undef _DARWIN_C_SOURCE #endif @@ -68,14 +68,38 @@ dnl configure.ac when using autoheader 2.62. #ifndef _GNU_SOURCE # undef _GNU_SOURCE #endif -/* Use GNU style printf and scanf. */ -#ifndef __USE_MINGW_ANSI_STDIO -# undef __USE_MINGW_ANSI_STDIO -#endif /* Enable threading extensions on Solaris. */ #ifndef _POSIX_PTHREAD_SEMANTICS # undef _POSIX_PTHREAD_SEMANTICS #endif +/* Enable extensions specified by ISO/IEC TS 18661-5:2014. */ +#ifndef __STDC_WANT_IEC_60559_ATTRIBS_EXT__ +# undef __STDC_WANT_IEC_60559_ATTRIBS_EXT__ +#endif +/* Enable extensions specified by ISO/IEC TS 18661-1:2014. */ +#ifndef __STDC_WANT_IEC_60559_BFP_EXT__ +# undef __STDC_WANT_IEC_60559_BFP_EXT__ +#endif +/* Enable extensions specified by ISO/IEC TS 18661-2:2015. */ +#ifndef __STDC_WANT_IEC_60559_DFP_EXT__ +# undef __STDC_WANT_IEC_60559_DFP_EXT__ +#endif +/* Enable extensions specified by ISO/IEC TS 18661-4:2015. */ +#ifndef __STDC_WANT_IEC_60559_FUNCS_EXT__ +# undef __STDC_WANT_IEC_60559_FUNCS_EXT__ +#endif +/* Enable extensions specified by ISO/IEC TS 18661-3:2015. */ +#ifndef __STDC_WANT_IEC_60559_TYPES_EXT__ +# undef __STDC_WANT_IEC_60559_TYPES_EXT__ +#endif +/* Enable extensions specified by ISO/IEC TR 24731-2:2010. */ +#ifndef __STDC_WANT_LIB_EXT2__ +# undef __STDC_WANT_LIB_EXT2__ +#endif +/* Enable extensions specified by ISO/IEC 24747:2009. */ +#ifndef __STDC_WANT_MATH_SPEC_FUNCS__ +# undef __STDC_WANT_MATH_SPEC_FUNCS__ +#endif /* Enable extensions on HP NonStop. */ #ifndef _TANDEM_SOURCE # undef _TANDEM_SOURCE @@ -104,8 +128,14 @@ dnl configure.ac when using autoheader 2.62. AC_DEFINE([_ALL_SOURCE]) AC_DEFINE([_DARWIN_C_SOURCE]) AC_DEFINE([_GNU_SOURCE]) - AC_DEFINE([__USE_MINGW_ANSI_STDIO]) AC_DEFINE([_POSIX_PTHREAD_SEMANTICS]) + AC_DEFINE([__STDC_WANT_IEC_60559_ATTRIBS_EXT__]) + AC_DEFINE([__STDC_WANT_IEC_60559_BFP_EXT__]) + AC_DEFINE([__STDC_WANT_IEC_60559_DFP_EXT__]) + AC_DEFINE([__STDC_WANT_IEC_60559_FUNCS_EXT__]) + AC_DEFINE([__STDC_WANT_IEC_60559_TYPES_EXT__]) + AC_DEFINE([__STDC_WANT_LIB_EXT2__]) + AC_DEFINE([__STDC_WANT_MATH_SPEC_FUNCS__]) AC_DEFINE([_TANDEM_SOURCE]) AC_CACHE_CHECK([whether _XOPEN_SOURCE should be defined], [ac_cv_should_define__xopen_source], diff --git a/m4/extern-inline.m4 b/m4/extern-inline.m4 index 1e578f3..00f9609 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-2016 Free Software Foundation, Inc. +dnl Copyright 2012-2017 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/fcntl-o.m4 b/m4/fcntl-o.m4 index 24fcf88..3c3b63c 100644 --- a/m4/fcntl-o.m4 +++ b/m4/fcntl-o.m4 @@ -1,5 +1,5 @@ # fcntl-o.m4 serial 4 -dnl Copyright (C) 2006, 2009-2016 Free Software Foundation, Inc. +dnl Copyright (C) 2006, 2009-2017 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/fcntl.m4 b/m4/fcntl.m4 index bb61470..dda3b5f 100644 --- a/m4/fcntl.m4 +++ b/m4/fcntl.m4 @@ -1,5 +1,5 @@ # fcntl.m4 serial 9 -dnl Copyright (C) 2009-2016 Free Software Foundation, Inc. +dnl Copyright (C) 2009-2017 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/fcntl_h.m4 b/m4/fcntl_h.m4 index ef0d78d..09c21ef 100644 --- a/m4/fcntl_h.m4 +++ b/m4/fcntl_h.m4 @@ -1,6 +1,6 @@ # serial 15 # Configure fcntl.h. -dnl Copyright (C) 2006-2007, 2009-2016 Free Software Foundation, Inc. +dnl Copyright (C) 2006-2007, 2009-2017 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/fdopen.m4 b/m4/fdopen.m4 index 685a1bb..42f928e 100644 --- a/m4/fdopen.m4 +++ b/m4/fdopen.m4 @@ -1,5 +1,5 @@ -# fdopen.m4 serial 3 -dnl Copyright (C) 2011-2016 Free Software Foundation, Inc. +# fdopen.m4 serial 4 +dnl Copyright (C) 2011-2017 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -8,10 +8,13 @@ AC_DEFUN([gl_FUNC_FDOPEN], [ AC_REQUIRE([gl_STDIO_H_DEFAULTS]) AC_REQUIRE([AC_CANONICAL_HOST]) dnl for cross-compiles - AC_REQUIRE([gl_MSVC_INVAL]) - if test $HAVE_MSVC_INVALID_PARAMETER_HANDLER = 1; then - REPLACE_FDOPEN=1 - else + m4_ifdef([gl_MSVC_INVAL], [ + AC_REQUIRE([gl_MSVC_INVAL]) + if test $HAVE_MSVC_INVALID_PARAMETER_HANDLER = 1; then + REPLACE_FDOPEN=1 + fi + ]) + if test $REPLACE_FDOPEN = 0; then dnl Test whether fdopen() sets errno when it fails due to a bad fd argument. AC_CACHE_CHECK([whether fdopen sets errno], [gl_cv_func_fdopen_works], [ diff --git a/m4/filenamecat.m4 b/m4/filenamecat.m4 index b794880..ce60cb4 100644 --- a/m4/filenamecat.m4 +++ b/m4/filenamecat.m4 @@ -1,5 +1,5 @@ # filenamecat.m4 serial 11 -dnl Copyright (C) 2002-2006, 2009-2016 Free Software Foundation, Inc. +dnl Copyright (C) 2002-2006, 2009-2017 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/flexmember.m4 b/m4/flexmember.m4 index baa9ff8..9d3b50d 100644 --- a/m4/flexmember.m4 +++ b/m4/flexmember.m4 @@ -1,7 +1,7 @@ -# serial 3 +# serial 5 # Check for flexible array member support. -# Copyright (C) 2006, 2009-2016 Free Software Foundation, Inc. +# Copyright (C) 2006, 2009-2017 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. @@ -17,10 +17,15 @@ AC_DEFUN([AC_C_FLEXIBLE_ARRAY_MEMBER], [[#include <stdlib.h> #include <stdio.h> #include <stddef.h> - struct s { int n; double d[]; };]], + struct m { struct m *next, **list; char name[]; }; + struct s { struct s *p; struct m *m; int n; double d[]; };]], [[int m = getchar (); - struct s *p = malloc (offsetof (struct s, d) - + m * sizeof (double)); + size_t nbytes = offsetof (struct s, d) + m * sizeof (double); + nbytes += sizeof (struct s) - 1; + nbytes -= nbytes % sizeof (struct s); + struct s *p = malloc (nbytes); + p->p = p; + p->m = NULL; p->d[0] = 0.0; return p->d != (double *) NULL;]])], [ac_cv_c_flexmember=yes], diff --git a/m4/float_h.m4 b/m4/float_h.m4 index e2887eb..e8522ab 100644 --- a/m4/float_h.m4 +++ b/m4/float_h.m4 @@ -1,5 +1,5 @@ # float_h.m4 serial 9 -dnl Copyright (C) 2007, 2009-2016 Free Software Foundation, Inc. +dnl Copyright (C) 2007, 2009-2017 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/fnmatch.m4 b/m4/fnmatch.m4 index b38f56c..7292c1a 100644 --- a/m4/fnmatch.m4 +++ b/m4/fnmatch.m4 @@ -1,6 +1,6 @@ # Check for fnmatch - serial 9. -*- coding: utf-8 -*- -# Copyright (C) 2000-2007, 2009-2016 Free Software Foundation, Inc. +# Copyright (C) 2000-2007, 2009-2017 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/fpieee.m4 b/m4/fpieee.m4 index e11ac9f..69579d8 100644 --- a/m4/fpieee.m4 +++ b/m4/fpieee.m4 @@ -1,5 +1,5 @@ # fpieee.m4 serial 2 -*- coding: utf-8 -*- -dnl Copyright (C) 2007, 2009-2016 Free Software Foundation, Inc. +dnl Copyright (C) 2007, 2009-2017 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/freopen.m4 b/m4/freopen.m4 index 8d8e124..e772377 100644 --- a/m4/freopen.m4 +++ b/m4/freopen.m4 @@ -1,5 +1,5 @@ -# freopen.m4 serial 5 -dnl Copyright (C) 2007-2016 Free Software Foundation, Inc. +# freopen.m4 serial 6 +dnl Copyright (C) 2007-2017 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -12,6 +12,27 @@ AC_DEFUN([gl_FUNC_FREOPEN], mingw* | pw* | os2*) REPLACE_FREOPEN=1 ;; + *) + AC_CACHE_CHECK([whether freopen works on closed fds], + [gl_cv_func_freopen_works_on_closed], + [AC_RUN_IFELSE( + [AC_LANG_PROGRAM( + [[#include <stdio.h> + #include <unistd.h> + ]], + [[close (0); + return !(freopen ("/dev/null", "r", stdin) + && getchar () == EOF + && !ferror (stdin) && feof (stdin));]])], + [gl_cv_func_freopen_works_on_closed=yes], + [gl_cv_func_freopen_works_on_closed=no], + [case $host_os in + *gnu*) gl_cv_func_freopen_works_on_closed="guessing no" ;; + *) gl_cv_func_freopen_works_on_closed="guessing yes";; + esac])]) + case $gl_cv_func_freopen_works_on_closed in + *no) REPLACE_FREOPEN=1;; + esac esac ]) diff --git a/m4/fstat.m4 b/m4/fstat.m4 index 29f9b81..e70e533 100644 --- a/m4/fstat.m4 +++ b/m4/fstat.m4 @@ -1,22 +1,21 @@ -# fstat.m4 serial 4 -dnl Copyright (C) 2011-2016 Free Software Foundation, Inc. +# fstat.m4 serial 5 +dnl Copyright (C) 2011-2017 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. AC_DEFUN([gl_FUNC_FSTAT], [ + AC_REQUIRE([AC_CANONICAL_HOST]) AC_REQUIRE([gl_SYS_STAT_H_DEFAULTS]) - AC_REQUIRE([gl_MSVC_INVAL]) - if test $HAVE_MSVC_INVALID_PARAMETER_HANDLER = 1; then - REPLACE_FSTAT=1 - fi - - AC_REQUIRE([gl_HEADER_SYS_STAT_H]) - if test $WINDOWS_64_BIT_ST_SIZE = 1; then - REPLACE_FSTAT=1 - fi + case "$host_os" in + mingw*) + dnl On this platform, the original stat() returns st_atime, st_mtime, + dnl st_ctime values that are affected by the time zone. + REPLACE_FSTAT=1 + ;; + esac dnl Replace fstat() for supporting the gnulib-defined open() on directories. m4_ifdef([gl_FUNC_FCHDIR], [ @@ -32,5 +31,8 @@ AC_DEFUN([gl_FUNC_FSTAT], ]) ]) -# Prerequisites of lib/fstat.c. -AC_DEFUN([gl_PREREQ_FSTAT], [:]) +# Prerequisites of lib/fstat.c and lib/stat-w32.c. +AC_DEFUN([gl_PREREQ_FSTAT], [ + AC_REQUIRE([gl_HEADER_SYS_STAT_H]) + : +]) diff --git a/m4/ftruncate.m4 b/m4/ftruncate.m4 index b62414c..4070016 100644 --- a/m4/ftruncate.m4 +++ b/m4/ftruncate.m4 @@ -2,7 +2,7 @@ # See if we need to emulate a missing ftruncate function using chsize. -# Copyright (C) 2000-2001, 2003-2007, 2009-2016 Free Software Foundation, Inc. +# Copyright (C) 2000-2001, 2003-2007, 2009-2017 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/getcwd.m4 b/m4/getcwd.m4 index 566c3c1..ec6b637 100644 --- a/m4/getcwd.m4 +++ b/m4/getcwd.m4 @@ -1,6 +1,6 @@ # getcwd.m4 - check for working getcwd that is compatible with glibc -# Copyright (C) 2001, 2003-2007, 2009-2016 Free Software Foundation, Inc. +# Copyright (C) 2001, 2003-2007, 2009-2017 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/getdtablesize.m4 b/m4/getdtablesize.m4 index 1bf4db0..1af2a24 100644 --- a/m4/getdtablesize.m4 +++ b/m4/getdtablesize.m4 @@ -1,5 +1,5 @@ # getdtablesize.m4 serial 6 -dnl Copyright (C) 2008-2016 Free Software Foundation, Inc. +dnl Copyright (C) 2008-2017 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/getopt.m4 b/m4/getopt.m4 index ce6ec67..3ebc7b7 100644 --- a/m4/getopt.m4 +++ b/m4/getopt.m4 @@ -1,5 +1,5 @@ -# getopt.m4 serial 44 -dnl Copyright (C) 2002-2006, 2008-2016 Free Software Foundation, Inc. +# getopt.m4 serial 46 +dnl Copyright (C) 2002-2006, 2008-2017 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -32,9 +32,16 @@ AC_DEFUN([gl_FUNC_GETOPT_POSIX], # getopt_long_only. AC_DEFUN([gl_FUNC_GETOPT_GNU], [ + dnl Set the variable gl_getopt_required, so that all invocations of + dnl gl_GETOPT_CHECK_HEADERS in the scope of the current configure file + dnl will check for getopt with GNU extensions. + dnl This means that if one gnulib-tool invocation requests getopt-posix + dnl and another gnulib-tool invocation requests getopt-gnu, it is as if + dnl both had requested getopt-gnu. m4_divert_text([INIT_PREPARE], [gl_getopt_required=GNU]) - AC_REQUIRE([gl_FUNC_GETOPT_POSIX]) + dnl No need to invoke gl_FUNC_GETOPT_POSIX here; this is automatically + dnl done through the module dependency getopt-gnu -> getopt-posix. ]) # Determine whether to replace the entire getopt facility. @@ -354,15 +361,19 @@ dnl is ambiguous with environment values that contain newlines. AC_DEFUN([gl_GETOPT_SUBSTITUTE_HEADER], [ - GETOPT_H=getopt.h + AC_CHECK_HEADERS_ONCE([sys/cdefs.h]) + if test $ac_cv_header_sys_cdefs_h = yes; then + HAVE_SYS_CDEFS_H=1 + else + HAVE_SYS_CDEFS_H=0 + fi + AC_SUBST([HAVE_SYS_CDEFS_H]) + AC_DEFINE([__GETOPT_PREFIX], [[rpl_]], [Define to rpl_ if the getopt replacement functions and variables should be used.]) + GETOPT_H=getopt.h + GETOPT_CDEFS_H=getopt-cdefs.h AC_SUBST([GETOPT_H]) -]) - -# Prerequisites of lib/getopt*. -AC_DEFUN([gl_PREREQ_GETOPT], -[ - AC_CHECK_DECLS_ONCE([getenv]) + AC_SUBST([GETOPT_CDEFS_H]) ]) diff --git a/m4/getpagesize.m4 b/m4/getpagesize.m4 index 8902b7b..f891200 100644 --- a/m4/getpagesize.m4 +++ b/m4/getpagesize.m4 @@ -1,5 +1,5 @@ # getpagesize.m4 serial 9 -dnl Copyright (C) 2002, 2004-2005, 2007, 2009-2016 Free Software Foundation, +dnl Copyright (C) 2002, 2004-2005, 2007, 2009-2017 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 new file mode 100644 index 0000000..efc06e7 --- /dev/null +++ b/m4/getprogname.m4 @@ -0,0 +1,43 @@ +# getprogname.m4 - check for getprogname or replacements for it + +# Copyright (C) 2016-2017 Free Software Foundation, Inc. +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# serial 4 + +AC_DEFUN([gl_FUNC_GETPROGNAME], +[ + AC_CHECK_FUNCS_ONCE([getprogname getexecname]) + AC_REQUIRE([gl_USE_SYSTEM_EXTENSIONS]) + ac_found=0 + AC_CHECK_DECLS([program_invocation_name], [ac_found=1], [], + [#include <errno.h>]) + AC_CHECK_DECLS([program_invocation_short_name], [ac_found=1], [], + [#include <errno.h>]) + AC_CHECK_DECLS([__argv], [ac_found=1], [], [#include <stdlib.h>]) + + # Incur the cost of this test only if none of the above worked. + if test $ac_found = 0; then + # On OpenBSD 5.1, using the global __progname variable appears to be + # the only way to implement getprogname. + AC_CACHE_CHECK([whether __progname is defined in default libraries], + [gl_cv_var___progname], + [ + gl_cv_var___progname= + AC_LINK_IFELSE( + [AC_LANG_PROGRAM( + [[extern char *__progname;]], + [[return *__progname;]] + )], + [gl_cv_var___progname=yes] + ) + ] + ) + if test "$gl_cv_var___progname" = yes; then + AC_DEFINE([HAVE_VAR___PROGNAME], 1, + [Define if you have a global __progname variable]) + fi + fi +]) diff --git a/m4/gettime.m4 b/m4/gettime.m4 index 9843ed4..1cdab27 100644 --- a/m4/gettime.m4 +++ b/m4/gettime.m4 @@ -1,5 +1,5 @@ # gettime.m4 serial 8 -dnl Copyright (C) 2002, 2004-2006, 2009-2016 Free Software Foundation, Inc. +dnl Copyright (C) 2002, 2004-2006, 2009-2017 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/gettimeofday.m4 b/m4/gettimeofday.m4 index 4ae5d63..8ee206e 100644 --- a/m4/gettimeofday.m4 +++ b/m4/gettimeofday.m4 @@ -1,6 +1,6 @@ -# serial 21 +# serial 23 -# Copyright (C) 2001-2003, 2005, 2007, 2009-2016 Free Software Foundation, Inc. +# Copyright (C) 2001-2003, 2005, 2007, 2009-2017 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. @@ -9,9 +9,10 @@ dnl From Jim Meyering. AC_DEFUN([gl_FUNC_GETTIMEOFDAY], [ + AC_REQUIRE([gl_HEADER_SYS_TIME_H_DEFAULTS]) AC_REQUIRE([AC_C_RESTRICT]) + AC_REQUIRE([AC_CANONICAL_HOST]) AC_REQUIRE([gl_HEADER_SYS_TIME_H]) - AC_REQUIRE([gl_HEADER_SYS_TIME_H_DEFAULTS]) AC_CHECK_FUNCS_ONCE([gettimeofday]) gl_gettimeofday_timezone=void @@ -54,19 +55,11 @@ int gettimeofday (struct timeval *restrict, struct timezone *restrict); if test $REPLACE_STRUCT_TIMEVAL = 1; then REPLACE_GETTIMEOFDAY=1 fi - m4_ifdef([gl_FUNC_TZSET_CLOBBER], [ - gl_FUNC_TZSET_CLOBBER - case "$gl_cv_func_tzset_clobber" in - *yes) - REPLACE_GETTIMEOFDAY=1 - gl_GETTIMEOFDAY_REPLACE_LOCALTIME - AC_DEFINE([tzset], [rpl_tzset], - [Define to rpl_tzset if the wrapper function should be used.]) - AC_DEFINE([TZSET_CLOBBERS_LOCALTIME], [1], - [Define if tzset clobbers localtime's static buffer.]) - ;; - esac - ]) + dnl On mingw, the original gettimeofday has only a precision of 15.6 + dnl milliseconds. So override it. + case "$host_os" in + mingw*) REPLACE_GETTIMEOFDAY=1 ;; + esac fi AC_DEFINE_UNQUOTED([GETTIMEOFDAY_TIMEZONE], [$gl_gettimeofday_timezone], [Define this to 'void' or 'struct timezone' to match the system's @@ -85,6 +78,7 @@ 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], @@ -119,20 +113,12 @@ AC_DEFUN([gl_FUNC_GETTIMEOFDAY_CLOBBER], case "$gl_cv_func_gettimeofday_clobber" in *yes) REPLACE_GETTIMEOFDAY=1 - gl_GETTIMEOFDAY_REPLACE_LOCALTIME AC_DEFINE([GETTIMEOFDAY_CLOBBERS_LOCALTIME], [1], [Define if gettimeofday clobbers the localtime buffer.]) + gl_LOCALTIME_BUFFER_NEEDED ;; esac ]) -AC_DEFUN([gl_GETTIMEOFDAY_REPLACE_LOCALTIME], [ - REPLACE_GMTIME=1 - REPLACE_LOCALTIME=1 -]) - # Prerequisites of lib/gettimeofday.c. -AC_DEFUN([gl_PREREQ_GETTIMEOFDAY], [ - AC_CHECK_HEADERS([sys/timeb.h]) - AC_CHECK_FUNCS([_ftime]) -]) +AC_DEFUN([gl_PREREQ_GETTIMEOFDAY], [:]) diff --git a/m4/glibc21.m4 b/m4/glibc21.m4 index dafebf5..2e30ed6 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-2016 Free Software Foundation, +dnl Copyright (C) 2000-2002, 2004, 2008, 2010-2017 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/gnu-make.m4 b/m4/gnu-make.m4 index 320c831..55dbfd4 100644 --- a/m4/gnu-make.m4 +++ b/m4/gnu-make.m4 @@ -1,6 +1,6 @@ # Determine whether recent-enough GNU Make is being used. -# Copyright (C) 2007, 2009-2016 Free Software Foundation, Inc. +# Copyright (C) 2007, 2009-2017 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/gnulib-common.m4 b/m4/gnulib-common.m4 index f8454c8..36f2acc 100644 --- a/m4/gnulib-common.m4 +++ b/m4/gnulib-common.m4 @@ -1,5 +1,5 @@ -# gnulib-common.m4 serial 36 -dnl Copyright (C) 2007-2016 Free Software Foundation, Inc. +# gnulib-common.m4 serial 38 +dnl Copyright (C) 2007-2017 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -256,7 +256,8 @@ AC_DEFUN([gl_PROG_AR_RANLIB], dnl library formats. In particular, the GNU binutils programs ar and ranlib dnl produce libraries that work only with gcc, not with cc. AC_REQUIRE([AC_PROG_CC]) - AC_BEFORE([$0], [AM_PROG_AR]) + dnl The '][' hides this use from 'aclocal'. + AC_BEFORE([$0], [A][M_PROG_AR]) AC_CACHE_CHECK([for Minix Amsterdam compiler], [gl_cv_c_amsterdam_compiler], [ AC_EGREP_CPP([Amsterdam], @@ -288,7 +289,9 @@ Amsterdam dnl __ACK__. It may seem like its easier to avoid calling the macro here, dnl but we need to AC_SUBST both AR/ARFLAGS (thus those must have some good dnl default value and automake should usually know them). - m4_ifdef([AM_PROG_AR], [AM_PROG_AR], [:]) + dnl + dnl The '][' hides this use from 'aclocal'. + m4_ifdef([A][M_PROG_AR], [A][M_PROG_AR], [:]) fi dnl In case the code above has not helped with setting AR/ARFLAGS, use @@ -456,7 +459,9 @@ m4_ifndef([AC_PROG_SED], else ac_cv_path_SED=$SED fi + ]) SED="$ac_cv_path_SED" AC_SUBST([SED])dnl rm -f conftest.sed -])])]) +]) +]) diff --git a/m4/gnulib-comp.m4 b/m4/gnulib-comp.m4 index ee8ab85..77adaf8 100644 --- a/m4/gnulib-comp.m4 +++ b/m4/gnulib-comp.m4 @@ -1,5 +1,5 @@ # DO NOT EDIT! GENERATED AUTOMATICALLY! -# Copyright (C) 2002-2016 Free Software Foundation, Inc. +# Copyright (C) 2002-2017 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 @@ -66,6 +66,7 @@ AC_DEFUN([gl_EARLY], # Code from module bitrotate-tests: # Code from module btowc: # Code from module btowc-tests: + # Code from module builtin-expect: # Code from module c-ctype: # Code from module c-ctype-tests: # Code from module c-stack: @@ -144,9 +145,12 @@ AC_DEFUN([gl_EARLY], # Code from module getdtablesize-tests: # Code from module getopt: # Code from module getopt-gnu: + # Code from module getopt-gnu-tests: # Code from module getopt-posix: # Code from module getopt-posix-tests: # Code from module getpagesize: + # Code from module getprogname: + # Code from module getprogname-tests: # Code from module gettext-h: # Code from module gettime: # Code from module gettimeofday: @@ -192,6 +196,8 @@ AC_DEFUN([gl_EARLY], # Code from module largefile: AC_REQUIRE([AC_SYS_LARGEFILE]) # Code from module libsigsegv: + # Code from module limits-h: + # Code from module limits-h-tests: # Code from module listen: # Code from module listen-tests: # Code from module localcharset: @@ -199,6 +205,7 @@ AC_DEFUN([gl_EARLY], # Code from module locale-tests: # Code from module localeconv: # Code from module localeconv-tests: + # Code from module localtime-buffer: # Code from module lstat: # Code from module lstat-tests: # Code from module maintainer-makefile: @@ -223,6 +230,7 @@ AC_DEFUN([gl_EARLY], # Code from module mbuiter: # Code from module memchr: # Code from module memchr-tests: + # Code from module minmax: # Code from module mkstemp: # Code from module mktime: # Code from module mktime-internal: @@ -374,6 +382,7 @@ AC_DEFUN([gl_EARLY], # Code from module timespec-sub: # Code from module timespec-tests: # Code from module trim: + # Code from module tzset: # Code from module unistd: # Code from module unistd-tests: # Code from module unistr/base: @@ -454,6 +463,7 @@ AC_DEFUN([gl_INIT], gl_PREREQ_BTOWC fi gl_WCHAR_MODULE_INDICATOR([btowc]) + gl___BUILTIN_EXPECT gl_C_STACK AC_CHECK_FUNCS_ONCE([readlinkat]) gl_CLOCK_TIME @@ -524,6 +534,7 @@ AC_DEFUN([gl_INIT], gl_FUNC_FSTAT if test $REPLACE_FSTAT = 1; then AC_LIBOBJ([fstat]) + AC_LIBOBJ([stat-w32]) gl_PREREQ_FSTAT fi gl_SYS_STAT_MODULE_INDICATOR([fstat]) @@ -534,24 +545,18 @@ AC_DEFUN([gl_INIT], fi gl_UNISTD_MODULE_INDICATOR([getdtablesize]) gl_FUNC_GETOPT_GNU - if test $REPLACE_GETOPT = 1; then - AC_LIBOBJ([getopt]) - AC_LIBOBJ([getopt1]) - gl_PREREQ_GETOPT - dnl Arrange for unistd.h to include getopt.h. - GNULIB_GL_UNISTD_H_GETOPT=1 - fi - AC_SUBST([GNULIB_GL_UNISTD_H_GETOPT]) - gl_MODULE_INDICATOR_FOR_TESTS([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 + dnl done in the getopt-posix module. gl_FUNC_GETOPT_POSIX if test $REPLACE_GETOPT = 1; then AC_LIBOBJ([getopt]) AC_LIBOBJ([getopt1]) - gl_PREREQ_GETOPT dnl Arrange for unistd.h to include getopt.h. GNULIB_GL_UNISTD_H_GETOPT=1 fi AC_SUBST([GNULIB_GL_UNISTD_H_GETOPT]) + gl_FUNC_GETPROGNAME AC_SUBST([LIBINTL]) AC_SUBST([LTLIBINTL]) gl_GETTIME @@ -606,6 +611,7 @@ AC_DEFUN([gl_INIT], gl_LANGINFO_H AC_REQUIRE([gl_LARGEFILE]) gl_LIBSIGSEGV + gl_LIMITS_H gl_LOCALCHARSET LOCALCHARSET_TESTS_ENVIRONMENT="CHARSETALIASDIR=\"\$(abs_top_builddir)/$gl_source_base\"" AC_SUBST([LOCALCHARSET_TESTS_ENVIRONMENT]) @@ -616,6 +622,8 @@ AC_DEFUN([gl_INIT], gl_PREREQ_LOCALECONV fi gl_LOCALE_MODULE_INDICATOR([localeconv]) + AC_REQUIRE([gl_LOCALTIME_BUFFER_DEFAULTS]) + AC_LIBOBJ([localtime-buffer]) gl_FUNC_LSTAT if test $REPLACE_LSTAT = 1; then AC_LIBOBJ([lstat]) @@ -669,6 +677,7 @@ AC_DEFUN([gl_INIT], gl_PREREQ_MEMCHR fi gl_STRING_MODULE_INDICATOR([memchr]) + gl_MINMAX gl_FUNC_MKSTEMP if test $HAVE_MKSTEMP = 0 || test $REPLACE_MKSTEMP = 1; then AC_LIBOBJ([mkstemp]) @@ -682,7 +691,7 @@ AC_DEFUN([gl_INIT], fi gl_TIME_MODULE_INDICATOR([mktime]) gl_FUNC_MKTIME_INTERNAL - if test $REPLACE_MKTIME = 1; then + if test $WANT_MKTIME_INTERNAL = 1; then AC_LIBOBJ([mktime]) gl_PREREQ_MKTIME fi @@ -694,6 +703,7 @@ AC_DEFUN([gl_INIT], if test $HAVE_MSVC_INVALID_PARAMETER_HANDLER = 1; then AC_LIBOBJ([msvc-nothrow]) fi + gl_MODULE_INDICATOR([msvc-nothrow]) gl_MULTIARCH gl_FUNC_NL_LANGINFO if test $HAVE_NL_LANGINFO = 0 || test $REPLACE_NL_LANGINFO = 1; then @@ -766,6 +776,7 @@ AC_DEFUN([gl_INIT], gl_FUNC_STAT if test $REPLACE_STAT = 1; then AC_LIBOBJ([stat]) + AC_LIBOBJ([stat-w32]) gl_PREREQ_STAT fi gl_SYS_STAT_MODULE_INDICATOR([stat]) @@ -851,7 +862,7 @@ AC_DEFUN([gl_INIT], fi gl_TIME_MODULE_INDICATOR([time_r]) gl_TIME_RZ - if test "$HAVE_TIMEZONE_T" = 0; then + if test $HAVE_TIMEZONE_T = 0; then AC_LIBOBJ([time_rz]) fi gl_TIME_MODULE_INDICATOR([time_rz]) @@ -862,6 +873,11 @@ AC_DEFUN([gl_INIT], fi gl_TIME_MODULE_INDICATOR([timegm]) gl_TIMESPEC + gl_FUNC_TZSET + if test $HAVE_TZSET = 0 || test $REPLACE_TZSET = 1; then + AC_LIBOBJ([tzset]) + fi + gl_TIME_MODULE_INDICATOR([tzset]) gl_UNISTD_H gl_LIBUNISTRING_LIBHEADER([0.9.4], [unistr.h]) gl_MODULE_INDICATOR([unistr/u8-mbtoucr]) @@ -1121,6 +1137,8 @@ changequote([, ])dnl gl_PREREQ_STRERROR_R fi gl_STRING_MODULE_INDICATOR([strerror_r]) + dnl For the modules argp, error. + gl_MODULE_INDICATOR([strerror_r-posix]) dnl Check for prerequisites for memory fence checks. gl_FUNC_MMAP_ANON AC_CHECK_HEADERS_ONCE([sys/mman.h]) @@ -1132,7 +1150,7 @@ changequote([, ])dnl gl_UNISTD_MODULE_INDICATOR([symlink]) gl_SYS_IOCTL_H AC_PROG_MKDIR_P - gl_HEADER_SYS_SELECT + AC_REQUIRE([gl_HEADER_SYS_SELECT]) AC_PROG_MKDIR_P AC_REQUIRE([gl_HEADER_SYS_SOCKET]) AC_PROG_MKDIR_P @@ -1263,17 +1281,13 @@ AC_DEFUN([gl_FILE_LIST], [ build-aux/gitlog-to-changelog build-aux/gnu-web-doc-update build-aux/gnupload - build-aux/snippet/_Noreturn.h - build-aux/snippet/arg-nonnull.h - build-aux/snippet/c++defs.h - build-aux/snippet/unused-parameter.h - build-aux/snippet/warn-on-use.h build-aux/update-copyright build-aux/useless-if-before-free build-aux/vc-list-files doc/fdl.texi doc/gendocs_template doc/gendocs_template_min + lib/_Noreturn.h lib/alloca.c lib/alloca.in.h lib/allocator.c @@ -1281,6 +1295,7 @@ AC_DEFUN([gl_FILE_LIST], [ lib/anytostr.c lib/areadlink.c lib/areadlink.h + lib/arg-nonnull.h lib/argmatch.c lib/argmatch.h lib/asnprintf.c @@ -1293,6 +1308,7 @@ AC_DEFUN([gl_FILE_LIST], [ lib/bitrotate.c lib/bitrotate.h lib/btowc.c + lib/c++defs.h lib/c-ctype.c lib/c-ctype.h lib/c-stack.c @@ -1329,6 +1345,7 @@ AC_DEFUN([gl_FILE_LIST], [ lib/filenamecat-lgpl.c lib/filenamecat.c lib/filenamecat.h + lib/flexmember.h lib/float+.h lib/float.c lib/float.in.h @@ -1339,10 +1356,17 @@ AC_DEFUN([gl_FILE_LIST], [ lib/freopen.c lib/fstat.c lib/getdtablesize.c + lib/getopt-cdefs.in.h + lib/getopt-core.h + lib/getopt-ext.h + lib/getopt-pfx-core.h + lib/getopt-pfx-ext.h lib/getopt.c lib/getopt.in.h lib/getopt1.c lib/getopt_int.h + lib/getprogname.c + lib/getprogname.h lib/gettext.h lib/gettime.c lib/gettimeofday.c @@ -1369,10 +1393,13 @@ AC_DEFUN([gl_FILE_LIST], [ lib/iswblank.c lib/itold.c lib/langinfo.in.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/lstat.c lib/malloc.c lib/malloca.c @@ -1396,6 +1423,7 @@ AC_DEFUN([gl_FILE_LIST], [ lib/mbuiter.h lib/memchr.c lib/memchr.valgrind + lib/minmax.h lib/mkstemp.c lib/mktime-internal.h lib/mktime.c @@ -1443,6 +1471,8 @@ AC_DEFUN([gl_FILE_LIST], [ lib/stat-macros.h lib/stat-time.c lib/stat-time.h + lib/stat-w32.c + lib/stat-w32.h lib/stat.c lib/stdarg.in.h lib/stdbool.in.h @@ -1493,6 +1523,7 @@ AC_DEFUN([gl_FILE_LIST], [ lib/timespec.h lib/trim.c lib/trim.h + lib/tzset.c lib/uinttostr.c lib/umaxtostr.c lib/unistd.c @@ -1507,6 +1538,7 @@ AC_DEFUN([gl_FILE_LIST], [ lib/uniwidth/width.c lib/unlocked-io.h lib/unsetenv.c + lib/unused-parameter.h lib/vasnprintf.c lib/vasnprintf.h lib/vasprintf.c @@ -1514,6 +1546,7 @@ AC_DEFUN([gl_FILE_LIST], [ lib/version-etc-fsf.c lib/version-etc.c lib/version-etc.h + lib/warn-on-use.h lib/wchar.in.h lib/wcrtomb.c lib/wctype-h.c @@ -1546,6 +1579,7 @@ AC_DEFUN([gl_FILE_LIST], [ m4/alloca.m4 m4/arpa_inet_h.m4 m4/btowc.m4 + m4/builtin-expect.m4 m4/c-stack.m4 m4/clock_time.m4 m4/close.m4 @@ -1579,6 +1613,7 @@ AC_DEFUN([gl_FILE_LIST], [ m4/getdtablesize.m4 m4/getopt.m4 m4/getpagesize.m4 + m4/getprogname.m4 m4/gettime.m4 m4/gettimeofday.m4 m4/glibc21.m4 @@ -1606,6 +1641,7 @@ AC_DEFUN([gl_FILE_LIST], [ m4/lib-prefix.m4 m4/libsigsegv.m4 m4/libunistring-base.m4 + m4/limits-h.m4 m4/localcharset.m4 m4/locale-fr.m4 m4/locale-ja.m4 @@ -1613,6 +1649,7 @@ AC_DEFUN([gl_FILE_LIST], [ m4/locale-zh.m4 m4/locale_h.m4 m4/localeconv.m4 + m4/localtime-buffer.m4 m4/longlong.m4 m4/lstat.m4 m4/malloc.m4 @@ -1628,6 +1665,7 @@ AC_DEFUN([gl_FILE_LIST], [ m4/mbstate_t.m4 m4/mbtowc.m4 m4/memchr.m4 + m4/minmax.m4 m4/mkstemp.m4 m4/mktime.m4 m4/mmap-anon.m4 @@ -1704,6 +1742,7 @@ AC_DEFUN([gl_FILE_LIST], [ m4/timegm.m4 m4/timespec.m4 m4/tm_gmtoff.m4 + m4/tzset.m4 m4/unistd_h.m4 m4/unlocked-io.m4 m4/vararrays.m4 @@ -1782,9 +1821,12 @@ AC_DEFUN([gl_FILE_LIST], [ tests/test-fwrite.c tests/test-getcwd-lgpl.c tests/test-getdtablesize.c - tests/test-getopt.c + tests/test-getopt-gnu.c + tests/test-getopt-main.h + tests/test-getopt-posix.c tests/test-getopt.h tests/test-getopt_long.h + tests/test-getprogname.c tests/test-gettimeofday.c tests/test-hash.c tests/test-iconv-h.c @@ -1799,6 +1841,7 @@ AC_DEFUN([gl_FILE_LIST], [ tests/test-isblank.c tests/test-iswblank.c tests/test-langinfo.c + tests/test-limits-h.c tests/test-listen.c tests/test-locale.c tests/test-localeconv.c @@ -1907,6 +1950,7 @@ AC_DEFUN([gl_FILE_LIST], [ tests/test-vasprintf.c tests/test-vc-list-files-cvs.sh tests/test-vc-list-files-git.sh + tests/test-verify-try.c tests/test-verify.c tests/test-verify.sh tests/test-version-etc.c @@ -1936,9 +1980,12 @@ AC_DEFUN([gl_FILE_LIST], [ tests/uniwidth/test-uc_width2.c tests/uniwidth/test-uc_width2.sh tests/zerosize-ptr.h + tests=lib/_Noreturn.h tests=lib/accept.c + tests=lib/arg-nonnull.h tests=lib/arpa_inet.in.h tests=lib/bind.c + tests=lib/c++defs.h tests=lib/connect.c tests=lib/dtotimespec.c tests=lib/fdopen.c @@ -1975,7 +2022,9 @@ AC_DEFUN([gl_FILE_LIST], [ tests=lib/sys_uio.in.h tests=lib/timespec-add.c tests=lib/timespec-sub.c + tests=lib/unused-parameter.h tests=lib/w32sock.h + tests=lib/warn-on-use.h tests=lib/wctob.c tests=lib/wctomb-impl.h tests=lib/wctomb.c diff --git a/m4/hard-locale.m4 b/m4/hard-locale.m4 index 4661bfc..d79acd6 100644 --- a/m4/hard-locale.m4 +++ b/m4/hard-locale.m4 @@ -1,5 +1,5 @@ # hard-locale.m4 serial 8 -dnl Copyright (C) 2002-2006, 2009-2016 Free Software Foundation, Inc. +dnl Copyright (C) 2002-2006, 2009-2017 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/iconv.m4 b/m4/iconv.m4 index aa159c5..bdafc54 100644 --- a/m4/iconv.m4 +++ b/m4/iconv.m4 @@ -1,4 +1,4 @@ -# iconv.m4 serial 19 (gettext-0.18.2) +# iconv.m4 serial 20 dnl Copyright (C) 2000-2002, 2007-2014, 2016 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -258,14 +258,18 @@ size_t iconv(); am_cv_proto_iconv=`echo "[$]am_cv_proto_iconv" | tr -s ' ' | sed -e 's/( /(/'` AC_MSG_RESULT([ $am_cv_proto_iconv]) - AC_DEFINE_UNQUOTED([ICONV_CONST], [$am_cv_proto_iconv_arg1], - [Define as const if the declaration of iconv() needs const.]) - dnl Also substitute ICONV_CONST in the gnulib generated <iconv.h>. - m4_ifdef([gl_ICONV_H_DEFAULTS], - [AC_REQUIRE([gl_ICONV_H_DEFAULTS]) - if test -n "$am_cv_proto_iconv_arg1"; then - ICONV_CONST="const" - fi - ]) + else + dnl When compiling GNU libiconv on a system that does not have iconv yet, + dnl pick the POSIX compliant declaration without 'const'. + am_cv_proto_iconv_arg1="" fi + AC_DEFINE_UNQUOTED([ICONV_CONST], [$am_cv_proto_iconv_arg1], + [Define as const if the declaration of iconv() needs const.]) + dnl Also substitute ICONV_CONST in the gnulib generated <iconv.h>. + m4_ifdef([gl_ICONV_H_DEFAULTS], + [AC_REQUIRE([gl_ICONV_H_DEFAULTS]) + if test -n "$am_cv_proto_iconv_arg1"; then + ICONV_CONST="const" + fi + ]) ]) diff --git a/m4/iconv_h.m4 b/m4/iconv_h.m4 index c95ecc2..d4ac243 100644 --- a/m4/iconv_h.m4 +++ b/m4/iconv_h.m4 @@ -1,5 +1,5 @@ # iconv_h.m4 serial 8 -dnl Copyright (C) 2007-2016 Free Software Foundation, Inc. +dnl Copyright (C) 2007-2017 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/iconv_open.m4 b/m4/iconv_open.m4 index 54e1dc8..2517a5b 100644 --- a/m4/iconv_open.m4 +++ b/m4/iconv_open.m4 @@ -1,5 +1,5 @@ # iconv_open.m4 serial 14 -dnl Copyright (C) 2007-2016 Free Software Foundation, Inc. +dnl Copyright (C) 2007-2017 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/include_next.m4 b/m4/include_next.m4 index db0f2c0..068f6f6 100644 --- a/m4/include_next.m4 +++ b/m4/include_next.m4 @@ -1,12 +1,13 @@ -# include_next.m4 serial 23 -dnl Copyright (C) 2006-2016 Free Software Foundation, Inc. +# include_next.m4 serial 24 +dnl Copyright (C) 2006-2017 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. dnl From Paul Eggert and Derek Price. -dnl Sets INCLUDE_NEXT and PRAGMA_SYSTEM_HEADER. +dnl Sets INCLUDE_NEXT, INCLUDE_NEXT_AS_FIRST_DIRECTIVE, PRAGMA_SYSTEM_HEADER, +dnl and PRAGMA_COLUMNS. dnl dnl INCLUDE_NEXT expands to 'include_next' if the compiler supports it, or to dnl 'include' otherwise. diff --git a/m4/inet_pton.m4 b/m4/inet_pton.m4 index 4f5db71..407c29c 100644 --- a/m4/inet_pton.m4 +++ b/m4/inet_pton.m4 @@ -1,5 +1,5 @@ # inet_pton.m4 serial 17 -dnl Copyright (C) 2006, 2008-2016 Free Software Foundation, Inc. +dnl Copyright (C) 2006, 2008-2017 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/inline.m4 b/m4/inline.m4 index 28fd2d0..f00572e 100644 --- a/m4/inline.m4 +++ b/m4/inline.m4 @@ -1,5 +1,5 @@ # inline.m4 serial 4 -dnl Copyright (C) 2006, 2009-2016 Free Software Foundation, Inc. +dnl Copyright (C) 2006, 2009-2017 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/intmax_t.m4 b/m4/intmax_t.m4 index 9559acc..ff143e9 100644 --- a/m4/intmax_t.m4 +++ b/m4/intmax_t.m4 @@ -1,5 +1,5 @@ # intmax_t.m4 serial 8 -dnl Copyright (C) 1997-2004, 2006-2007, 2009-2016 Free Software Foundation, +dnl Copyright (C) 1997-2004, 2006-2007, 2009-2017 Free Software Foundation, dnl Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, diff --git a/m4/inttostr.m4 b/m4/inttostr.m4 index fd4ba76..3120f95 100644 --- a/m4/inttostr.m4 +++ b/m4/inttostr.m4 @@ -1,5 +1,5 @@ #serial 8 -dnl Copyright (C) 2004-2006, 2009-2016 Free Software Foundation, Inc. +dnl Copyright (C) 2004-2006, 2009-2017 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/inttypes-pri.m4 b/m4/inttypes-pri.m4 index ae20183..2055787 100644 --- a/m4/inttypes-pri.m4 +++ b/m4/inttypes-pri.m4 @@ -1,5 +1,5 @@ # inttypes-pri.m4 serial 7 (gettext-0.18.2) -dnl Copyright (C) 1997-2002, 2006, 2008-2016 Free Software Foundation, Inc. +dnl Copyright (C) 1997-2002, 2006, 2008-2017 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/inttypes.m4 b/m4/inttypes.m4 index 61cdb1a..434a7ee 100644 --- a/m4/inttypes.m4 +++ b/m4/inttypes.m4 @@ -1,5 +1,5 @@ # inttypes.m4 serial 26 -dnl Copyright (C) 2006-2016 Free Software Foundation, Inc. +dnl Copyright (C) 2006-2017 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/inttypes_h.m4 b/m4/inttypes_h.m4 index 7657119..9240305 100644 --- a/m4/inttypes_h.m4 +++ b/m4/inttypes_h.m4 @@ -1,5 +1,5 @@ # inttypes_h.m4 serial 10 -dnl Copyright (C) 1997-2004, 2006, 2008-2016 Free Software Foundation, Inc. +dnl Copyright (C) 1997-2004, 2006, 2008-2017 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/ioctl.m4 b/m4/ioctl.m4 index c688a64..30209dd 100644 --- a/m4/ioctl.m4 +++ b/m4/ioctl.m4 @@ -1,5 +1,5 @@ # ioctl.m4 serial 4 -dnl Copyright (C) 2008-2016 Free Software Foundation, Inc. +dnl Copyright (C) 2008-2017 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/isblank.m4 b/m4/isblank.m4 index 63d4a39..abbc338 100644 --- a/m4/isblank.m4 +++ b/m4/isblank.m4 @@ -1,5 +1,5 @@ # isblank.m4 serial 3 -dnl Copyright (C) 2009-2016 Free Software Foundation, Inc. +dnl Copyright (C) 2009-2017 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/iswblank.m4 b/m4/iswblank.m4 index 0639073..e9d6975 100644 --- a/m4/iswblank.m4 +++ b/m4/iswblank.m4 @@ -1,5 +1,5 @@ # iswblank.m4 serial 4 -dnl Copyright (C) 2011-2016 Free Software Foundation, Inc. +dnl Copyright (C) 2011-2017 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/langinfo_h.m4 b/m4/langinfo_h.m4 index edbbe76..ea94b4e 100644 --- a/m4/langinfo_h.m4 +++ b/m4/langinfo_h.m4 @@ -1,5 +1,5 @@ # langinfo_h.m4 serial 7 -dnl Copyright (C) 2009-2016 Free Software Foundation, Inc. +dnl Copyright (C) 2009-2017 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/largefile.m4 b/m4/largefile.m4 index 8bbdfaa..edc1a9b 100644 --- a/m4/largefile.m4 +++ b/m4/largefile.m4 @@ -1,6 +1,6 @@ # Enable large files on systems where this is not the default. -# Copyright 1992-1996, 1998-2016 Free Software Foundation, Inc. +# Copyright 1992-1996, 1998-2017 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. @@ -126,9 +126,24 @@ AC_DEFUN([gl_LARGEFILE], else WINDOWS_64_BIT_OFF_T=0 fi - dnl But all native Windows platforms (including mingw64) have a 32-bit - dnl st_size member in 'struct stat'. - WINDOWS_64_BIT_ST_SIZE=1 + dnl Some mingw versions define, if _FILE_OFFSET_BITS=64, 'struct stat' + dnl to 'struct _stat32i64' or 'struct _stat64' (depending on + dnl _USE_32BIT_TIME_T), which has a 32-bit st_size member. + AC_CACHE_CHECK([for 64-bit st_size], [gl_cv_member_st_size_64], + [AC_COMPILE_IFELSE( + [AC_LANG_PROGRAM( + [[#include <sys/types.h> + struct stat buf; + int verify_st_size_size[sizeof (buf.st_size) >= 8 ? 1 : -1]; + ]], + [[]])], + [gl_cv_member_st_size_64=yes], [gl_cv_member_st_size_64=no]) + ]) + if test $gl_cv_member_st_size_64 = no; then + WINDOWS_64_BIT_ST_SIZE=1 + else + WINDOWS_64_BIT_ST_SIZE=0 + fi ;; *) dnl Nothing to do on gnulib's side. diff --git a/m4/lib-ld.m4 b/m4/lib-ld.m4 index 6209de6..8b8a26e 100644 --- a/m4/lib-ld.m4 +++ b/m4/lib-ld.m4 @@ -1,5 +1,5 @@ -# lib-ld.m4 serial 6 -dnl Copyright (C) 1996-2003, 2009-2016 Free Software Foundation, Inc. +# lib-ld.m4 serial 7 +dnl Copyright (C) 1996-2003, 2009-2017 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -47,73 +47,101 @@ if test "${PATH_SEPARATOR+set}" != set; then } fi -ac_prog=ld -if test "$GCC" = yes; then - # Check if gcc -print-prog-name=ld gives a path. +if test -n "$LD"; then + AC_MSG_CHECKING([for ld]) +elif test "$GCC" = yes; then AC_MSG_CHECKING([for ld used by $CC]) - 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. - [[\\/]]* | ?:[[\\/]]*) - re_direlt='/[[^/]][[^/]]*/\.\./' - # Canonicalize the pathname 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 -AC_CACHE_VAL([acl_cv_path_LD], -[if test -z "$LD"; then - 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 </dev/null` in - *GNU* | *'with BFD'*) - test "$with_gnu_ld" != no && break - ;; - *) - test "$with_gnu_ld" != yes && break - ;; +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 + ;; esac fi - done - IFS="$acl_save_ifs" -else - acl_cv_path_LD="$LD" # Let the user override the test with a path. -fi]) -LD="$acl_cv_path_LD" + 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 </dev/null` in + *GNU* | *'with BFD'*) + test "$with_gnu_ld" != no && break + ;; + *) + test "$with_gnu_ld" != yes && break + ;; + esac + fi + done + IFS="$acl_save_ifs" + fi + case $host in + *-*-aix*) + AC_EGREP_CPP([yes], + [#if defined __powerpc64__ || defined _ARCH_PPC64 + yes + #endif + ], + [# 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 + ], []) + ;; + esac + ]) + LD="$acl_cv_path_LD" +fi if test -n "$LD"; then AC_MSG_RESULT([$LD]) else AC_MSG_RESULT([no]) + AC_MSG_ERROR([no acceptable ld found in \$PATH]) fi -test -z "$LD" && AC_MSG_ERROR([no acceptable ld found in \$PATH]) AC_LIB_PROG_LD_GNU ]) diff --git a/m4/lib-link.m4 b/m4/lib-link.m4 index 2f51855..1ce9a5a 100644 --- a/m4/lib-link.m4 +++ b/m4/lib-link.m4 @@ -1,5 +1,5 @@ # lib-link.m4 serial 26 (gettext-0.18.2) -dnl Copyright (C) 2001-2016 Free Software Foundation, Inc. +dnl Copyright (C) 2001-2017 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/lib-prefix.m4 b/m4/lib-prefix.m4 index 6851031..a5d56c8 100644 --- a/m4/lib-prefix.m4 +++ b/m4/lib-prefix.m4 @@ -1,5 +1,5 @@ -# lib-prefix.m4 serial 7 (gettext-0.18) -dnl Copyright (C) 2001-2005, 2008-2016 Free Software Foundation, Inc. +# lib-prefix.m4 serial 8 +dnl Copyright (C) 2001-2005, 2008-2017 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -174,51 +174,68 @@ 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]) - 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 <http://docs.sun.com/app/docs/doc/816-5138/dev-env?l=en&a=view>. - 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_EGREP_CPP([sixtyfour bits], [ + 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 <http://docs.sun.com/app/docs/doc/816-5138/dev-env?l=en&a=view>. + 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_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 ) acl_libdirstem=lib64 ;; - esac ;; - esac - fi - done - IFS="$acl_save_IFS" - fi - ;; - esac - test -n "$acl_libdirstem2" || acl_libdirstem2="$acl_libdirstem" + ], [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 + ;; + *) + dnl The result is a property of the system. However, non-system + dnl compilers sometimes have odd library search paths. Therefore + dnl prefer asking /usr/bin/gcc, if available, rather than $CC. + searchpath=`(if test -f /usr/bin/gcc \ + && LC_ALL=C /usr/bin/gcc -print-search-dirs >/dev/null 2>/dev/null; then \ + LC_ALL=C /usr/bin/gcc -print-search-dirs; \ + else \ + LC_ALL=C $CC -print-search-dirs; \ + fi) 2>/dev/null \ + | sed -n -e 's,^libraries: ,,p' | sed -e 's,^=,,'` + if test -n "$searchpath"; then + acl_save_IFS="${IFS= }"; IFS=":" + for searchdir in $searchpath; do + if test -d "$searchdir"; then + case "$searchdir" in + */lib64/ | */lib64 ) acl_libdirstem=lib64 ;; + */../ | */.. ) + # Better ignore directories of this form. They are misleading. + ;; + *) searchdir=`cd "$searchdir" && pwd` + case "$searchdir" in + */lib64 ) acl_libdirstem=lib64 ;; + esac ;; + esac + fi + done + IFS="$acl_save_IFS" + fi + ;; + esac + 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/.*,//'` ]) diff --git a/m4/libsigsegv.m4 b/m4/libsigsegv.m4 index 5bfa092..cb9d4d5 100644 --- a/m4/libsigsegv.m4 +++ b/m4/libsigsegv.m4 @@ -1,5 +1,5 @@ # libsigsegv.m4 serial 4 -dnl Copyright (C) 2002-2003, 2008-2016 Free Software Foundation, Inc. +dnl Copyright (C) 2002-2003, 2008-2017 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/libunistring-base.m4 b/m4/libunistring-base.m4 index f911216..ee648f2 100644 --- a/m4/libunistring-base.m4 +++ b/m4/libunistring-base.m4 @@ -1,5 +1,5 @@ # libunistring-base.m4 serial 5 -dnl Copyright (C) 2010-2016 Free Software Foundation, Inc. +dnl Copyright (C) 2010-2017 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/limits-h.m4 b/m4/limits-h.m4 new file mode 100644 index 0000000..443f91b --- /dev/null +++ b/m4/limits-h.m4 @@ -0,0 +1,31 @@ +dnl Check whether limits.h has needed features. + +dnl Copyright 2016-2017 Free Software Foundation, Inc. +dnl This file is free software; the Free Software Foundation +dnl gives unlimited permission to copy and/or distribute it, +dnl with or without modifications, as long as this notice is preserved. + +dnl From Paul Eggert. + +AC_DEFUN_ONCE([gl_LIMITS_H], +[ + gl_CHECK_NEXT_HEADERS([limits.h]) + + AC_CACHE_CHECK([whether limits.h has ULLONG_WIDTH etc.], + [gl_cv_header_limits_width], + [AC_COMPILE_IFELSE( + [AC_LANG_PROGRAM([[#ifndef __STDC_WANT_IEC_60559_BFP_EXT__ + #define __STDC_WANT_IEC_60559_BFP_EXT__ 1 + #endif + #include <limits.h> + int ullw = ULLONG_WIDTH;]])], + [gl_cv_header_limits_width=yes], + [gl_cv_header_limits_width=no])]) + if test "$gl_cv_header_limits_width" = yes; then + LIMITS_H= + else + LIMITS_H=limits.h + fi + AC_SUBST([LIMITS_H]) + AM_CONDITIONAL([GL_GENERATE_LIMITS_H], [test -n "$LIMITS_H"]) +]) diff --git a/m4/localcharset.m4 b/m4/localcharset.m4 index 22c311b..0c1ff38 100644 --- a/m4/localcharset.m4 +++ b/m4/localcharset.m4 @@ -1,5 +1,5 @@ # localcharset.m4 serial 7 -dnl Copyright (C) 2002, 2004, 2006, 2009-2016 Free Software Foundation, Inc. +dnl Copyright (C) 2002, 2004, 2006, 2009-2017 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/locale-fr.m4 b/m4/locale-fr.m4 index 92896a0..93d3da7 100644 --- a/m4/locale-fr.m4 +++ b/m4/locale-fr.m4 @@ -1,5 +1,5 @@ # locale-fr.m4 serial 17 -dnl Copyright (C) 2003, 2005-2016 Free Software Foundation, Inc. +dnl Copyright (C) 2003, 2005-2017 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/locale-ja.m4 b/m4/locale-ja.m4 index f222a08..c1d1154 100644 --- a/m4/locale-ja.m4 +++ b/m4/locale-ja.m4 @@ -1,5 +1,5 @@ # locale-ja.m4 serial 12 -dnl Copyright (C) 2003, 2005-2016 Free Software Foundation, Inc. +dnl Copyright (C) 2003, 2005-2017 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/locale-tr.m4 b/m4/locale-tr.m4 index 75aa295..06e2f6e 100644 --- a/m4/locale-tr.m4 +++ b/m4/locale-tr.m4 @@ -1,5 +1,5 @@ # locale-tr.m4 serial 10 -dnl Copyright (C) 2003, 2005-2016 Free Software Foundation, Inc. +dnl Copyright (C) 2003, 2005-2017 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/locale-zh.m4 b/m4/locale-zh.m4 index 2271f77..1459418 100644 --- a/m4/locale-zh.m4 +++ b/m4/locale-zh.m4 @@ -1,5 +1,5 @@ # locale-zh.m4 serial 12 -dnl Copyright (C) 2003, 2005-2016 Free Software Foundation, Inc. +dnl Copyright (C) 2003, 2005-2017 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/locale_h.m4 b/m4/locale_h.m4 index 563f8f8..7426a65 100644 --- a/m4/locale_h.m4 +++ b/m4/locale_h.m4 @@ -1,5 +1,5 @@ # locale_h.m4 serial 19 -dnl Copyright (C) 2007, 2009-2016 Free Software Foundation, Inc. +dnl Copyright (C) 2007, 2009-2017 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/localeconv.m4 b/m4/localeconv.m4 index 6e1dbf1..c287aa5 100644 --- a/m4/localeconv.m4 +++ b/m4/localeconv.m4 @@ -1,5 +1,5 @@ # localeconv.m4 serial 1 -dnl Copyright (C) 2012-2016 Free Software Foundation, Inc. +dnl Copyright (C) 2012-2017 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/localtime-buffer.m4 b/m4/localtime-buffer.m4 new file mode 100644 index 0000000..3965b5d --- /dev/null +++ b/m4/localtime-buffer.m4 @@ -0,0 +1,21 @@ +# localtime-buffer.m4 serial 1 +dnl Copyright (C) 2017 Free Software Foundation, Inc. +dnl This file is free software; the Free Software Foundation +dnl gives unlimited permission to copy and/or distribute it, +dnl with or without modifications, as long as this notice is preserved. + +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/longlong.m4 b/m4/longlong.m4 index 36d8b12..9a3294b 100644 --- a/m4/longlong.m4 +++ b/m4/longlong.m4 @@ -1,5 +1,5 @@ # longlong.m4 serial 17 -dnl Copyright (C) 1999-2007, 2009-2016 Free Software Foundation, Inc. +dnl Copyright (C) 1999-2007, 2009-2017 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/lstat.m4 b/m4/lstat.m4 index e143d5c..953c117 100644 --- a/m4/lstat.m4 +++ b/m4/lstat.m4 @@ -1,6 +1,6 @@ # serial 27 -# Copyright (C) 1997-2001, 2003-2016 Free Software Foundation, Inc. +# Copyright (C) 1997-2001, 2003-2017 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/malloc.m4 b/m4/malloc.m4 index c393690..e1d2ec6 100644 --- a/m4/malloc.m4 +++ b/m4/malloc.m4 @@ -1,5 +1,5 @@ # malloc.m4 serial 15 -dnl Copyright (C) 2007, 2009-2016 Free Software Foundation, Inc. +dnl Copyright (C) 2007, 2009-2017 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/malloca.m4 b/m4/malloca.m4 index b368b20..6956baf 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-2016 Free Software Foundation, +dnl Copyright (C) 2003-2004, 2006-2007, 2009-2017 Free Software Foundation, dnl Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, diff --git a/m4/manywarnings.m4 b/m4/manywarnings.m4 index 90823b0..2d35eff 100644 --- a/m4/manywarnings.m4 +++ b/m4/manywarnings.m4 @@ -1,5 +1,5 @@ # manywarnings.m4 serial 8 -dnl Copyright (C) 2008-2016 Free Software Foundation, Inc. +dnl Copyright (C) 2008-2017 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -62,10 +62,11 @@ AC_DEFUN([gl_MANYWARN_ALL_GCC], CFLAGS="$CFLAGS -W -Werror" AC_COMPILE_IFELSE( [AC_LANG_PROGRAM( - [[void f (void) + [[int f (void) { typedef struct { int a; int b; } s_t; s_t s1 = { 0, }; + return s1.b; } ]], [[]])], @@ -98,11 +99,11 @@ AC_DEFUN([gl_MANYWARN_ALL_GCC], # comm -3 \ # <(sed -n 's/^ *\(-[^ ]*\) .*/\1/p' manywarnings.m4 | sort) \ # <(gcc --help=warnings | sed -n 's/^ \(-[^ ]*\) .*/\1/p' | sort | - # grep -v -x -f <( + # grep -v -x -F -f <( # awk '/^[^#]/ {print $1}' ../build-aux/gcc-warning.spec)) gl_manywarn_set= - for gl_manywarn_item in \ + for gl_manywarn_item in -fno-common \ -W \ -Wabi \ -Waddress \ @@ -111,6 +112,8 @@ AC_DEFUN([gl_MANYWARN_ALL_GCC], -Wattributes \ -Wbad-function-cast \ -Wbool-compare \ + -Wbool-operation \ + -Wbuiltin-declaration-mismatch \ -Wbuiltin-macro-redefined \ -Wcast-align \ -Wchar-subscripts \ @@ -120,6 +123,7 @@ AC_DEFUN([gl_MANYWARN_ALL_GCC], -Wcomments \ -Wcoverage-mismatch \ -Wcpp \ + -Wdangling-else \ -Wdate-time \ -Wdeprecated \ -Wdeprecated-declarations \ @@ -129,10 +133,13 @@ AC_DEFUN([gl_MANYWARN_ALL_GCC], -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 \ @@ -153,6 +160,7 @@ AC_DEFUN([gl_MANYWARN_ALL_GCC], -Winit-self \ -Winline \ -Wint-conversion \ + -Wint-in-bool-context \ -Wint-to-pointer-cast \ -Winvalid-memory-model \ -Winvalid-pch \ @@ -161,6 +169,7 @@ AC_DEFUN([gl_MANYWARN_ALL_GCC], -Wlogical-op \ -Wmain \ -Wmaybe-uninitialized \ + -Wmemset-elt-size \ -Wmemset-transposed-args \ -Wmisleading-indentation \ -Wmissing-braces \ @@ -186,9 +195,12 @@ AC_DEFUN([gl_MANYWARN_ALL_GCC], -Wpacked-bitfield-compat \ -Wparentheses \ -Wpointer-arith \ + -Wpointer-compare \ -Wpointer-sign \ -Wpointer-to-int-cast \ -Wpragmas \ + -Wpsabi \ + -Wrestrict \ -Wreturn-local-addr \ -Wreturn-type \ -Wscalar-storage-order \ @@ -212,6 +224,7 @@ AC_DEFUN([gl_MANYWARN_ALL_GCC], -Wswitch \ -Wswitch-bool \ -Wswitch-default \ + -Wswitch-unreachable \ -Wsync-nand \ -Wsystem-headers \ -Wtautological-compare \ @@ -245,10 +258,18 @@ AC_DEFUN([gl_MANYWARN_ALL_GCC], # 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: + ptrdiff_max_max=9223372036854775807 + gl_manywarn_set="$gl_manywarn_set -Walloc-size-larger-than=$ptrdiff_max_max" gl_manywarn_set="$gl_manywarn_set -Warray-bounds=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" # These are needed for older GCC versions. if test -n "$GCC"; then diff --git a/m4/mbchar.m4 b/m4/mbchar.m4 index 26484fa..60ea124 100644 --- a/m4/mbchar.m4 +++ b/m4/mbchar.m4 @@ -1,5 +1,5 @@ # mbchar.m4 serial 9 -dnl Copyright (C) 2005-2007, 2009-2016 Free Software Foundation, Inc. +dnl Copyright (C) 2005-2007, 2009-2017 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/mbiter.m4 b/m4/mbiter.m4 index 3383ee4..add4034 100644 --- a/m4/mbiter.m4 +++ b/m4/mbiter.m4 @@ -1,5 +1,5 @@ # mbiter.m4 serial 7 -dnl Copyright (C) 2005, 2008-2016 Free Software Foundation, Inc. +dnl Copyright (C) 2005, 2008-2017 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/mbrtowc.m4 b/m4/mbrtowc.m4 index d370fcc..536183f 100644 --- a/m4/mbrtowc.m4 +++ b/m4/mbrtowc.m4 @@ -1,5 +1,5 @@ # mbrtowc.m4 serial 27 -*- coding: utf-8 -*- -dnl Copyright (C) 2001-2002, 2004-2005, 2008-2016 Free Software Foundation, +dnl Copyright (C) 2001-2002, 2004-2005, 2008-2017 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, @@ -164,7 +164,7 @@ int main () memset (&state, '\0', sizeof (mbstate_t)); if (mbrtowc (&wc, input + 1, 1, &state) == (size_t)(-2)) if (mbsinit (&state)) - return 1; + return 2; } return 0; }]])], @@ -224,7 +224,7 @@ int main () memset (&state, '\0', sizeof (mbstate_t)); if (mbrtowc (&wc, input + 3, 6, &state) != 4 && mbtowc (&wc, input + 3, 6) == 4) - return 1; + return 2; } return 0; }]])], @@ -352,7 +352,7 @@ int main () mbrtowc (&wc, NULL, 5, &state); /* Check that wc was not modified. */ if (wc != (wchar_t) 0xBADFACE) - return 1; + return 2; } return 0; }]])], @@ -539,7 +539,7 @@ int main () memset (&state, '\0', sizeof (mbstate_t)); if (mbrtowc (&wc, "", 1, &state) != 0) - return 1; + return 2; } return 0; }]])], @@ -608,7 +608,7 @@ AC_DEFUN([gl_MBRTOWC_C_LOCALE], int i; char *locale = setlocale (LC_ALL, "C"); if (! locale) - return 1; + return 2; for (i = CHAR_MIN; i <= CHAR_MAX; i++) { char c = i; @@ -616,7 +616,7 @@ AC_DEFUN([gl_MBRTOWC_C_LOCALE], mbstate_t mbs = { 0, }; size_t ss = mbrtowc (&wc, &c, 1, &mbs); if (1 < ss) - return 1; + return 3; } return 0; ]])], diff --git a/m4/mbsinit.m4 b/m4/mbsinit.m4 index 88f0836..5904a51 100644 --- a/m4/mbsinit.m4 +++ b/m4/mbsinit.m4 @@ -1,5 +1,5 @@ # mbsinit.m4 serial 8 -dnl Copyright (C) 2008, 2010-2016 Free Software Foundation, Inc. +dnl Copyright (C) 2008, 2010-2017 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/mbslen.m4 b/m4/mbslen.m4 index 7736529..b9193ad 100644 --- a/m4/mbslen.m4 +++ b/m4/mbslen.m4 @@ -1,5 +1,5 @@ # mbslen.m4 serial 2 -dnl Copyright (C) 2010-2016 Free Software Foundation, Inc. +dnl Copyright (C) 2010-2017 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/mbsrtowcs.m4 b/m4/mbsrtowcs.m4 index 3b5dc6e..79b8d76 100644 --- a/m4/mbsrtowcs.m4 +++ b/m4/mbsrtowcs.m4 @@ -1,5 +1,5 @@ # mbsrtowcs.m4 serial 13 -dnl Copyright (C) 2008-2016 Free Software Foundation, Inc. +dnl Copyright (C) 2008-2017 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/mbstate_t.m4 b/m4/mbstate_t.m4 index 0a8eae2..6325cf3 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-2016 Free Software Foundation, Inc. +dnl Copyright (C) 2000-2002, 2008-2017 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/mbtowc.m4 b/m4/mbtowc.m4 index e770bbf..378a4e2 100644 --- a/m4/mbtowc.m4 +++ b/m4/mbtowc.m4 @@ -1,5 +1,5 @@ # mbtowc.m4 serial 2 -dnl Copyright (C) 2011-2016 Free Software Foundation, Inc. +dnl Copyright (C) 2011-2017 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/memchr.m4 b/m4/memchr.m4 index 25d32f0..b6ec814 100644 --- a/m4/memchr.m4 +++ b/m4/memchr.m4 @@ -1,5 +1,5 @@ # memchr.m4 serial 12 -dnl Copyright (C) 2002-2004, 2009-2016 Free Software Foundation, Inc. +dnl Copyright (C) 2002-2004, 2009-2017 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/minmax.m4 b/m4/minmax.m4 new file mode 100644 index 0000000..6845fce --- /dev/null +++ b/m4/minmax.m4 @@ -0,0 +1,44 @@ +# minmax.m4 serial 4 +dnl Copyright (C) 2005, 2009-2017 Free Software Foundation, Inc. +dnl This file is free software; the Free Software Foundation +dnl gives unlimited permission to copy and/or distribute it, +dnl with or without modifications, as long as this notice is preserved. + +AC_PREREQ([2.53]) + +AC_DEFUN([gl_MINMAX], +[ + AC_REQUIRE([gl_PREREQ_MINMAX]) +]) + +# Prerequisites of lib/minmax.h. +AC_DEFUN([gl_PREREQ_MINMAX], +[ + gl_MINMAX_IN_HEADER([limits.h]) + gl_MINMAX_IN_HEADER([sys/param.h]) +]) + +dnl gl_MINMAX_IN_HEADER(HEADER) +dnl The parameter has to be a literal header name; it cannot be macro, +dnl nor a shell variable. (Because autoheader collects only AC_DEFINE +dnl invocations with a literal macro name.) +AC_DEFUN([gl_MINMAX_IN_HEADER], +[ + m4_pushdef([header], AS_TR_SH([$1])) + m4_pushdef([HEADER], AS_TR_CPP([$1])) + AC_CACHE_CHECK([whether <$1> defines MIN and MAX], + [gl_cv_minmax_in_]header, + [AC_COMPILE_IFELSE( + [AC_LANG_PROGRAM( + [[#include <$1> + int x = MIN (42, 17);]], + [[]])], + [gl_cv_minmax_in_]header[=yes], + [gl_cv_minmax_in_]header[=no])]) + if test $gl_cv_minmax_in_[]header = yes; then + AC_DEFINE([HAVE_MINMAX_IN_]HEADER, 1, + [Define to 1 if <$1> defines the MIN and MAX macros.]) + fi + m4_popdef([HEADER]) + m4_popdef([header]) +]) diff --git a/m4/mkstemp.m4 b/m4/mkstemp.m4 index 131e4a7..31b9b8b 100644 --- a/m4/mkstemp.m4 +++ b/m4/mkstemp.m4 @@ -1,6 +1,6 @@ #serial 23 -# Copyright (C) 2001, 2003-2007, 2009-2016 Free Software Foundation, Inc. +# Copyright (C) 2001, 2003-2007, 2009-2017 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/mktime.m4 b/m4/mktime.m4 index 23cad73..31da65e 100644 --- a/m4/mktime.m4 +++ b/m4/mktime.m4 @@ -1,5 +1,5 @@ -# serial 27 -dnl Copyright (C) 2002-2003, 2005-2007, 2009-2016 Free Software Foundation, +# serial 28 +dnl Copyright (C) 2002-2003, 2005-2007, 2009-2017 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, @@ -21,9 +21,9 @@ AC_DEFUN([gl_TIME_T_IS_SIGNED], fi ]) -AC_DEFUN([gl_FUNC_MKTIME], +dnl Test whether mktime works. Set gl_cv_func_working_mktime. +AC_DEFUN([gl_FUNC_MKTIME_WORKS], [ - AC_REQUIRE([gl_HEADER_TIME_H_DEFAULTS]) AC_REQUIRE([gl_TIME_T_IS_SIGNED]) dnl We don't use AC_FUNC_MKTIME any more, because it is no longer maintained @@ -239,29 +239,50 @@ main () }]])], [gl_cv_func_working_mktime=yes], [gl_cv_func_working_mktime=no], - [gl_cv_func_working_mktime=no]) + [gl_cv_func_working_mktime="guessing no"]) ]) +]) + +dnl Main macro of module 'mktime'. +AC_DEFUN([gl_FUNC_MKTIME], +[ + AC_REQUIRE([gl_HEADER_TIME_H_DEFAULTS]) + AC_REQUIRE([AC_CANONICAL_HOST]) + AC_REQUIRE([gl_FUNC_MKTIME_WORKS]) - if test $gl_cv_func_working_mktime = no; then + REPLACE_MKTIME=0 + if test "$gl_cv_func_working_mktime" != yes; then REPLACE_MKTIME=1 - else - REPLACE_MKTIME=0 + AC_DEFINE([NEED_MKTIME_WORKING], [1], + [Define if the compilation of mktime.c should define 'mktime' + with the algorithmic workarounds.]) fi + case "$host_os" in + mingw*) + REPLACE_MKTIME=1 + AC_DEFINE([NEED_MKTIME_WINDOWS], [1], + [Define if the compilation of mktime.c should define 'mktime' + with the native Windows TZ workaround.]) + ;; + esac ]) +dnl Main macro of module 'mktime-internal'. AC_DEFUN([gl_FUNC_MKTIME_INTERNAL], [ - AC_REQUIRE([gl_FUNC_MKTIME]) - if test $REPLACE_MKTIME = 0; then - dnl BeOS has __mktime_internal in libc, but other platforms don't. - AC_CHECK_FUNC([__mktime_internal], - [AC_DEFINE([mktime_internal], [__mktime_internal], - [Define to the real name of the mktime_internal function.]) - ], - [dnl mktime works but it doesn't export __mktime_internal, - dnl so we need to substitute our own mktime implementation. - REPLACE_MKTIME=1 - ]) - fi + AC_REQUIRE([gl_FUNC_MKTIME_WORKS]) + + WANT_MKTIME_INTERNAL=0 + dnl BeOS has __mktime_internal in libc, but other platforms don't. + AC_CHECK_FUNC([__mktime_internal], + [AC_DEFINE([mktime_internal], [__mktime_internal], + [Define to the real name of the mktime_internal function.]) + ], + [dnl mktime works but it doesn't export __mktime_internal, + dnl so we need to substitute our own mktime implementation. + WANT_MKTIME_INTERNAL=1 + AC_DEFINE([NEED_MKTIME_INTERNAL], [1], + [Define if the compilation of mktime.c should define 'mktime_internal'.]) + ]) ]) # Prerequisites of lib/mktime.c. diff --git a/m4/mmap-anon.m4 b/m4/mmap-anon.m4 index 853c89d..263687d 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-2016 Free Software Foundation, Inc. +dnl Copyright (C) 2005, 2007, 2009-2017 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/mode_t.m4 b/m4/mode_t.m4 index 0cd40db..75d372a 100644 --- a/m4/mode_t.m4 +++ b/m4/mode_t.m4 @@ -1,5 +1,5 @@ # mode_t.m4 serial 2 -dnl Copyright (C) 2009-2016 Free Software Foundation, Inc. +dnl Copyright (C) 2009-2017 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/msvc-inval.m4 b/m4/msvc-inval.m4 index f5e4c89..3324375 100644 --- a/m4/msvc-inval.m4 +++ b/m4/msvc-inval.m4 @@ -1,5 +1,5 @@ # msvc-inval.m4 serial 1 -dnl Copyright (C) 2011-2016 Free Software Foundation, Inc. +dnl Copyright (C) 2011-2017 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/msvc-nothrow.m4 b/m4/msvc-nothrow.m4 index 58f5c0b..3014661 100644 --- a/m4/msvc-nothrow.m4 +++ b/m4/msvc-nothrow.m4 @@ -1,5 +1,5 @@ # msvc-nothrow.m4 serial 1 -dnl Copyright (C) 2011-2016 Free Software Foundation, Inc. +dnl Copyright (C) 2011-2017 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/multiarch.m4 b/m4/multiarch.m4 index 43b5d05..30006cb 100644 --- a/m4/multiarch.m4 +++ b/m4/multiarch.m4 @@ -1,5 +1,5 @@ # multiarch.m4 serial 7 -dnl Copyright (C) 2008-2016 Free Software Foundation, Inc. +dnl Copyright (C) 2008-2017 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/nanosleep.m4 b/m4/nanosleep.m4 index 12914d4..5590696 100644 --- a/m4/nanosleep.m4 +++ b/m4/nanosleep.m4 @@ -5,7 +5,7 @@ dnl Check for the nanosleep function. dnl If not found, use the supplied replacement. dnl -# Copyright (C) 1999-2001, 2003-2016 Free Software Foundation, Inc. +# Copyright (C) 1999-2001, 2003-2017 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/netinet_in_h.m4 b/m4/netinet_in_h.m4 index 93dcc68..f936657 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-2016 Free Software Foundation, Inc. +dnl Copyright (C) 2006-2017 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/nl_langinfo.m4 b/m4/nl_langinfo.m4 index a2f7196..16de8de 100644 --- a/m4/nl_langinfo.m4 +++ b/m4/nl_langinfo.m4 @@ -1,5 +1,5 @@ # nl_langinfo.m4 serial 5 -dnl Copyright (C) 2009-2016 Free Software Foundation, Inc. +dnl Copyright (C) 2009-2017 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/nocrash.m4 b/m4/nocrash.m4 index d8dd8f1..2c2c5fb 100644 --- a/m4/nocrash.m4 +++ b/m4/nocrash.m4 @@ -1,5 +1,5 @@ # nocrash.m4 serial 4 -dnl Copyright (C) 2005, 2009-2016 Free Software Foundation, Inc. +dnl Copyright (C) 2005, 2009-2017 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/off_t.m4 b/m4/off_t.m4 index 282751b..92c45ef 100644 --- a/m4/off_t.m4 +++ b/m4/off_t.m4 @@ -1,5 +1,5 @@ # off_t.m4 serial 1 -dnl Copyright (C) 2012-2016 Free Software Foundation, Inc. +dnl Copyright (C) 2012-2017 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -1,5 +1,5 @@ # open.m4 serial 14 -dnl Copyright (C) 2007-2016 Free Software Foundation, Inc. +dnl Copyright (C) 2007-2017 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/pathmax.m4 b/m4/pathmax.m4 index 6f8e59a..c6c9f24 100644 --- a/m4/pathmax.m4 +++ b/m4/pathmax.m4 @@ -1,5 +1,5 @@ # pathmax.m4 serial 10 -dnl Copyright (C) 2002-2003, 2005-2006, 2009-2016 Free Software Foundation, +dnl Copyright (C) 2002-2003, 2005-2006, 2009-2017 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 743ab7a..752cb44 100644 --- a/m4/perror.m4 +++ b/m4/perror.m4 @@ -1,5 +1,5 @@ # perror.m4 serial 6 -dnl Copyright (C) 2008-2016 Free Software Foundation, Inc. +dnl Copyright (C) 2008-2017 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -1,5 +1,5 @@ # pipe.m4 serial 2 -dnl Copyright (C) 2010-2016 Free Software Foundation, Inc. +dnl Copyright (C) 2010-2017 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/printf.m4 b/m4/printf.m4 index e495e0c..113cc2e 100644 --- a/m4/printf.m4 +++ b/m4/printf.m4 @@ -1,5 +1,5 @@ -# printf.m4 serial 52 -dnl Copyright (C) 2003, 2007-2016 Free Software Foundation, Inc. +# printf.m4 serial 53 +dnl Copyright (C) 2003, 2007-2017 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -38,6 +38,8 @@ int main () if (sprintf (buf, "%ju %d", (uintmax_t) 12345671, 33, 44, 55) < 0 || strcmp (buf, "12345671 33") != 0) result |= 1; +#else + result |= 1; #endif buf[0] = '\0'; if (sprintf (buf, "%zu %d", (size_t) 12345672, 33, 44, 55) < 0 @@ -487,6 +489,13 @@ int main () && strcmp (buf, "0x6.0ap-2 33") != 0 && strcmp (buf, "0xc.14p-3 33") != 0)) result |= 4; + /* This catches a Mac OS X 10.12.4 (Darwin 16.5) bug: it doesn't round. */ + if (sprintf (buf, "%.0a %d", 1.51, 33, 44, 55) < 0 + || (strcmp (buf, "0x2p+0 33") != 0 + && strcmp (buf, "0x3p-1 33") != 0 + && strcmp (buf, "0x6p-2 33") != 0 + && strcmp (buf, "0xcp-3 33") != 0)) + result |= 4; /* This catches a FreeBSD 6.1 bug. See <http://lists.gnu.org/archive/html/bug-gnulib/2007-04/msg00107.html> */ if (sprintf (buf, "%010a %d", 1.0 / zero, 33, 44, 55) < 0 diff --git a/m4/putenv.m4 b/m4/putenv.m4 index c3c30d8..a8e3ab3 100644 --- a/m4/putenv.m4 +++ b/m4/putenv.m4 @@ -1,5 +1,5 @@ # putenv.m4 serial 20 -dnl Copyright (C) 2002-2016 Free Software Foundation, Inc. +dnl Copyright (C) 2002-2017 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/quote.m4 b/m4/quote.m4 index 50894f8..92be1e7 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-2016 Free Software Foundation, +dnl Copyright (C) 2002-2003, 2005-2006, 2009-2017 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 2562375..5fae4f3 100644 --- a/m4/quotearg.m4 +++ b/m4/quotearg.m4 @@ -1,5 +1,5 @@ # quotearg.m4 serial 9 -dnl Copyright (C) 2002, 2004-2016 Free Software Foundation, Inc. +dnl Copyright (C) 2002, 2004-2017 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/raise.m4 b/m4/raise.m4 index 71c1f4c..fe6e068 100644 --- a/m4/raise.m4 +++ b/m4/raise.m4 @@ -1,5 +1,5 @@ -# raise.m4 serial 3 -dnl Copyright (C) 2011-2016 Free Software Foundation, Inc. +# raise.m4 serial 4 +dnl Copyright (C) 2011-2017 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -8,14 +8,16 @@ AC_DEFUN([gl_FUNC_RAISE], [ AC_REQUIRE([gl_SIGNAL_H_DEFAULTS]) AC_REQUIRE([AC_CANONICAL_HOST]) - AC_REQUIRE([gl_MSVC_INVAL]) AC_CHECK_FUNCS([raise]) if test $ac_cv_func_raise = no; then HAVE_RAISE=0 else - if test $HAVE_MSVC_INVALID_PARAMETER_HANDLER = 1; then - REPLACE_RAISE=1 - fi + m4_ifdef([gl_MSVC_INVAL], [ + AC_REQUIRE([gl_MSVC_INVAL]) + if test $HAVE_MSVC_INVALID_PARAMETER_HANDLER = 1; then + REPLACE_RAISE=1 + fi + ]) m4_ifdef([gl_SIGNALBLOCKING], [ gl_SIGNALBLOCKING if test $HAVE_POSIX_SIGNALBLOCKING = 0; then diff --git a/m4/rawmemchr.m4 b/m4/rawmemchr.m4 index d3ccb7e..f800ed4 100644 --- a/m4/rawmemchr.m4 +++ b/m4/rawmemchr.m4 @@ -1,5 +1,5 @@ # rawmemchr.m4 serial 2 -dnl Copyright (C) 2003, 2007-2016 Free Software Foundation, Inc. +dnl Copyright (C) 2003, 2007-2017 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/readlink.m4 b/m4/readlink.m4 index ede0378..d3ba0ad 100644 --- a/m4/readlink.m4 +++ b/m4/readlink.m4 @@ -1,5 +1,5 @@ # readlink.m4 serial 12 -dnl Copyright (C) 2003, 2007, 2009-2016 Free Software Foundation, Inc. +dnl Copyright (C) 2003, 2007, 2009-2017 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/regex.m4 b/m4/regex.m4 index abfd262..61ff098 100644 --- a/m4/regex.m4 +++ b/m4/regex.m4 @@ -1,6 +1,6 @@ # serial 66 -# Copyright (C) 1996-2001, 2003-2016 Free Software Foundation, Inc. +# Copyright (C) 1996-2001, 2003-2017 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/secure_getenv.m4 b/m4/secure_getenv.m4 index 3983173..6bd4afd 100644 --- a/m4/secure_getenv.m4 +++ b/m4/secure_getenv.m4 @@ -1,5 +1,5 @@ # Look up an environment variable more securely. -dnl Copyright 2013-2016 Free Software Foundation, Inc. +dnl Copyright 2013-2017 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/select.m4 b/m4/select.m4 index d193655..c7844bc 100644 --- a/m4/select.m4 +++ b/m4/select.m4 @@ -1,5 +1,5 @@ # select.m4 serial 8 -dnl Copyright (C) 2009-2016 Free Software Foundation, Inc. +dnl Copyright (C) 2009-2017 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/setenv.m4 b/m4/setenv.m4 index 5d49aba..005aa8c 100644 --- a/m4/setenv.m4 +++ b/m4/setenv.m4 @@ -1,5 +1,5 @@ # setenv.m4 serial 26 -dnl Copyright (C) 2001-2004, 2006-2016 Free Software Foundation, Inc. +dnl Copyright (C) 2001-2004, 2006-2017 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/setlocale.m4 b/m4/setlocale.m4 index a359069..879317d 100644 --- a/m4/setlocale.m4 +++ b/m4/setlocale.m4 @@ -1,5 +1,5 @@ # setlocale.m4 serial 4 -dnl Copyright (C) 2011-2016 Free Software Foundation, Inc. +dnl Copyright (C) 2011-2017 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/sigaction.m4 b/m4/sigaction.m4 index 9b43764..1042f3a 100644 --- a/m4/sigaction.m4 +++ b/m4/sigaction.m4 @@ -1,5 +1,5 @@ # sigaction.m4 serial 7 -dnl Copyright (C) 2008-2016 Free Software Foundation, Inc. +dnl Copyright (C) 2008-2017 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/signal_h.m4 b/m4/signal_h.m4 index bcfd7b4..eaf5ce9 100644 --- a/m4/signal_h.m4 +++ b/m4/signal_h.m4 @@ -1,5 +1,5 @@ # signal_h.m4 serial 18 -dnl Copyright (C) 2007-2016 Free Software Foundation, Inc. +dnl Copyright (C) 2007-2017 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/signalblocking.m4 b/m4/signalblocking.m4 index 5197c50..26041b1 100644 --- a/m4/signalblocking.m4 +++ b/m4/signalblocking.m4 @@ -1,5 +1,5 @@ # signalblocking.m4 serial 14 -dnl Copyright (C) 2001-2002, 2006-2016 Free Software Foundation, Inc. +dnl Copyright (C) 2001-2002, 2006-2017 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/size_max.m4 b/m4/size_max.m4 index de69025..05ad1b6 100644 --- a/m4/size_max.m4 +++ b/m4/size_max.m4 @@ -1,5 +1,5 @@ # size_max.m4 serial 10 -dnl Copyright (C) 2003, 2005-2006, 2008-2016 Free Software Foundation, Inc. +dnl Copyright (C) 2003, 2005-2006, 2008-2017 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/sleep.m4 b/m4/sleep.m4 index 99de5ee..2d92ea8 100644 --- a/m4/sleep.m4 +++ b/m4/sleep.m4 @@ -1,5 +1,5 @@ # sleep.m4 serial 7 -dnl Copyright (C) 2007-2016 Free Software Foundation, Inc. +dnl Copyright (C) 2007-2017 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/snprintf.m4 b/m4/snprintf.m4 index f876b55..e5155f7 100644 --- a/m4/snprintf.m4 +++ b/m4/snprintf.m4 @@ -1,5 +1,5 @@ -# snprintf.m4 serial 6 -dnl Copyright (C) 2002-2004, 2007-2016 Free Software Foundation, Inc. +# snprintf.m4 serial 7 +dnl Copyright (C) 2002-2004, 2007-2017 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -46,6 +46,14 @@ AC_DEFUN([gl_REPLACE_SNPRINTF], AC_LIBOBJ([snprintf]) if test $ac_cv_func_snprintf = yes; then REPLACE_SNPRINTF=1 + else + AC_CHECK_DECLS_ONCE([snprintf]) + if test $ac_cv_have_decl_snprintf = yes; then + dnl If the function is declared but does not appear to exist, it may be + dnl defined as an inline function. In order to avoid a conflict, we have + dnl to define rpl_snprintf, not snprintf. + REPLACE_SNPRINTF=1 + fi fi gl_PREREQ_SNPRINTF ]) diff --git a/m4/socketlib.m4 b/m4/socketlib.m4 index 5da64fc..c708fd2 100644 --- a/m4/socketlib.m4 +++ b/m4/socketlib.m4 @@ -1,5 +1,5 @@ # socketlib.m4 serial 1 -dnl Copyright (C) 2008-2016 Free Software Foundation, Inc. +dnl Copyright (C) 2008-2017 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/sockets.m4 b/m4/sockets.m4 index 7e77a62..0ef23bc 100644 --- a/m4/sockets.m4 +++ b/m4/sockets.m4 @@ -1,5 +1,5 @@ # sockets.m4 serial 7 -dnl Copyright (C) 2008-2016 Free Software Foundation, Inc. +dnl Copyright (C) 2008-2017 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/socklen.m4 b/m4/socklen.m4 index 634c43a..0a62f49 100644 --- a/m4/socklen.m4 +++ b/m4/socklen.m4 @@ -1,5 +1,5 @@ # socklen.m4 serial 10 -dnl Copyright (C) 2005-2007, 2009-2016 Free Software Foundation, Inc. +dnl Copyright (C) 2005-2007, 2009-2017 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/sockpfaf.m4 b/m4/sockpfaf.m4 index dce8b8f..c2e2582 100644 --- a/m4/sockpfaf.m4 +++ b/m4/sockpfaf.m4 @@ -1,5 +1,5 @@ # sockpfaf.m4 serial 8 -dnl Copyright (C) 2004, 2006, 2009-2016 Free Software Foundation, Inc. +dnl Copyright (C) 2004, 2006, 2009-2017 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/ssize_t.m4 b/m4/ssize_t.m4 index 3e7b9e6..66ba9d4 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-2016 Free Software Foundation, Inc. +dnl Copyright (C) 2001-2003, 2006, 2010-2017 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/stat-time.m4 b/m4/stat-time.m4 index 231cb74..4017fc9 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-2016 Free Software +# Copyright (C) 1998-1999, 2001, 2003, 2005-2007, 2009-2017 Free Software # Foundation, Inc. # This file is free software; the Free Software Foundation @@ -1,6 +1,6 @@ -# serial 11 +# serial 12 -# Copyright (C) 2009-2016 Free Software Foundation, Inc. +# Copyright (C) 2009-2017 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -8,64 +8,60 @@ AC_DEFUN([gl_FUNC_STAT], [ - AC_REQUIRE([AC_CANONICAL_HOST]) dnl for cross-compiles + AC_REQUIRE([AC_CANONICAL_HOST]) AC_REQUIRE([gl_SYS_STAT_H_DEFAULTS]) AC_CHECK_FUNCS_ONCE([lstat]) - dnl mingw is the only known platform where stat(".") and stat("./") differ - AC_CACHE_CHECK([whether stat handles trailing slashes on directories], - [gl_cv_func_stat_dir_slash], - [AC_RUN_IFELSE( - [AC_LANG_PROGRAM( - [[#include <sys/stat.h> -]], [[struct stat st; return stat (".", &st) != stat ("./", &st);]])], - [gl_cv_func_stat_dir_slash=yes], [gl_cv_func_stat_dir_slash=no], - [case $host_os in - mingw*) gl_cv_func_stat_dir_slash="guessing no";; - *) gl_cv_func_stat_dir_slash="guessing yes";; - esac])]) - dnl AIX 7.1, Solaris 9, mingw64 mistakenly succeed on stat("file/"). - dnl (For mingw, this is due to a broken stat() override in libmingwex.a.) - dnl FreeBSD 7.2 mistakenly succeeds on stat("link-to-file/"). - AC_CACHE_CHECK([whether stat handles trailing slashes on files], - [gl_cv_func_stat_file_slash], - [touch conftest.tmp - # Assume that if we have lstat, we can also check symlinks. - if test $ac_cv_func_lstat = yes; then - ln -s conftest.tmp conftest.lnk - fi - AC_RUN_IFELSE( - [AC_LANG_PROGRAM( - [[#include <sys/stat.h> + case "$host_os" in + mingw*) + dnl On this platform, the original stat() returns st_atime, st_mtime, + dnl st_ctime values that are affected by the time zone. + REPLACE_STAT=1 + ;; + *) + dnl AIX 7.1, Solaris 9, mingw64 mistakenly succeed on stat("file/"). + dnl (For mingw, this is due to a broken stat() override in libmingwex.a.) + dnl FreeBSD 7.2 mistakenly succeeds on stat("link-to-file/"). + AC_CACHE_CHECK([whether stat handles trailing slashes on files], + [gl_cv_func_stat_file_slash], + [touch conftest.tmp + # Assume that if we have lstat, we can also check symlinks. + if test $ac_cv_func_lstat = yes; then + ln -s conftest.tmp conftest.lnk + fi + AC_RUN_IFELSE( + [AC_LANG_PROGRAM( + [[#include <sys/stat.h> ]], [[int result = 0; - struct stat st; - if (!stat ("conftest.tmp/", &st)) - result |= 1; + struct stat st; + if (!stat ("conftest.tmp/", &st)) + result |= 1; #if HAVE_LSTAT - if (!stat ("conftest.lnk/", &st)) - result |= 2; + if (!stat ("conftest.lnk/", &st)) + result |= 2; #endif - return result; - ]])], - [gl_cv_func_stat_file_slash=yes], [gl_cv_func_stat_file_slash=no], - [case "$host_os" in - # Guess yes on glibc systems. - *-gnu*) gl_cv_func_stat_file_slash="guessing yes" ;; - # If we don't know, assume the worst. - *) gl_cv_func_stat_file_slash="guessing no" ;; - esac - ]) - rm -f conftest.tmp conftest.lnk]) - case $gl_cv_func_stat_dir_slash in - *no) REPLACE_STAT=1 - AC_DEFINE([REPLACE_FUNC_STAT_DIR], [1], [Define to 1 if stat needs - help when passed a directory name with a trailing slash]);; - esac - case $gl_cv_func_stat_file_slash in - *no) REPLACE_STAT=1 - AC_DEFINE([REPLACE_FUNC_STAT_FILE], [1], [Define to 1 if stat needs - help when passed a file name with a trailing slash]);; + return result; + ]])], + [gl_cv_func_stat_file_slash=yes], [gl_cv_func_stat_file_slash=no], + [case "$host_os" in + # Guess yes on glibc systems. + *-gnu*) gl_cv_func_stat_file_slash="guessing yes" ;; + # If we don't know, assume the worst. + *) gl_cv_func_stat_file_slash="guessing no" ;; + esac + ]) + rm -f conftest.tmp conftest.lnk]) + case $gl_cv_func_stat_file_slash in + *no) + REPLACE_STAT=1 + AC_DEFINE([REPLACE_FUNC_STAT_FILE], [1], [Define to 1 if stat needs + help when passed a file name with a trailing slash]);; + esac + ;; esac ]) -# Prerequisites of lib/stat.c. -AC_DEFUN([gl_PREREQ_STAT], [:]) +# Prerequisites of lib/stat.c and lib/stat-w32.c. +AC_DEFUN([gl_PREREQ_STAT], [ + AC_REQUIRE([gl_HEADER_SYS_STAT_H]) + : +]) diff --git a/m4/stdalign.m4 b/m4/stdalign.m4 index 49980cd..0652a1e 100644 --- a/m4/stdalign.m4 +++ b/m4/stdalign.m4 @@ -1,6 +1,6 @@ # Check for stdalign.h that conforms to C11. -dnl Copyright 2011-2016 Free Software Foundation, Inc. +dnl Copyright 2011-2017 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -35,8 +35,8 @@ AC_DEFUN([gl_STDALIGN_H], || (defined __APPLE__ && defined __MACH__ \ ? 4 < __GNUC__ + (1 <= __GNUC_MINOR__) \ : __GNUC__) \ - || __HP_cc || __HP_aCC || __IBMC__ || __IBMCPP__ \ - || __ICC || 0x5110 <= __SUNPRO_C \ + || (__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 diff --git a/m4/stdarg.m4 b/m4/stdarg.m4 index ab3e7f5..40db5e4 100644 --- a/m4/stdarg.m4 +++ b/m4/stdarg.m4 @@ -1,5 +1,5 @@ # stdarg.m4 serial 6 -dnl Copyright (C) 2006, 2008-2016 Free Software Foundation, Inc. +dnl Copyright (C) 2006, 2008-2017 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/stdbool.m4 b/m4/stdbool.m4 index a556153..d368123 100644 --- a/m4/stdbool.m4 +++ b/m4/stdbool.m4 @@ -1,11 +1,11 @@ # Check for stdbool.h that conforms to C99. -dnl Copyright (C) 2002-2006, 2009-2016 Free Software Foundation, Inc. +dnl Copyright (C) 2002-2006, 2009-2017 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. -#serial 6 +#serial 7 # Prepare for substituting <stdbool.h> if it is not supported. @@ -44,7 +44,10 @@ AC_DEFUN([AC_CHECK_HEADER_STDBOOL], [[ #include <stdbool.h> - #if __cplusplus < 201103 + #ifdef __cplusplus + typedef bool Bool; + #else + typedef _Bool Bool; #ifndef bool "error: bool is not defined" #endif @@ -66,37 +69,38 @@ AC_DEFUN([AC_CHECK_HEADER_STDBOOL], "error: __bool_true_false_are_defined is not defined" #endif - struct s { _Bool s: 1; _Bool t; } s; + struct s { Bool s: 1; Bool t; bool u: 1; bool v; } s; char a[true == 1 ? 1 : -1]; char b[false == 0 ? 1 : -1]; char c[__bool_true_false_are_defined == 1 ? 1 : -1]; char d[(bool) 0.5 == true ? 1 : -1]; /* See body of main program for 'e'. */ - char f[(_Bool) 0.0 == false ? 1 : -1]; + char f[(Bool) 0.0 == false ? 1 : -1]; char g[true]; - char h[sizeof (_Bool)]; + char h[sizeof (Bool)]; char i[sizeof s.t]; enum { j = false, k = true, l = false * true, m = true * 256 }; /* The following fails for HP aC++/ANSI C B3910B A.05.55 [Dec 04 2003]. */ - _Bool n[m]; + Bool n[m]; char o[sizeof n == m * sizeof n[0] ? 1 : -1]; - char p[-1 - (_Bool) 0 < 0 && -1 - (bool) 0 < 0 ? 1 : -1]; + char p[-1 - (Bool) 0 < 0 && -1 - (bool) 0 < 0 ? 1 : -1]; /* Catch a bug in an HP-UX C compiler. See http://gcc.gnu.org/ml/gcc-patches/2003-12/msg02303.html http://lists.gnu.org/archive/html/bug-coreutils/2005-11/msg00161.html */ - _Bool q = true; - _Bool *pq = &q; + Bool q = true; + Bool *pq = &q; + bool *qq = &q; ]], [[ bool e = &s; - *pq |= q; - *pq |= ! q; + *pq |= q; *pq |= ! q; + *qq |= q; *qq |= ! q; /* Refer to every declared value, to avoid compiler optimizations. */ return (!a + !b + !c + !d + !e + !f + !g + !h + !i + !!j + !k + !!l - + !m + !n + !o + !p + !q + !pq); + + !m + !n + !o + !p + !q + !pq + !qq); ]])], [ac_cv_header_stdbool_h=yes], [ac_cv_header_stdbool_h=no])]) diff --git a/m4/stddef_h.m4 b/m4/stddef_h.m4 index c045c65..f45def1 100644 --- a/m4/stddef_h.m4 +++ b/m4/stddef_h.m4 @@ -1,6 +1,6 @@ dnl A placeholder for <stddef.h>, for platforms that have issues. # stddef_h.m4 serial 5 -dnl Copyright (C) 2009-2016 Free Software Foundation, Inc. +dnl Copyright (C) 2009-2017 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/stdint.m4 b/m4/stdint.m4 index 0b4b906..4ac854d 100644 --- a/m4/stdint.m4 +++ b/m4/stdint.m4 @@ -1,5 +1,5 @@ -# stdint.m4 serial 44 -dnl Copyright (C) 2001-2016 Free Software Foundation, Inc. +# stdint.m4 serial 50 +dnl Copyright (C) 2001-2017 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -11,6 +11,9 @@ AC_DEFUN_ONCE([gl_STDINT_H], [ AC_PREREQ([2.59])dnl + 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 @@ -152,6 +155,15 @@ uintptr_t h = UINTPTR_MAX; intmax_t i = INTMAX_MAX; 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__ \ + || (0x5110 <= __SUNPRO_C && !__STDC__)) +extern size_t k; +extern __typeof__ (SIZE_MAX) k; +#endif + #include <limits.h> /* for CHAR_BIT */ #define TYPE_MINIMUM(t) \ ((t) ((t) 0 < (t) -1 ? (t) 0 : ~ TYPE_MAXIMUM (t))) @@ -282,14 +294,20 @@ static const char *macro_values[] = ]) ]) fi + + HAVE_C99_STDINT_H=0 + HAVE_SYS_BITYPES_H=0 + HAVE_SYS_INTTYPES_H=0 + STDINT_H=stdint.h if test "$gl_cv_header_working_stdint_h" = yes; then + HAVE_C99_STDINT_H=1 dnl Now see whether the system <stdint.h> 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 AC_COMPILE_IFELSE([ - AC_LANG_PROGRAM([[ + AC_LANG_PROGRAM([[ #define _GL_JUST_INCLUDE_SYSTEM_STDINT_H 1 /* work if build isn't clean */ #include <stdint.h> ] @@ -306,27 +324,44 @@ int32_t i32 = INT32_C (0x7fffffff); AC_DEFINE([__STDC_LIMIT_MACROS], [1], [Define to 1 if the system <stdint.h> predates C++11.]) fi - STDINT_H= + AC_CACHE_CHECK([whether stdint.h has UINTMAX_WIDTH etc.], + [gl_cv_header_stdint_width], + [gl_cv_header_stdint_width=no + AC_COMPILE_IFELSE( + [AC_LANG_PROGRAM([[ + /* Work if build is not clean. */ + #define _GL_JUST_INCLUDE_SYSTEM_STDINT_H 1 + #ifndef __STDC_WANT_IEC_60559_BFP_EXT__ + #define __STDC_WANT_IEC_60559_BFP_EXT__ 1 + #endif + #include <stdint.h> + ]gl_STDINT_INCLUDES[ + int iw = UINTMAX_WIDTH; + ]])], + [gl_cv_header_stdint_width=yes])]) + if test "$gl_cv_header_stdint_width" = yes; then + STDINT_H= + fi else dnl Check for <sys/inttypes.h>, and for dnl <sys/bitypes.h> (used in Linux libc4 >= 4.6.7 and libc5). AC_CHECK_HEADERS([sys/inttypes.h sys/bitypes.h]) if test $ac_cv_header_sys_inttypes_h = yes; then HAVE_SYS_INTTYPES_H=1 - else - HAVE_SYS_INTTYPES_H=0 fi - AC_SUBST([HAVE_SYS_INTTYPES_H]) if test $ac_cv_header_sys_bitypes_h = yes; then HAVE_SYS_BITYPES_H=1 - else - HAVE_SYS_BITYPES_H=0 fi - AC_SUBST([HAVE_SYS_BITYPES_H]) - gl_STDINT_TYPE_PROPERTIES - STDINT_H=stdint.h fi + + dnl The substitute stdint.h needs the substitute limit.h's _GL_INTEGER_WIDTH. + LIMITS_H=limits.h + AM_CONDITIONAL([GL_GENERATE_LIMITS_H], [test -n "$LIMITS_H"]) + + AC_SUBST([HAVE_C99_STDINT_H]) + AC_SUBST([HAVE_SYS_BITYPES_H]) + AC_SUBST([HAVE_SYS_INTTYPES_H]) AC_SUBST([STDINT_H]) AM_CONDITIONAL([GL_GENERATE_STDINT_H], [test -n "$STDINT_H"]) ]) @@ -494,7 +529,7 @@ AC_DEFUN([gl_STDINT_TYPE_PROPERTIES], dnl requirement that wint_t is "unchanged by default argument promotions". dnl In this case gnulib's <wchar.h> and <wctype.h> override wint_t. dnl Set the variable BITSIZEOF_WINT_T accordingly. - if test $BITSIZEOF_WINT_T -lt 32; then + if test $GNULIB_OVERRIDES_WINT_T = 1; then BITSIZEOF_WINT_T=32 fi ]) @@ -504,8 +539,3 @@ dnl Remove this when we can assume autoconf >= 2.61. m4_ifdef([AC_COMPUTE_INT], [], [ AC_DEFUN([AC_COMPUTE_INT], [_AC_COMPUTE_INT([$2],[$1],[$3],[$4])]) ]) - -# Hey Emacs! -# Local Variables: -# indent-tabs-mode: nil -# End: diff --git a/m4/stdint_h.m4 b/m4/stdint_h.m4 index f823b94..786eaa3 100644 --- a/m4/stdint_h.m4 +++ b/m4/stdint_h.m4 @@ -1,5 +1,5 @@ # stdint_h.m4 serial 9 -dnl Copyright (C) 1997-2004, 2006, 2008-2016 Free Software Foundation, Inc. +dnl Copyright (C) 1997-2004, 2006, 2008-2017 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/stdio_h.m4 b/m4/stdio_h.m4 index 0e38758..9ffbb85 100644 --- a/m4/stdio_h.m4 +++ b/m4/stdio_h.m4 @@ -1,14 +1,18 @@ -# stdio_h.m4 serial 46 -dnl Copyright (C) 2007-2016 Free Software Foundation, Inc. +# stdio_h.m4 serial 48 +dnl Copyright (C) 2007-2017 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. AC_DEFUN([gl_STDIO_H], [ - dnl For __USE_MINGW_ANSI_STDIO - AC_REQUIRE([gl_USE_SYSTEM_EXTENSIONS]) - + AH_VERBATIM([MINGW_ANSI_STDIO], +[/* Use GNU style printf and scanf. */ +#ifndef __USE_MINGW_ANSI_STDIO +# undef __USE_MINGW_ANSI_STDIO +#endif +]) + AC_DEFINE([__USE_MINGW_ANSI_STDIO]) AC_REQUIRE([gl_STDIO_H_DEFAULTS]) gl_NEXT_HEADERS([stdio.h]) diff --git a/m4/stdlib_h.m4 b/m4/stdlib_h.m4 index 19107c4..110fe2d 100644 --- a/m4/stdlib_h.m4 +++ b/m4/stdlib_h.m4 @@ -1,5 +1,5 @@ -# stdlib_h.m4 serial 42 -dnl Copyright (C) 2007-2016 Free Software Foundation, Inc. +# stdlib_h.m4 serial 43 +dnl Copyright (C) 2007-2017 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -21,7 +21,7 @@ AC_DEFUN([gl_STDLIB_H], #endif ]], [_Exit atoll canonicalize_file_name getloadavg getsubopt grantpt initstate initstate_r mkdtemp mkostemp mkostemps mkstemp mkstemps - posix_openpt ptsname ptsname_r random random_r realpath rpmatch + posix_openpt ptsname ptsname_r qsort_r random random_r realpath rpmatch secure_getenv setenv setstate setstate_r srandom srandom_r strtod strtoll strtoull unlockpt unsetenv]) ]) @@ -85,6 +85,7 @@ AC_DEFUN([gl_STDLIB_H_DEFAULTS], 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]) + HAVE_QSORT_R=1; AC_SUBST([HAVE_QSORT_R]) HAVE_RANDOM=1; AC_SUBST([HAVE_RANDOM]) HAVE_RANDOM_H=1; AC_SUBST([HAVE_RANDOM_H]) HAVE_RANDOM_R=1; AC_SUBST([HAVE_RANDOM_R]) diff --git a/m4/strcase.m4 b/m4/strcase.m4 index eefc047..de20eb6 100644 --- a/m4/strcase.m4 +++ b/m4/strcase.m4 @@ -1,5 +1,5 @@ # strcase.m4 serial 11 -dnl Copyright (C) 2002, 2005-2016 Free Software Foundation, Inc. +dnl Copyright (C) 2002, 2005-2017 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/strerror.m4 b/m4/strerror.m4 index e286594..460ddc9 100644 --- a/m4/strerror.m4 +++ b/m4/strerror.m4 @@ -1,5 +1,5 @@ # strerror.m4 serial 17 -dnl Copyright (C) 2002, 2007-2016 Free Software Foundation, Inc. +dnl Copyright (C) 2002, 2007-2017 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/strerror_r.m4 b/m4/strerror_r.m4 index 2318927..28cd0d4 100644 --- a/m4/strerror_r.m4 +++ b/m4/strerror_r.m4 @@ -1,5 +1,5 @@ -# strerror_r.m4 serial 15 -dnl Copyright (C) 2002, 2007-2016 Free Software Foundation, Inc. +# strerror_r.m4 serial 19 +dnl Copyright (C) 2002, 2007-2017 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/strftime.m4 b/m4/strftime.m4 index 9598e72..d2dac9e 100644 --- a/m4/strftime.m4 +++ b/m4/strftime.m4 @@ -1,6 +1,6 @@ -# serial 33 +# serial 34 -# Copyright (C) 1996-1997, 1999-2007, 2009-2016 Free Software Foundation, Inc. +# Copyright (C) 1996-1997, 1999-2007, 2009-2017 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -10,12 +10,6 @@ AC_DEFUN([gl_FUNC_GNU_STRFTIME], [ - gl_FUNC_STRFTIME -]) - -# These are the prerequisite macros for GNU's strftime.c replacement. -AC_DEFUN([gl_FUNC_STRFTIME], -[ # This defines (or not) HAVE_TZNAME and HAVE_TM_ZONE. AC_REQUIRE([AC_STRUCT_TIMEZONE]) diff --git a/m4/string_h.m4 b/m4/string_h.m4 index 0c5ec6f..3d2ad22 100644 --- a/m4/string_h.m4 +++ b/m4/string_h.m4 @@ -1,6 +1,6 @@ # Configure a GNU-like replacement for <string.h>. -# Copyright (C) 2007-2016 Free Software Foundation, Inc. +# Copyright (C) 2007-2017 Free Software Foundation, Inc. # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. diff --git a/m4/strings_h.m4 b/m4/strings_h.m4 index 62a62e2..1163a63 100644 --- a/m4/strings_h.m4 +++ b/m4/strings_h.m4 @@ -1,7 +1,7 @@ # Configure a replacement for <strings.h>. # serial 6 -# Copyright (C) 2007, 2009-2016 Free Software Foundation, Inc. +# Copyright (C) 2007, 2009-2017 Free Software Foundation, Inc. # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. diff --git a/m4/strndup.m4 b/m4/strndup.m4 index ac48a22..7a28f21 100644 --- a/m4/strndup.m4 +++ b/m4/strndup.m4 @@ -1,5 +1,5 @@ # strndup.m4 serial 22 -dnl Copyright (C) 2002-2003, 2005-2016 Free Software Foundation, Inc. +dnl Copyright (C) 2002-2003, 2005-2017 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/strnlen.m4 b/m4/strnlen.m4 index 67b3859..bf05027 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-2016 Free Software Foundation, +dnl Copyright (C) 2002-2003, 2005-2007, 2009-2017 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/strptime.m4 b/m4/strptime.m4 index 0b760e1..91ce498 100644 --- a/m4/strptime.m4 +++ b/m4/strptime.m4 @@ -1,5 +1,5 @@ # strptime.m4 serial 7 -dnl Copyright (C) 2007, 2009-2016 Free Software Foundation, Inc. +dnl Copyright (C) 2007, 2009-2017 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/strtoull.m4 b/m4/strtoull.m4 index 78a67c7..c6b2150 100644 --- a/m4/strtoull.m4 +++ b/m4/strtoull.m4 @@ -1,5 +1,5 @@ # strtoull.m4 serial 7 -dnl Copyright (C) 2002, 2004, 2006, 2008-2016 Free Software Foundation, Inc. +dnl Copyright (C) 2002, 2004, 2006, 2008-2017 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/strtoumax.m4 b/m4/strtoumax.m4 index 1a5ee4b..43ef5b5 100644 --- a/m4/strtoumax.m4 +++ b/m4/strtoumax.m4 @@ -1,5 +1,5 @@ # strtoumax.m4 serial 12 -dnl Copyright (C) 2002-2004, 2006, 2009-2016 Free Software Foundation, Inc. +dnl Copyright (C) 2002-2004, 2006, 2009-2017 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/symlink.m4 b/m4/symlink.m4 index d15d915..220ea19 100644 --- a/m4/symlink.m4 +++ b/m4/symlink.m4 @@ -1,7 +1,7 @@ # serial 6 # See if we need to provide symlink replacement. -dnl Copyright (C) 2009-2016 Free Software Foundation, Inc. +dnl Copyright (C) 2009-2017 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/sys_ioctl_h.m4 b/m4/sys_ioctl_h.m4 index 85cab83..e68f9cd 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-2016 Free Software Foundation, Inc. +dnl Copyright (C) 2008-2017 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/sys_select_h.m4 b/m4/sys_select_h.m4 index 23526e5..4ec2800 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-2016 Free Software Foundation, Inc. +dnl Copyright (C) 2006-2017 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/sys_socket_h.m4 b/m4/sys_socket_h.m4 index ae500c7..3ecbe7c 100644 --- a/m4/sys_socket_h.m4 +++ b/m4/sys_socket_h.m4 @@ -1,5 +1,5 @@ # sys_socket_h.m4 serial 23 -dnl Copyright (C) 2005-2016 Free Software Foundation, Inc. +dnl Copyright (C) 2005-2017 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/sys_stat_h.m4 b/m4/sys_stat_h.m4 index 3d43b6f..8934278 100644 --- a/m4/sys_stat_h.m4 +++ b/m4/sys_stat_h.m4 @@ -1,5 +1,5 @@ -# sys_stat_h.m4 serial 28 -*- Autoconf -*- -dnl Copyright (C) 2006-2016 Free Software Foundation, Inc. +# sys_stat_h.m4 serial 31 -*- Autoconf -*- +dnl Copyright (C) 2006-2017 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -19,18 +19,21 @@ AC_DEFUN([gl_HEADER_SYS_STAT_H], dnl Ensure the type mode_t gets defined. AC_REQUIRE([AC_TYPE_MODE_T]) - dnl Whether to override 'struct stat'. + dnl Whether to enable precise timestamps in 'struct stat'. + m4_ifdef([gl_WINDOWS_STAT_TIMESPEC], [ + AC_REQUIRE([gl_WINDOWS_STAT_TIMESPEC]) + ], [ + WINDOWS_STAT_TIMESPEC=0 + ]) + AC_SUBST([WINDOWS_STAT_TIMESPEC]) + + dnl Whether to ensure that struct stat.st_size is 64-bit wide. m4_ifdef([gl_LARGEFILE], [ AC_REQUIRE([gl_LARGEFILE]) ], [ WINDOWS_64_BIT_ST_SIZE=0 ]) AC_SUBST([WINDOWS_64_BIT_ST_SIZE]) - if test $WINDOWS_64_BIT_ST_SIZE = 1; then - AC_DEFINE([_GL_WINDOWS_64_BIT_ST_SIZE], [1], - [Define to 1 if Gnulib overrides 'struct stat' on Windows so that - struct stat.st_size becomes 64-bit.]) - fi dnl Define types that are supposed to be defined in <sys/types.h> or dnl <sys/stat.h>. @@ -72,6 +75,7 @@ AC_DEFUN([gl_SYS_STAT_H_DEFAULTS], GNULIB_MKNODAT=0; AC_SUBST([GNULIB_MKNODAT]) GNULIB_STAT=0; AC_SUBST([GNULIB_STAT]) GNULIB_UTIMENSAT=0; AC_SUBST([GNULIB_UTIMENSAT]) + GNULIB_OVERRIDES_STRUCT_STAT=0; AC_SUBST([GNULIB_OVERRIDES_STRUCT_STAT]) dnl Assume proper GNU behavior unless another module says otherwise. HAVE_FCHMODAT=1; AC_SUBST([HAVE_FCHMODAT]) HAVE_FSTATAT=1; AC_SUBST([HAVE_FSTATAT]) diff --git a/m4/sys_time_h.m4 b/m4/sys_time_h.m4 index 3061a9c..1c8c3cf 100644 --- a/m4/sys_time_h.m4 +++ b/m4/sys_time_h.m4 @@ -1,7 +1,7 @@ # Configure a replacement for <sys/time.h>. -# serial 8 +# serial 9 -# Copyright (C) 2007, 2009-2016 Free Software Foundation, Inc. +# Copyright (C) 2007, 2009-2017 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. @@ -105,7 +105,6 @@ AC_DEFUN([gl_HEADER_SYS_TIME_H_DEFAULTS], HAVE_GETTIMEOFDAY=1; AC_SUBST([HAVE_GETTIMEOFDAY]) HAVE_STRUCT_TIMEVAL=1; AC_SUBST([HAVE_STRUCT_TIMEVAL]) HAVE_SYS_TIME_H=1; AC_SUBST([HAVE_SYS_TIME_H]) - HAVE_TIMEZONE_T=0; AC_SUBST([HAVE_TIMEZONE_T]) REPLACE_GETTIMEOFDAY=0; AC_SUBST([REPLACE_GETTIMEOFDAY]) REPLACE_STRUCT_TIMEVAL=0; AC_SUBST([REPLACE_STRUCT_TIMEVAL]) ]) diff --git a/m4/sys_types_h.m4 b/m4/sys_types_h.m4 index b0aabb4..e590670 100644 --- a/m4/sys_types_h.m4 +++ b/m4/sys_types_h.m4 @@ -1,5 +1,5 @@ -# sys_types_h.m4 serial 5 -dnl Copyright (C) 2011-2016 Free Software Foundation, Inc. +# sys_types_h.m4 serial 7 +dnl Copyright (C) 2011-2017 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -17,8 +17,41 @@ AC_DEFUN_ONCE([gl_SYS_TYPES_H], dnl Whether to override the 'off_t' type. AC_REQUIRE([gl_TYPE_OFF_T]) + + dnl Whether to override the 'dev_t' and 'ino_t' types. + m4_ifdef([gl_WINDOWS_STAT_INODES], [ + AC_REQUIRE([gl_WINDOWS_STAT_INODES]) + ], [ + WINDOWS_STAT_INODES=0 + ]) + AC_SUBST([WINDOWS_STAT_INODES]) ]) AC_DEFUN([gl_SYS_TYPES_H_DEFAULTS], [ ]) + +# This works around a buggy version in autoconf <= 2.69. +# See <https://lists.gnu.org/archive/html/autoconf/2016-08/msg00014.html> + +m4_version_prereq([2.70], [], [ + +# This is taken from the following Autoconf patch: +# http://git.sv.gnu.org/cgit/autoconf.git/commit/?id=e17a30e98 + +m4_undefine([AC_HEADER_MAJOR]) +AC_DEFUN([AC_HEADER_MAJOR], +[AC_CHECK_HEADERS_ONCE([sys/types.h]) +AC_CHECK_HEADER([sys/mkdev.h], + [AC_DEFINE([MAJOR_IN_MKDEV], [1], + [Define to 1 if `major', `minor', and `makedev' are declared in + <mkdev.h>.])]) +if test $ac_cv_header_sys_mkdev_h = no; then + AC_CHECK_HEADER([sys/sysmacros.h], + [AC_DEFINE([MAJOR_IN_SYSMACROS], [1], + [Define to 1 if `major', `minor', and `makedev' are declared in + <sysmacros.h>.])]) +fi +]) + +]) diff --git a/m4/sys_uio_h.m4 b/m4/sys_uio_h.m4 index d4d967f..68ef088 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-2016 Free Software Foundation, Inc. +dnl Copyright (C) 2011-2017 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/sys_wait_h.m4 b/m4/sys_wait_h.m4 index 69ca429..ed0fe7f 100644 --- a/m4/sys_wait_h.m4 +++ b/m4/sys_wait_h.m4 @@ -1,5 +1,5 @@ # sys_wait_h.m4 serial 6 -dnl Copyright (C) 2008-2016 Free Software Foundation, Inc. +dnl Copyright (C) 2008-2017 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/tempname.m4 b/m4/tempname.m4 index acf4c8d..a59f4c0 100644 --- a/m4/tempname.m4 +++ b/m4/tempname.m4 @@ -1,6 +1,6 @@ #serial 5 -# Copyright (C) 2006-2007, 2009-2016 Free Software Foundation, Inc. +# Copyright (C) 2006-2007, 2009-2017 Free Software Foundation, Inc. # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. diff --git a/m4/time_h.m4 b/m4/time_h.m4 index eb2a631..28e2209 100644 --- a/m4/time_h.m4 +++ b/m4/time_h.m4 @@ -1,8 +1,8 @@ # Configure a more-standard replacement for <time.h>. -# Copyright (C) 2000-2001, 2003-2007, 2009-2016 Free Software Foundation, Inc. +# Copyright (C) 2000-2001, 2003-2007, 2009-2017 Free Software Foundation, Inc. -# serial 9 +# serial 11 # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -104,24 +104,34 @@ AC_DEFUN([gl_TIME_MODULE_INDICATOR], AC_DEFUN([gl_HEADER_TIME_H_DEFAULTS], [ + GNULIB_CTIME=0; AC_SUBST([GNULIB_CTIME]) GNULIB_MKTIME=0; AC_SUBST([GNULIB_MKTIME]) + GNULIB_LOCALTIME=0; AC_SUBST([GNULIB_LOCALTIME]) GNULIB_NANOSLEEP=0; AC_SUBST([GNULIB_NANOSLEEP]) + GNULIB_STRFTIME=0; AC_SUBST([GNULIB_STRFTIME]) GNULIB_STRPTIME=0; AC_SUBST([GNULIB_STRPTIME]) GNULIB_TIMEGM=0; AC_SUBST([GNULIB_TIMEGM]) GNULIB_TIME_R=0; AC_SUBST([GNULIB_TIME_R]) GNULIB_TIME_RZ=0; AC_SUBST([GNULIB_TIME_RZ]) + GNULIB_TZSET=0; AC_SUBST([GNULIB_TZSET]) dnl Assume proper GNU behavior unless another module says otherwise. HAVE_DECL_LOCALTIME_R=1; AC_SUBST([HAVE_DECL_LOCALTIME_R]) 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. dnl Otherwise, replace only if someone compiles with -DGNULIB_PORTCHECK; dnl this lets maintainers check for portability. + REPLACE_CTIME=GNULIB_PORTCHECK; AC_SUBST([REPLACE_CTIME]) REPLACE_LOCALTIME_R=GNULIB_PORTCHECK; AC_SUBST([REPLACE_LOCALTIME_R]) REPLACE_MKTIME=GNULIB_PORTCHECK; AC_SUBST([REPLACE_MKTIME]) REPLACE_NANOSLEEP=GNULIB_PORTCHECK; AC_SUBST([REPLACE_NANOSLEEP]) + REPLACE_STRFTIME=GNULIB_PORTCHECK; AC_SUBST([REPLACE_STRFTIME]) REPLACE_TIMEGM=GNULIB_PORTCHECK; AC_SUBST([REPLACE_TIMEGM]) + REPLACE_TZSET=GNULIB_PORTCHECK; AC_SUBST([REPLACE_TZSET]) dnl Hack so that the time module doesn't depend on the sys_time module. dnl First, default GNULIB_GETTIMEOFDAY to 0 if sys_time is absent. diff --git a/m4/time_r.m4 b/m4/time_r.m4 index 21b4a2c..3e24ccb 100644 --- a/m4/time_r.m4 +++ b/m4/time_r.m4 @@ -1,6 +1,6 @@ dnl Reentrant time functions: localtime_r, gmtime_r. -dnl Copyright (C) 2003, 2006-2016 Free Software Foundation, Inc. +dnl Copyright (C) 2003, 2006-2017 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/time_rz.m4 b/m4/time_rz.m4 index 9b1db1b..3991118 100644 --- a/m4/time_rz.m4 +++ b/m4/time_rz.m4 @@ -1,6 +1,6 @@ dnl Time zone functions: tzalloc, localtime_rz, etc. -dnl Copyright (C) 2015-2016 Free Software Foundation, Inc. +dnl Copyright (C) 2015-2017 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -10,9 +10,8 @@ dnl Written by Paul Eggert. AC_DEFUN([gl_TIME_RZ], [ AC_REQUIRE([gl_USE_SYSTEM_EXTENSIONS]) - AC_REQUIRE([gl_HEADER_SYS_TIME_H_DEFAULTS]) + AC_REQUIRE([gl_HEADER_TIME_H_DEFAULTS]) AC_REQUIRE([AC_STRUCT_TIMEZONE]) - AC_CHECK_FUNCS_ONCE([tzset]) AC_CHECK_TYPES([timezone_t], [], [], [[#include <time.h>]]) if test "$ac_cv_type_timezone_t" = yes; then diff --git a/m4/timegm.m4 b/m4/timegm.m4 index 752aa43..1f18552 100644 --- a/m4/timegm.m4 +++ b/m4/timegm.m4 @@ -1,5 +1,5 @@ -# timegm.m4 serial 11 -dnl Copyright (C) 2003, 2007, 2009-2016 Free Software Foundation, Inc. +# timegm.m4 serial 12 +dnl Copyright (C) 2003, 2007, 2009-2017 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -7,11 +7,11 @@ dnl with or without modifications, as long as this notice is preserved. AC_DEFUN([gl_FUNC_TIMEGM], [ AC_REQUIRE([gl_HEADER_TIME_H_DEFAULTS]) - AC_REQUIRE([gl_FUNC_MKTIME]) + AC_REQUIRE([gl_FUNC_MKTIME_WORKS]) REPLACE_TIMEGM=0 AC_CHECK_FUNCS_ONCE([timegm]) if test $ac_cv_func_timegm = yes; then - if test $gl_cv_func_working_mktime = no; then + if test "$gl_cv_func_working_mktime" != yes; then # Assume that timegm is buggy if mktime is. REPLACE_TIMEGM=1 fi diff --git a/m4/timespec.m4 b/m4/timespec.m4 index 2482518..c901468 100644 --- a/m4/timespec.m4 +++ b/m4/timespec.m4 @@ -1,6 +1,6 @@ #serial 15 -# Copyright (C) 2000-2001, 2003-2007, 2009-2016 Free Software Foundation, Inc. +# Copyright (C) 2000-2001, 2003-2007, 2009-2017 Free Software Foundation, Inc. # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, diff --git a/m4/tm_gmtoff.m4 b/m4/tm_gmtoff.m4 index ce0671f..32db008 100644 --- a/m4/tm_gmtoff.m4 +++ b/m4/tm_gmtoff.m4 @@ -1,5 +1,5 @@ # tm_gmtoff.m4 serial 3 -dnl Copyright (C) 2002, 2009-2016 Free Software Foundation, Inc. +dnl Copyright (C) 2002, 2009-2017 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/tzset.m4 b/m4/tzset.m4 new file mode 100644 index 0000000..08362fe --- /dev/null +++ b/m4/tzset.m4 @@ -0,0 +1,81 @@ +# serial 8 + +# Copyright (C) 2003, 2007, 2009-2017 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. + +# See if we have a working tzset function. +# If so, arrange to compile the wrapper function. +# For at least Solaris 2.5.1 and 2.6, this is necessary +# because tzset can clobber the contents of the buffer +# used by localtime. + +# Written by Paul Eggert and Jim Meyering. + +AC_DEFUN([gl_FUNC_TZSET], +[ + AC_REQUIRE([gl_HEADER_TIME_H_DEFAULTS]) + AC_REQUIRE([gl_LOCALTIME_BUFFER_DEFAULTS]) + AC_REQUIRE([AC_CANONICAL_HOST]) + AC_CHECK_FUNCS_ONCE([tzset]) + if test $ac_cv_func_tzset = no; then + HAVE_TZSET=0 + fi + gl_FUNC_TZSET_CLOBBER + REPLACE_TZSET=0 + case "$gl_cv_func_tzset_clobber" in + *yes) + REPLACE_TZSET=1 + AC_DEFINE([TZSET_CLOBBERS_LOCALTIME], [1], + [Define if tzset clobbers localtime's static buffer.]) + gl_LOCALTIME_BUFFER_NEEDED + ;; + esac + case "$host_os" in + mingw*) REPLACE_TZSET=1 ;; + esac +]) + +# Set gl_cv_func_tzset_clobber. +AC_DEFUN([gl_FUNC_TZSET_CLOBBER], +[ + AC_REQUIRE([AC_CANONICAL_HOST]) dnl for cross-compiles + AC_CACHE_CHECK([whether tzset clobbers localtime buffer], + gl_cv_func_tzset_clobber, + [ + AC_RUN_IFELSE([AC_LANG_SOURCE([[ +#include <time.h> +#include <stdlib.h> + +int +main () +{ + time_t t1 = 853958121; + struct tm *p, s; + putenv ("TZ=GMT0"); + p = localtime (&t1); + s = *p; + putenv ("TZ=EST+3EDT+2,M10.1.0/00:00:00,M2.3.0/00:00:00"); + tzset (); + return (p->tm_year != s.tm_year + || p->tm_mon != s.tm_mon + || p->tm_mday != s.tm_mday + || p->tm_hour != s.tm_hour + || p->tm_min != s.tm_min + || p->tm_sec != s.tm_sec); +} + ]])], + [gl_cv_func_tzset_clobber=no], + [gl_cv_func_tzset_clobber=yes], + [case "$host_os" in + # Guess all is fine on glibc systems. + *-gnu*) gl_cv_func_tzset_clobber="guessing no" ;; + # If we don't know, assume the worst. + *) gl_cv_func_tzset_clobber="guessing yes" ;; + esac + ])]) + + AC_DEFINE([HAVE_RUN_TZSET_TEST], [1], + [Define to 1 if you have run the test for working tzset.]) +]) diff --git a/m4/unistd_h.m4 b/m4/unistd_h.m4 index 544dadb..cc44677 100644 --- a/m4/unistd_h.m4 +++ b/m4/unistd_h.m4 @@ -1,5 +1,5 @@ -# unistd_h.m4 serial 68 -dnl Copyright (C) 2006-2016 Free Software Foundation, Inc. +# unistd_h.m4 serial 70 +dnl Copyright (C) 2006-2017 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -46,8 +46,8 @@ AC_DEFUN([gl_UNISTD_H], gethostname getlogin getlogin_r getpagesize getusershell setusershell endusershell group_member isatty lchown link linkat lseek pipe pipe2 pread pwrite - readlink readlinkat rmdir sethostname sleep symlink symlinkat ttyname_r - unlink unlinkat usleep]) + readlink readlinkat rmdir sethostname sleep symlink symlinkat + truncate ttyname_r unlink unlinkat usleep]) ]) AC_DEFUN([gl_UNISTD_MODULE_INDICATOR], @@ -102,6 +102,7 @@ AC_DEFUN([gl_UNISTD_H_DEFAULTS], GNULIB_SLEEP=0; AC_SUBST([GNULIB_SLEEP]) GNULIB_SYMLINK=0; AC_SUBST([GNULIB_SYMLINK]) GNULIB_SYMLINKAT=0; AC_SUBST([GNULIB_SYMLINKAT]) + GNULIB_TRUNCATE=0; AC_SUBST([GNULIB_TRUNCATE]) GNULIB_TTYNAME_R=0; AC_SUBST([GNULIB_TTYNAME_R]) GNULIB_UNISTD_H_NONBLOCKING=0; AC_SUBST([GNULIB_UNISTD_H_NONBLOCKING]) GNULIB_UNISTD_H_SIGPIPE=0; AC_SUBST([GNULIB_UNISTD_H_SIGPIPE]) @@ -139,12 +140,14 @@ AC_DEFUN([gl_UNISTD_H_DEFAULTS], HAVE_SLEEP=1; AC_SUBST([HAVE_SLEEP]) HAVE_SYMLINK=1; AC_SUBST([HAVE_SYMLINK]) HAVE_SYMLINKAT=1; AC_SUBST([HAVE_SYMLINKAT]) + HAVE_TRUNCATE=1; AC_SUBST([HAVE_TRUNCATE]) HAVE_UNLINKAT=1; AC_SUBST([HAVE_UNLINKAT]) HAVE_USLEEP=1; AC_SUBST([HAVE_USLEEP]) HAVE_DECL_ENVIRON=1; AC_SUBST([HAVE_DECL_ENVIRON]) 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]) + HAVE_DECL_GETLOGIN=1; AC_SUBST([HAVE_DECL_GETLOGIN]) HAVE_DECL_GETLOGIN_R=1; AC_SUBST([HAVE_DECL_GETLOGIN_R]) HAVE_DECL_GETPAGESIZE=1; AC_SUBST([HAVE_DECL_GETPAGESIZE]) HAVE_DECL_GETUSERSHELL=1; AC_SUBST([HAVE_DECL_GETUSERSHELL]) @@ -178,6 +181,7 @@ AC_DEFUN([gl_UNISTD_H_DEFAULTS], REPLACE_SLEEP=0; AC_SUBST([REPLACE_SLEEP]) REPLACE_SYMLINK=0; AC_SUBST([REPLACE_SYMLINK]) REPLACE_SYMLINKAT=0; AC_SUBST([REPLACE_SYMLINKAT]) + REPLACE_TRUNCATE=0; AC_SUBST([REPLACE_TRUNCATE]) REPLACE_TTYNAME_R=0; AC_SUBST([REPLACE_TTYNAME_R]) REPLACE_UNLINK=0; AC_SUBST([REPLACE_UNLINK]) REPLACE_UNLINKAT=0; AC_SUBST([REPLACE_UNLINKAT]) diff --git a/m4/unlocked-io.m4 b/m4/unlocked-io.m4 index c29ec20..448ccac 100644 --- a/m4/unlocked-io.m4 +++ b/m4/unlocked-io.m4 @@ -1,6 +1,6 @@ # unlocked-io.m4 serial 15 -# Copyright (C) 1998-2006, 2009-2016 Free Software Foundation, Inc. +# Copyright (C) 1998-2006, 2009-2017 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/vararrays.m4 b/m4/vararrays.m4 index 93fd66e..8391121 100644 --- a/m4/vararrays.m4 +++ b/m4/vararrays.m4 @@ -4,7 +4,7 @@ # From Paul Eggert -# Copyright (C) 2001, 2009-2016 Free Software Foundation, Inc. +# Copyright (C) 2001, 2009-2017 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/vasnprintf.m4 b/m4/vasnprintf.m4 index 2d4b463..47c5951 100644 --- a/m4/vasnprintf.m4 +++ b/m4/vasnprintf.m4 @@ -1,5 +1,5 @@ # vasnprintf.m4 serial 36 -dnl Copyright (C) 2002-2004, 2006-2016 Free Software Foundation, Inc. +dnl Copyright (C) 2002-2004, 2006-2017 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/vasprintf.m4 b/m4/vasprintf.m4 index d7866b1..a75c6f1 100644 --- a/m4/vasprintf.m4 +++ b/m4/vasprintf.m4 @@ -1,5 +1,5 @@ # vasprintf.m4 serial 6 -dnl Copyright (C) 2002-2003, 2006-2007, 2009-2016 Free Software Foundation, +dnl Copyright (C) 2002-2003, 2006-2007, 2009-2017 Free Software Foundation, dnl Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, diff --git a/m4/version-etc.m4 b/m4/version-etc.m4 index a719182..c099101 100644 --- a/m4/version-etc.m4 +++ b/m4/version-etc.m4 @@ -1,5 +1,5 @@ # version-etc.m4 serial 1 -# Copyright (C) 2009-2016 Free Software Foundation, Inc. +# Copyright (C) 2009-2017 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/warn-on-use.m4 b/m4/warn-on-use.m4 index 08440ec..25ce737 100644 --- a/m4/warn-on-use.m4 +++ b/m4/warn-on-use.m4 @@ -1,5 +1,5 @@ # warn-on-use.m4 serial 5 -dnl Copyright (C) 2010-2016 Free Software Foundation, Inc. +dnl Copyright (C) 2010-2017 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/warnings.m4 b/m4/warnings.m4 index 924e21d..e697174 100644 --- a/m4/warnings.m4 +++ b/m4/warnings.m4 @@ -1,5 +1,5 @@ # warnings.m4 serial 11 -dnl Copyright (C) 2008-2016 Free Software Foundation, Inc. +dnl Copyright (C) 2008-2017 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/wchar_h.m4 b/m4/wchar_h.m4 index b40b732..1a2734c 100644 --- a/m4/wchar_h.m4 +++ b/m4/wchar_h.m4 @@ -1,13 +1,13 @@ dnl A placeholder for ISO C99 <wchar.h>, for platforms that have issues. -dnl Copyright (C) 2007-2016 Free Software Foundation, Inc. +dnl Copyright (C) 2007-2017 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. dnl Written by Eric Blake. -# wchar_h.m4 serial 39 +# wchar_h.m4 serial 42 AC_DEFUN([gl_WCHAR_H], [ @@ -35,6 +35,8 @@ AC_DEFUN([gl_WCHAR_H], fi AC_SUBST([HAVE_WINT_T]) + AC_REQUIRE([gl_TYPE_WINT_T_PREREQ]) + 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([[ @@ -53,7 +55,7 @@ AC_DEFUN([gl_WCHAR_H], wcsrtombs wcsnrtombs wcwidth wmemchr wmemcmp wmemcpy wmemmove wmemset wcslen wcsnlen wcscpy wcpcpy wcsncpy wcpncpy wcscat wcsncat wcscmp wcsncmp wcscasecmp wcsncasecmp wcscoll wcsxfrm wcsdup wcschr wcsrchr - wcscspn wcsspn wcspbrk wcsstr wcstok wcswidth + wcscspn wcsspn wcspbrk wcsstr wcstok wcswidth wcsftime ]) ]) @@ -81,8 +83,14 @@ 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 AC_TRY_EVAL([ac_compile]); then - mv conftest.$ac_objext conftest1.$ac_objext AC_LANG_CONFTEST([ AC_LANG_SOURCE([[#define wcstod renamed_wcstod /* Tru64 with Desktop Toolkit C has a bug: <stdio.h> must be included before @@ -95,8 +103,9 @@ int main () { return zero(); } #include <wchar.h> int zero (void) { return 0; } ]])]) + dnl See note above about renaming object files. + ac_compile=`echo "$save_ac_compile" | sed s/conftest/conftest2/` if AC_TRY_EVAL([ac_compile]); then - mv conftest.$ac_objext conftest2.$ac_objext if $CC -o conftest$ac_exeext $CFLAGS $LDFLAGS conftest1.$ac_objext conftest2.$ac_objext $LIBS >&AS_MESSAGE_LOG_FD 2>&1; then : else @@ -104,6 +113,7 @@ int zero (void) { return 0; } fi fi fi + ac_compile="$save_ac_compile" rm -f conftest1.$ac_objext conftest2.$ac_objext conftest$ac_exeext ]) if test $gl_cv_header_wchar_h_correct_inline = no; then @@ -169,6 +179,7 @@ AC_DEFUN([gl_WCHAR_H_DEFAULTS], GNULIB_WCSSTR=0; AC_SUBST([GNULIB_WCSSTR]) GNULIB_WCSTOK=0; AC_SUBST([GNULIB_WCSTOK]) GNULIB_WCSWIDTH=0; AC_SUBST([GNULIB_WCSWIDTH]) + GNULIB_WCSFTIME=0; AC_SUBST([GNULIB_WCSFTIME]) dnl Assume proper GNU behavior unless another module says otherwise. HAVE_BTOWC=1; AC_SUBST([HAVE_BTOWC]) HAVE_MBSINIT=1; AC_SUBST([HAVE_MBSINIT]) @@ -207,6 +218,7 @@ AC_DEFUN([gl_WCHAR_H_DEFAULTS], HAVE_WCSSTR=1; AC_SUBST([HAVE_WCSSTR]) HAVE_WCSTOK=1; AC_SUBST([HAVE_WCSTOK]) 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_WCWIDTH=1; AC_SUBST([HAVE_DECL_WCWIDTH]) REPLACE_MBSTATE_T=0; AC_SUBST([REPLACE_MBSTATE_T]) @@ -222,4 +234,5 @@ AC_DEFUN([gl_WCHAR_H_DEFAULTS], REPLACE_WCSNRTOMBS=0; AC_SUBST([REPLACE_WCSNRTOMBS]) REPLACE_WCWIDTH=0; AC_SUBST([REPLACE_WCWIDTH]) REPLACE_WCSWIDTH=0; AC_SUBST([REPLACE_WCSWIDTH]) + REPLACE_WCSFTIME=0; AC_SUBST([REPLACE_WCSFTIME]) ]) diff --git a/m4/wchar_t.m4 b/m4/wchar_t.m4 index 2db8c3f..11783d2 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-2016 Free Software Foundation, Inc. +dnl Copyright (C) 2002-2003, 2008-2017 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/wcrtomb.m4 b/m4/wcrtomb.m4 index 267b3c9..0aa040d 100644 --- a/m4/wcrtomb.m4 +++ b/m4/wcrtomb.m4 @@ -1,5 +1,5 @@ # wcrtomb.m4 serial 11 -dnl Copyright (C) 2008-2016 Free Software Foundation, Inc. +dnl Copyright (C) 2008-2017 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/wctob.m4 b/m4/wctob.m4 index bdb5299..492f4c8 100644 --- a/m4/wctob.m4 +++ b/m4/wctob.m4 @@ -1,5 +1,5 @@ # wctob.m4 serial 10 -dnl Copyright (C) 2008-2016 Free Software Foundation, Inc. +dnl Copyright (C) 2008-2017 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/wctomb.m4 b/m4/wctomb.m4 index 7c8b3ef..dc1860f 100644 --- a/m4/wctomb.m4 +++ b/m4/wctomb.m4 @@ -1,5 +1,5 @@ # wctomb.m4 serial 2 -dnl Copyright (C) 2011-2016 Free Software Foundation, Inc. +dnl Copyright (C) 2011-2017 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/wctype_h.m4 b/m4/wctype_h.m4 index accc001..0c8c305 100644 --- a/m4/wctype_h.m4 +++ b/m4/wctype_h.m4 @@ -1,8 +1,8 @@ -# wctype_h.m4 serial 18 +# wctype_h.m4 serial 20 dnl A placeholder for ISO C99 <wctype.h>, for platforms that lack it. -dnl Copyright (C) 2006-2016 Free Software Foundation, Inc. +dnl Copyright (C) 2006-2017 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -30,6 +30,8 @@ AC_DEFUN([gl_WCTYPE_H], fi AC_SUBST([HAVE_WINT_T]) + AC_REQUIRE([gl_TYPE_WINT_T_PREREQ]) + gl_CHECK_NEXT_HEADERS([wctype.h]) if test $ac_cv_header_wctype_h = yes; then if test $ac_cv_func_iswcntrl = yes; then diff --git a/m4/wcwidth.m4 b/m4/wcwidth.m4 index 7a743c0..5871641 100644 --- a/m4/wcwidth.m4 +++ b/m4/wcwidth.m4 @@ -1,5 +1,5 @@ # wcwidth.m4 serial 23 -dnl Copyright (C) 2006-2016 Free Software Foundation, Inc. +dnl Copyright (C) 2006-2017 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/wint_t.m4 b/m4/wint_t.m4 index 8ff2a5b..d30b8bc 100644 --- a/m4/wint_t.m4 +++ b/m4/wint_t.m4 @@ -1,11 +1,12 @@ -# wint_t.m4 serial 5 (gettext-0.18.2) -dnl Copyright (C) 2003, 2007-2016 Free Software Foundation, Inc. +# wint_t.m4 serial 7 +dnl Copyright (C) 2003, 2007-2017 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. dnl From Bruno Haible. -dnl Test whether <wchar.h> has the 'wint_t' type. +dnl Test whether <wchar.h> has the 'wint_t' type and whether gnulib's +dnl <wchar.h> or <wctype.h> would, if present, override 'wint_t'. dnl Prerequisite: AC_PROG_CC AC_DEFUN([gt_TYPE_WINT_T], @@ -28,5 +29,46 @@ AC_DEFUN([gt_TYPE_WINT_T], [gt_cv_c_wint_t=no])]) if test $gt_cv_c_wint_t = yes; then AC_DEFINE([HAVE_WINT_T], [1], [Define if you have the 'wint_t' type.]) + + dnl Determine whether gnulib's <wchar.h> or <wctype.h> would, if present, + dnl override 'wint_t'. + AC_CACHE_CHECK([whether wint_t is too small], + [gl_cv_type_wint_t_too_small], + [AC_COMPILE_IFELSE( + [AC_LANG_PROGRAM([[ +/* Tru64 with Desktop Toolkit C has a bug: <stdio.h> must be included before + <wchar.h>. + BSD/OS 4.0.1 has a bug: <stddef.h>, <stdio.h> and <time.h> must be + included before <wchar.h>. */ +#if !(defined __GLIBC__ && !defined __UCLIBC__) +# include <stddef.h> +# include <stdio.h> +# include <time.h> +#endif +#include <wchar.h> + int 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 + GNULIB_OVERRIDES_WINT_T=1 + else + GNULIB_OVERRIDES_WINT_T=0 + fi + else + GNULIB_OVERRIDES_WINT_T=0 + fi + AC_SUBST([GNULIB_OVERRIDES_WINT_T]) +]) + +dnl Prerequisites of the 'wint_t' override. +AC_DEFUN([gl_TYPE_WINT_T_PREREQ], +[ + AC_CHECK_HEADERS_ONCE([crtdefs.h]) + if test $ac_cv_header_crtdefs_h = yes; then + HAVE_CRTDEFS_H=1 + else + HAVE_CRTDEFS_H=0 fi + AC_SUBST([HAVE_CRTDEFS_H]) ]) diff --git a/m4/xalloc.m4 b/m4/xalloc.m4 index f4f540d..53aba14 100644 --- a/m4/xalloc.m4 +++ b/m4/xalloc.m4 @@ -1,5 +1,5 @@ # xalloc.m4 serial 18 -dnl Copyright (C) 2002-2006, 2009-2016 Free Software Foundation, Inc. +dnl Copyright (C) 2002-2006, 2009-2017 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/xsize.m4 b/m4/xsize.m4 index 16764e8..5f85057 100644 --- a/m4/xsize.m4 +++ b/m4/xsize.m4 @@ -1,5 +1,5 @@ # xsize.m4 serial 5 -dnl Copyright (C) 2003-2004, 2008-2016 Free Software Foundation, Inc. +dnl Copyright (C) 2003-2004, 2008-2017 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/xstrndup.m4 b/m4/xstrndup.m4 index 3511c80..efb94a1 100644 --- a/m4/xstrndup.m4 +++ b/m4/xstrndup.m4 @@ -1,5 +1,5 @@ # xstrndup.m4 serial 2 -dnl Copyright (C) 2003, 2009-2016 Free Software Foundation, Inc. +dnl Copyright (C) 2003, 2009-2017 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/xstrtol.m4 b/m4/xstrtol.m4 index f81cd21..035588e 100644 --- a/m4/xstrtol.m4 +++ b/m4/xstrtol.m4 @@ -1,5 +1,5 @@ #serial 11 -dnl Copyright (C) 2002-2007, 2009-2016 Free Software Foundation, Inc. +dnl Copyright (C) 2002-2007, 2009-2017 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/xvasprintf.m4 b/m4/xvasprintf.m4 index dd01142..b7ce7b5 100644 --- a/m4/xvasprintf.m4 +++ b/m4/xvasprintf.m4 @@ -1,5 +1,5 @@ # xvasprintf.m4 serial 2 -dnl Copyright (C) 2006, 2009-2016 Free Software Foundation, Inc. +dnl Copyright (C) 2006, 2009-2017 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -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-2016 Free Software Foundation, Inc. +## Copyright (C) 2001-2017 Free Software Foundation, Inc. ## ## This program is free software: you can redistribute it and/or modify ## it under the terms of the GNU General Public License as published by @@ -55,6 +55,10 @@ VC = $(GIT) VC_LIST = $(srcdir)/$(_build-aux)/vc-list-files -C $(srcdir) +# You can override this variable in cfg.mk if your gnulib submodule lives +# in a different location. +gnulib_dir ?= $(srcdir)/gnulib + # You can override this variable in cfg.mk to set your own regexp # matching files to ignore. VC_LIST_ALWAYS_EXCLUDE_REGEX ?= ^$$ @@ -657,17 +661,14 @@ sc_prohibit_strings_without_use: re='\<(strn?casecmp|ffs(ll)?)\>' \ $(_sc_header_without_use) -# Get the list of symbol names with this: -# perl -lne '/^# *define ([A-Z]\w+)\(/ and print $1' lib/intprops.h|fmt -_intprops_names = \ - TYPE_IS_INTEGER TYPE_SIGNED TYPE_MINIMUM TYPE_MAXIMUM \ - INT_BITS_STRLEN_BOUND INT_STRLEN_BOUND INT_BUFSIZE_BOUND \ - INT_ADD_RANGE_OVERFLOW INT_SUBTRACT_RANGE_OVERFLOW \ - INT_NEGATE_RANGE_OVERFLOW INT_MULTIPLY_RANGE_OVERFLOW \ - INT_DIVIDE_RANGE_OVERFLOW INT_REMAINDER_RANGE_OVERFLOW \ - INT_LEFT_SHIFT_RANGE_OVERFLOW INT_ADD_OVERFLOW INT_SUBTRACT_OVERFLOW \ - INT_NEGATE_OVERFLOW INT_MULTIPLY_OVERFLOW INT_DIVIDE_OVERFLOW \ - INT_REMAINDER_OVERFLOW INT_LEFT_SHIFT_OVERFLOW +# Extract the raw list of symbol names with this: +gl_extract_define_simple = \ + /^\# *define ([A-Z]\w+)\(/ and print $$1 +# Filter out duplicates and convert to a space-separated list: +_intprops_names = \ + $(shell f=$(gnulib_dir)/lib/intprops.h; \ + perl -lne '$(gl_extract_define_simple)' $$f | sort -u | tr '\n' ' ') +# Remove trailing space and convert to a regular expression: _intprops_syms_re = $(subst $(_sp),|,$(strip $(_intprops_names))) # Prohibit the inclusion of intprops.h without an actual use. sc_prohibit_intprops_without_use: @@ -695,7 +696,7 @@ sc_prohibit_dirent_without_use: # Prohibit the inclusion of verify.h without an actual use. sc_prohibit_verify_without_use: @h='verify.h' \ - re='\<(verify(true|expr)?|static_assert) *\(' \ + re='\<(verify(true|expr)?|assume|static_assert) *\(' \ $(_sc_header_without_use) # Don't include xfreopen.h unless you use one of its functions. @@ -717,15 +718,6 @@ sc_changelog: $(_sc_search_regexp) # Ensure that each .c file containing a "main" function also -# calls set_program_name. -sc_program_name: - @require='set_program_name *\(.*\);' \ - in_vc_files='\.c$$' \ - containing='\<main *(' \ - halt='the above files do not call set_program_name' \ - $(_sc_search_regexp) - -# Ensure that each .c file containing a "main" function also # calls bindtextdomain. sc_bindtextdomain: @require='bindtextdomain *\(' \ @@ -991,10 +983,11 @@ sc_prohibit_doubled_word: # Also prohibit a prefix matching "\w+ +". # @pxref gets the same see/also treatment and should be parenthesized; # presume it must *not* start a sentence. +# POSIX spells it "timestamp" rather than "time\s+stamp", so we do, too. bad_xref_re_ ?= (?:[\w,:;] +|(?:see|also)\s+)\@xref\{ bad_pxref_re_ ?= (?:[.!?]|(?:see|also))\s+\@pxref\{ prohibit_undesirable_word_seq_RE_ ?= \ - /(?:\bcan\s+not\b|$(bad_xref_re_)|$(bad_pxref_re_))/gims + /(?:\bcan\s+not\b|\btime\s+stamps?\b|$(bad_xref_re_)|$(bad_pxref_re_))/gims prohibit_undesirable_word_seq_ = \ -e 'while ($(prohibit_undesirable_word_seq_RE_))' \ $(perl_filename_lineno_text_) @@ -1300,7 +1293,6 @@ vc-diff-check: rel-files = $(DIST_ARCHIVES) -gnulib_dir ?= $(srcdir)/gnulib gnulib-version = $$(cd $(gnulib_dir) \ && { git describe || git rev-parse --short=10 HEAD; } ) bootstrap-tools ?= autoconf,automake,gnulib @@ -1510,7 +1502,10 @@ gen-coverage: --highlight --frames --legend \ --title "$(PACKAGE_NAME)" -coverage: init-coverage build-coverage gen-coverage +coverage: + $(MAKE) init-coverage + $(MAKE) build-coverage + $(MAKE) gen-coverage # Some projects carry local adjustments for gnulib modules via patches in # a gnulib patch directory whose default name is gl/ (defined in bootstrap diff --git a/man/Makefile.am b/man/Makefile.am index 918d863..98bfb4b 100644 --- a/man/Makefile.am +++ b/man/Makefile.am @@ -1,6 +1,6 @@ # Automakefile for GNU diffutils man pages -# Copyright (C) 2002, 2009-2013, 2015-2016 Free Software Foundation, Inc. +# Copyright (C) 2002, 2009-2013, 2015-2017 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/man/Makefile.in b/man/Makefile.in index a7dc647..327c9c0 100644 --- a/man/Makefile.in +++ b/man/Makefile.in @@ -16,7 +16,7 @@ # Automakefile for GNU diffutils man pages -# Copyright (C) 2002, 2009-2013, 2015-2016 Free Software Foundation, Inc. +# Copyright (C) 2002, 2009-2013, 2015-2017 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -108,10 +108,11 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \ $(top_srcdir)/m4/absolute-header.m4 $(top_srcdir)/m4/alloca.m4 \ $(top_srcdir)/m4/arpa_inet_h.m4 $(top_srcdir)/m4/btowc.m4 \ - $(top_srcdir)/m4/c-stack.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/dirname.m4 \ + $(top_srcdir)/m4/builtin-expect.m4 $(top_srcdir)/m4/c-stack.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/dirname.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 \ @@ -124,7 +125,8 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \ $(top_srcdir)/m4/freopen.m4 $(top_srcdir)/m4/fstat.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/gettext.m4 \ + $(top_srcdir)/m4/getpagesize.m4 \ + $(top_srcdir)/m4/getprogname.m4 $(top_srcdir)/m4/gettext.m4 \ $(top_srcdir)/m4/gettime.m4 $(top_srcdir)/m4/gettimeofday.m4 \ $(top_srcdir)/m4/glibc21.m4 $(top_srcdir)/m4/gnu-make.m4 \ $(top_srcdir)/m4/gnulib-common.m4 \ @@ -141,17 +143,19 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \ $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \ $(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libsigsegv.m4 \ $(top_srcdir)/m4/libunistring-base.m4 \ - $(top_srcdir)/m4/localcharset.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/longlong.m4 \ - $(top_srcdir)/m4/lstat.m4 $(top_srcdir)/m4/malloc.m4 \ - $(top_srcdir)/m4/malloca.m4 $(top_srcdir)/m4/manywarnings.m4 \ - $(top_srcdir)/m4/mbchar.m4 $(top_srcdir)/m4/mbiter.m4 \ - $(top_srcdir)/m4/mbrtowc.m4 $(top_srcdir)/m4/mbsinit.m4 \ - $(top_srcdir)/m4/mbslen.m4 $(top_srcdir)/m4/mbsrtowcs.m4 \ - $(top_srcdir)/m4/mbstate_t.m4 $(top_srcdir)/m4/mbtowc.m4 \ - $(top_srcdir)/m4/memchr.m4 $(top_srcdir)/m4/mkstemp.m4 \ + $(top_srcdir)/m4/limits-h.m4 $(top_srcdir)/m4/localcharset.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/localtime-buffer.m4 \ + $(top_srcdir)/m4/longlong.m4 $(top_srcdir)/m4/lstat.m4 \ + $(top_srcdir)/m4/malloc.m4 $(top_srcdir)/m4/malloca.m4 \ + $(top_srcdir)/m4/manywarnings.m4 $(top_srcdir)/m4/mbchar.m4 \ + $(top_srcdir)/m4/mbiter.m4 $(top_srcdir)/m4/mbrtowc.m4 \ + $(top_srcdir)/m4/mbsinit.m4 $(top_srcdir)/m4/mbslen.m4 \ + $(top_srcdir)/m4/mbsrtowcs.m4 $(top_srcdir)/m4/mbstate_t.m4 \ + $(top_srcdir)/m4/mbtowc.m4 $(top_srcdir)/m4/memchr.m4 \ + $(top_srcdir)/m4/minmax.m4 $(top_srcdir)/m4/mkstemp.m4 \ $(top_srcdir)/m4/mktime.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 \ @@ -193,9 +197,10 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \ $(top_srcdir)/m4/time_h.m4 $(top_srcdir)/m4/time_r.m4 \ $(top_srcdir)/m4/time_rz.m4 $(top_srcdir)/m4/timegm.m4 \ $(top_srcdir)/m4/timespec.m4 $(top_srcdir)/m4/tm_gmtoff.m4 \ - $(top_srcdir)/m4/unistd_h.m4 $(top_srcdir)/m4/unlocked-io.m4 \ - $(top_srcdir)/m4/vararrays.m4 $(top_srcdir)/m4/vasnprintf.m4 \ - $(top_srcdir)/m4/vasprintf.m4 $(top_srcdir)/m4/version-etc.m4 \ + $(top_srcdir)/m4/tzset.m4 $(top_srcdir)/m4/unistd_h.m4 \ + $(top_srcdir)/m4/unlocked-io.m4 $(top_srcdir)/m4/vararrays.m4 \ + $(top_srcdir)/m4/vasnprintf.m4 $(top_srcdir)/m4/vasprintf.m4 \ + $(top_srcdir)/m4/version-etc.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 \ @@ -305,6 +310,7 @@ ERRNO_H = @ERRNO_H@ EXEEXT = @EXEEXT@ FLOAT_H = @FLOAT_H@ FNMATCH_H = @FNMATCH_H@ +GETOPT_CDEFS_H = @GETOPT_CDEFS_H@ GETOPT_H = @GETOPT_H@ GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@ GLIBC21 = @GLIBC21@ @@ -321,6 +327,7 @@ GNULIB_CHDIR = @GNULIB_CHDIR@ GNULIB_CHOWN = @GNULIB_CHOWN@ GNULIB_CLOSE = @GNULIB_CLOSE@ GNULIB_CONNECT = @GNULIB_CONNECT@ +GNULIB_CTIME = @GNULIB_CTIME@ GNULIB_DPRINTF = @GNULIB_DPRINTF@ GNULIB_DUP = @GNULIB_DUP@ GNULIB_DUP2 = @GNULIB_DUP2@ @@ -399,6 +406,7 @@ GNULIB_LINK = @GNULIB_LINK@ GNULIB_LINKAT = @GNULIB_LINKAT@ GNULIB_LISTEN = @GNULIB_LISTEN@ GNULIB_LOCALECONV = @GNULIB_LOCALECONV@ +GNULIB_LOCALTIME = @GNULIB_LOCALTIME@ GNULIB_LSEEK = @GNULIB_LSEEK@ GNULIB_LSTAT = @GNULIB_LSTAT@ GNULIB_MALLOC_POSIX = @GNULIB_MALLOC_POSIX@ @@ -444,6 +452,8 @@ GNULIB_OBSTACK_PRINTF = @GNULIB_OBSTACK_PRINTF@ GNULIB_OBSTACK_PRINTF_POSIX = @GNULIB_OBSTACK_PRINTF_POSIX@ GNULIB_OPEN = @GNULIB_OPEN@ GNULIB_OPENAT = @GNULIB_OPENAT@ +GNULIB_OVERRIDES_STRUCT_STAT = @GNULIB_OVERRIDES_STRUCT_STAT@ +GNULIB_OVERRIDES_WINT_T = @GNULIB_OVERRIDES_WINT_T@ GNULIB_PCLOSE = @GNULIB_PCLOSE@ GNULIB_PERROR = @GNULIB_PERROR@ GNULIB_PIPE = @GNULIB_PIPE@ @@ -506,6 +516,7 @@ GNULIB_STRCHRNUL = @GNULIB_STRCHRNUL@ GNULIB_STRDUP = @GNULIB_STRDUP@ GNULIB_STRERROR = @GNULIB_STRERROR@ GNULIB_STRERROR_R = @GNULIB_STRERROR_R@ +GNULIB_STRFTIME = @GNULIB_STRFTIME@ GNULIB_STRNCAT = @GNULIB_STRNCAT@ GNULIB_STRNDUP = @GNULIB_STRNDUP@ GNULIB_STRNLEN = @GNULIB_STRNLEN@ @@ -529,7 +540,9 @@ GNULIB_TIME_R = @GNULIB_TIME_R@ GNULIB_TIME_RZ = @GNULIB_TIME_RZ@ GNULIB_TMPFILE = @GNULIB_TMPFILE@ GNULIB_TOWCTRANS = @GNULIB_TOWCTRANS@ +GNULIB_TRUNCATE = @GNULIB_TRUNCATE@ GNULIB_TTYNAME_R = @GNULIB_TTYNAME_R@ +GNULIB_TZSET = @GNULIB_TZSET@ GNULIB_UNISTD_H_NONBLOCKING = @GNULIB_UNISTD_H_NONBLOCKING@ GNULIB_UNISTD_H_SIGPIPE = @GNULIB_UNISTD_H_SIGPIPE@ GNULIB_UNLINK = @GNULIB_UNLINK@ @@ -561,6 +574,7 @@ GNULIB_WCSCOLL = @GNULIB_WCSCOLL@ GNULIB_WCSCPY = @GNULIB_WCSCPY@ GNULIB_WCSCSPN = @GNULIB_WCSCSPN@ GNULIB_WCSDUP = @GNULIB_WCSDUP@ +GNULIB_WCSFTIME = @GNULIB_WCSFTIME@ GNULIB_WCSLEN = @GNULIB_WCSLEN@ GNULIB_WCSNCASECMP = @GNULIB_WCSNCASECMP@ GNULIB_WCSNCAT = @GNULIB_WCSNCAT@ @@ -593,8 +607,10 @@ HAVE_ACCEPT4 = @HAVE_ACCEPT4@ HAVE_ARPA_INET_H = @HAVE_ARPA_INET_H@ HAVE_ATOLL = @HAVE_ATOLL@ HAVE_BTOWC = @HAVE_BTOWC@ +HAVE_C99_STDINT_H = @HAVE_C99_STDINT_H@ HAVE_CANONICALIZE_FILE_NAME = @HAVE_CANONICALIZE_FILE_NAME@ HAVE_CHOWN = @HAVE_CHOWN@ +HAVE_CRTDEFS_H = @HAVE_CRTDEFS_H@ HAVE_DECL_ENVIRON = @HAVE_DECL_ENVIRON@ HAVE_DECL_FCHDIR = @HAVE_DECL_FCHDIR@ HAVE_DECL_FDATASYNC = @HAVE_DECL_FDATASYNC@ @@ -605,6 +621,7 @@ HAVE_DECL_GETDELIM = @HAVE_DECL_GETDELIM@ HAVE_DECL_GETDOMAINNAME = @HAVE_DECL_GETDOMAINNAME@ HAVE_DECL_GETLINE = @HAVE_DECL_GETLINE@ HAVE_DECL_GETLOADAVG = @HAVE_DECL_GETLOADAVG@ +HAVE_DECL_GETLOGIN = @HAVE_DECL_GETLOGIN@ HAVE_DECL_GETLOGIN_R = @HAVE_DECL_GETLOGIN_R@ HAVE_DECL_GETPAGESIZE = @HAVE_DECL_GETPAGESIZE@ HAVE_DECL_GETUSERSHELL = @HAVE_DECL_GETUSERSHELL@ @@ -717,6 +734,7 @@ HAVE_PTHREAD_SIGMASK = @HAVE_PTHREAD_SIGMASK@ HAVE_PTSNAME = @HAVE_PTSNAME@ HAVE_PTSNAME_R = @HAVE_PTSNAME_R@ HAVE_PWRITE = @HAVE_PWRITE@ +HAVE_QSORT_R = @HAVE_QSORT_R@ HAVE_RAISE = @HAVE_RAISE@ HAVE_RANDOM = @HAVE_RANDOM@ HAVE_RANDOM_H = @HAVE_RANDOM_H@ @@ -761,6 +779,7 @@ HAVE_STRVERSCMP = @HAVE_STRVERSCMP@ HAVE_SYMLINK = @HAVE_SYMLINK@ HAVE_SYMLINKAT = @HAVE_SYMLINKAT@ HAVE_SYS_BITYPES_H = @HAVE_SYS_BITYPES_H@ +HAVE_SYS_CDEFS_H = @HAVE_SYS_CDEFS_H@ HAVE_SYS_INTTYPES_H = @HAVE_SYS_INTTYPES_H@ HAVE_SYS_IOCTL_H = @HAVE_SYS_IOCTL_H@ HAVE_SYS_LOADAVG_H = @HAVE_SYS_LOADAVG_H@ @@ -772,7 +791,9 @@ HAVE_SYS_TYPES_H = @HAVE_SYS_TYPES_H@ HAVE_SYS_UIO_H = @HAVE_SYS_UIO_H@ HAVE_TIMEGM = @HAVE_TIMEGM@ HAVE_TIMEZONE_T = @HAVE_TIMEZONE_T@ +HAVE_TRUNCATE = @HAVE_TRUNCATE@ HAVE_TYPE_VOLATILE_SIG_ATOMIC_T = @HAVE_TYPE_VOLATILE_SIG_ATOMIC_T@ +HAVE_TZSET = @HAVE_TZSET@ HAVE_UNISTD_H = @HAVE_UNISTD_H@ HAVE_UNLINKAT = @HAVE_UNLINKAT@ HAVE_UNLOCKPT = @HAVE_UNLOCKPT@ @@ -794,6 +815,7 @@ HAVE_WCSCOLL = @HAVE_WCSCOLL@ HAVE_WCSCPY = @HAVE_WCSCPY@ HAVE_WCSCSPN = @HAVE_WCSCSPN@ HAVE_WCSDUP = @HAVE_WCSDUP@ +HAVE_WCSFTIME = @HAVE_WCSFTIME@ HAVE_WCSLEN = @HAVE_WCSLEN@ HAVE_WCSNCASECMP = @HAVE_WCSNCASECMP@ HAVE_WCSNCAT = @HAVE_WCSNCAT@ @@ -856,6 +878,7 @@ LIBUNISTRING_UNIWIDTH_H = @LIBUNISTRING_UNIWIDTH_H@ LIB_CLOCK_GETTIME = @LIB_CLOCK_GETTIME@ LIB_NANOSLEEP = @LIB_NANOSLEEP@ LIB_SELECT = @LIB_SELECT@ +LIMITS_H = @LIMITS_H@ LOCALCHARSET_TESTS_ENVIRONMENT = @LOCALCHARSET_TESTS_ENVIRONMENT@ LOCALE_FR = @LOCALE_FR@ LOCALE_FR_UTF8 = @LOCALE_FR_UTF8@ @@ -883,6 +906,7 @@ NEXT_AS_FIRST_DIRECTIVE_GETOPT_H = @NEXT_AS_FIRST_DIRECTIVE_GETOPT_H@ NEXT_AS_FIRST_DIRECTIVE_ICONV_H = @NEXT_AS_FIRST_DIRECTIVE_ICONV_H@ NEXT_AS_FIRST_DIRECTIVE_INTTYPES_H = @NEXT_AS_FIRST_DIRECTIVE_INTTYPES_H@ NEXT_AS_FIRST_DIRECTIVE_LANGINFO_H = @NEXT_AS_FIRST_DIRECTIVE_LANGINFO_H@ +NEXT_AS_FIRST_DIRECTIVE_LIMITS_H = @NEXT_AS_FIRST_DIRECTIVE_LIMITS_H@ NEXT_AS_FIRST_DIRECTIVE_LOCALE_H = @NEXT_AS_FIRST_DIRECTIVE_LOCALE_H@ NEXT_AS_FIRST_DIRECTIVE_NETINET_IN_H = @NEXT_AS_FIRST_DIRECTIVE_NETINET_IN_H@ NEXT_AS_FIRST_DIRECTIVE_SIGNAL_H = @NEXT_AS_FIRST_DIRECTIVE_SIGNAL_H@ @@ -913,6 +937,7 @@ NEXT_GETOPT_H = @NEXT_GETOPT_H@ NEXT_ICONV_H = @NEXT_ICONV_H@ NEXT_INTTYPES_H = @NEXT_INTTYPES_H@ NEXT_LANGINFO_H = @NEXT_LANGINFO_H@ +NEXT_LIMITS_H = @NEXT_LIMITS_H@ NEXT_LOCALE_H = @NEXT_LOCALE_H@ NEXT_NETINET_IN_H = @NEXT_NETINET_IN_H@ NEXT_SIGNAL_H = @NEXT_SIGNAL_H@ @@ -958,6 +983,7 @@ REPLACE_CALLOC = @REPLACE_CALLOC@ REPLACE_CANONICALIZE_FILE_NAME = @REPLACE_CANONICALIZE_FILE_NAME@ REPLACE_CHOWN = @REPLACE_CHOWN@ REPLACE_CLOSE = @REPLACE_CLOSE@ +REPLACE_CTIME = @REPLACE_CTIME@ REPLACE_DPRINTF = @REPLACE_DPRINTF@ REPLACE_DUP = @REPLACE_DUP@ REPLACE_DUP2 = @REPLACE_DUP2@ @@ -1065,6 +1091,7 @@ REPLACE_STRCHRNUL = @REPLACE_STRCHRNUL@ REPLACE_STRDUP = @REPLACE_STRDUP@ REPLACE_STRERROR = @REPLACE_STRERROR@ REPLACE_STRERROR_R = @REPLACE_STRERROR_R@ +REPLACE_STRFTIME = @REPLACE_STRFTIME@ REPLACE_STRNCAT = @REPLACE_STRNCAT@ REPLACE_STRNDUP = @REPLACE_STRNDUP@ REPLACE_STRNLEN = @REPLACE_STRNLEN@ @@ -1081,7 +1108,9 @@ REPLACE_SYMLINKAT = @REPLACE_SYMLINKAT@ REPLACE_TIMEGM = @REPLACE_TIMEGM@ REPLACE_TMPFILE = @REPLACE_TMPFILE@ REPLACE_TOWLOWER = @REPLACE_TOWLOWER@ +REPLACE_TRUNCATE = @REPLACE_TRUNCATE@ REPLACE_TTYNAME_R = @REPLACE_TTYNAME_R@ +REPLACE_TZSET = @REPLACE_TZSET@ REPLACE_UNLINK = @REPLACE_UNLINK@ REPLACE_UNLINKAT = @REPLACE_UNLINKAT@ REPLACE_UNSETENV = @REPLACE_UNSETENV@ @@ -1094,6 +1123,7 @@ REPLACE_VPRINTF = @REPLACE_VPRINTF@ REPLACE_VSNPRINTF = @REPLACE_VSNPRINTF@ REPLACE_VSPRINTF = @REPLACE_VSPRINTF@ REPLACE_WCRTOMB = @REPLACE_WCRTOMB@ +REPLACE_WCSFTIME = @REPLACE_WCSFTIME@ REPLACE_WCSNRTOMBS = @REPLACE_WCSNRTOMBS@ REPLACE_WCSRTOMBS = @REPLACE_WCSRTOMBS@ REPLACE_WCSWIDTH = @REPLACE_WCSWIDTH@ @@ -1130,6 +1160,8 @@ WCHAR_T_SUFFIX = @WCHAR_T_SUFFIX@ WERROR_CFLAGS = @WERROR_CFLAGS@ WINDOWS_64_BIT_OFF_T = @WINDOWS_64_BIT_OFF_T@ WINDOWS_64_BIT_ST_SIZE = @WINDOWS_64_BIT_ST_SIZE@ +WINDOWS_STAT_INODES = @WINDOWS_STAT_INODES@ +WINDOWS_STAT_TIMESPEC = @WINDOWS_STAT_TIMESPEC@ WINT_T_SUFFIX = @WINT_T_SUFFIX@ XGETTEXT = @XGETTEXT@ XGETTEXT_015 = @XGETTEXT_015@ @@ -1139,7 +1171,6 @@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ abs_top_srcdir = @abs_top_srcdir@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ am__include = @am__include@ am__quote = @am__quote@ @@ -1,5 +1,5 @@ .\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.40.4. -.TH CMP "1" "August 2016" "diffutils 3.5" "User Commands" +.TH CMP "1" "May 2017" "diffutils 3.6" "User Commands" .SH NAME cmp \- compare two files byte by byte .SH SYNOPSIS @@ -53,7 +53,7 @@ GNU diffutils home page: <http://www.gnu.org/software/diffutils/> .br General help using GNU software: <http://www.gnu.org/gethelp/> .SH COPYRIGHT -Copyright \(co 2016 Free Software Foundation, Inc. +Copyright \(co 2017 Free Software Foundation, Inc. License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>. .br This is free software: you are free to change and redistribute it. @@ -1,5 +1,5 @@ .\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.40.4. -.TH DIFF "1" "August 2016" "diffutils 3.5" "User Commands" +.TH DIFF "1" "May 2017" "diffutils 3.6" "User Commands" .SH NAME diff \- compare files line by line .SH SYNOPSIS @@ -222,8 +222,8 @@ colorize the output; WHEN can be 'never', 'always', or 'auto' (the default) .TP \fB\-\-palette\fR=\fIPALETTE\fR -specify the colors to use when \fB\-\-color\fR is active -PALETTE is a colon\-separated list terminfo capabilities +the colors to use when \fB\-\-color\fR is active; PALETTE is +a colon\-separated list of terminfo capabilities .TP \fB\-\-help\fR display this help and exit @@ -245,7 +245,7 @@ GNU diffutils home page: <http://www.gnu.org/software/diffutils/> .br General help using GNU software: <http://www.gnu.org/gethelp/> .SH COPYRIGHT -Copyright \(co 2016 Free Software Foundation, Inc. +Copyright \(co 2017 Free Software Foundation, Inc. License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>. .br This is free software: you are free to change and redistribute it. diff --git a/man/diff3.1 b/man/diff3.1 index 2560146..d0b51f9 100644 --- a/man/diff3.1 +++ b/man/diff3.1 @@ -1,5 +1,5 @@ .\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.40.4. -.TH DIFF3 "1" "August 2016" "diffutils 3.5" "User Commands" +.TH DIFF3 "1" "May 2017" "diffutils 3.6" "User Commands" .SH NAME diff3 \- compare three files line by line .SH SYNOPSIS @@ -79,7 +79,7 @@ GNU diffutils home page: <http://www.gnu.org/software/diffutils/> .br General help using GNU software: <http://www.gnu.org/gethelp/> .SH COPYRIGHT -Copyright \(co 2016 Free Software Foundation, Inc. +Copyright \(co 2017 Free Software Foundation, Inc. License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>. .br This is free software: you are free to change and redistribute it. diff --git a/man/help2man b/man/help2man index e6207e5..54e5a31 100755 --- a/man/help2man +++ b/man/help2man @@ -1,7 +1,7 @@ #!/usr/bin/perl -w # Generate a short man page from --help and --version output. -# Copyright (C) 1997-2005, 2009-2011, 2013, 2015-2016 Free Software Foundation, +# Copyright (C) 1997-2005, 2009-2011, 2013, 2015-2017 Free Software Foundation, # Inc. # This program is free software; you can redistribute it and/or modify diff --git a/man/sdiff.1 b/man/sdiff.1 index f055c70..e7ca72d 100644 --- a/man/sdiff.1 +++ b/man/sdiff.1 @@ -1,5 +1,5 @@ .\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.40.4. -.TH SDIFF "1" "August 2016" "diffutils 3.5" "User Commands" +.TH SDIFF "1" "May 2017" "diffutils 3.6" "User Commands" .SH NAME sdiff \- side-by-side merge of file differences .SH SYNOPSIS @@ -81,7 +81,7 @@ GNU diffutils home page: <http://www.gnu.org/software/diffutils/> .br General help using GNU software: <http://www.gnu.org/gethelp/> .SH COPYRIGHT -Copyright \(co 2016 Free Software Foundation, Inc. +Copyright \(co 2017 Free Software Foundation, Inc. License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>. .br This is free software: you are free to change and redistribute it. diff --git a/po/POTFILES.in b/po/POTFILES.in index c379074..08690f8 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -1,6 +1,6 @@ # List of files that contain translatable strings. -# Copyright (C) 2001-2002, 2009-2013, 2015-2016 Free Software Foundation, Inc. +# Copyright (C) 2001-2002, 2009-2013, 2015-2017 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by Binary files differ@@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: diffutils 2.8.7\n" "Report-Msgid-Bugs-To: bug-diffutils@gnu.org\n" -"POT-Creation-Date: 2016-08-20 22:22-0700\n" +"POT-Creation-Date: 2017-05-21 13:26-0700\n" "PO-Revision-Date: 2004-04-21 13:33+0200\n" "Last-Translator: Ernest Adrogué Calveras <eadrogue@gmx.net>\n" "Language-Team: Catalan <ca@dodds.net>\n" @@ -15,31 +15,31 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=ISO-8859-1\n" "Content-Transfer-Encoding: 8bit\n" +"X-Bugs: Report translation errors to the Language-Team address.\n" -#: lib/argmatch.c:133 -#, fuzzy, c-format +#: lib/argmatch.c:134 +#, c-format msgid "invalid argument %s for %s" -msgstr "el valor «%s» per l'opció --bytes no és vàlid" +msgstr "" -#: lib/argmatch.c:134 +#: lib/argmatch.c:135 #, c-format msgid "ambiguous argument %s for %s" msgstr "" -#: lib/argmatch.c:153 -#, fuzzy +#: lib/argmatch.c:154 msgid "Valid arguments are:" -msgstr "el valor «%s» per l'opció --bytes no és vàlid" +msgstr "" -#: lib/c-stack.c:204 lib/c-stack.c:297 +#: lib/c-stack.c:203 lib/c-stack.c:296 msgid "program error" msgstr "error del programa" -#: lib/c-stack.c:205 lib/c-stack.c:298 +#: lib/c-stack.c:204 lib/c-stack.c:297 msgid "stack overflow" msgstr "desbordament de pila" -#: lib/error.c:191 +#: lib/error.c:195 msgid "Unknown system error" msgstr "Error no identificat del sistema" @@ -143,66 +143,41 @@ msgstr "" msgid "weird file" msgstr "fitxer estrambòtic" -#: lib/getopt.c:575 lib/getopt.c:604 +#: lib/getopt.c:278 #, fuzzy, c-format -msgid "%s: option '%s' is ambiguous; possibilities:" +msgid "%s: option '%s%s' is ambiguous\n" msgstr "%s: l'opció «%s» és ambigua\n" -#: lib/getopt.c:619 +#: lib/getopt.c:284 #, fuzzy, c-format -msgid "%s: option '%s' is ambiguous\n" -msgstr "%s: l'opció «-W %s» és ambigua\n" +msgid "%s: option '%s%s' is ambiguous; possibilities:" +msgstr "%s: l'opció «%s» és ambigua\n" -#: lib/getopt.c:654 lib/getopt.c:658 +#: lib/getopt.c:319 #, fuzzy, c-format -msgid "%s: option '--%s' doesn't allow an argument\n" -msgstr "%s: l'opció «--%s» no admet arguments\n" +msgid "%s: unrecognized option '%s%s'\n" +msgstr "%s: opció no reconeguda «%c%s»\n" -#: lib/getopt.c:667 lib/getopt.c:672 +#: lib/getopt.c:345 #, fuzzy, c-format -msgid "%s: option '%c%s' doesn't allow an argument\n" +msgid "%s: option '%s%s' doesn't allow an argument\n" msgstr "%s: l'opció «%c%s» no admet arguments\n" -#: lib/getopt.c:715 lib/getopt.c:734 +#: lib/getopt.c:360 #, fuzzy, c-format -msgid "%s: option '--%s' requires an argument\n" +msgid "%s: option '%s%s' requires an argument\n" msgstr "%s: l'opció «%s» requereix arguments\n" -#: lib/getopt.c:772 lib/getopt.c:775 -#, fuzzy, c-format -msgid "%s: unrecognized option '--%s'\n" -msgstr "%s: opció no reconeguda «--%s»\n" - -#: lib/getopt.c:783 lib/getopt.c:786 -#, fuzzy, c-format -msgid "%s: unrecognized option '%c%s'\n" -msgstr "%s: opció no reconeguda «%c%s»\n" - -#: lib/getopt.c:835 lib/getopt.c:838 +#: lib/getopt.c:621 #, fuzzy, c-format msgid "%s: invalid option -- '%c'\n" msgstr "%s: opció no vàlida -- %c\n" -#: lib/getopt.c:891 lib/getopt.c:908 lib/getopt.c:1118 lib/getopt.c:1136 +#: lib/getopt.c:636 lib/getopt.c:682 #, fuzzy, c-format msgid "%s: option requires an argument -- '%c'\n" msgstr "%s: l'opció requereix arguments -- %c\n" -#: lib/getopt.c:964 lib/getopt.c:980 -#, fuzzy, c-format -msgid "%s: option '-W %s' is ambiguous\n" -msgstr "%s: l'opció «-W %s» és ambigua\n" - -#: lib/getopt.c:1004 lib/getopt.c:1022 -#, fuzzy, c-format -msgid "%s: option '-W %s' doesn't allow an argument\n" -msgstr "%s: l'opció «-W %s» no admet arguments\n" - -#: lib/getopt.c:1043 lib/getopt.c:1061 -#, fuzzy, c-format -msgid "%s: option '-W %s' requires an argument\n" -msgstr "%s: l'opció «%s» requereix arguments\n" - #. TRANSLATORS: #. Get translations for open and closing quotation marks. #. The message catalog should translate "`" to a left @@ -224,11 +199,11 @@ msgstr "%s: l'opció «%s» requereix arguments\n" #. If you don't know what to put here, please see #. <http://en.wikipedia.org/wiki/Quotation_marks_in_other_languages> #. and use glyphs suitable for your language. -#: lib/quotearg.c:347 +#: lib/quotearg.c:362 msgid "`" msgstr "" -#: lib/quotearg.c:348 +#: lib/quotearg.c:363 msgid "'" msgstr "" @@ -512,7 +487,7 @@ msgstr "" msgid "General help using GNU software: <http://www.gnu.org/gethelp/>\n" msgstr "" -#: src/analyze.c:454 src/diff.c:1400 +#: src/analyze.c:454 src/diff.c:1401 #, c-format msgid "Files %s and %s differ\n" msgstr "Els fitxers %s i %s difereixen\n" @@ -522,21 +497,21 @@ msgstr "Els fitxers %s i %s difereixen\n" msgid "Binary files %s and %s differ\n" msgstr "Els fitxers %s i %s difereixen\n" -#: src/analyze.c:697 src/diff3.c:1463 src/util.c:1255 +#: src/analyze.c:706 src/diff3.c:1465 src/util.c:1254 msgid "No newline at end of file" msgstr "No hi ha cap caràcter de salt de línia al final del fitxer" #. This is a proper name. See the gettext manual, section Names. -#: src/cmp.c:43 +#: src/cmp.c:44 msgid "Torbjorn Granlund" msgstr "Torbjorn Granlund" #. This is a proper name. See the gettext manual, section Names. -#: src/cmp.c:44 +#: src/cmp.c:45 msgid "David MacKenzie" msgstr "" -#: src/cmp.c:118 src/diff.c:875 src/diff3.c:459 src/sdiff.c:158 +#: src/cmp.c:119 src/diff.c:877 src/diff3.c:462 src/sdiff.c:159 #, fuzzy, c-format msgid "Try '%s --help' for more information." msgstr "Proveu «%s --help» per obtenir més informació." @@ -551,12 +526,12 @@ msgstr "el valor «%s» per l'opció --ignore-initial no és vàlid" msgid "options -l and -s are incompatible" msgstr "les opcions -l i -s són incompatibles" -#: src/cmp.c:155 src/diff.c:884 src/diff3.c:467 src/sdiff.c:167 src/sdiff.c:315 -#: src/sdiff.c:322 src/sdiff.c:874 src/util.c:853 src/util.c:953 src/util.c:960 +#: src/cmp.c:155 src/diff.c:885 src/diff3.c:469 src/sdiff.c:167 src/sdiff.c:315 +#: src/sdiff.c:322 src/sdiff.c:874 src/util.c:852 src/util.c:952 src/util.c:959 msgid "write failed" msgstr "error d'escriptura" -#: src/cmp.c:157 src/diff.c:886 src/diff.c:1465 src/diff3.c:469 src/sdiff.c:169 +#: src/cmp.c:157 src/diff.c:887 src/diff.c:1466 src/diff3.c:471 src/sdiff.c:169 msgid "standard output" msgstr "sortida estàndard" @@ -619,7 +594,7 @@ msgid "" msgstr "" "SALT1 i SALT2 són el nombre d'octets que es passen per alt de cada fitxer." -#: src/cmp.c:185 src/diff.c:996 src/diff3.c:507 src/sdiff.c:210 +#: src/cmp.c:185 src/diff.c:997 src/diff3.c:509 src/sdiff.c:210 msgid "" "Mandatory arguments to long options are mandatory for short options too.\n" msgstr "" @@ -639,7 +614,7 @@ msgstr "" msgid "If a FILE is '-' or missing, read standard input." msgstr "Si un FITXER és «-» o falta, llegeix l'entrada estàndard." -#: src/cmp.c:195 src/diff.c:984 src/sdiff.c:220 +#: src/cmp.c:195 src/diff.c:985 src/sdiff.c:220 msgid "Exit status is 0 if inputs are the same, 1 if different, 2 if trouble." msgstr "" "L'estat de sortida és 0 si les entrades són iguals, 1 si són diferents\n" @@ -650,188 +625,202 @@ msgstr "" msgid "invalid --bytes value '%s'" msgstr "el valor «%s» per l'opció --bytes no és vàlid" -#: src/cmp.c:266 src/diff.c:793 src/diff3.c:353 src/sdiff.c:565 +#: src/cmp.c:266 src/diff.c:795 src/diff3.c:356 src/sdiff.c:565 #, fuzzy, c-format msgid "missing operand after '%s'" msgstr "falta un operand després de «%s»" -#: src/cmp.c:278 src/diff.c:795 src/diff3.c:355 src/sdiff.c:567 +#: src/cmp.c:278 src/diff.c:797 src/diff3.c:358 src/sdiff.c:567 #, fuzzy, c-format msgid "extra operand '%s'" msgstr "sobra l'operand «%s»" # mirar el comentari del codi font -#: src/cmp.c:494 +#: src/cmp.c:498 #, c-format msgid "%s %s differ: byte %s, line %s\n" msgstr "%s i %s difereixen: octet %s, línia %s\n" -#: src/cmp.c:510 +#: src/cmp.c:514 #, c-format msgid "%s %s differ: byte %s, line %s is %3o %s %3o %s\n" msgstr "%s i %s difereixen: l'octet %s, línia %s, és %3o %s %3o %s\n" -#: src/cmp.c:562 -#, c-format -msgid "cmp: EOF on %s\n" +#: src/cmp.c:571 +#, fuzzy, c-format +msgid "cmp: EOF on %s which is empty\n" +msgstr "cmp: final de fitxer a %s\n" + +# mirar el comentari del codi font +#: src/cmp.c:585 +#, fuzzy, c-format +msgid "cmp: EOF on %s after byte %s, line %s\n" +msgstr "%s i %s difereixen: octet %s, línia %s\n" + +# mirar el comentari del codi font +#: src/cmp.c:586 +#, fuzzy, c-format +msgid "cmp: EOF on %s after byte %s, in line %s\n" +msgstr "%s i %s difereixen: octet %s, línia %s\n" + +#: src/cmp.c:592 +#, fuzzy, c-format +msgid "cmp: EOF on %s after byte %s\n" msgstr "cmp: final de fitxer a %s\n" #. This is a proper name. See the gettext manual, section Names. -#: src/diff.c:49 +#: src/diff.c:50 msgid "Paul Eggert" msgstr "" #. This is a proper name. See the gettext manual, section Names. -#: src/diff.c:50 +#: src/diff.c:51 msgid "Mike Haertel" msgstr "" #. This is a proper name. See the gettext manual, section Names. -#: src/diff.c:51 +#: src/diff.c:52 msgid "David Hayes" msgstr "" #. This is a proper name. See the gettext manual, section Names. -#: src/diff.c:52 +#: src/diff.c:53 msgid "Richard Stallman" msgstr "" #. This is a proper name. See the gettext manual, section Names. -#: src/diff.c:53 +#: src/diff.c:54 msgid "Len Tower" msgstr "" -#: src/diff.c:351 +#: src/diff.c:353 #, fuzzy, c-format msgid "invalid context length '%s'" msgstr "el nombre de línies de context «%s» no és vàlid" -#: src/diff.c:434 +#: src/diff.c:436 #, c-format msgid "pagination not supported on this host" msgstr "aquest sistema no suporta paginació" -#: src/diff.c:449 src/diff3.c:335 +#: src/diff.c:451 src/diff3.c:336 #, c-format msgid "too many file label options" msgstr "massa opcions d'etiqueta de fitxer" -#: src/diff.c:526 +#: src/diff.c:528 #, fuzzy, c-format msgid "invalid width '%s'" msgstr "l'amplada «%s» no és vàlida" -#: src/diff.c:530 +#: src/diff.c:532 msgid "conflicting width options" msgstr "opcions d'amplada incompatibles" -#: src/diff.c:555 +#: src/diff.c:557 #, fuzzy, c-format msgid "invalid horizon length '%s'" msgstr "el nombre de línies d'horitzó «%s» no és vàlid" -#: src/diff.c:611 +#: src/diff.c:613 #, fuzzy, c-format msgid "invalid tabsize '%s'" msgstr "la distància de tabulació «%s» no és vàlida" -#: src/diff.c:615 +#: src/diff.c:617 msgid "conflicting tabsize options" msgstr "opcions de distància de tabulació incompatibles" -#: src/diff.c:770 +#: src/diff.c:772 msgid "--from-file and --to-file both specified" msgstr "heu especificat les opcions --from-file i --to-file al mateix temps" -#: src/diff.c:890 +#: src/diff.c:891 #, fuzzy msgid " --normal output a normal diff (the default)" msgstr "--normal Genera un diff normal." -#: src/diff.c:891 +#: src/diff.c:892 #, fuzzy msgid "-q, --brief report only when files differ" msgstr "-q --brief Indica només si els fitxers difereixen o no." -#: src/diff.c:892 +#: src/diff.c:893 #, fuzzy msgid "-s, --report-identical-files report when two files are the same" msgstr "-s --report-identical-files Avisa quan dos fitxers són idèntics." -#: src/diff.c:893 +#: src/diff.c:894 msgid "" "-c, -C NUM, --context[=NUM] output NUM (default 3) lines of copied context" msgstr "" -#: src/diff.c:894 +#: src/diff.c:895 #, fuzzy msgid "" "-u, -U NUM, --unified[=NUM] output NUM (default 3) lines of unified context" msgstr "" "-w NÚM --width=NÚM No més de NÚM (130 per omissió) caràcters per línia." -#: src/diff.c:895 +#: src/diff.c:896 #, fuzzy msgid "-e, --ed output an ed script" msgstr "-e --ed Genera un script ed." -#: src/diff.c:896 +#: src/diff.c:897 #, fuzzy msgid "-n, --rcs output an RCS format diff" msgstr "-n --rcs Genera un diff en format RCS." -#: src/diff.c:897 +#: src/diff.c:898 msgid "-y, --side-by-side output in two columns" msgstr "" -#: src/diff.c:898 +#: src/diff.c:899 #, fuzzy msgid "" "-W, --width=NUM output at most NUM (default 130) print columns" msgstr "" "-w NÚM --width=NÚM No més de NÚM (130 per omissió) caràcters per línia." -#: src/diff.c:899 +#: src/diff.c:900 #, fuzzy msgid "" " --left-column output only the left column of common lines" msgstr "" "-l --left-column Només escriu les línies en comú a la columna esquerra." -#: src/diff.c:900 +#: src/diff.c:901 #, fuzzy msgid " --suppress-common-lines do not output common lines" msgstr "-s --suppress-common-lines No mostra les línies en comú." -#: src/diff.c:902 +#: src/diff.c:903 msgid "-p, --show-c-function show which C function each change is in" msgstr "" -#: src/diff.c:903 +#: src/diff.c:904 msgid "-F, --show-function-line=RE show the most recent line matching RE" msgstr "" -#: src/diff.c:904 -#, fuzzy +#: src/diff.c:905 msgid "" " --label LABEL use LABEL instead of file name and timestamp\n" " (can be repeated)" msgstr "" -"--from-file=FITXER1 Compara FITXER1 amb tots els operands. FITXER1 pot ser\n" -" un directori." -#: src/diff.c:907 +#: src/diff.c:908 #, fuzzy msgid "-t, --expand-tabs expand tabs to spaces in output" msgstr "-t --expand-tabs Expandeix les tabulacions de la sortida a espais." -#: src/diff.c:908 +#: src/diff.c:909 #, fuzzy msgid "-T, --initial-tab make tabs line up by prepending a tab" msgstr "" "-T --initial-tab Alinea el text de cada línia amb un caràcter de tabulació." -#: src/diff.c:909 +#: src/diff.c:910 #, fuzzy msgid "" " --tabsize=NUM tab stops every NUM (default 8) print columns" @@ -839,40 +828,40 @@ msgstr "" "--tabsize=NÚM Estableix la distància de tabulació en NÚM (8 per omissió)\n" " caràcters." -#: src/diff.c:910 +#: src/diff.c:911 msgid "" " --suppress-blank-empty suppress space or tab before empty output lines" msgstr "" -#: src/diff.c:911 +#: src/diff.c:912 #, fuzzy msgid "-l, --paginate pass output through 'pr' to paginate it" msgstr "-l --paginate Pagina la sortida amb el programa «pr»." -#: src/diff.c:913 +#: src/diff.c:914 #, fuzzy msgid "" "-r, --recursive recursively compare any subdirectories found" msgstr "" "-r --recursive Compara recursivament qualsevol subdirectori existent." -#: src/diff.c:914 +#: src/diff.c:915 msgid " --no-dereference don't follow symbolic links" msgstr "" -#: src/diff.c:915 +#: src/diff.c:916 #, fuzzy msgid "-N, --new-file treat absent files as empty" msgstr "-N --new-file Considera els fitxers inexistents com si fóssin buits." -#: src/diff.c:916 +#: src/diff.c:917 #, fuzzy msgid " --unidirectional-new-file treat absent first files as empty" msgstr "" "--unidirectional-new-file Tracta els fitxers primers inexistents com si\n" " fóssin buits." -#: src/diff.c:917 +#: src/diff.c:918 #, fuzzy msgid " --ignore-file-name-case ignore case when comparing file names" msgstr "" @@ -880,19 +869,19 @@ msgstr "" "en\n" " els noms dels fitxers." -#: src/diff.c:918 +#: src/diff.c:919 #, fuzzy msgid " --no-ignore-file-name-case consider case when comparing file names" msgstr "" "--no-ignore-file-name-case Té en compte diferències entre majúscules i\n" " minúscules en comparar noms de fitxers." -#: src/diff.c:919 +#: src/diff.c:920 #, fuzzy msgid "-x, --exclude=PAT exclude files that match PAT" msgstr "-x PAT --exclude=PAT Exclou fitxers que coincideixen amb PAT." -#: src/diff.c:920 +#: src/diff.c:921 #, fuzzy msgid "" "-X, --exclude-from=FILE exclude files that match any pattern in FILE" @@ -900,7 +889,7 @@ msgstr "" "-X FITXER --exclude-from=FITXER Exclou fitxers que coincideixen amb\n" " qualsevol patró de FITXER." -#: src/diff.c:921 +#: src/diff.c:922 #, fuzzy msgid "" "-S, --starting-file=FILE start with FILE when comparing directories" @@ -908,7 +897,7 @@ msgstr "" "-S FITXER --starting-file=FITXER Comença per FITXER quan es comparen\n" " directoris." -#: src/diff.c:922 +#: src/diff.c:923 #, fuzzy msgid "" " --from-file=FILE1 compare FILE1 to all operands;\n" @@ -917,7 +906,7 @@ msgstr "" "--from-file=FITXER1 Compara FITXER1 amb tots els operands. FITXER1 pot ser\n" " un directori." -#: src/diff.c:924 +#: src/diff.c:925 #, fuzzy msgid "" " --to-file=FILE2 compare all operands to FILE2;\n" @@ -926,66 +915,66 @@ msgstr "" "--to-file=FITXER1 Compara tots els operands amb FITXER2. FITXER2 pot ser\n" " un directori." -#: src/diff.c:927 +#: src/diff.c:928 #, fuzzy msgid "" "-i, --ignore-case ignore case differences in file contents" msgstr "-i --ignore-case Ignora diferències entre majúscules i minúscules." -#: src/diff.c:928 +#: src/diff.c:929 #, fuzzy msgid "-E, --ignore-tab-expansion ignore changes due to tab expansion" msgstr "" "-E --ignore-tab-expansion Ignora canvis provocats per la distància de\n" " tabulació." -#: src/diff.c:929 +#: src/diff.c:930 #, fuzzy msgid "-Z, --ignore-trailing-space ignore white space at line end" msgstr "-w --ignore-all-space Ignora tot l'espai en blanc." -#: src/diff.c:930 +#: src/diff.c:931 #, fuzzy msgid "" "-b, --ignore-space-change ignore changes in the amount of white space" msgstr "" "-b --ignore-space-change Ignora canvis en la quantitat d'espai en blanc." -#: src/diff.c:931 +#: src/diff.c:932 #, fuzzy msgid "-w, --ignore-all-space ignore all white space" msgstr "-w --ignore-all-space Ignora tot l'espai en blanc." -#: src/diff.c:932 +#: src/diff.c:933 #, fuzzy msgid "" "-B, --ignore-blank-lines ignore changes where lines are all blank" msgstr "-B --ignore-blank-lines Ignora canvis en línies que estan en blanc." -#: src/diff.c:933 +#: src/diff.c:934 #, fuzzy msgid "-I, --ignore-matching-lines=RE ignore changes where all lines match RE" msgstr "" "-I ER --ignore-matching-lines=ER Ignora canvis en línies que continguin ER." -#: src/diff.c:935 +#: src/diff.c:936 #, fuzzy msgid "-a, --text treat all files as text" msgstr "-a --text Tracta tots els fitxers com a text." -#: src/diff.c:936 +#: src/diff.c:937 #, fuzzy msgid " --strip-trailing-cr strip trailing carriage return on input" msgstr "" "--strip-trailing-cr Treu els caràcters finals de retorn de carro de " "l'entrada." -#: src/diff.c:938 +#: src/diff.c:939 #, fuzzy msgid " --binary read and write data in binary mode" msgstr "--binary Escriu i llegeix dades en mode binari." -#: src/diff.c:941 +#: src/diff.c:942 #, fuzzy msgid "" "-D, --ifdef=NAME output merged file with '#ifdef NAME' diffs" @@ -994,30 +983,30 @@ msgstr "" " amb directives `#ifdef NOM'." # `grups' o `grups de línies' (no queda prou clar) -#: src/diff.c:942 +#: src/diff.c:943 #, fuzzy msgid " --GTYPE-group-format=GFMT format GTYPE input groups with GFMT" msgstr "" "--TIPUSG-group-format=FMTG Similar, però formata els grups TIPUSG amb FMTG." -#: src/diff.c:943 +#: src/diff.c:944 #, fuzzy msgid " --line-format=LFMT format all input lines with LFMT" msgstr "--line-format=FMTL Similar, però formata totes les línies amb FMTL." -#: src/diff.c:944 +#: src/diff.c:945 #, fuzzy msgid " --LTYPE-line-format=LFMT format LTYPE input lines with LFMT" msgstr "" "--TIPUSL-line-format=FMTL Similar, però formata les línies TIPUSL amb FMTL." -#: src/diff.c:945 +#: src/diff.c:946 msgid "" " These format options provide fine-grained control over the output\n" " of diff, generalizing -D/--ifdef." msgstr "" -#: src/diff.c:947 +#: src/diff.c:948 #, fuzzy msgid " LTYPE is 'old', 'new', or 'unchanged'. GTYPE is LTYPE or 'changed'." msgstr "" @@ -1025,7 +1014,7 @@ msgstr "" "«unchanged» (inalterades).\n" " TIPUSG pot ser qualsevol TIPUSL o bé «changed» (alterades)." -#: src/diff.c:948 +#: src/diff.c:949 #, fuzzy msgid "" " GFMT (only) may contain:\n" @@ -1055,7 +1044,7 @@ msgstr "" " E F-1\n" " M L+1" -#: src/diff.c:960 +#: src/diff.c:961 #, fuzzy msgid "" " LFMT (only) may contain:\n" @@ -1069,7 +1058,7 @@ msgstr "" " %[-][AMPLADA][.[PRECISIÓ]]{doxX}n espec. estil printf pel nombre de " "línia" -#: src/diff.c:964 +#: src/diff.c:965 #, fuzzy msgid "" " Both GFMT and LFMT may contain:\n" @@ -1083,17 +1072,17 @@ msgstr "" " %c'C' el caràcter C\n" " %c'\\OOO' el caràcter de codi octal OOO" -#: src/diff.c:970 +#: src/diff.c:971 #, fuzzy msgid "-d, --minimal try hard to find a smaller set of changes" msgstr "-d --minimal Intenta trobar canvis mínims." -#: src/diff.c:971 +#: src/diff.c:972 #, fuzzy msgid " --horizon-lines=NUM keep NUM lines of the common prefix and suffix" msgstr "--horizon-lines=NÚM No descarta NÚM línies amb prefix i sufix comú." -#: src/diff.c:972 +#: src/diff.c:973 #, fuzzy msgid "" " --speed-large-files assume large files and many scattered small changes" @@ -1101,142 +1090,135 @@ msgstr "" "-H --speed-large-files Assumeix fitxers grans i molts canvis petits " "dispersos." -#: src/diff.c:973 -msgid "" -" --color[=WHEN] colorize the output; WHEN can be 'never', 'always'," -msgstr "" - #: src/diff.c:974 -#, fuzzy -msgid " or 'auto' (the default)" -msgstr "--normal Genera un diff normal." - -#: src/diff.c:975 msgid "" -" --palette=PALETTE specify the colors to use when --color is active" +" --color[=WHEN] colorize the output; WHEN can be 'never', " +"'always',\n" +" or 'auto' (the default)" msgstr "" #: src/diff.c:976 msgid "" -" PALETTE is a colon-separated list terminfo " -"capabilities" +" --palette=PALETTE the colors to use when --color is active; PALETTE " +"is\n" +" a colon-separated list of terminfo capabilities" msgstr "" -#: src/diff.c:978 +#: src/diff.c:979 msgid " --help display this help and exit" msgstr "" -#: src/diff.c:979 +#: src/diff.c:980 #, fuzzy msgid "-v, --version output version information and exit" msgstr "-v --version Mostra la versió del programa." -#: src/diff.c:981 +#: src/diff.c:982 #, fuzzy msgid "FILES are 'FILE1 FILE2' or 'DIR1 DIR2' or 'DIR FILE' or 'FILE DIR'." msgstr "" "FITXERS és «FITXER1 FITXER2» o «DIR1 DIR2» o «DIR FITXER...» o «FITXER... " "DIR»." -#: src/diff.c:982 +#: src/diff.c:983 #, fuzzy msgid "" "If --from-file or --to-file is given, there are no restrictions on FILE(s)." msgstr "" "Amb les opcions --from-file o --to-file no hi ha restriccions de FITXERS." -#: src/diff.c:983 src/diff3.c:526 src/sdiff.c:219 +#: src/diff.c:984 src/diff3.c:528 src/sdiff.c:219 #, fuzzy msgid "If a FILE is '-', read standard input." msgstr "Si FITXER és «-», llegeix l'entrada estàndard." -#: src/diff.c:993 +#: src/diff.c:994 #, c-format msgid "Usage: %s [OPTION]... FILES\n" msgstr "Mode d'ús: %s [OPCIÓ]... FITXERS\n" -#: src/diff.c:994 +#: src/diff.c:995 #, fuzzy msgid "Compare FILES line by line." msgstr "Compara fitxers línia per línia." -#: src/diff.c:1028 +#: src/diff.c:1029 #, fuzzy, c-format msgid "conflicting %s option value '%s'" msgstr "el valor «%s» per l'opció %s és conflictiu" -#: src/diff.c:1041 +#: src/diff.c:1042 #, c-format msgid "conflicting output style options" msgstr "opcions d'estil de sortida conflictives" -#: src/diff.c:1057 +#: src/diff.c:1058 #, fuzzy, c-format msgid "invalid color '%s'" -msgstr "l'amplada «%s» no és vàlida" +msgstr "el nombre de línies de context «%s» no és vàlid" -#: src/diff.c:1113 src/diff.c:1323 +#: src/diff.c:1114 src/diff.c:1324 #, c-format msgid "Only in %s: %s\n" msgstr "Només a %s: %s\n" -#: src/diff.c:1247 +#: src/diff.c:1248 #, fuzzy msgid "cannot compare '-' to a directory" msgstr "no es pot comparar «-» amb un directori" -#: src/diff.c:1282 +#: src/diff.c:1283 msgid "-D option not supported with directories" msgstr "l'opció -D no funciona amb directoris" -#: src/diff.c:1291 +#: src/diff.c:1292 #, c-format msgid "Common subdirectories: %s and %s\n" msgstr "Subdirectoris comuns: %s i %s\n" -#: src/diff.c:1333 src/diff.c:1383 +#: src/diff.c:1334 src/diff.c:1384 #, c-format msgid "File %s is a %s while file %s is a %s\n" msgstr "El fitxer %s és un %s mentre que el fitxer %s és un %s\n" -#: src/diff.c:1369 +#: src/diff.c:1370 #, fuzzy, c-format msgid "Symbolic links %s and %s differ\n" msgstr "Els fitxers %s i %s difereixen\n" -#: src/diff.c:1456 +#: src/diff.c:1457 #, c-format msgid "Files %s and %s are identical\n" msgstr "Els fitxers %s i %s són idèntics\n" #. This is a proper name. See the gettext manual, section Names. -#: src/diff3.c:41 +#: src/diff3.c:42 msgid "Randy Smith" msgstr "" -#: src/diff3.c:348 +#: src/diff3.c:351 #, c-format msgid "incompatible options" msgstr "opcions incompatibles" -#: src/diff3.c:388 +#: src/diff3.c:391 #, fuzzy msgid "'-' specified for more than one input file" msgstr "heu especificat «-» per més d'un fitxer d'entrada" -#: src/diff3.c:439 src/diff3.c:1288 src/diff3.c:1692 src/diff3.c:1747 +#: src/diff3.c:442 src/diff3.c:1290 src/diff3.c:1693 src/diff3.c:1748 #: src/sdiff.c:307 src/sdiff.c:844 src/sdiff.c:855 msgid "read failed" msgstr "lectura fallida" -#: src/diff3.c:473 +#: src/diff3.c:475 #, fuzzy msgid "-A, --show-all output all changes, bracketing conflicts" msgstr "" "-A --show-all Mostra tots els canvis, senyalant els conflictes amb " "separadors." -#: src/diff3.c:475 +#: src/diff3.c:477 #, fuzzy msgid "" "-e, --ed output ed script incorporating changes\n" @@ -1244,7 +1226,7 @@ msgid "" msgstr "" "-e --ed Mostra els canvis no comuns de FITXER-VELL a FITXER2 en FITXER1." -#: src/diff3.c:477 +#: src/diff3.c:479 #, fuzzy msgid "-E, --show-overlap like -e, but bracket conflicts" msgstr "" @@ -1252,82 +1234,82 @@ msgstr "" "amb\n" " separadors." -#: src/diff3.c:478 +#: src/diff3.c:480 #, fuzzy msgid "" "-3, --easy-only like -e, but incorporate only nonoverlapping " "changes" msgstr "-3 --easy-only Mostra els canvis no comuns i no solapats." -#: src/diff3.c:479 +#: src/diff3.c:481 #, fuzzy msgid "" "-x, --overlap-only like -e, but incorporate only overlapping changes" msgstr "-x --overlap-only Mostra els canvis solapats." -#: src/diff3.c:480 +#: src/diff3.c:482 msgid "-X like -x, but bracket conflicts" msgstr "" -#: src/diff3.c:481 +#: src/diff3.c:483 #, fuzzy msgid "-i append 'w' and 'q' commands to ed scripts" msgstr "-i Afegeix les instruccions «w» i «q» a l'script ed." -#: src/diff3.c:483 +#: src/diff3.c:485 msgid "" "-m, --merge output actual merged file, according to\n" " -A if no other options are given" msgstr "" -#: src/diff3.c:486 +#: src/diff3.c:488 #, fuzzy msgid "-a, --text treat all files as text" msgstr "-a --text Tracta tots els fitxers com a text." -#: src/diff3.c:487 +#: src/diff3.c:489 #, fuzzy msgid " --strip-trailing-cr strip trailing carriage return on input" msgstr "" "--strip-trailing-cr Treu els caràcters finals de retorn de carro de " "l'entrada." -#: src/diff3.c:488 +#: src/diff3.c:490 #, fuzzy msgid "-T, --initial-tab make tabs line up by prepending a tab" msgstr "" "-T --initial-tab Alinea el text de cada línia amb un caràcter de tabulació." -#: src/diff3.c:489 +#: src/diff3.c:491 #, fuzzy msgid " --diff-program=PROGRAM use PROGRAM to compare files" msgstr "--diff-program=PROGRAMA Usa PROGRAMA per comparar fitxers." -#: src/diff3.c:490 +#: src/diff3.c:492 msgid "" "-L, --label=LABEL use LABEL instead of file name\n" " (can be repeated up to three times)" msgstr "" -#: src/diff3.c:493 +#: src/diff3.c:495 msgid " --help display this help and exit" msgstr "" -#: src/diff3.c:494 +#: src/diff3.c:496 #, fuzzy msgid "-v, --version output version information and exit" msgstr "-v --version Mostra la versió del programa." -#: src/diff3.c:503 +#: src/diff3.c:505 #, c-format msgid "Usage: %s [OPTION]... MYFILE OLDFILE YOURFILE\n" msgstr "Mode d'ús: %s [OPCIÓ]... FITXER1 FITXER-VELL FITXER2\n" -#: src/diff3.c:505 +#: src/diff3.c:507 msgid "Compare three files line by line." msgstr "Compara tres fitxers línia per línia." -#: src/diff3.c:515 +#: src/diff3.c:517 msgid "" "\n" "The default output format is a somewhat human-readable representation of\n" @@ -1341,47 +1323,47 @@ msgid "" "robust than using ed.\n" msgstr "" -#: src/diff3.c:527 +#: src/diff3.c:529 msgid "Exit status is 0 if successful, 1 if conflicts, 2 if trouble." msgstr "" "L'estat de sortida és 0 si s'acaba amb èxit, 1 si hi ha conflictes\n" "i 2 en cas d'error." -#: src/diff3.c:720 +#: src/diff3.c:722 msgid "internal error: screwup in format of diff blocks" msgstr "error intern: format dels blocs diff desmanegat" -#: src/diff3.c:1015 +#: src/diff3.c:1017 #, c-format msgid "%s: diff failed: " msgstr "%s: diff ha fallat: " -#: src/diff3.c:1037 +#: src/diff3.c:1039 msgid "internal error: invalid diff type in process_diff" msgstr "error intern: tipus de diff invàlid en process_diff" -#: src/diff3.c:1062 +#: src/diff3.c:1064 msgid "invalid diff format; invalid change separator" msgstr "el format diff no és vàlid: el separador de canvis no és vàlid" -#: src/diff3.c:1298 +#: src/diff3.c:1300 msgid "invalid diff format; incomplete last line" msgstr "el format diff no és vàlid: l'última línia està incompleta" -#: src/diff3.c:1322 src/sdiff.c:275 src/util.c:970 +#: src/diff3.c:1324 src/sdiff.c:275 src/util.c:969 #, fuzzy, c-format msgid "subsidiary program '%s' could not be invoked" msgstr "no s'ha pogut invocar el programa subsidiari «%s»" -#: src/diff3.c:1347 +#: src/diff3.c:1349 msgid "invalid diff format; incorrect leading line chars" msgstr "el format diff no és vàlid: caràcters invàlids al principi de línia" -#: src/diff3.c:1420 +#: src/diff3.c:1422 msgid "internal error: invalid diff type passed to output" msgstr "error intern: tipus de diff no vàlid passat a la sortida" -#: src/diff3.c:1694 src/diff3.c:1751 +#: src/diff3.c:1695 src/diff3.c:1752 msgid "input file shrank" msgstr "el fitxer d'entrada s'ha encongit" @@ -1396,7 +1378,7 @@ msgid "%s: recursive directory loop" msgstr "" #. This is a proper name. See the gettext manual, section Names. -#: src/sdiff.c:42 +#: src/sdiff.c:43 msgid "Thomas Lord" msgstr "" @@ -1563,16 +1545,36 @@ msgstr "" "v:\tInclou les línies comunes i informa amb loquacitat\n" "q:\tSurt.\n" -#: src/util.c:663 +#: src/util.c:662 #, fuzzy, c-format msgid "unrecognized prefix: %s" msgstr "%s: opció no reconeguda «--%s»\n" -#: src/util.c:693 +#: src/util.c:692 #, c-format msgid "unparsable value for --palette" msgstr "" +#, fuzzy +#~ msgid "%s: option '--%s' doesn't allow an argument\n" +#~ msgstr "%s: l'opció «--%s» no admet arguments\n" + +#, fuzzy +#~ msgid "%s: unrecognized option '--%s'\n" +#~ msgstr "%s: opció no reconeguda «--%s»\n" + +#, fuzzy +#~ msgid "%s: option '-W %s' is ambiguous\n" +#~ msgstr "%s: l'opció «-W %s» és ambigua\n" + +#, fuzzy +#~ msgid "%s: option '-W %s' doesn't allow an argument\n" +#~ msgstr "%s: l'opció «-W %s» no admet arguments\n" + +#, fuzzy +#~ msgid "%s: option '-W %s' requires an argument\n" +#~ msgstr "%s: l'opció «%s» requereix arguments\n" + #~ msgid "%s: illegal option -- %c\n" #~ msgstr "%s: opció il·legal -- %c\n" @@ -2,45 +2,45 @@ # Copyright (C) 1998, 2002, 2004, 2010 Free Software Foundation, Inc. # This file is distributed under the same license as the diffutils package. # Petr KoÄvara <petr.kocvara@nemfm.cz>, 1998, 2002, 2004, 2010 -# Petr Pisar <petr.pisar@atlas.cz, 2014. +# Petr Pisar <petr.pisar@atlas.cz, 2014, 2017. # msgid "" msgstr "" -"Project-Id-Version: diffutils 3.3-pre1\n" +"Project-Id-Version: diffutils 3.5.14\n" "Report-Msgid-Bugs-To: bug-diffutils@gnu.org\n" -"POT-Creation-Date: 2016-08-20 22:22-0700\n" -"PO-Revision-Date: 2014-04-16 06:33+0200\n" +"POT-Creation-Date: 2017-05-21 13:26-0700\n" +"PO-Revision-Date: 2017-02-03 13:03+01:00\n" "Last-Translator: Petr Pisar <petr.pisar@atlas.cz>\n" "Language-Team: Czech <translation-team-cs@lists.sourceforge.net>\n" "Language: cs\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8-bit\n" +"X-Bugs: Report translation errors to the Language-Team address.\n" -#: lib/argmatch.c:133 -#, fuzzy, c-format +#: lib/argmatch.c:134 +#, c-format msgid "invalid argument %s for %s" -msgstr "neplatný argument „%3$s“ pÅ™epÃnaÄe %1$s%2$s" +msgstr "neplatný argument „%s“ pro %s" -#: lib/argmatch.c:134 +#: lib/argmatch.c:135 #, c-format msgid "ambiguous argument %s for %s" -msgstr "" +msgstr "nejednoznaÄný argument %s pro %s" -#: lib/argmatch.c:153 -#, fuzzy +#: lib/argmatch.c:154 msgid "Valid arguments are:" -msgstr "neplatný argument „%3$s“ pÅ™epÃnaÄe %1$s%2$s" +msgstr "Platné argumenty jsou:" -#: lib/c-stack.c:204 lib/c-stack.c:297 +#: lib/c-stack.c:203 lib/c-stack.c:296 msgid "program error" msgstr "chyba programu" -#: lib/c-stack.c:205 lib/c-stack.c:298 +#: lib/c-stack.c:204 lib/c-stack.c:297 msgid "stack overflow" msgstr "pÅ™eteÄenà zásobnÃku" -#: lib/error.c:191 +#: lib/error.c:195 msgid "Unknown system error" msgstr "Neznámá chyba systému" @@ -78,15 +78,15 @@ msgstr "objekt typové pamÄ›ti" #: lib/file-type.c:66 msgid "block special file" -msgstr "speciálnà blokový soubor" +msgstr "blokový speciálnà soubor" #: lib/file-type.c:69 msgid "character special file" -msgstr "speciálnà znakový soubor" +msgstr "znakový speciálnà soubor" #: lib/file-type.c:72 msgid "contiguous data" -msgstr "" +msgstr "souvislá data" #: lib/file-type.c:75 msgid "fifo" @@ -94,43 +94,39 @@ msgstr "roura" #: lib/file-type.c:78 msgid "door" -msgstr "" +msgstr "dveÅ™e" #: lib/file-type.c:81 -#, fuzzy msgid "multiplexed block special file" -msgstr "speciálnà blokový soubor" +msgstr "sdružený blokový speciálnà soubor" #: lib/file-type.c:84 -#, fuzzy msgid "multiplexed character special file" -msgstr "speciálnà znakový soubor" +msgstr "sdružený znakový speciálnà soubor" #: lib/file-type.c:87 msgid "multiplexed file" -msgstr "" +msgstr "sdružený soubor" #: lib/file-type.c:90 -#, fuzzy msgid "named file" -msgstr "soubor neznámého typu" +msgstr "pojmenovaný soubor" #: lib/file-type.c:93 -#, fuzzy msgid "network special file" -msgstr "speciálnà blokový soubor" +msgstr "sÃÅ¥ový speciálnà soubor" #: lib/file-type.c:96 msgid "migrated file with data" -msgstr "" +msgstr "zmigrovaný soubor s daty" #: lib/file-type.c:99 msgid "migrated file without data" -msgstr "" +msgstr "zmigrovaný soubor bez dat" #: lib/file-type.c:102 msgid "port" -msgstr "" +msgstr "port" #: lib/file-type.c:105 msgid "socket" @@ -138,72 +134,47 @@ msgstr "soket" #: lib/file-type.c:108 msgid "whiteout" -msgstr "" +msgstr "zabÄ›lenÃ" #: lib/file-type.c:110 msgid "weird file" msgstr "soubor neznámého typu" -#: lib/getopt.c:575 lib/getopt.c:604 -#, c-format -msgid "%s: option '%s' is ambiguous; possibilities:" -msgstr "%s: pÅ™epÃnaÄ â€ž%s“ nenà jednoznaÄný; možnosti:" +#: lib/getopt.c:278 +#, fuzzy, c-format +msgid "%s: option '%s%s' is ambiguous\n" +msgstr "%s: pÅ™epÃnaÄ â€ž%s“ nenà jednoznaÄný\n" -#: lib/getopt.c:619 +#: lib/getopt.c:284 #, fuzzy, c-format -msgid "%s: option '%s' is ambiguous\n" -msgstr "%s: pÅ™epÃnaÄ â€ž-W %s“ nenà jednoznaÄný\n" +msgid "%s: option '%s%s' is ambiguous; possibilities:" +msgstr "%s: pÅ™epÃnaÄ â€ž%s“ nenà jednoznaÄný; možnosti:" -#: lib/getopt.c:654 lib/getopt.c:658 -#, c-format -msgid "%s: option '--%s' doesn't allow an argument\n" -msgstr "%s: pÅ™epÃnaÄ â€ž--%s“ musà být zadán bez argumentu\n" +#: lib/getopt.c:319 +#, fuzzy, c-format +msgid "%s: unrecognized option '%s%s'\n" +msgstr "%s: neznámý pÅ™epÃnaÄ â€ž%c%s“\n" -#: lib/getopt.c:667 lib/getopt.c:672 -#, c-format -msgid "%s: option '%c%s' doesn't allow an argument\n" +#: lib/getopt.c:345 +#, fuzzy, c-format +msgid "%s: option '%s%s' doesn't allow an argument\n" msgstr "%s: pÅ™epÃnaÄ â€ž%c%s“ musà být zadán bez argumentu\n" -#: lib/getopt.c:715 lib/getopt.c:734 -#, c-format -msgid "%s: option '--%s' requires an argument\n" +#: lib/getopt.c:360 +#, fuzzy, c-format +msgid "%s: option '%s%s' requires an argument\n" msgstr "%s: pÅ™epÃnaÄ â€ž--%s“ vyžaduje argument\n" -#: lib/getopt.c:772 lib/getopt.c:775 -#, c-format -msgid "%s: unrecognized option '--%s'\n" -msgstr "%s: neznámý pÅ™epÃnaÄ â€ž--%s“\n" - -#: lib/getopt.c:783 lib/getopt.c:786 -#, c-format -msgid "%s: unrecognized option '%c%s'\n" -msgstr "%s: neznámý pÅ™epÃnaÄ â€ž%c%s“\n" - -#: lib/getopt.c:835 lib/getopt.c:838 +#: lib/getopt.c:621 #, c-format msgid "%s: invalid option -- '%c'\n" msgstr "%s: neznámý pÅ™epÃnaÄ – „%c“\n" -#: lib/getopt.c:891 lib/getopt.c:908 lib/getopt.c:1118 lib/getopt.c:1136 +#: lib/getopt.c:636 lib/getopt.c:682 #, c-format msgid "%s: option requires an argument -- '%c'\n" msgstr "%s: pÅ™epÃnaÄ vyžaduje argument – „%c“\n" -#: lib/getopt.c:964 lib/getopt.c:980 -#, c-format -msgid "%s: option '-W %s' is ambiguous\n" -msgstr "%s: pÅ™epÃnaÄ â€ž-W %s“ nenà jednoznaÄný\n" - -#: lib/getopt.c:1004 lib/getopt.c:1022 -#, c-format -msgid "%s: option '-W %s' doesn't allow an argument\n" -msgstr "%s: pÅ™epÃnaÄ â€ž-W %s“ musà být zadán bez argumentu\n" - -#: lib/getopt.c:1043 lib/getopt.c:1061 -#, c-format -msgid "%s: option '-W %s' requires an argument\n" -msgstr "%s: pÅ™epÃnaÄ â€ž-W %s“ vyžaduje argument\n" - #. TRANSLATORS: #. Get translations for open and closing quotation marks. #. The message catalog should translate "`" to a left @@ -225,11 +196,11 @@ msgstr "%s: pÅ™epÃnaÄ â€ž-W %s“ vyžaduje argument\n" #. If you don't know what to put here, please see #. <http://en.wikipedia.org/wiki/Quotation_marks_in_other_languages> #. and use glyphs suitable for your language. -#: lib/quotearg.c:347 +#: lib/quotearg.c:362 msgid "`" msgstr "„" -#: lib/quotearg.c:348 +#: lib/quotearg.c:363 msgid "'" msgstr "“" @@ -262,9 +233,8 @@ msgid "Invalid back reference" msgstr "Neplatný zpÄ›tný odkaz" #: lib/regcomp.c:156 -#, fuzzy msgid "Unmatched [, [^, [:, [., or [=" -msgstr "Nepárová [ nebo ]^" +msgstr "Nepárová [, [^, [:, [. nebo [=" #: lib/regcomp.c:159 msgid "Unmatched ( or \\(" @@ -525,7 +495,7 @@ msgid "General help using GNU software: <http://www.gnu.org/gethelp/>\n" msgstr "" "Obecná pomoc pÅ™i použÃvánà softwaru GNU:: <http://www.gnu.org/gethelp/>\n" -#: src/analyze.c:454 src/diff.c:1400 +#: src/analyze.c:454 src/diff.c:1401 #, c-format msgid "Files %s and %s differ\n" msgstr "Soubory %s a %s jsou různé\n" @@ -535,21 +505,21 @@ msgstr "Soubory %s a %s jsou různé\n" msgid "Binary files %s and %s differ\n" msgstr "Binárnà soubory %s a %s jsou rozdÃlné\n" -#: src/analyze.c:697 src/diff3.c:1463 src/util.c:1255 +#: src/analyze.c:706 src/diff3.c:1465 src/util.c:1254 msgid "No newline at end of file" msgstr "Chybà znak konce řádku na konci souboru" #. This is a proper name. See the gettext manual, section Names. -#: src/cmp.c:43 +#: src/cmp.c:44 msgid "Torbjorn Granlund" msgstr "Torbjorn Granlund" #. This is a proper name. See the gettext manual, section Names. -#: src/cmp.c:44 +#: src/cmp.c:45 msgid "David MacKenzie" msgstr "David MacKenzie" -#: src/cmp.c:118 src/diff.c:875 src/diff3.c:459 src/sdiff.c:158 +#: src/cmp.c:119 src/diff.c:877 src/diff3.c:462 src/sdiff.c:159 #, c-format msgid "Try '%s --help' for more information." msgstr "VÃce informacà zÃskáte pÅ™Ãkazem „%s --help“." @@ -564,12 +534,12 @@ msgstr "neplatná hodnota --ignore-inital „%s“" msgid "options -l and -s are incompatible" msgstr "pÅ™epÃnaÄe -l a -s nejsou kompatibilnÃ" -#: src/cmp.c:155 src/diff.c:884 src/diff3.c:467 src/sdiff.c:167 src/sdiff.c:315 -#: src/sdiff.c:322 src/sdiff.c:874 src/util.c:853 src/util.c:953 src/util.c:960 +#: src/cmp.c:155 src/diff.c:885 src/diff3.c:469 src/sdiff.c:167 src/sdiff.c:315 +#: src/sdiff.c:322 src/sdiff.c:874 src/util.c:852 src/util.c:952 src/util.c:959 msgid "write failed" msgstr "zápis selhal" -#: src/cmp.c:157 src/diff.c:886 src/diff.c:1465 src/diff3.c:469 src/sdiff.c:169 +#: src/cmp.c:157 src/diff.c:887 src/diff.c:1466 src/diff3.c:471 src/sdiff.c:169 msgid "standard output" msgstr "standardnà výstup" @@ -627,7 +597,7 @@ msgstr "" "Volitelné argumenty N1 a N2 udávajà poÄet bajtů, které budou pÅ™eskoÄeny\n" "na zaÄátku každého souboru (výchozà je nula)." -#: src/cmp.c:185 src/diff.c:996 src/diff3.c:507 src/sdiff.c:210 +#: src/cmp.c:185 src/diff.c:997 src/diff3.c:509 src/sdiff.c:210 msgid "" "Mandatory arguments to long options are mandatory for short options too.\n" msgstr "" @@ -647,7 +617,7 @@ msgstr "" msgid "If a FILE is '-' or missing, read standard input." msgstr "Pokud SOUBOR je „-“ nebo nebo chybÃ, bude Äten standardnà vstup." -#: src/cmp.c:195 src/diff.c:984 src/sdiff.c:220 +#: src/cmp.c:195 src/diff.c:985 src/sdiff.c:220 msgid "Exit status is 0 if inputs are the same, 1 if different, 2 if trouble." msgstr "" "Návratový kód je roven 0 pokud jsou vstupy shodné, 1 pokud se liÅ¡Ã a 2 pÅ™i " @@ -658,111 +628,126 @@ msgstr "" msgid "invalid --bytes value '%s'" msgstr "neplatná hodnota pÅ™epÃnaÄe --bytes „%s“" -#: src/cmp.c:266 src/diff.c:793 src/diff3.c:353 src/sdiff.c:565 +#: src/cmp.c:266 src/diff.c:795 src/diff3.c:356 src/sdiff.c:565 #, c-format msgid "missing operand after '%s'" msgstr "po „%s“ chybà operand" -#: src/cmp.c:278 src/diff.c:795 src/diff3.c:355 src/sdiff.c:567 +#: src/cmp.c:278 src/diff.c:797 src/diff3.c:358 src/sdiff.c:567 #, c-format msgid "extra operand '%s'" msgstr "operand „%s“ je nadbyteÄný" -#: src/cmp.c:494 +#: src/cmp.c:498 #, c-format msgid "%s %s differ: byte %s, line %s\n" msgstr "%s %s se liÅ¡Ã: bajt %s, řádek %s\n" -#: src/cmp.c:510 +#: src/cmp.c:514 #, c-format msgid "%s %s differ: byte %s, line %s is %3o %s %3o %s\n" msgstr "%s %s se liÅ¡Ã: bajt %s, řádek %s je %3o %s %3o %s\n" -#: src/cmp.c:562 -#, c-format -msgid "cmp: EOF on %s\n" +#: src/cmp.c:571 +#, fuzzy, c-format +msgid "cmp: EOF on %s which is empty\n" +msgstr "cmp: konec souboru v %s\n" + +#: src/cmp.c:585 +#, fuzzy, c-format +msgid "cmp: EOF on %s after byte %s, line %s\n" +msgstr "%s %s se liÅ¡Ã: bajt %s, řádek %s\n" + +#: src/cmp.c:586 +#, fuzzy, c-format +msgid "cmp: EOF on %s after byte %s, in line %s\n" +msgstr "%s %s se liÅ¡Ã: bajt %s, řádek %s\n" + +#: src/cmp.c:592 +#, fuzzy, c-format +msgid "cmp: EOF on %s after byte %s\n" msgstr "cmp: konec souboru v %s\n" #. This is a proper name. See the gettext manual, section Names. -#: src/diff.c:49 +#: src/diff.c:50 msgid "Paul Eggert" msgstr "Paul Eggert" #. This is a proper name. See the gettext manual, section Names. -#: src/diff.c:50 +#: src/diff.c:51 msgid "Mike Haertel" msgstr "Mike Haertel" #. This is a proper name. See the gettext manual, section Names. -#: src/diff.c:51 +#: src/diff.c:52 msgid "David Hayes" msgstr "David Hayes" #. This is a proper name. See the gettext manual, section Names. -#: src/diff.c:52 +#: src/diff.c:53 msgid "Richard Stallman" msgstr "Richard Stallman" #. This is a proper name. See the gettext manual, section Names. -#: src/diff.c:53 +#: src/diff.c:54 msgid "Len Tower" msgstr "Len Tower" -#: src/diff.c:351 +#: src/diff.c:353 #, c-format msgid "invalid context length '%s'" msgstr "neplatná délka kontextu „%s“" -#: src/diff.c:434 +#: src/diff.c:436 #, c-format msgid "pagination not supported on this host" msgstr "pÅ™estránkovánà nenà na tomto poÄÃtaÄi podporováno" -#: src/diff.c:449 src/diff3.c:335 +#: src/diff.c:451 src/diff3.c:336 #, c-format msgid "too many file label options" msgstr "pÅ™ÃliÅ¡ mnoho pÅ™epÃnaÄů popisu souboru" -#: src/diff.c:526 +#: src/diff.c:528 #, c-format msgid "invalid width '%s'" msgstr "nesprávná délka „%s“" -#: src/diff.c:530 +#: src/diff.c:532 msgid "conflicting width options" msgstr "konfliktnà volby Å¡ÃÅ™ky výstupu" -#: src/diff.c:555 +#: src/diff.c:557 #, c-format msgid "invalid horizon length '%s'" msgstr "neplatná výška obzoru „%s“" -#: src/diff.c:611 +#: src/diff.c:613 #, c-format msgid "invalid tabsize '%s'" msgstr "nesprávná hodnota --tabsize „%s“" -#: src/diff.c:615 +#: src/diff.c:617 msgid "conflicting tabsize options" msgstr "konfliktnà pÅ™epÃnaÄe tabsize" -#: src/diff.c:770 +#: src/diff.c:772 msgid "--from-file and --to-file both specified" msgstr "parametry --from-file i to-file použity najednou" -#: src/diff.c:890 +#: src/diff.c:891 msgid " --normal output a normal diff (the default)" msgstr " --normal normálnÃm formát výstupu diff (výchozÃ)" -#: src/diff.c:891 +#: src/diff.c:892 msgid "-q, --brief report only when files differ" msgstr "-q --brief výstup pouze pÅ™i rozdÃlných souborech" -#: src/diff.c:892 +#: src/diff.c:893 msgid "-s, --report-identical-files report when two files are the same" msgstr "-s --report-identical-files hlásà shodné soubory" -#: src/diff.c:893 +#: src/diff.c:894 msgid "" "-c, -C NUM, --context[=NUM] output NUM (default 3) lines of copied context" msgstr "" @@ -770,7 +755,7 @@ msgstr "" " vypÃÅ¡e POÄŒET (výchozà je 3) řádků\n" " kopÃrovaného kontextu" -#: src/diff.c:894 +#: src/diff.c:895 msgid "" "-u, -U NUM, --unified[=NUM] output NUM (default 3) lines of unified context" msgstr "" @@ -778,131 +763,131 @@ msgstr "" " vypÃÅ¡e POÄŒET (výchozà je 3) řádků\n" " unifikovaného kontextu" -#: src/diff.c:895 +#: src/diff.c:896 msgid "-e, --ed output an ed script" msgstr "-e --ed vypÃÅ¡e skript pro ed" -#: src/diff.c:896 +#: src/diff.c:897 msgid "-n, --rcs output an RCS format diff" msgstr "-n --rcs vypÃÅ¡e rozdÃl ve formátu RCS" -#: src/diff.c:897 +#: src/diff.c:898 msgid "-y, --side-by-side output in two columns" msgstr "-y, --side-by-side vypÃÅ¡e ve dvou sloupcÃch" -#: src/diff.c:898 +#: src/diff.c:899 msgid "" "-W, --width=NUM output at most NUM (default 130) print columns" msgstr "" "-W, --width=POÄŒET vypÃÅ¡e nejvýše POÄŒET (výchozà je 130)\n" " tiskových sloupců" -#: src/diff.c:899 +#: src/diff.c:900 msgid "" " --left-column output only the left column of common lines" msgstr "" " --left-column vypÃÅ¡e pouze levý sloupec spoleÄných řádků" -#: src/diff.c:900 +#: src/diff.c:901 msgid " --suppress-common-lines do not output common lines" msgstr " --suppress-common-lines nevypisuje shodné řádky" -#: src/diff.c:902 +#: src/diff.c:903 msgid "-p, --show-c-function show which C function each change is in" msgstr "" "-p, --show-c-function ukáže, ve které funkci C se zmÄ›na nacházÃ" -#: src/diff.c:903 +#: src/diff.c:904 msgid "-F, --show-function-line=RE show the most recent line matching RE" msgstr "-F, --show-function-line=RV ukáže poslednà řádek odpovÃdajÃcà RV" -#: src/diff.c:904 -#, fuzzy +#: src/diff.c:905 msgid "" " --label LABEL use LABEL instead of file name and timestamp\n" " (can be repeated)" msgstr "" -" --label NÃZEV použije NÃZEV mÃsto názvu souboru\n" +" --label NÃZEV použije NÃZEV mÃsto názvu souboru a Äasového " +"údaje\n" " (lze opakovat)" -#: src/diff.c:907 +#: src/diff.c:908 msgid "-t, --expand-tabs expand tabs to spaces in output" msgstr "-t, --expand-tabs ve výstupu pÅ™evede tabulátory na mezery" -#: src/diff.c:908 +#: src/diff.c:909 msgid "-T, --initial-tab make tabs line up by prepending a tab" msgstr "-T, --initial-tab na zaÄátek řádků se vložà tabulátor" -#: src/diff.c:909 +#: src/diff.c:910 msgid "" " --tabsize=NUM tab stops every NUM (default 8) print columns" msgstr "" " --tabsize=POÄŒET tabulátor zastavuje každých POÄŒET\n" " (výchozà je 8) tiskových sloupců" -#: src/diff.c:910 +#: src/diff.c:911 msgid "" " --suppress-blank-empty suppress space or tab before empty output lines" msgstr "" " --suppress-blank-empty potlaÄà mezeru nebo tabulátor pÅ™ed prázdnými\n" "  řádky výstupu" -#: src/diff.c:911 +#: src/diff.c:912 msgid "-l, --paginate pass output through 'pr' to paginate it" msgstr "" "-l, --paginate výstup projde pÅ™es „pr“ pro pÅ™estránkovánÃ" -#: src/diff.c:913 +#: src/diff.c:914 msgid "" "-r, --recursive recursively compare any subdirectories found" msgstr "" "-r --recursive rekurzivnÄ› porovná vÅ¡echny nalezené " "podadresáře" -#: src/diff.c:914 +#: src/diff.c:915 msgid " --no-dereference don't follow symbolic links" msgstr " --no-dereference nenásleduje symbolické odkazy" -#: src/diff.c:915 +#: src/diff.c:916 msgid "-N, --new-file treat absent files as empty" msgstr "" "-N, --new-file neexistujÃcà soubory považuje za prázdné" -#: src/diff.c:916 +#: src/diff.c:917 msgid " --unidirectional-new-file treat absent first files as empty" msgstr "" " --unidirectional-new-file neexistujÃcà soubory z prvnÃho adresáře\n" " považuje za prázdné" -#: src/diff.c:917 +#: src/diff.c:918 msgid " --ignore-file-name-case ignore case when comparing file names" msgstr "" " --ignore-file-name-case ignoruje velikost pÃsmen v názvech souborů" -#: src/diff.c:918 +#: src/diff.c:919 msgid " --no-ignore-file-name-case consider case when comparing file names" msgstr "" " --no-ignore-file-name-case bere v potaz velikost pÃsmen v názvech " "souborů" -#: src/diff.c:919 +#: src/diff.c:920 msgid "-x, --exclude=PAT exclude files that match PAT" msgstr "-x, --exclude=VZOR vynechá soubory odpovÃdajÃcà VZORU" -#: src/diff.c:920 +#: src/diff.c:921 msgid "" "-X, --exclude-from=FILE exclude files that match any pattern in FILE" msgstr "" "-X, --exclude-from=SOUBOR vynechá soubory, které odpovÃdajÃ\n" " libovolnému vzoru ze SOUBORU" -#: src/diff.c:921 +#: src/diff.c:922 msgid "" "-S, --starting-file=FILE start with FILE when comparing directories" msgstr "" "-S, --starting-file=SOUBOR pÅ™i porovnávánà adresářů zaÄne SOUBOREM" -#: src/diff.c:922 +#: src/diff.c:923 msgid "" " --from-file=FILE1 compare FILE1 to all operands;\n" " FILE1 can be a directory" @@ -910,7 +895,7 @@ msgstr "" " --from-file=SOUBOR1 porovná SOUBOR1 se vÅ¡emi operandy,\n" " SOUBOR1 může být adresář" -#: src/diff.c:924 +#: src/diff.c:925 msgid "" " --to-file=FILE2 compare all operands to FILE2;\n" " FILE2 can be a directory" @@ -918,77 +903,77 @@ msgstr "" " --to-file=SOUBOR2 porovná vÅ¡echny operandy se SOUBOREM2,\n" " SOUBOR2 může být adresář" -#: src/diff.c:927 +#: src/diff.c:928 msgid "" "-i, --ignore-case ignore case differences in file contents" msgstr "" "-i, --ignore-case ignoruje velikost pÃsmen v obsahu souborů" -#: src/diff.c:928 +#: src/diff.c:929 msgid "-E, --ignore-tab-expansion ignore changes due to tab expansion" msgstr "-E, --ignore-tab-expansion ignoruje zmÄ›ny v odsazenà tabulátorem" -#: src/diff.c:929 +#: src/diff.c:930 msgid "-Z, --ignore-trailing-space ignore white space at line end" msgstr "-Z, --ignore-trailing-space ignoruje bÃlá mÃsta na konci řádku" -#: src/diff.c:930 +#: src/diff.c:931 msgid "" "-b, --ignore-space-change ignore changes in the amount of white space" msgstr "-b, --ignore-space-change ignoruje zmÄ›ny v poÄtu bÃlých mÃst" -#: src/diff.c:931 +#: src/diff.c:932 msgid "-w, --ignore-all-space ignore all white space" msgstr "-w, --ignore-all-space ignoruje vÅ¡echna bÃlá mÃsta" -#: src/diff.c:932 +#: src/diff.c:933 msgid "" "-B, --ignore-blank-lines ignore changes where lines are all blank" msgstr "" "-B, --ignore-blank-lines ignoruje zmÄ›ny v pÅ™ÃpadÄ› prázdných řádků" -#: src/diff.c:933 +#: src/diff.c:934 msgid "-I, --ignore-matching-lines=RE ignore changes where all lines match RE" msgstr "" "-I, --ignore-matching-lines=RV ignoruje zmÄ›ny na vÅ¡ech řádcÃch\n" " odpovÃdajÃcÃch RV" -#: src/diff.c:935 +#: src/diff.c:936 msgid "-a, --text treat all files as text" msgstr "-a, --text pokládá vÅ¡echny soubory za text" -#: src/diff.c:936 +#: src/diff.c:937 msgid " --strip-trailing-cr strip trailing carriage return on input" msgstr " --strip-trailing-cr odstranà ukonÄovacà znak CR na vstupu" -#: src/diff.c:938 +#: src/diff.c:939 msgid " --binary read and write data in binary mode" msgstr "" " --binary data Äte a zapisuje data v binárnÃm režimu" -#: src/diff.c:941 +#: src/diff.c:942 msgid "" "-D, --ifdef=NAME output merged file with '#ifdef NAME' diffs" msgstr "" "-D, --ifdef=NÃZEV vypÃÅ¡e slouÄený soubor s rozdÃly „#ifdef " "NÃZEV“" -#: src/diff.c:942 +#: src/diff.c:943 msgid " --GTYPE-group-format=GFMT format GTYPE input groups with GFMT" msgstr "" " --GTYPE-group-format=GFMT formátuje vstupnà skupiny GTYPE podle FMTS" -#: src/diff.c:943 +#: src/diff.c:944 msgid " --line-format=LFMT format all input lines with LFMT" msgstr "" " --line-format=LFMT formátuje vÅ¡echny vstupnà řádky podle LFMT" -#: src/diff.c:944 +#: src/diff.c:945 msgid " --LTYPE-line-format=LFMT format LTYPE input lines with LFMT" msgstr "" " --LTYPE-line-format=LFMT formátuje vstupnà řádky LTYPE podle LFMT" -#: src/diff.c:945 +#: src/diff.c:946 msgid "" " These format options provide fine-grained control over the output\n" " of diff, generalizing -D/--ifdef." @@ -996,13 +981,13 @@ msgstr "" " Tyto formátovacà pÅ™epÃnaÄe poskytujà jemnou kontrolu nad výstupem diffu\n" " a zobecňujà -D/--ifdef." -#: src/diff.c:947 +#: src/diff.c:948 msgid " LTYPE is 'old', 'new', or 'unchanged'. GTYPE is LTYPE or 'changed'." msgstr "" " LTYPE je „old“ (starý), „new“ (nový) nebo „unchanged“ (nezmÄ›nÄ›n). GTYPE\n" " je LTYPE nebo „changed“ (zmÄ›nÄ›n)." -#: src/diff.c:948 +#: src/diff.c:949 msgid "" " GFMT (only) may contain:\n" " %< lines from FILE1\n" @@ -1030,7 +1015,7 @@ msgstr "" " M L+1\n" " %(A=B?T:E) pokud A se rovná B, tak T, jinak E" -#: src/diff.c:960 +#: src/diff.c:961 msgid "" " LFMT (only) may contain:\n" " %L contents of line\n" @@ -1044,7 +1029,7 @@ msgstr "" "vstupnÃho\n" " řádku" -#: src/diff.c:964 +#: src/diff.c:965 msgid "" " Both GFMT and LFMT may contain:\n" " %% %\n" @@ -1058,152 +1043,150 @@ msgstr "" " %c'\\000' znak s osmiÄkovým kódem 000\n" " C znak C (ostatnà znaky zastupujà samy sebe)" -#: src/diff.c:970 +#: src/diff.c:971 msgid "-d, --minimal try hard to find a smaller set of changes" msgstr "-d, --minimal pokusà se nalézt nejmenÅ¡Ã sadu zmÄ›n" -#: src/diff.c:971 +#: src/diff.c:972 msgid " --horizon-lines=NUM keep NUM lines of the common prefix and suffix" msgstr "" " --horizon-lines=POÄŒET\n" " ponechá POÄŒET shodných řádků pÅ™edpony a pÅ™Ãpony" -#: src/diff.c:972 +#: src/diff.c:973 msgid "" " --speed-large-files assume large files and many scattered small changes" msgstr "" " --speed-large-files pÅ™edpokládá velké soubory a mnoho rozptýlených\n" " drobných zmÄ›n" -#: src/diff.c:973 -msgid "" -" --color[=WHEN] colorize the output; WHEN can be 'never', 'always'," -msgstr "" - #: src/diff.c:974 #, fuzzy -msgid " or 'auto' (the default)" -msgstr " --normal normálnÃm formát výstupu diff (výchozÃ)" - -#: src/diff.c:975 msgid "" -" --palette=PALETTE specify the colors to use when --color is active" +" --color[=WHEN] colorize the output; WHEN can be 'never', " +"'always',\n" +" or 'auto' (the default)" msgstr "" +" --color[=KDY] obarvà výstup, KDY smà být „never“ (nikdy),\n" +" „always“ (vždy)," #: src/diff.c:976 +#, fuzzy msgid "" -" PALETTE is a colon-separated list terminfo " -"capabilities" +" --palette=PALETTE the colors to use when --color is active; PALETTE " +"is\n" +" a colon-separated list of terminfo capabilities" msgstr "" +" PALETA je dvojteÄkou oddÄ›lený seznam schopnostÃ\n" +" terminfa" -#: src/diff.c:978 +#: src/diff.c:979 msgid " --help display this help and exit" msgstr " --help zobrazà tuto nápovÄ›du a skonÄÃ" -#: src/diff.c:979 +#: src/diff.c:980 msgid "-v, --version output version information and exit" msgstr "-v, --version vypÃÅ¡e údaje o verzi a skonÄÃ" -#: src/diff.c:981 -#, fuzzy +#: src/diff.c:982 msgid "FILES are 'FILE1 FILE2' or 'DIR1 DIR2' or 'DIR FILE' or 'FILE DIR'." msgstr "" "SOUBORY jsou „SOUBOR1 SOUBOR2“ nebo „ADRESÃŘ1 ADRESÃŘ2' nebo\n" -"„ADRESÃŘ SOUBOR…“ nebo „SOUBOR… ADRESÃŘ“." +"„ADRESÃŘ SOUBOR“ nebo „SOUBOR ADRESÃŘ“." -#: src/diff.c:982 +#: src/diff.c:983 msgid "" "If --from-file or --to-file is given, there are no restrictions on FILE(s)." msgstr "" "Pokud je uveden --from-file nebo --to-file, pak nejsou u SOUBORÅ® žádná " "omezenÃ." -#: src/diff.c:983 src/diff3.c:526 src/sdiff.c:219 +#: src/diff.c:984 src/diff3.c:528 src/sdiff.c:219 msgid "If a FILE is '-', read standard input." msgstr "Pokud SOUBOR bude „-“, bude Äten standardnà vstup." -#: src/diff.c:993 +#: src/diff.c:994 #, c-format msgid "Usage: %s [OPTION]... FILES\n" msgstr "PoužitÃ: %s [PŘEPÃNAÄŒ]… SOUBORY\n" -#: src/diff.c:994 +#: src/diff.c:995 msgid "Compare FILES line by line." msgstr "Porovnává SOUBORY řádek po řádku." -#: src/diff.c:1028 +#: src/diff.c:1029 #, c-format msgid "conflicting %s option value '%s'" msgstr "konfliktnà hodnota „%2$s“ pÅ™epÃnaÄe „%1$s“" -#: src/diff.c:1041 +#: src/diff.c:1042 #, c-format msgid "conflicting output style options" msgstr "konfliktnà pÅ™epÃnaÄe pro styl výstupu" -#: src/diff.c:1057 -#, fuzzy, c-format +#: src/diff.c:1058 +#, c-format msgid "invalid color '%s'" -msgstr "nesprávná délka „%s“" +msgstr "neplatná barva „%s“" -#: src/diff.c:1113 src/diff.c:1323 +#: src/diff.c:1114 src/diff.c:1324 #, c-format msgid "Only in %s: %s\n" msgstr "Pouze v %s: %s\n" -#: src/diff.c:1247 +#: src/diff.c:1248 msgid "cannot compare '-' to a directory" msgstr "„-“ s adresářem nelze porovnat" -#: src/diff.c:1282 +#: src/diff.c:1283 msgid "-D option not supported with directories" msgstr "-D pÅ™epÃnaÄ nepodporuje práci s adresáři" -#: src/diff.c:1291 +#: src/diff.c:1292 #, c-format msgid "Common subdirectories: %s and %s\n" msgstr "SpoleÄné podadresáře: %s a %s\n" -#: src/diff.c:1333 src/diff.c:1383 +#: src/diff.c:1334 src/diff.c:1384 #, c-format msgid "File %s is a %s while file %s is a %s\n" msgstr "Soubor %s je %s zatÃmco soubor %s je %s\n" -#: src/diff.c:1369 +#: src/diff.c:1370 #, c-format msgid "Symbolic links %s and %s differ\n" msgstr "Symbolické odkazy %s a %s se liÅ¡Ã\n" -#: src/diff.c:1456 +#: src/diff.c:1457 #, c-format msgid "Files %s and %s are identical\n" msgstr "Soubory %s a %s jsou identické\n" #. This is a proper name. See the gettext manual, section Names. -#: src/diff3.c:41 +#: src/diff3.c:42 msgid "Randy Smith" msgstr "Randy Smith" -#: src/diff3.c:348 +#: src/diff3.c:351 #, c-format msgid "incompatible options" msgstr "nekompatibilnà pÅ™epÃnaÄe" -#: src/diff3.c:388 +#: src/diff3.c:391 msgid "'-' specified for more than one input file" msgstr "„-“ zadáno pro vÃce než jeden vstupnà soubor" -#: src/diff3.c:439 src/diff3.c:1288 src/diff3.c:1692 src/diff3.c:1747 +#: src/diff3.c:442 src/diff3.c:1290 src/diff3.c:1693 src/diff3.c:1748 #: src/sdiff.c:307 src/sdiff.c:844 src/sdiff.c:855 msgid "read failed" msgstr "Ätenà selhalo" -#: src/diff3.c:473 +#: src/diff3.c:475 msgid "-A, --show-all output all changes, bracketing conflicts" msgstr "" "-A, --show-all vypÃÅ¡e vÅ¡echny rozdÃly, konflikty v závorkách" -#: src/diff3.c:475 +#: src/diff3.c:477 msgid "" "-e, --ed output ed script incorporating changes\n" " from OLDFILE to YOURFILE into MYFILE" @@ -1211,32 +1194,32 @@ msgstr "" "-e, --ed vypÃÅ¡e ed skript zahrnujÃcà zmÄ›ny mezi\n" " STARÃM_SOUBOREM a VAÅ ÃM_SOUBOREM do MÉHO_SOUBORU" -#: src/diff3.c:477 +#: src/diff3.c:479 msgid "-E, --show-overlap like -e, but bracket conflicts" msgstr "-E, --show-overlap jako -e, ale konflikty umÃstà do závorek" -#: src/diff3.c:478 +#: src/diff3.c:480 msgid "" "-3, --easy-only like -e, but incorporate only nonoverlapping " "changes" msgstr "" "-3, --easy-only jako -e, ale zahrne jen nepÅ™ekrývajÃcà se zmÄ›ny" -#: src/diff3.c:479 +#: src/diff3.c:481 msgid "" "-x, --overlap-only like -e, but incorporate only overlapping changes" msgstr "" "-x, --overlap-only jako -e, ale zahrne jen pÅ™ekrývajÃcà se zmÄ›ny" -#: src/diff3.c:480 +#: src/diff3.c:482 msgid "-X like -x, but bracket conflicts" msgstr "-X jako -x, ale konflikty umÃstà do závorek" -#: src/diff3.c:481 +#: src/diff3.c:483 msgid "-i append 'w' and 'q' commands to ed scripts" msgstr "-i pÅ™idá pÅ™Ãkazy „w“ a „q“ do skriptů pro ed" -#: src/diff3.c:483 +#: src/diff3.c:485 msgid "" "-m, --merge output actual merged file, according to\n" " -A if no other options are given" @@ -1245,23 +1228,23 @@ msgstr "" "li\n" " uvedeny dalÅ¡Ã pÅ™epÃnaÄe" -#: src/diff3.c:486 +#: src/diff3.c:488 msgid "-a, --text treat all files as text" msgstr "-a, --text pokládá vÅ¡echny soubory za text" -#: src/diff3.c:487 +#: src/diff3.c:489 msgid " --strip-trailing-cr strip trailing carriage return on input" msgstr " --strip-trailing-cr odstranà ukonÄovacà znak CR na vstupu" -#: src/diff3.c:488 +#: src/diff3.c:490 msgid "-T, --initial-tab make tabs line up by prepending a tab" msgstr "-T, --initial-tab na zaÄátek řádků se vložà tabulátor" -#: src/diff3.c:489 +#: src/diff3.c:491 msgid " --diff-program=PROGRAM use PROGRAM to compare files" msgstr " --diff-program=PROGRAM použije PROGRAM k porovnánà souborů" -#: src/diff3.c:490 +#: src/diff3.c:492 msgid "" "-L, --label=LABEL use LABEL instead of file name\n" " (can be repeated up to three times)" @@ -1269,24 +1252,24 @@ msgstr "" "-L, --label=NÃZEV použije NÃZEV namÃsto názvu souboru\n" " (lze opakovat až tÅ™ikrát)" -#: src/diff3.c:493 +#: src/diff3.c:495 msgid " --help display this help and exit" msgstr " --help zobrazà tuto nápovÄ›du a skonÄÃ" -#: src/diff3.c:494 +#: src/diff3.c:496 msgid "-v, --version output version information and exit" msgstr "-v, --version vypÃÅ¡e údaje o verzi a skonÄÃ" -#: src/diff3.c:503 +#: src/diff3.c:505 #, c-format msgid "Usage: %s [OPTION]... MYFILE OLDFILE YOURFILE\n" msgstr "PoužitÃ: %s [PŘEPÃNAÄŒ]… MÅ®J_SOUBOR STARÃ_SOUBOR VÃÅ _SOUBOR\n" -#: src/diff3.c:505 +#: src/diff3.c:507 msgid "Compare three files line by line." msgstr "Porovnánà třà souborů řádek po řádku." -#: src/diff3.c:515 +#: src/diff3.c:517 msgid "" "\n" "The default output format is a somewhat human-readable representation of\n" @@ -1310,45 +1293,45 @@ msgstr "" "vlastnà spojený soubor. V pÅ™ÃpadÄ› neobvyklého vstupu, je toto spolehlivÄ›jÅ¡Ã\n" "způsob než použità programu ed.\n" -#: src/diff3.c:527 +#: src/diff3.c:529 msgid "Exit status is 0 if successful, 1 if conflicts, 2 if trouble." msgstr "Návratová hodnota je 0 pÅ™i úspÄ›chu, 1 pÅ™i konfliktu a 2 pÅ™i chybÄ›." -#: src/diff3.c:720 +#: src/diff3.c:722 msgid "internal error: screwup in format of diff blocks" msgstr "vnitÅ™nà chyba: chyba ve formátu diff bloků" -#: src/diff3.c:1015 +#: src/diff3.c:1017 #, c-format msgid "%s: diff failed: " msgstr "%s: diff selhal: " -#: src/diff3.c:1037 +#: src/diff3.c:1039 msgid "internal error: invalid diff type in process_diff" msgstr "vnitÅ™nà chyba: nesprávný typ diffu v process_diff" -#: src/diff3.c:1062 +#: src/diff3.c:1064 msgid "invalid diff format; invalid change separator" msgstr "neplatný formát diff souboru; neplatný oddÄ›lovaÄ zmÄ›ny" -#: src/diff3.c:1298 +#: src/diff3.c:1300 msgid "invalid diff format; incomplete last line" msgstr "neplatný formát diff souboru; nekompletnà poslednà řádek" -#: src/diff3.c:1322 src/sdiff.c:275 src/util.c:970 +#: src/diff3.c:1324 src/sdiff.c:275 src/util.c:969 #, c-format msgid "subsidiary program '%s' could not be invoked" msgstr "pomocný program „%s“ nebylo možné zavolat" -#: src/diff3.c:1347 +#: src/diff3.c:1349 msgid "invalid diff format; incorrect leading line chars" msgstr "neplatný formát diff souboru; nesprávné úvodnà znaky na řádku" -#: src/diff3.c:1420 +#: src/diff3.c:1422 msgid "internal error: invalid diff type passed to output" msgstr "vnitÅ™nà chyba: nesprávný typ diffu pro výstup" -#: src/diff3.c:1694 src/diff3.c:1751 +#: src/diff3.c:1695 src/diff3.c:1752 msgid "input file shrank" msgstr "vstupnà soubor se zmenÅ¡il" @@ -1363,7 +1346,7 @@ msgid "%s: recursive directory loop" msgstr "%s: smyÄka v rekurzi adresářů" #. This is a proper name. See the gettext manual, section Names. -#: src/sdiff.c:42 +#: src/sdiff.c:43 msgid "Thomas Lord" msgstr "Thomas Lord" @@ -1508,15 +1491,39 @@ msgstr "" "v:\tUpozornà na vloženà spoleÄných řádků.\n" "q:\tUkonÄenÃ.\n" -#: src/util.c:663 -#, fuzzy, c-format +#: src/util.c:662 +#, c-format msgid "unrecognized prefix: %s" -msgstr "%s: neznámý pÅ™epÃnaÄ â€ž--%s“\n" +msgstr "nerozpoznaná pÅ™edpona: %s" -#: src/util.c:693 +#: src/util.c:692 #, c-format msgid "unparsable value for --palette" -msgstr "" +msgstr "nerozebratelná hodnota pro pÅ™epÃnaÄ --pellete" + +#~ msgid " or 'auto' (the default)" +#~ msgstr " nebo „auto“ (výchozÃ)" + +#~ msgid "" +#~ " --palette=PALETTE specify the colors to use when --color is active" +#~ msgstr "" +#~ " --pellete=PALETA urÄuje barvy, které se použijà se zapnutým --" +#~ "color" + +#~ msgid "%s: option '--%s' doesn't allow an argument\n" +#~ msgstr "%s: pÅ™epÃnaÄ â€ž--%s“ musà být zadán bez argumentu\n" + +#~ msgid "%s: unrecognized option '--%s'\n" +#~ msgstr "%s: neznámý pÅ™epÃnaÄ â€ž--%s“\n" + +#~ msgid "%s: option '-W %s' is ambiguous\n" +#~ msgstr "%s: pÅ™epÃnaÄ â€ž-W %s“ nenà jednoznaÄný\n" + +#~ msgid "%s: option '-W %s' doesn't allow an argument\n" +#~ msgstr "%s: pÅ™epÃnaÄ â€ž-W %s“ musà být zadán bez argumentu\n" + +#~ msgid "%s: option '-W %s' requires an argument\n" +#~ msgstr "%s: pÅ™epÃnaÄ â€ž-W %s“ vyžaduje argument\n" #~ msgid "-i SKIP1:SKIP2 --ignore-initial=SKIP1:SKIP2" #~ msgstr "-i N1:N2 --ignore-initial=N1:N2" Binary files differ@@ -1,48 +1,48 @@ # Danish diffutils translation po-file -# Copyright (C) 2000, 2012 Free Software Foundation, Inc. +# Copyright (C) 2000, 2012, 2017 Free Software Foundation, Inc. # This file is distributed under the same license as the diffutils package. # # Claus Hindsgaul <claus_h@image.dk>, 2000-2002. -# Ask Hjorth Larsen <asklarsen@gmail.com>, 2010-2012. +# Ask Hjorth Larsen <asklarsen@gmail.com>, 2010-2012, 2017. # msgid "" msgstr "" -"Project-Id-Version: diffutils-3.3-pre1\n" +"Project-Id-Version: diffutils-3.5.14\n" "Report-Msgid-Bugs-To: bug-diffutils@gnu.org\n" -"POT-Creation-Date: 2016-08-20 22:22-0700\n" -"PO-Revision-Date: 2012-11-03 14:34+0100\n" +"POT-Creation-Date: 2017-05-21 13:26-0700\n" +"PO-Revision-Date: 2017-02-06 19:52+0100\n" "Last-Translator: Ask Hjorth Larsen <asklarsen@gmail.com>\n" "Language-Team: Danish <dansk@dansk-gruppen.dk>\n" "Language: da\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: KBabel 0.9.5\n" -#: lib/argmatch.c:133 -#, fuzzy, c-format +#: lib/argmatch.c:134 +#, c-format msgid "invalid argument %s for %s" -msgstr "ugyldigt %s%s-argument '%s'" +msgstr "ugyldigt argument %s til %s" -#: lib/argmatch.c:134 +#: lib/argmatch.c:135 #, c-format msgid "ambiguous argument %s for %s" -msgstr "" +msgstr "flertydigt argument %s til %s" -#: lib/argmatch.c:153 -#, fuzzy +#: lib/argmatch.c:154 msgid "Valid arguments are:" -msgstr "ugyldigt %s%s-argument '%s'" +msgstr "Gyldige argumenter er:" -#: lib/c-stack.c:204 lib/c-stack.c:297 +#: lib/c-stack.c:203 lib/c-stack.c:296 msgid "program error" msgstr "programfejl" -#: lib/c-stack.c:205 lib/c-stack.c:298 +#: lib/c-stack.c:204 lib/c-stack.c:297 msgid "stack overflow" msgstr "stakoverløb" -#: lib/error.c:191 +#: lib/error.c:195 msgid "Unknown system error" msgstr "Ukendt systemfejl" @@ -88,7 +88,7 @@ msgstr "tegn-specialfil" #: lib/file-type.c:72 msgid "contiguous data" -msgstr "" +msgstr "Sammenhængende data" #: lib/file-type.c:75 msgid "fifo" @@ -96,115 +96,87 @@ msgstr "fifo" #: lib/file-type.c:78 msgid "door" -msgstr "" +msgstr "dør" #: lib/file-type.c:81 -#, fuzzy msgid "multiplexed block special file" -msgstr "blok-specialfil" +msgstr "multiplekset blokspecialfil" #: lib/file-type.c:84 -#, fuzzy msgid "multiplexed character special file" -msgstr "tegn-specialfil" +msgstr "multiplekset tegnspecialfil" #: lib/file-type.c:87 msgid "multiplexed file" -msgstr "" +msgstr "multiplekset fil" #: lib/file-type.c:90 -#, fuzzy msgid "named file" -msgstr "mystisk fil" +msgstr "navngivet fil" #: lib/file-type.c:93 -#, fuzzy msgid "network special file" -msgstr "blok-specialfil" +msgstr "netværksspecialfil" #: lib/file-type.c:96 msgid "migrated file with data" -msgstr "" +msgstr "migreret fil med data" #: lib/file-type.c:99 msgid "migrated file without data" -msgstr "" +msgstr "migreret fil uden data" #: lib/file-type.c:102 msgid "port" -msgstr "" +msgstr "port" #: lib/file-type.c:105 msgid "socket" msgstr "stik" +# ?? #: lib/file-type.c:108 msgid "whiteout" -msgstr "" +msgstr "whiteout" #: lib/file-type.c:110 msgid "weird file" msgstr "mystisk fil" -#: lib/getopt.c:575 lib/getopt.c:604 -#, c-format -msgid "%s: option '%s' is ambiguous; possibilities:" -msgstr "%s: tilvalget '%s' er flertydigt; muligheder:" - -#: lib/getopt.c:619 +#: lib/getopt.c:278 #, fuzzy, c-format -msgid "%s: option '%s' is ambiguous\n" -msgstr "%s: tilvalget '-W %s' er flertydigt\n" +msgid "%s: option '%s%s' is ambiguous\n" +msgstr "%s: tilvalget \"%s\" er flertydigt\n" -#: lib/getopt.c:654 lib/getopt.c:658 -#, c-format -msgid "%s: option '--%s' doesn't allow an argument\n" -msgstr "%s: tilvalg '--%s' tillader ikke et argument\n" - -#: lib/getopt.c:667 lib/getopt.c:672 -#, c-format -msgid "%s: option '%c%s' doesn't allow an argument\n" -msgstr "%s: tilvalg '%c%s' tillader ikke et argument\n" +#: lib/getopt.c:284 +#, fuzzy, c-format +msgid "%s: option '%s%s' is ambiguous; possibilities:" +msgstr "%s: tilvalget \"%s\" er flertydigt; muligheder:" -#: lib/getopt.c:715 lib/getopt.c:734 -#, c-format -msgid "%s: option '--%s' requires an argument\n" -msgstr "%s: tilvalg '--%s' kræver et argument\n" +#: lib/getopt.c:319 +#, fuzzy, c-format +msgid "%s: unrecognized option '%s%s'\n" +msgstr "%s: ukendt tilvalg \"%c%s\"\n" -#: lib/getopt.c:772 lib/getopt.c:775 -#, c-format -msgid "%s: unrecognized option '--%s'\n" -msgstr "%s: ukendt tilvalg '--%s'\n" +#: lib/getopt.c:345 +#, fuzzy, c-format +msgid "%s: option '%s%s' doesn't allow an argument\n" +msgstr "%s: tilvalget \"%c%s\" tillader ikke et argument\n" -#: lib/getopt.c:783 lib/getopt.c:786 -#, c-format -msgid "%s: unrecognized option '%c%s'\n" -msgstr "%s: ukendt tilvalg '%c%s'\n" +#: lib/getopt.c:360 +#, fuzzy, c-format +msgid "%s: option '%s%s' requires an argument\n" +msgstr "%s: tilvalget \"--%s\" kræver et argument\n" -#: lib/getopt.c:835 lib/getopt.c:838 +#: lib/getopt.c:621 #, c-format msgid "%s: invalid option -- '%c'\n" -msgstr "%s: ugyldigt tilvalg -- '%c'\n" +msgstr "%s: ugyldigt tilvalg -- \"%c\"\n" -#: lib/getopt.c:891 lib/getopt.c:908 lib/getopt.c:1118 lib/getopt.c:1136 +#: lib/getopt.c:636 lib/getopt.c:682 #, c-format msgid "%s: option requires an argument -- '%c'\n" -msgstr "%s: tilvalg kræver et argument -- '%c'\n" - -#: lib/getopt.c:964 lib/getopt.c:980 -#, c-format -msgid "%s: option '-W %s' is ambiguous\n" -msgstr "%s: tilvalget '-W %s' er flertydigt\n" - -#: lib/getopt.c:1004 lib/getopt.c:1022 -#, c-format -msgid "%s: option '-W %s' doesn't allow an argument\n" -msgstr "%s: tilvalget '-W %s' tillader ikke et argument\n" - -#: lib/getopt.c:1043 lib/getopt.c:1061 -#, c-format -msgid "%s: option '-W %s' requires an argument\n" -msgstr "%s: tilvalget '-W %s' tillader ikke et argument\n" +msgstr "%s: tilvalg kræver et argument -- \"%c\"\n" #. TRANSLATORS: #. Get translations for open and closing quotation marks. @@ -227,13 +199,13 @@ msgstr "%s: tilvalget '-W %s' tillader ikke et argument\n" #. If you don't know what to put here, please see #. <http://en.wikipedia.org/wiki/Quotation_marks_in_other_languages> #. and use glyphs suitable for your language. -#: lib/quotearg.c:347 +#: lib/quotearg.c:362 msgid "`" -msgstr "'" +msgstr "\"" -#: lib/quotearg.c:348 +#: lib/quotearg.c:363 msgid "'" -msgstr "'" +msgstr "\"" #: lib/regcomp.c:135 msgid "Success" @@ -264,9 +236,8 @@ msgid "Invalid back reference" msgstr "Ugyldig bagud-reference" #: lib/regcomp.c:156 -#, fuzzy msgid "Unmatched [, [^, [:, [., or [=" -msgstr "Uparret [ eller [^" +msgstr "Uparret [, [^, [:, [. eller [=" #: lib/regcomp.c:159 msgid "Unmatched ( or \\(" @@ -336,17 +307,17 @@ msgstr "kunne ikke genÃ¥bne %s i tilstand %s" #: lib/xstrtol-error.c:63 #, c-format msgid "invalid %s%s argument '%s'" -msgstr "ugyldigt %s%s-argument '%s'" +msgstr "ugyldigt %s%s-argument \"%s\"" #: lib/xstrtol-error.c:68 #, c-format msgid "invalid suffix in %s%s argument '%s'" -msgstr "ugyldig endelse i %s%s-argument '%s'" +msgstr "ugyldig endelse i %s%s-argument \"%s\"" #: lib/xstrtol-error.c:72 #, c-format msgid "%s%s argument '%s' too large" -msgstr "%s%s-argumentet '%s' er for stort" +msgstr "%s%s-argumentet \"%s\" er for stort" #: lib/version-etc.c:74 #, c-format @@ -522,7 +493,7 @@ msgstr "Hjemmeside for %s: <http://www.gnu.org/software/%s/>\n" msgid "General help using GNU software: <http://www.gnu.org/gethelp/>\n" msgstr "Generel hjælp til GNU-programmer: <http://www.gnu.org/gethelp/>\n" -#: src/analyze.c:454 src/diff.c:1400 +#: src/analyze.c:454 src/diff.c:1401 #, c-format msgid "Files %s and %s differ\n" msgstr "Filerne %s og %s er forskellige\n" @@ -532,41 +503,41 @@ msgstr "Filerne %s og %s er forskellige\n" msgid "Binary files %s and %s differ\n" msgstr "Binære filer %s og %s er forskellige\n" -#: src/analyze.c:697 src/diff3.c:1463 src/util.c:1255 +#: src/analyze.c:706 src/diff3.c:1465 src/util.c:1254 msgid "No newline at end of file" msgstr "Intet linjeskift ved filafslutning" #. This is a proper name. See the gettext manual, section Names. -#: src/cmp.c:43 +#: src/cmp.c:44 msgid "Torbjorn Granlund" msgstr "Torbjörn Granlund" #. This is a proper name. See the gettext manual, section Names. -#: src/cmp.c:44 +#: src/cmp.c:45 msgid "David MacKenzie" msgstr "David MacKenzie" -#: src/cmp.c:118 src/diff.c:875 src/diff3.c:459 src/sdiff.c:158 +#: src/cmp.c:119 src/diff.c:877 src/diff3.c:462 src/sdiff.c:159 #, c-format msgid "Try '%s --help' for more information." -msgstr "Prøv '%s --help' for mere information." +msgstr "Prøv \"%s --help\" for mere information." #: src/cmp.c:137 #, c-format msgid "invalid --ignore-initial value '%s'" -msgstr "ugyldig værdi '%s' for --ignore-initial" +msgstr "ugyldig værdi \"%s\" for --ignore-initial" #: src/cmp.c:147 #, c-format msgid "options -l and -s are incompatible" msgstr "tilvalgene -l og -s er inkompatible" -#: src/cmp.c:155 src/diff.c:884 src/diff3.c:467 src/sdiff.c:167 src/sdiff.c:315 -#: src/sdiff.c:322 src/sdiff.c:874 src/util.c:853 src/util.c:953 src/util.c:960 +#: src/cmp.c:155 src/diff.c:885 src/diff3.c:469 src/sdiff.c:167 src/sdiff.c:315 +#: src/sdiff.c:322 src/sdiff.c:874 src/util.c:852 src/util.c:952 src/util.c:959 msgid "write failed" msgstr "skrivning mislykkedes" -#: src/cmp.c:157 src/diff.c:886 src/diff.c:1465 src/diff3.c:469 src/sdiff.c:169 +#: src/cmp.c:157 src/diff.c:887 src/diff.c:1466 src/diff3.c:471 src/sdiff.c:169 msgid "standard output" msgstr "standard-ud" @@ -629,7 +600,7 @@ msgstr "" "De valgfri SPRING1 og SPRING2 angiver antallet af byte, der skal springes\n" "over ved begyndelsen af hver fil (normalt 0)." -#: src/cmp.c:185 src/diff.c:996 src/diff3.c:507 src/sdiff.c:210 +#: src/cmp.c:185 src/diff.c:997 src/diff3.c:509 src/sdiff.c:210 msgid "" "Mandatory arguments to long options are mandatory for short options too.\n" msgstr "" @@ -648,9 +619,9 @@ msgstr "" #: src/cmp.c:194 msgid "If a FILE is '-' or missing, read standard input." -msgstr "SÃ¥fremt en FIL er '-' eller mangler, læses fra standard-ind." +msgstr "SÃ¥fremt en FIL er \"-\" eller mangler, læses fra standard-ind." -#: src/cmp.c:195 src/diff.c:984 src/sdiff.c:220 +#: src/cmp.c:195 src/diff.c:985 src/sdiff.c:220 msgid "Exit status is 0 if inputs are the same, 1 if different, 2 if trouble." msgstr "" "Slutstatus er 0 hvis inddata er ens, 1 hvis ikke, og 2 hvis der er problemer." @@ -658,113 +629,128 @@ msgstr "" #: src/cmp.c:240 #, c-format msgid "invalid --bytes value '%s'" -msgstr "ugyldig værdi '%s' for --bytes" +msgstr "ugyldig værdi \"%s\" for --bytes" -#: src/cmp.c:266 src/diff.c:793 src/diff3.c:353 src/sdiff.c:565 +#: src/cmp.c:266 src/diff.c:795 src/diff3.c:356 src/sdiff.c:565 #, c-format msgid "missing operand after '%s'" -msgstr "manglende operand efter '%s'" +msgstr "manglende operand efter \"%s\"" -#: src/cmp.c:278 src/diff.c:795 src/diff3.c:355 src/sdiff.c:567 +#: src/cmp.c:278 src/diff.c:797 src/diff3.c:358 src/sdiff.c:567 #, c-format msgid "extra operand '%s'" -msgstr "ekstra operand '%s'" +msgstr "ekstra operand \"%s\"" -#: src/cmp.c:494 +#: src/cmp.c:498 #, c-format msgid "%s %s differ: byte %s, line %s\n" msgstr "%s %s afviger: byte %s, linje %s\n" -#: src/cmp.c:510 +#: src/cmp.c:514 #, c-format msgid "%s %s differ: byte %s, line %s is %3o %s %3o %s\n" msgstr "%s %s afviger: tegn %s, linje %s er %3o %s %3o %s\n" -#: src/cmp.c:562 -#, c-format -msgid "cmp: EOF on %s\n" +#: src/cmp.c:571 +#, fuzzy, c-format +msgid "cmp: EOF on %s which is empty\n" +msgstr "cmp: filafslutning pÃ¥ %s\n" + +#: src/cmp.c:585 +#, fuzzy, c-format +msgid "cmp: EOF on %s after byte %s, line %s\n" +msgstr "%s %s afviger: byte %s, linje %s\n" + +#: src/cmp.c:586 +#, fuzzy, c-format +msgid "cmp: EOF on %s after byte %s, in line %s\n" +msgstr "%s %s afviger: byte %s, linje %s\n" + +#: src/cmp.c:592 +#, fuzzy, c-format +msgid "cmp: EOF on %s after byte %s\n" msgstr "cmp: filafslutning pÃ¥ %s\n" #. This is a proper name. See the gettext manual, section Names. -#: src/diff.c:49 +#: src/diff.c:50 msgid "Paul Eggert" msgstr "Paul Eggert" #. This is a proper name. See the gettext manual, section Names. -#: src/diff.c:50 +#: src/diff.c:51 msgid "Mike Haertel" msgstr "Mike Haertel" #. This is a proper name. See the gettext manual, section Names. -#: src/diff.c:51 +#: src/diff.c:52 msgid "David Hayes" msgstr "David Hayes" #. This is a proper name. See the gettext manual, section Names. -#: src/diff.c:52 +#: src/diff.c:53 msgid "Richard Stallman" msgstr "Richard Stallman" #. This is a proper name. See the gettext manual, section Names. -#: src/diff.c:53 +#: src/diff.c:54 msgid "Len Tower" msgstr "Len Tower" -#: src/diff.c:351 +#: src/diff.c:353 #, c-format msgid "invalid context length '%s'" -msgstr "ugyldig kontekstlængde '%s'" +msgstr "ugyldig kontekstlængde \"%s\"" -#: src/diff.c:434 +#: src/diff.c:436 #, c-format msgid "pagination not supported on this host" msgstr "paginering understøttes ikke af denne vært" -#: src/diff.c:449 src/diff3.c:335 +#: src/diff.c:451 src/diff3.c:336 #, c-format msgid "too many file label options" msgstr "for mange fil-mærke tilvalg" -#: src/diff.c:526 +#: src/diff.c:528 #, c-format msgid "invalid width '%s'" -msgstr "ugyldig bredde '%s'" +msgstr "ugyldig bredde \"%s\"" -#: src/diff.c:530 +#: src/diff.c:532 msgid "conflicting width options" msgstr "modstridende breddeangivelser" -#: src/diff.c:555 +#: src/diff.c:557 #, c-format msgid "invalid horizon length '%s'" -msgstr "ugyldig horisontlængde '%s'" +msgstr "ugyldig horisontlængde \"%s\"" -#: src/diff.c:611 +#: src/diff.c:613 #, c-format msgid "invalid tabsize '%s'" -msgstr "ugyldig tabulatorbredde '%s'" +msgstr "ugyldig tabulatorbredde \"%s\"" -#: src/diff.c:615 +#: src/diff.c:617 msgid "conflicting tabsize options" msgstr "modstridende angivelser af tabulatorbredde" -#: src/diff.c:770 +#: src/diff.c:772 msgid "--from-file and --to-file both specified" msgstr "bÃ¥de --from-file og --to-file er angivet" -#: src/diff.c:890 +#: src/diff.c:891 msgid " --normal output a normal diff (the default)" msgstr " --normal udskriv en almindelig diff (forvalg)" -#: src/diff.c:891 +#: src/diff.c:892 msgid "-q, --brief report only when files differ" msgstr "-q, --brief angiv kun nÃ¥r filerne er forskellige" -#: src/diff.c:892 +#: src/diff.c:893 msgid "-s, --report-identical-files report when two files are the same" msgstr "-s, --report-identical-files rapportér hvis to filer er ens" -#: src/diff.c:893 +#: src/diff.c:894 msgid "" "-c, -C NUM, --context[=NUM] output NUM (default 3) lines of copied context" msgstr "" @@ -772,140 +758,139 @@ msgstr "" "kopieret\n" " kontekst" -#: src/diff.c:894 +#: src/diff.c:895 msgid "" "-u, -U NUM, --unified[=NUM] output NUM (default 3) lines of unified context" msgstr "" "-u, -U ANTAL, --unified[=ANTAL] Udskriv højst ANTAL (normalt 3) linjer\n" " forenet kontekst" -#: src/diff.c:895 +#: src/diff.c:896 msgid "-e, --ed output an ed script" msgstr "-e, --ed udskriv et ed-script" -#: src/diff.c:896 +#: src/diff.c:897 msgid "-n, --rcs output an RCS format diff" msgstr "-n, --rcs udskriv en diff i RCS-format" -#: src/diff.c:897 +#: src/diff.c:898 msgid "-y, --side-by-side output in two columns" msgstr "-y, --side-by-side udskriv i to kolonner" -#: src/diff.c:898 +#: src/diff.c:899 msgid "" "-W, --width=NUM output at most NUM (default 130) print columns" msgstr "" "-W, --width=ANTAL udskriv højst ANTAL (normalt 130) kolonner" -#: src/diff.c:899 +#: src/diff.c:900 msgid "" " --left-column output only the left column of common lines" msgstr "" " --left-column udskriv kun venstre kolonne i fælles linjer" -#: src/diff.c:900 +#: src/diff.c:901 msgid " --suppress-common-lines do not output common lines" msgstr " --suppress-common-lines udskriv ikke fælles linjer" -#: src/diff.c:902 +#: src/diff.c:903 msgid "-p, --show-c-function show which C function each change is in" msgstr "-p, --show-c-function vis hvilken C-funktion hver ændring er i" -#: src/diff.c:903 +#: src/diff.c:904 msgid "-F, --show-function-line=RE show the most recent line matching RE" msgstr "-F, --show-function-line=RE vis den seneste linje der matcher RE" -#: src/diff.c:904 -#, fuzzy +#: src/diff.c:905 msgid "" " --label LABEL use LABEL instead of file name and timestamp\n" " (can be repeated)" msgstr "" -" --label MÆRKAT brug MÆRKAT frem for filnavn\n" +" --label MÆRKAT brug MÆRKAT frem for filnavn og tidsstempel\n" " (kan gentages)" -#: src/diff.c:907 +#: src/diff.c:908 msgid "-t, --expand-tabs expand tabs to spaces in output" msgstr "" "-t, --expand-tabs lav tabulatorer om til mellemrum i udskrift" -#: src/diff.c:908 +#: src/diff.c:909 msgid "-T, --initial-tab make tabs line up by prepending a tab" msgstr "" "-T, --initial-tab fÃ¥ tabulatorer pÃ¥ linje ved at forudstille en\n" " tabulator" -#: src/diff.c:909 +#: src/diff.c:910 msgid "" " --tabsize=NUM tab stops every NUM (default 8) print columns" msgstr "" " --tabsize=ANTAL tabulatorstop for hver ANTAL (normalt 8) " "kolonner" -#: src/diff.c:910 +#: src/diff.c:911 msgid "" " --suppress-blank-empty suppress space or tab before empty output lines" msgstr "" " --suppress-blank-empty intet mellemrum eller tabulator før tomme\n" " ud-linjer" -#: src/diff.c:911 +#: src/diff.c:912 msgid "-l, --paginate pass output through 'pr' to paginate it" msgstr "" -"-l, --paginate led uddata gennem 'pr' for at sideinddele det" +"-l, --paginate led uddata gennem \"pr\" for at sideinddele det" -#: src/diff.c:913 +#: src/diff.c:914 msgid "" "-r, --recursive recursively compare any subdirectories found" msgstr "" "-r, --recursive sammenlign alle fundne underkataloger " "rekursivt" -#: src/diff.c:914 +#: src/diff.c:915 msgid " --no-dereference don't follow symbolic links" msgstr " --no-dereference følg ikke symbolske lænker" -#: src/diff.c:915 +#: src/diff.c:916 msgid "-N, --new-file treat absent files as empty" msgstr "" "-N, --new-file behandl manglende filer som var de tomme" -#: src/diff.c:916 +#: src/diff.c:917 msgid " --unidirectional-new-file treat absent first files as empty" msgstr "" " --unidirectional-new-file behandl manglende førstefiler som var de " "tomme" -#: src/diff.c:917 +#: src/diff.c:918 msgid " --ignore-file-name-case ignore case when comparing file names" msgstr "" " --ignore-file-name-case ingen forskel pÃ¥ store og smÃ¥ bogstaver ved\n" " sammenligning af filnavne" -#: src/diff.c:918 +#: src/diff.c:919 msgid " --no-ignore-file-name-case consider case when comparing file names" msgstr "" " --no-ignore-file-name-case skeln mellem store og smÃ¥ bogstaver ved\n" " sammenligning af filnavne" -#: src/diff.c:919 +#: src/diff.c:920 msgid "-x, --exclude=PAT exclude files that match PAT" msgstr "-x, --exclude=MØNSTER udelad filer, det matcher MØNSTER" -#: src/diff.c:920 +#: src/diff.c:921 msgid "" "-X, --exclude-from=FILE exclude files that match any pattern in FILE" msgstr "" "-X, --exclude-from=FIL udelad filer, der matcher ethvert mønster i " "FIL" -#: src/diff.c:921 +#: src/diff.c:922 msgid "" "-S, --starting-file=FILE start with FILE when comparing directories" msgstr "" "-S, --starting-file=FIL start med FIL, nÃ¥r der sammenlignes kataloger" -#: src/diff.c:922 +#: src/diff.c:923 msgid "" " --from-file=FILE1 compare FILE1 to all operands;\n" " FILE1 can be a directory" @@ -913,7 +898,7 @@ msgstr "" " --from-file=FIL1 sammenlign FIL1 med alle operander; FIL1 mÃ¥\n" " godt være et katalog" -#: src/diff.c:924 +#: src/diff.c:925 msgid "" " --to-file=FILE2 compare all operands to FILE2;\n" " FILE2 can be a directory" @@ -922,74 +907,75 @@ msgstr "" "mÃ¥\n" " godt være et katalog" -#: src/diff.c:927 +#: src/diff.c:928 msgid "" "-i, --ignore-case ignore case differences in file contents" msgstr "-i, --ignore-case ignorér versalforskelle i filindhold" -#: src/diff.c:928 +#: src/diff.c:929 msgid "-E, --ignore-tab-expansion ignore changes due to tab expansion" msgstr "" "-E, --ignore-tab-expansion ignorér ændringer der skyldes\n" " tabulatoromsætning" -#: src/diff.c:929 +#: src/diff.c:930 msgid "-Z, --ignore-trailing-space ignore white space at line end" msgstr "" "-Z, --ignore-trailing-space ignorér blanke tegn ved linjens afslutning" -#: src/diff.c:930 +#: src/diff.c:931 msgid "" "-b, --ignore-space-change ignore changes in the amount of white space" msgstr "" "-b, --ignore-space-change ignorér ændringer i mængden af blanke tegn" -#: src/diff.c:931 +#: src/diff.c:932 msgid "-w, --ignore-all-space ignore all white space" msgstr "-w, --ignore-all-space ignorér alle blanke tegn" -#: src/diff.c:932 +#: src/diff.c:933 msgid "" "-B, --ignore-blank-lines ignore changes where lines are all blank" msgstr "-B, --ignore-blank-lines ignorér ændringer med kun tomme linjer" -#: src/diff.c:933 +#: src/diff.c:934 msgid "-I, --ignore-matching-lines=RE ignore changes where all lines match RE" msgstr "" "-I, --ignore-matching-lines=MØNSTER ignorér ændringer, hvis linjer alle\n" " matcher MØNSTER" -#: src/diff.c:935 +#: src/diff.c:936 msgid "-a, --text treat all files as text" msgstr "-a, --text behandl alle filer som tekst" -#: src/diff.c:936 +#: src/diff.c:937 msgid " --strip-trailing-cr strip trailing carriage return on input" msgstr " --strip-trailing-cr fjern afsluttende vognretur i inddata" -#: src/diff.c:938 +#: src/diff.c:939 msgid " --binary read and write data in binary mode" msgstr " --binary læs og skriv data binært" -#: src/diff.c:941 +#: src/diff.c:942 msgid "" "-D, --ifdef=NAME output merged file with '#ifdef NAME' diffs" msgstr "" -"-D, --ifdef=NAVN udskriv flettet fil med '#ifdef NAVN'-differ" +"-D, --ifdef=NAVN udskriv flettet fil med \"#ifdef NAVN\"-" +"differ" -#: src/diff.c:942 +#: src/diff.c:943 msgid " --GTYPE-group-format=GFMT format GTYPE input groups with GFMT" msgstr " --GTYPE-group-format=GFMT formatér GTYPE-inputgrupper med GFMT" -#: src/diff.c:943 +#: src/diff.c:944 msgid " --line-format=LFMT format all input lines with LFMT" msgstr " --line-format=LFMT formatér alle inputlinjer med LFMT" -#: src/diff.c:944 +#: src/diff.c:945 msgid " --LTYPE-line-format=LFMT format LTYPE input lines with LFMT" msgstr " --LTYPE-line-format=LFMT formatér LTYPE-inputlinjer med LFMT" -#: src/diff.c:945 +#: src/diff.c:946 msgid "" " These format options provide fine-grained control over the output\n" " of diff, generalizing -D/--ifdef." @@ -997,15 +983,15 @@ msgstr "" " Disse formattilvalg giver finkontrol over udskriften af diff, og\n" " generaliserer -D/--ifdef." -#: src/diff.c:947 +#: src/diff.c:948 msgid " LTYPE is 'old', 'new', or 'unchanged'. GTYPE is LTYPE or 'changed'." msgstr "" -" LTYPE er 'old' (gammel), 'new' (ny) eller 'unchanged' (uændret).\n" -" GTYPE er LTYPE eller 'changed' (ændret)." +" LTYPE er \"old\" (gammel), \"new\" (ny) eller \"unchanged\" (uændret).\n" +" GTYPE er LTYPE eller \"changed\" (ændret)." # hvad er PREC? Det stÃ¥r ingen steder i filen. PRÆC blev brugt i tidligere # oversættelse, sÃ¥ beholder. -Ask -#: src/diff.c:948 +#: src/diff.c:949 msgid "" " GFMT (only) may contain:\n" " %< lines from FILE1\n" @@ -1035,7 +1021,7 @@ msgstr "" " M L+1\n" " %(A=B?T:E) hvis A lig med B sÃ¥ T, ellers E" -#: src/diff.c:960 +#: src/diff.c:961 msgid "" " LFMT (only) may contain:\n" " %L contents of line\n" @@ -1047,7 +1033,7 @@ msgstr "" " %l indhold af linje, undtagen eventuelt følgende linjeskift\n" " %[-][BREDDE][.[PRÆC]]{doxX}n printf-angivelse for inputlinjenummer" -#: src/diff.c:964 +#: src/diff.c:965 msgid "" " Both GFMT and LFMT may contain:\n" " %% %\n" @@ -1061,153 +1047,152 @@ msgstr "" " %c'\\OOO' tegnet med oktalkode OOO\n" " C tegnet C (andre tegn repræsenterer sig selv)" -#: src/diff.c:970 +#: src/diff.c:971 msgid "-d, --minimal try hard to find a smaller set of changes" msgstr "" "-d, --minimal grundigt forsøg pÃ¥ at finde et mindre antal " "ændringer" -#: src/diff.c:971 +#: src/diff.c:972 msgid " --horizon-lines=NUM keep NUM lines of the common prefix and suffix" msgstr "" " --horizon-lines=ANTAL behold ANTAL linjer af fælles præfiks og suffiks" -#: src/diff.c:972 +#: src/diff.c:973 msgid "" " --speed-large-files assume large files and many scattered small changes" msgstr "" " --speed-large-files antag store filer og mange spredte, smÃ¥ ændringer" -#: src/diff.c:973 -msgid "" -" --color[=WHEN] colorize the output; WHEN can be 'never', 'always'," -msgstr "" - #: src/diff.c:974 #, fuzzy -msgid " or 'auto' (the default)" -msgstr " --normal udskriv en almindelig diff (forvalg)" - -#: src/diff.c:975 msgid "" -" --palette=PALETTE specify the colors to use when --color is active" +" --color[=WHEN] colorize the output; WHEN can be 'never', " +"'always',\n" +" or 'auto' (the default)" msgstr "" +" --color[=HVORNÃ…R] farv udskriften; HVORNÃ…R kan være \"never\", " +"\"always\"" +# ikke direkte oversat men det mÃ¥ være ok #: src/diff.c:976 +#, fuzzy msgid "" -" PALETTE is a colon-separated list terminfo " -"capabilities" +" --palette=PALETTE the colors to use when --color is active; PALETTE " +"is\n" +" a colon-separated list of terminfo capabilities" msgstr "" +" PALET er en kolon-adskilt liste af terminfo-" +"egenskaber" -#: src/diff.c:978 +#: src/diff.c:979 msgid " --help display this help and exit" msgstr " --help vis denne hjælpetekst og afslut" -#: src/diff.c:979 +#: src/diff.c:980 msgid "-v, --version output version information and exit" msgstr "-v, --version vis versionsoplysninger og afslut" -#: src/diff.c:981 -#, fuzzy +#: src/diff.c:982 msgid "FILES are 'FILE1 FILE2' or 'DIR1 DIR2' or 'DIR FILE' or 'FILE DIR'." msgstr "" -"FILER er 'FIL1 FIL2' eller 'KATALOG1 KATALOG2' eller 'KATALOG FIL...' eller " -"'FIL... KATALOG'." +"FILER er \"FIL1 FIL2\" eller \"KATALOG1 KATALOG2\" eller \"KATALOG FIL\" " +"eller \"FIL KATALOG\"." -#: src/diff.c:982 +#: src/diff.c:983 msgid "" "If --from-file or --to-file is given, there are no restrictions on FILE(s)." msgstr "" "Hvis --from-file eller --to-file er givet, er der ingen restriktioner pÃ¥ " "FILer." -#: src/diff.c:983 src/diff3.c:526 src/sdiff.c:219 +#: src/diff.c:984 src/diff3.c:528 src/sdiff.c:219 msgid "If a FILE is '-', read standard input." -msgstr "SÃ¥fremt en FIL er '-', læses fra standard-ind." +msgstr "SÃ¥fremt en FIL er \"-\", læses fra standard-ind." -#: src/diff.c:993 +#: src/diff.c:994 #, c-format msgid "Usage: %s [OPTION]... FILES\n" msgstr "Brug: %s [TILVALG]... FILER\n" -#: src/diff.c:994 +#: src/diff.c:995 msgid "Compare FILES line by line." msgstr "Sammenlign filer linjevis." -#: src/diff.c:1028 +#: src/diff.c:1029 #, c-format msgid "conflicting %s option value '%s'" -msgstr "modstridende værdi for %s-tilvalget: '%s'" +msgstr "modstridende værdi for %s-tilvalget: \"%s\"" -#: src/diff.c:1041 +#: src/diff.c:1042 #, c-format msgid "conflicting output style options" msgstr "modstridende valg af uddata-stil" -#: src/diff.c:1057 -#, fuzzy, c-format +#: src/diff.c:1058 +#, c-format msgid "invalid color '%s'" -msgstr "ugyldig bredde '%s'" +msgstr "ugyldig farve \"%s\"" -#: src/diff.c:1113 src/diff.c:1323 +#: src/diff.c:1114 src/diff.c:1324 #, c-format msgid "Only in %s: %s\n" msgstr "Kun i %s: %s\n" -#: src/diff.c:1247 +#: src/diff.c:1248 msgid "cannot compare '-' to a directory" -msgstr "kan ikke sammenligne '-' med et katalog" +msgstr "kan ikke sammenligne \"-\" med et katalog" -#: src/diff.c:1282 +#: src/diff.c:1283 msgid "-D option not supported with directories" msgstr "-D tilvalg understøttes ikke for kataloger" -#: src/diff.c:1291 +#: src/diff.c:1292 #, c-format msgid "Common subdirectories: %s and %s\n" msgstr "Identiske underkataloger: %s og %s\n" -#: src/diff.c:1333 src/diff.c:1383 +#: src/diff.c:1334 src/diff.c:1384 #, c-format msgid "File %s is a %s while file %s is a %s\n" msgstr "Filen %s er en %s mens filen %s er en %s\n" -#: src/diff.c:1369 +#: src/diff.c:1370 #, c-format msgid "Symbolic links %s and %s differ\n" msgstr "De symbolske lænker %s og %s er forskellige\n" -#: src/diff.c:1456 +#: src/diff.c:1457 #, c-format msgid "Files %s and %s are identical\n" msgstr "Filerne %s og %s er identiske\n" #. This is a proper name. See the gettext manual, section Names. -#: src/diff3.c:41 +#: src/diff3.c:42 msgid "Randy Smith" msgstr "Randy Smith" -#: src/diff3.c:348 +#: src/diff3.c:351 #, c-format msgid "incompatible options" msgstr "inkompatible tilvalg" -#: src/diff3.c:388 +#: src/diff3.c:391 msgid "'-' specified for more than one input file" -msgstr "'-' angivet for mere end én ind-fil" +msgstr "\"-\" angivet for mere end én ind-fil" -#: src/diff3.c:439 src/diff3.c:1288 src/diff3.c:1692 src/diff3.c:1747 +#: src/diff3.c:442 src/diff3.c:1290 src/diff3.c:1693 src/diff3.c:1748 #: src/sdiff.c:307 src/sdiff.c:844 src/sdiff.c:855 msgid "read failed" msgstr "læsning mislykkedes" -#: src/diff3.c:473 +#: src/diff3.c:475 msgid "-A, --show-all output all changes, bracketing conflicts" msgstr "" "-A, --show-all udskriv alle ændringer, med konflikter i " "parenteser" -#: src/diff3.c:475 +#: src/diff3.c:477 msgid "" "-e, --ed output ed script incorporating changes\n" " from OLDFILE to YOURFILE into MYFILE" @@ -1215,11 +1200,11 @@ msgstr "" "-e, --ed udskriv et ed-script som udfører ændringerne\n" " fra GAMMELFIL til DINFIL ind i MINFIL" -#: src/diff3.c:477 +#: src/diff3.c:479 msgid "-E, --show-overlap like -e, but bracket conflicts" msgstr "-E, --show-overlap som -e, men sæt konflikter i parentes" -#: src/diff3.c:478 +#: src/diff3.c:480 msgid "" "-3, --easy-only like -e, but incorporate only nonoverlapping " "changes" @@ -1227,21 +1212,22 @@ msgstr "" "-3, --easy-only som -e, men inkludér kun ikke-overlappende " "ændringer" -#: src/diff3.c:479 +#: src/diff3.c:481 msgid "" "-x, --overlap-only like -e, but incorporate only overlapping changes" msgstr "" "-x, --overlap-only som -e, men inkludér kun overlappende ændringer" -#: src/diff3.c:480 +#: src/diff3.c:482 msgid "-X like -x, but bracket conflicts" msgstr "-X som -x, men sæt konflikter i parenteser" -#: src/diff3.c:481 +#: src/diff3.c:483 msgid "-i append 'w' and 'q' commands to ed scripts" -msgstr "-i tilføj 'w' og 'q'-kommandoer til ed-script" +msgstr "" +"-i tilføj \"w\" og \"q\"-kommandoer til ed-script" -#: src/diff3.c:483 +#: src/diff3.c:485 msgid "" "-m, --merge output actual merged file, according to\n" " -A if no other options are given" @@ -1249,25 +1235,25 @@ msgstr "" "-m, --merge udskriv faktisk flettet fil ifølge -A\n" " hvis ingen andre tilvalg er givet" -#: src/diff3.c:486 +#: src/diff3.c:488 msgid "-a, --text treat all files as text" msgstr "-a, --text behandl alle filer som tekst" -#: src/diff3.c:487 +#: src/diff3.c:489 msgid " --strip-trailing-cr strip trailing carriage return on input" msgstr " --strip-trailing-cr fjern afsluttende vognretur i inddata" -#: src/diff3.c:488 +#: src/diff3.c:490 msgid "-T, --initial-tab make tabs line up by prepending a tab" msgstr "" "-T, --initial-tab fÃ¥ tabulatorer pÃ¥ linje ved at forudstille\n" " en tabulator" -#: src/diff3.c:489 +#: src/diff3.c:491 msgid " --diff-program=PROGRAM use PROGRAM to compare files" msgstr " --diff-program=PROGRAM brug PROGRAM til at sammenligne filerne" -#: src/diff3.c:490 +#: src/diff3.c:492 msgid "" "-L, --label=LABEL use LABEL instead of file name\n" " (can be repeated up to three times)" @@ -1275,24 +1261,24 @@ msgstr "" "-L, --label=MÆRKAT brug MÆRKAT frem for filnavn\n" " (kan gentages op til tre gange)" -#: src/diff3.c:493 +#: src/diff3.c:495 msgid " --help display this help and exit" msgstr " --help vis denne hjælpetekst og afslut" -#: src/diff3.c:494 +#: src/diff3.c:496 msgid "-v, --version output version information and exit" msgstr "-v, --version vis versionsoplysninger og afslut" -#: src/diff3.c:503 +#: src/diff3.c:505 #, c-format msgid "Usage: %s [OPTION]... MYFILE OLDFILE YOURFILE\n" msgstr "Brug: %s [TILVALG]... MINFIL GAMMELFIL DINFIL\n" -#: src/diff3.c:505 +#: src/diff3.c:507 msgid "Compare three files line by line." msgstr "Sammenlign tre filer linje for linje." -#: src/diff3.c:515 +#: src/diff3.c:517 msgid "" "\n" "The default output format is a somewhat human-readable representation of\n" @@ -1318,54 +1304,54 @@ msgstr "" "end\n" "med ed.\n" -#: src/diff3.c:527 +#: src/diff3.c:529 msgid "Exit status is 0 if successful, 1 if conflicts, 2 if trouble." msgstr "" "Slutstatus er 0 hvis succes, 1 hvis der er konflikter, 2 hvis der er " "problemer." -#: src/diff3.c:720 +#: src/diff3.c:722 msgid "internal error: screwup in format of diff blocks" msgstr "intern fejl: rod i formatet pÃ¥ diff blokke" -#: src/diff3.c:1015 +#: src/diff3.c:1017 #, c-format msgid "%s: diff failed: " msgstr "%s: diff fejlede: " -#: src/diff3.c:1037 +#: src/diff3.c:1039 msgid "internal error: invalid diff type in process_diff" msgstr "intern fejl: ugyldig diff type i process_diff" -#: src/diff3.c:1062 +#: src/diff3.c:1064 msgid "invalid diff format; invalid change separator" msgstr "ugyldigt diff format; ugyldig ændrings-separator" -#: src/diff3.c:1298 +#: src/diff3.c:1300 msgid "invalid diff format; incomplete last line" msgstr "ugyldigt diff format; uafsluttet sidste linje" -#: src/diff3.c:1322 src/sdiff.c:275 src/util.c:970 +#: src/diff3.c:1324 src/sdiff.c:275 src/util.c:969 #, c-format msgid "subsidiary program '%s' could not be invoked" -msgstr "hjælpeprogrammet '%s' kunne ikke køres" +msgstr "hjælpeprogrammet \"%s\" kunne ikke køres" -#: src/diff3.c:1347 +#: src/diff3.c:1349 msgid "invalid diff format; incorrect leading line chars" msgstr "ugyldigt diff format; forkerte linje-begyndelses-tegn" -#: src/diff3.c:1420 +#: src/diff3.c:1422 msgid "internal error: invalid diff type passed to output" msgstr "intern fejl: ugyldig diff type sendt til uddata" -#: src/diff3.c:1694 src/diff3.c:1751 +#: src/diff3.c:1695 src/diff3.c:1752 msgid "input file shrank" msgstr "ind-fil formindskedes" #: src/dir.c:156 #, c-format msgid "cannot compare file names '%s' and '%s'" -msgstr "kan ikke sammenligne filnavnene '%s' og '%s'" +msgstr "kan ikke sammenligne filnavnene \"%s\" og \"%s\"" #: src/dir.c:225 #, c-format @@ -1373,7 +1359,7 @@ msgid "%s: recursive directory loop" msgstr "%s: rekursiv katalogløkke" #. This is a proper name. See the gettext manual, section Names. -#: src/sdiff.c:42 +#: src/sdiff.c:43 msgid "Thomas Lord" msgstr "Thomas Lord" @@ -1520,15 +1506,38 @@ msgstr "" "v:\tMedtag og vis fælles linjer.\n" "q:\tAfslut.\n" -#: src/util.c:663 -#, fuzzy, c-format +#: src/util.c:662 +#, c-format msgid "unrecognized prefix: %s" -msgstr "%s: ukendt tilvalg '--%s'\n" +msgstr "ukendt præfiks: %s" -#: src/util.c:693 +#: src/util.c:692 #, c-format msgid "unparsable value for --palette" -msgstr "" +msgstr "værdi for --palette kan ikke fortolkes" + +#~ msgid " or 'auto' (the default)" +#~ msgstr " eller \"auto\" (standard)" + +#~ msgid "" +#~ " --palette=PALETTE specify the colors to use when --color is active" +#~ msgstr "" +#~ " --palette=PALET angiv farverne, der skal bruges givet --color" + +#~ msgid "%s: option '--%s' doesn't allow an argument\n" +#~ msgstr "%s: tilvalget \"--%s\" tillader ikke et argument\n" + +#~ msgid "%s: unrecognized option '--%s'\n" +#~ msgstr "%s: ukendt tilvalg \"--%s\"\n" + +#~ msgid "%s: option '-W %s' is ambiguous\n" +#~ msgstr "%s: tilvalget \"-W %s\" er flertydigt\n" + +#~ msgid "%s: option '-W %s' doesn't allow an argument\n" +#~ msgstr "%s: tilvalget \"-W %s\" tillader ikke et argument\n" + +#~ msgid "%s: option '-W %s' requires an argument\n" +#~ msgstr "%s: tilvalget \"-W %s\" tillader ikke et argument\n" #~ msgid "-i SKIP1:SKIP2 --ignore-initial=SKIP1:SKIP2" #~ msgstr "-i SPRING1:SPRING2 --ignore-initial=SPRING1:SPRING2" @@ -1588,15 +1597,3 @@ msgstr "" #~ msgstr "" #~ "Skrevet af Paul Eggert, Mike Haertel, David Hayes,\n" #~ "Richard Stallman og Len Tower." - -#~ msgid "`-%ld' option is obsolete; use `-%c %ld'" -#~ msgstr "Tilvalget '-%ld' er forældet; benyt '-%c %ld'" - -#~ msgid "`-%ld' option is obsolete; omit it" -#~ msgstr "Tilvalget '-%ld' er forældet; udelad det" - -#~ msgid "subsidiary program `%s' not executable" -#~ msgstr "hjælpeprogram '%s' er ikke eksekverbart" - -#~ msgid "subsidiary program `%s' failed" -#~ msgstr "hjælpeprogram '%s' fejlede" Binary files differ@@ -5,46 +5,46 @@ # Martin von Löwis <martin@v.loewis.de>, 1997, 2001, 2002 # Jakob Kramer <jakob.kramer@gmx.de>, 2012, 2013. # Benno Schulenberg <bensberg@justemail.net>, 2013. -# Mario Blättermann <mario.blaettermann@gmail.com>, 2014. +# Mario Blättermann <mario.blaettermann@gmail.com>, 2014, 2017. # msgid "" msgstr "" -"Project-Id-Version: GNU diffutils 3.3-pre1\n" +"Project-Id-Version: GNU diffutils 3.5.25\n" "Report-Msgid-Bugs-To: bug-diffutils@gnu.org\n" -"POT-Creation-Date: 2016-08-20 22:22-0700\n" -"PO-Revision-Date: 2014-04-20 20:43+0100\n" +"POT-Creation-Date: 2017-05-21 13:26-0700\n" +"PO-Revision-Date: 2017-05-11 10:57+0200\n" "Last-Translator: Mario Blättermann <mario.blaettermann@gmail.com>\n" "Language-Team: German <translation-team-de@lists.sourceforge.net>\n" "Language: de\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: Poedit 1.5.4\n" +"X-Bugs: Report translation errors to the Language-Team address.\n" +"X-Generator: Poedit 1.8.12\n" -#: lib/argmatch.c:133 -#, fuzzy, c-format +#: lib/argmatch.c:134 +#, c-format msgid "invalid argument %s for %s" -msgstr "ungültiges %s%s-Argument »%s«" +msgstr "ungültiges Argument %s für %s" -#: lib/argmatch.c:134 +#: lib/argmatch.c:135 #, c-format msgid "ambiguous argument %s for %s" -msgstr "" +msgstr "Argument %s für %s ist mehrdeutig" -#: lib/argmatch.c:153 -#, fuzzy +#: lib/argmatch.c:154 msgid "Valid arguments are:" -msgstr "ungültiges %s%s-Argument »%s«" +msgstr "Gültige Argumente sind:" -#: lib/c-stack.c:204 lib/c-stack.c:297 +#: lib/c-stack.c:203 lib/c-stack.c:296 msgid "program error" msgstr "Programmfehler" -#: lib/c-stack.c:205 lib/c-stack.c:298 +#: lib/c-stack.c:204 lib/c-stack.c:297 msgid "stack overflow" msgstr "Stacküberlauf" -#: lib/error.c:191 +#: lib/error.c:195 msgid "Unknown system error" msgstr "Unbekannter Systemfehler" @@ -62,7 +62,7 @@ msgstr "Verzeichnis" #: lib/file-type.c:46 msgid "symbolic link" -msgstr "Symbolische Verknüpfung" +msgstr "symbolische Verknüpfung" #: lib/file-type.c:52 msgid "message queue" @@ -82,15 +82,15 @@ msgstr "typisiertes Speicherobjekt" #: lib/file-type.c:66 msgid "block special file" -msgstr "Blockorientiertes Gerät" +msgstr "blockorientiertes Gerät" #: lib/file-type.c:69 msgid "character special file" -msgstr "Zeichenorientiertes Gerät" +msgstr "zeichenorientiertes Gerät" #: lib/file-type.c:72 msgid "contiguous data" -msgstr "" +msgstr "zusammenhängende Daten" #: lib/file-type.c:75 msgid "fifo" @@ -98,43 +98,39 @@ msgstr "FIFO" #: lib/file-type.c:78 msgid "door" -msgstr "" +msgstr "Door" #: lib/file-type.c:81 -#, fuzzy msgid "multiplexed block special file" -msgstr "Blockorientiertes Gerät" +msgstr "blockorientierte Multiplex-Spezialdatei" #: lib/file-type.c:84 -#, fuzzy msgid "multiplexed character special file" -msgstr "Zeichenorientiertes Gerät" +msgstr "zeichenorientierte Multiplex-Spezialdatei" #: lib/file-type.c:87 msgid "multiplexed file" -msgstr "" +msgstr "Multiplex-Datei" #: lib/file-type.c:90 -#, fuzzy msgid "named file" -msgstr "seltsame Datei" +msgstr "benannte Datei" #: lib/file-type.c:93 -#, fuzzy msgid "network special file" -msgstr "Blockorientiertes Gerät" +msgstr "Netzwerk-Spezialdatei" #: lib/file-type.c:96 msgid "migrated file with data" -msgstr "" +msgstr "migrierte Datei mit Daten" #: lib/file-type.c:99 msgid "migrated file without data" -msgstr "" +msgstr "migrierte Datei ohne Daten" #: lib/file-type.c:102 msgid "port" -msgstr "" +msgstr "Port" #: lib/file-type.c:105 msgid "socket" @@ -142,72 +138,47 @@ msgstr "Socket" #: lib/file-type.c:108 msgid "whiteout" -msgstr "" +msgstr "Whiteout" #: lib/file-type.c:110 msgid "weird file" msgstr "seltsame Datei" -#: lib/getopt.c:575 lib/getopt.c:604 +#: lib/getopt.c:278 #, c-format -msgid "%s: option '%s' is ambiguous; possibilities:" -msgstr "%s: Option »%s« ist mehrdeutig, Möglichkeiten:" - -#: lib/getopt.c:619 -#, fuzzy, c-format -msgid "%s: option '%s' is ambiguous\n" -msgstr "%s: Option »-W %s« ist mehrdeutig\n" +msgid "%s: option '%s%s' is ambiguous\n" +msgstr "%s: Option »%s%s« ist mehrdeutig\n" -#: lib/getopt.c:654 lib/getopt.c:658 +#: lib/getopt.c:284 #, c-format -msgid "%s: option '--%s' doesn't allow an argument\n" -msgstr "%s: Option »--%s« erlaubt kein Argument.\n" +msgid "%s: option '%s%s' is ambiguous; possibilities:" +msgstr "%s: Option »%s%s« ist mehrdeutig, Möglichkeiten:" -#: lib/getopt.c:667 lib/getopt.c:672 +#: lib/getopt.c:319 #, c-format -msgid "%s: option '%c%s' doesn't allow an argument\n" -msgstr "%s: Option »%c%s« erlaubt kein Argument.\n" +msgid "%s: unrecognized option '%s%s'\n" +msgstr "%s: Unbekannte Option »%s%s«.\n" -#: lib/getopt.c:715 lib/getopt.c:734 +#: lib/getopt.c:345 #, c-format -msgid "%s: option '--%s' requires an argument\n" -msgstr "%s: Option »%s« verlangt ein Argument.\n" +msgid "%s: option '%s%s' doesn't allow an argument\n" +msgstr "%s: Option »%s%s« erlaubt kein Argument.\n" -#: lib/getopt.c:772 lib/getopt.c:775 +#: lib/getopt.c:360 #, c-format -msgid "%s: unrecognized option '--%s'\n" -msgstr "%s: Unbekannte Option »--%s«.\n" +msgid "%s: option '%s%s' requires an argument\n" +msgstr "%s: Option »%s%s« verlangt ein Argument.\n" -#: lib/getopt.c:783 lib/getopt.c:786 -#, c-format -msgid "%s: unrecognized option '%c%s'\n" -msgstr "%s: Unbekannte Option »%c%s«.\n" - -#: lib/getopt.c:835 lib/getopt.c:838 +#: lib/getopt.c:621 #, c-format msgid "%s: invalid option -- '%c'\n" msgstr "%s: ungültige Option -- »%c«\n" -#: lib/getopt.c:891 lib/getopt.c:908 lib/getopt.c:1118 lib/getopt.c:1136 +#: lib/getopt.c:636 lib/getopt.c:682 #, c-format msgid "%s: option requires an argument -- '%c'\n" msgstr "%s: Option verlangt ein Argument -- »%c«\n" -#: lib/getopt.c:964 lib/getopt.c:980 -#, c-format -msgid "%s: option '-W %s' is ambiguous\n" -msgstr "%s: Option »-W %s« ist mehrdeutig\n" - -#: lib/getopt.c:1004 lib/getopt.c:1022 -#, c-format -msgid "%s: option '-W %s' doesn't allow an argument\n" -msgstr "%s: Option »-W %s« erlaubt kein Argument.\n" - -#: lib/getopt.c:1043 lib/getopt.c:1061 -#, c-format -msgid "%s: option '-W %s' requires an argument\n" -msgstr "%s: Option »-W %s« verlangt ein Argument.\n" - #. TRANSLATORS: #. Get translations for open and closing quotation marks. #. The message catalog should translate "`" to a left @@ -229,11 +200,11 @@ msgstr "%s: Option »-W %s« verlangt ein Argument.\n" #. If you don't know what to put here, please see #. <http://en.wikipedia.org/wiki/Quotation_marks_in_other_languages> #. and use glyphs suitable for your language. -#: lib/quotearg.c:347 +#: lib/quotearg.c:362 msgid "`" msgstr "»" -#: lib/quotearg.c:348 +#: lib/quotearg.c:363 msgid "'" msgstr "«" @@ -259,16 +230,15 @@ msgstr "Ungültiger Name für Zeichenklasse." #: lib/regcomp.c:150 msgid "Trailing backslash" -msgstr "Extra Backslash." +msgstr "Extra Backslash am Ende." #: lib/regcomp.c:153 msgid "Invalid back reference" msgstr "Ungültige Rückreferenz." #: lib/regcomp.c:156 -#, fuzzy msgid "Unmatched [, [^, [:, [., or [=" -msgstr "Öffnende [ oder [^ ohne schließende." +msgstr "Öffnende [, [^, [:, [. oder [= ohne schließende." #: lib/regcomp.c:159 msgid "Unmatched ( or \\(" @@ -343,12 +313,12 @@ msgstr "ungültiges %s%s-Argument »%s«" #: lib/xstrtol-error.c:68 #, c-format msgid "invalid suffix in %s%s argument '%s'" -msgstr "ungültiger Suffix in %s%s Argument »%s«" +msgstr "ungültiges Suffix in %s%s Argument »%s«" #: lib/xstrtol-error.c:72 #, c-format msgid "%s%s argument '%s' too large" -msgstr "%s%s Argument »%s« ist zu groß" +msgstr "%s%s-Argument »%s« ist zu groß" #: lib/version-etc.c:74 #, c-format @@ -527,7 +497,7 @@ msgstr "" "Allgemeine Hilfe zur Benutzung von GNU-Software: <http://www.gnu.org/gethelp/" ">\n" -#: src/analyze.c:454 src/diff.c:1400 +#: src/analyze.c:454 src/diff.c:1401 #, c-format msgid "Files %s and %s differ\n" msgstr "Dateien %s und %s sind verschieden.\n" @@ -537,21 +507,21 @@ msgstr "Dateien %s und %s sind verschieden.\n" msgid "Binary files %s and %s differ\n" msgstr "Binärdateien %s und %s sind verschieden.\n" -#: src/analyze.c:697 src/diff3.c:1463 src/util.c:1255 +#: src/analyze.c:706 src/diff3.c:1465 src/util.c:1254 msgid "No newline at end of file" msgstr "Kein Zeilenumbruch am Dateiende." #. This is a proper name. See the gettext manual, section Names. -#: src/cmp.c:43 +#: src/cmp.c:44 msgid "Torbjorn Granlund" -msgstr "Torbjorn Granlund" +msgstr "Torbjörn Granlund" #. This is a proper name. See the gettext manual, section Names. -#: src/cmp.c:44 +#: src/cmp.c:45 msgid "David MacKenzie" msgstr "David MacKenzie" -#: src/cmp.c:118 src/diff.c:875 src/diff3.c:459 src/sdiff.c:158 +#: src/cmp.c:119 src/diff.c:877 src/diff3.c:462 src/sdiff.c:159 #, c-format msgid "Try '%s --help' for more information." msgstr "»%s --help« gibt Ihnen mehr Informationen." @@ -566,56 +536,56 @@ msgstr "ungültiger --ignore-initial-Wert »%s«." msgid "options -l and -s are incompatible" msgstr "Die Optionen -l und -s sind inkompatibel." -#: src/cmp.c:155 src/diff.c:884 src/diff3.c:467 src/sdiff.c:167 src/sdiff.c:315 -#: src/sdiff.c:322 src/sdiff.c:874 src/util.c:853 src/util.c:953 src/util.c:960 +#: src/cmp.c:155 src/diff.c:885 src/diff3.c:469 src/sdiff.c:167 src/sdiff.c:315 +#: src/sdiff.c:322 src/sdiff.c:874 src/util.c:852 src/util.c:952 src/util.c:959 msgid "write failed" msgstr "Schreibfehler." -#: src/cmp.c:157 src/diff.c:886 src/diff.c:1465 src/diff3.c:469 src/sdiff.c:169 +#: src/cmp.c:157 src/diff.c:887 src/diff.c:1466 src/diff3.c:471 src/sdiff.c:169 msgid "standard output" msgstr "Standardausgabe" #: src/cmp.c:161 msgid "-b, --print-bytes print differing bytes" -msgstr "-b, --print-bytes Unterschiedliche Bytes ausgeben." +msgstr "-b, --print-bytes Unterschiedliche Bytes ausgeben." #: src/cmp.c:162 msgid "-i, --ignore-initial=SKIP skip first SKIP bytes of both inputs" msgstr "" -"-i, --ignore-initial=SKIP Die ersten SKIP Bytes der Eingabe " -"überspringen." +"-i, --ignore-initial=SKIP\n" +" Die ersten SKIP Bytes der Eingabe überspringen." #: src/cmp.c:163 msgid "" "-i, --ignore-initial=SKIP1:SKIP2 skip first SKIP1 bytes of FILE1 and\n" " first SKIP2 bytes of FILE2" msgstr "" -"-i, --ignore-initial=SKIP1:SKIP2 Die ersten SKIP1 Bytes von DATEI1\n" -" und die ersten SKIP2 Bytes von DATEI2 " -"überspringen." +"-i, --ignore-initial=SKIP1:SKIP2\n" +" Die ersten SKIP1 Bytes von DATEI1 und die\n" +" ersten SKIP2 Bytes von DATEI2 überspringen." #: src/cmp.c:165 msgid "" "-l, --verbose output byte numbers and differing byte values" msgstr "" -"-l, --verbose Bytenummern und Werte aller unterschiedlichen " -"Bytes ausgeben." +"-l, --verbose Bytenummern und Werte aller unterschiedlichen\n" +" Bytes ausgeben." #: src/cmp.c:166 msgid "-n, --bytes=LIMIT compare at most LIMIT bytes" -msgstr "-n, --bytes=LIMIT Höchstens LIMIT Bytes vergleichen." +msgstr "-n, --bytes=LIMIT Höchstens LIMIT Bytes vergleichen." #: src/cmp.c:167 msgid "-s, --quiet, --silent suppress all normal output" -msgstr "-s, --quiet, --silent Alle normalen Ausgaben unterdrücken." +msgstr "-s, --quiet, --silent Alle normalen Ausgaben unterdrücken." #: src/cmp.c:168 msgid " --help display this help and exit" -msgstr " --help Diese Hilfe anzeigen und beenden." +msgstr " --help Diese Hilfe anzeigen und beenden." #: src/cmp.c:169 msgid "-v, --version output version information and exit" -msgstr "-v, -version Versionsinformation ausgeben und beenden." +msgstr "-v, -version Versionsinformation ausgeben und beenden." #: src/cmp.c:178 #, c-format @@ -634,7 +604,7 @@ msgstr "" "Die optionalen Argumente SKIP1 und SKIP2 geben die Zahl der Bytes an,\n" "die in jeder Datei übersprungen werden (standardmäßig null)." -#: src/cmp.c:185 src/diff.c:996 src/diff3.c:507 src/sdiff.c:210 +#: src/cmp.c:185 src/diff.c:997 src/diff3.c:509 src/sdiff.c:210 msgid "" "Mandatory arguments to long options are mandatory for short options too.\n" msgstr "" @@ -652,378 +622,397 @@ msgstr "" #: src/cmp.c:194 msgid "If a FILE is '-' or missing, read standard input." -msgstr "Wenn DATEI »-« ist oder fehlt, von der Standardeingabe lesen." +msgstr "Wenn DATEI »-« ist oder fehlt, wird von der Standardeingabe gelesen." -#: src/cmp.c:195 src/diff.c:984 src/sdiff.c:220 +#: src/cmp.c:195 src/diff.c:985 src/sdiff.c:220 msgid "Exit status is 0 if inputs are the same, 1 if different, 2 if trouble." msgstr "" "Der Rückgabewert des Programms ist 0, falls die Eingaben identisch\n" -"sind, 1 falls sie unterschiedlich sind und 2, falls es Probleme gab." +"sind, 1 falls sie verschieden sind und 2, falls es Probleme gab." #: src/cmp.c:240 #, c-format msgid "invalid --bytes value '%s'" msgstr "ungültiger --bytes-Wert »%s«" -#: src/cmp.c:266 src/diff.c:793 src/diff3.c:353 src/sdiff.c:565 +#: src/cmp.c:266 src/diff.c:795 src/diff3.c:356 src/sdiff.c:565 #, c-format msgid "missing operand after '%s'" msgstr "fehlender Operand nach »%s«" -#: src/cmp.c:278 src/diff.c:795 src/diff3.c:355 src/sdiff.c:567 +#: src/cmp.c:278 src/diff.c:797 src/diff3.c:358 src/sdiff.c:567 #, c-format msgid "extra operand '%s'" msgstr "extra Operand »%s«." -#: src/cmp.c:494 +#: src/cmp.c:498 #, c-format msgid "%s %s differ: byte %s, line %s\n" -msgstr "%s %s differieren: Byte %s, Zeile %s\n" +msgstr "%s %s sind verschieden: Byte %s, Zeile %s\n" -#: src/cmp.c:510 +#: src/cmp.c:514 #, c-format msgid "%s %s differ: byte %s, line %s is %3o %s %3o %s\n" -msgstr "%s %s differieren: Zeichen %s, Zeile %s ist %3o %s %3o %s\n" +msgstr "%s %s sind verschieden: Zeichen %s, Zeile %s ist %3o %s %3o %s\n" + +#: src/cmp.c:571 +#, c-format +msgid "cmp: EOF on %s which is empty\n" +msgstr "cmp: Dateiende in %s, welche leer ist.\n" -#: src/cmp.c:562 +#: src/cmp.c:585 #, c-format -msgid "cmp: EOF on %s\n" -msgstr "cmp: EOF auf %s.\n" +msgid "cmp: EOF on %s after byte %s, line %s\n" +msgstr "cmp: Dateiende in %s nach Byte %s, Zeile %s\n" + +#: src/cmp.c:586 +#, c-format +msgid "cmp: EOF on %s after byte %s, in line %s\n" +msgstr "cmp: Dateiende in %s nach Byte %s, Zeile %s\n" + +#: src/cmp.c:592 +#, c-format +msgid "cmp: EOF on %s after byte %s\n" +msgstr "cmp: Dateiende in %s nach Byte %s\n" #. This is a proper name. See the gettext manual, section Names. -#: src/diff.c:49 +#: src/diff.c:50 msgid "Paul Eggert" msgstr "Paul Eggert" #. This is a proper name. See the gettext manual, section Names. -#: src/diff.c:50 +#: src/diff.c:51 msgid "Mike Haertel" msgstr "Mike Haertel" #. This is a proper name. See the gettext manual, section Names. -#: src/diff.c:51 +#: src/diff.c:52 msgid "David Hayes" msgstr "David Hayes" #. This is a proper name. See the gettext manual, section Names. -#: src/diff.c:52 +#: src/diff.c:53 msgid "Richard Stallman" msgstr "Richard Stallman" #. This is a proper name. See the gettext manual, section Names. -#: src/diff.c:53 +#: src/diff.c:54 msgid "Len Tower" msgstr "Len Tower" -#: src/diff.c:351 +#: src/diff.c:353 #, c-format msgid "invalid context length '%s'" msgstr "ungültige Kontextlänge »%s«." -#: src/diff.c:434 +#: src/diff.c:436 #, c-format msgid "pagination not supported on this host" msgstr "Seitenumbruch wird auf diesem System nicht unterstützt." -#: src/diff.c:449 src/diff3.c:335 +#: src/diff.c:451 src/diff3.c:336 #, c-format msgid "too many file label options" msgstr "Zu viele Datei-Label-Optionen wurden angegeben." -#: src/diff.c:526 +#: src/diff.c:528 #, c-format msgid "invalid width '%s'" msgstr "ungültige Breite »%s«." -#: src/diff.c:530 +#: src/diff.c:532 msgid "conflicting width options" msgstr "widersprüchliche Breitenoptionen" -#: src/diff.c:555 +#: src/diff.c:557 #, c-format msgid "invalid horizon length '%s'" msgstr "ungültige Horizontlänge »%s«." -#: src/diff.c:611 +#: src/diff.c:613 #, c-format msgid "invalid tabsize '%s'" msgstr "ungültige Tabulatorbreite »%s«." -#: src/diff.c:615 +#: src/diff.c:617 msgid "conflicting tabsize options" msgstr "widersprüchliche Tabulatorbreitenoptionen." -#: src/diff.c:770 +#: src/diff.c:772 msgid "--from-file and --to-file both specified" msgstr "--from-file und --to-file sind beide angegeben." -#: src/diff.c:890 +#: src/diff.c:891 msgid " --normal output a normal diff (the default)" -msgstr " --normal Ein normales Diff ausgeben (Standard)." +msgstr " --normal Ein normales Diff ausgeben (Vorgabe)." -#: src/diff.c:891 +#: src/diff.c:892 msgid "-q, --brief report only when files differ" msgstr "" -"-q, --brief Nur ausgeben, ob die Dateien verschieden sind." +"-q, --brief Nur ausgeben, ob die Dateien verschieden " +"sind." -#: src/diff.c:892 +#: src/diff.c:893 msgid "-s, --report-identical-files report when two files are the same" -msgstr "-s, --report-identical-files Meldung, wenn zwei Dateien gleich sind." +msgstr "" +"-s, --report-identical-files Zurückgeben, ob zwei Dateien gleich sind." -#: src/diff.c:893 +#: src/diff.c:894 msgid "" "-c, -C NUM, --context[=NUM] output NUM (default 3) lines of copied context" msgstr "" -"-c, -C ZAHL, --context[=ZAHL] ZAHL Zeilen des kopierten Kontexts ausgeben " -"(Vorgabe: 3)." +"-c, -C ZAHL, --context[=ZAHL] ZAHL Zeilen des kopierten Kontexts ausgeben\n" +" (Vorgabe: 3)." -#: src/diff.c:894 +#: src/diff.c:895 msgid "" "-u, -U NUM, --unified[=NUM] output NUM (default 3) lines of unified context" msgstr "" -"-u, -U ZAHL, --unified[=ZAHL] ZAHL Zeilen des Unified-Kontexts ausgeben " -"(Vorgabe: 3)." +"-u, -U ZAHL, --unified[=ZAHL] ZAHL Zeilen des Unified-Kontexts ausgeben\n" +" (Vorgabe: 3)." -#: src/diff.c:895 +#: src/diff.c:896 msgid "-e, --ed output an ed script" -msgstr "-e, --ed Ein ed-Skript ausgeben." +msgstr "-e, --ed Ein ed-Skript ausgeben." -#: src/diff.c:896 +#: src/diff.c:897 msgid "-n, --rcs output an RCS format diff" -msgstr "-n, --rcs Im RCS-Format ausgeben." +msgstr "-n, --rcs Im RCS-Format ausgeben." -#: src/diff.c:897 +#: src/diff.c:898 msgid "-y, --side-by-side output in two columns" -msgstr "-y, --side-by-side In zwei Spalten ausgeben." +msgstr "-y, --side-by-side In zwei Spalten ausgeben." -#: src/diff.c:898 +#: src/diff.c:899 msgid "" "-W, --width=NUM output at most NUM (default 130) print columns" msgstr "" -"-W, --width=ZAHL Maximal ZAHL Druckspalten pro Zeile ausgeben\n" -" (Vorgabe: 130)." +"-W, --width=ZAHL Maximal ZAHL Druckspalten pro Zeile " +"ausgeben\n" +" (Vorgabe: 130)." -#: src/diff.c:899 +#: src/diff.c:900 msgid "" " --left-column output only the left column of common lines" msgstr "" -" --left-column Nur linke Spalte der gemeinsamen Zeilen " -"ausgeben." +" --left-column Nur linke Spalte der gemeinsamen Zeilen\n" +" ausgeben." -#: src/diff.c:900 +#: src/diff.c:901 msgid " --suppress-common-lines do not output common lines" -msgstr " --suppress-common-lines Keine gemeinsamen Zeilen ausgeben." +msgstr " --suppress-common-lines Keine gemeinsamen Zeilen ausgeben." -#: src/diff.c:902 +#: src/diff.c:903 msgid "-p, --show-c-function show which C function each change is in" msgstr "" -"-p, --show-c-function Für jede Änderung zeigen, in welcher C-" -"Funktion sie ist" +"-p, --show-c-function Für jede Änderung zeigen, in welcher\n" +" C-Funktion sie ist." -#: src/diff.c:903 +#: src/diff.c:904 msgid "-F, --show-function-line=RE show the most recent line matching RE" msgstr "" -"-F, --show-function-line=RE Die neueste Zeile zeigen, die dem Muster RE " -"entspricht" +"-F, --show-function-line=RE Die vorangehende Zeile zeigen, die dem " +"Muster\n" +" RE entspricht." -#: src/diff.c:904 -#, fuzzy +#: src/diff.c:905 msgid "" " --label LABEL use LABEL instead of file name and timestamp\n" " (can be repeated)" msgstr "" -" --label LABEL LABEL statt des Dateinamens benutzen\n" -" (kann wiederholt werden)." +" --label LABEL LABEL statt des Dateinamens und " +"Zeitstempels\n" +" benutzen (kann wiederholt werden)." -#: src/diff.c:907 +#: src/diff.c:908 msgid "-t, --expand-tabs expand tabs to spaces in output" msgstr "" -"-t, -expand-tabs Tabulatoren in der Ausgabe zu Leerzeichen " -"ausdehnen." +"-t, -expand-tabs Tabulatoren in der Ausgabe zu Leerzeichen\n" +" ausdehnen." -#: src/diff.c:908 +#: src/diff.c:909 msgid "-T, --initial-tab make tabs line up by prepending a tab" msgstr "" -"-T, --initial-tab Einrückungen durch vorangestellte Tabulatoren " -"erzeugen." +"-T, --initial-tab Einrückungen durch vorangestellte " +"Tabulatoren\n" +" erzeugen." -#: src/diff.c:909 +#: src/diff.c:910 msgid "" " --tabsize=NUM tab stops every NUM (default 8) print columns" msgstr "" -" --tabsize=ZAHL Tabulatorstopps sind alle ZAHL Spalten " -"(Vorgabe: 8)." +" --tabsize=ZAHL Tabulatorstopps sind alle ZAHL Spalten\n" +" (Vorgabe: 8)." -#: src/diff.c:910 +#: src/diff.c:911 msgid "" " --suppress-blank-empty suppress space or tab before empty output lines" msgstr "" -" --suppress-blank-empty Leerzeichen oder Tabulator vor leeren\n" -" Ausgabezeilen verhindern." +" --suppress-blank-empty Leerzeichen oder Tabulator vor leeren\n" +" Ausgabezeilen verhindern." -#: src/diff.c:911 +#: src/diff.c:912 msgid "-l, --paginate pass output through 'pr' to paginate it" msgstr "" -"-l, --paginate Ausgabe an »pr« zum Seitenumbruch übergeben." +"-l, --paginate Ausgabe an »pr« zum Seitenumbruch übergeben." -#: src/diff.c:913 +#: src/diff.c:914 msgid "" "-r, --recursive recursively compare any subdirectories found" msgstr "" "-r, --recursive Rekursiv alle Unterverzeichnisse vergleichen." -#: src/diff.c:914 +#: src/diff.c:915 msgid " --no-dereference don't follow symbolic links" msgstr "" -" --no-derefence Symbolischen Verknüpfungen nicht folgen." +" --no-dereference Symbolischen Verknüpfungen nicht folgen." -#: src/diff.c:915 +#: src/diff.c:916 msgid "-N, --new-file treat absent files as empty" msgstr "-N, --new-file Fehlende Dateien als leer betrachten." -#: src/diff.c:916 +#: src/diff.c:917 msgid " --unidirectional-new-file treat absent first files as empty" msgstr "" -" --unidirectional-new-file Die ersten fehlenden Dateien als leer " -"betrachten." +" --unidirectional-new-file Fehlende erste Dateien als leer betrachten." -#: src/diff.c:917 +#: src/diff.c:918 msgid " --ignore-file-name-case ignore case when comparing file names" msgstr "" -" --ignore-file-name-case Unterschiede der Groß/Kleinschreibung von " -"Dateinamen\n" -" ignorieren." +" --ignore-file-name-case Unterschiede der Groß-/Kleinschreibung von\n" +" Dateinamen ignorieren." -#: src/diff.c:918 +#: src/diff.c:919 msgid " --no-ignore-file-name-case consider case when comparing file names" msgstr "" -" --no-ignore-file-name-case Unterschiede der Groß/Kleinschreibung von \n" -" Dateinamen beachten." +" --no-ignore-file-name-case Unterschiede der Groß-/Kleinschreibung von\n" +" Dateinamen beachten." -#: src/diff.c:919 +#: src/diff.c:920 msgid "-x, --exclude=PAT exclude files that match PAT" msgstr "" "-x, --exclude=MUSTER Dateien ausschließen, die auf MUSTER passen." -#: src/diff.c:920 +#: src/diff.c:921 msgid "" "-X, --exclude-from=FILE exclude files that match any pattern in FILE" msgstr "" -"-X, --exclude-from=DATEI Dateien überspringen, die auf eines der\n" -" Muster in DATEI passen." +"-X, --exclude-from=DATEI Dateien ausschließen, die auf eines der\n" +" Muster in DATEI passen." -#: src/diff.c:921 +#: src/diff.c:922 msgid "" "-S, --starting-file=FILE start with FILE when comparing directories" msgstr "" "-S, --starting-file=DATEI Beim Verzeichnisvergleich mit DATEI beginnen." -#: src/diff.c:922 +#: src/diff.c:923 msgid "" " --from-file=FILE1 compare FILE1 to all operands;\n" " FILE1 can be a directory" msgstr "" " --from-file=DATEI1 DATEI1 mit allen Operanden vergleichen.\n" -" DATEI1 kann ein Verzeichnis sein." +" DATEI1 kann ein Verzeichnis sein." -#: src/diff.c:924 +#: src/diff.c:925 msgid "" " --to-file=FILE2 compare all operands to FILE2;\n" " FILE2 can be a directory" msgstr "" " --to-file=DATEI2 Alle Operanden mit DATEI2 vergleichen.\n" -" DATEI2 kann ein Verzeichnis sein." +" DATEI2 kann ein Verzeichnis sein." -#: src/diff.c:927 +#: src/diff.c:928 msgid "" "-i, --ignore-case ignore case differences in file contents" msgstr "" -"-i, --ignore-case Unterschiede der Groß/Kleinschreibung\n" -" im Dateiinhalt ignorieren." +"-i, --ignore-case Unterschiede der Groß-/Kleinschreibung\n" +" im Dateiinhalt ignorieren." -#: src/diff.c:928 +#: src/diff.c:929 msgid "-E, --ignore-tab-expansion ignore changes due to tab expansion" msgstr "" -"-E, --ignore-tab-expansion Änderungen aufgrund von Tabausdehnungen " -"ignorieren." +"-E, --ignore-tab-expansion Änderungen aufgrund von Tabausdehnungen\n" +" ignorieren." -#: src/diff.c:929 +#: src/diff.c:930 msgid "-Z, --ignore-trailing-space ignore white space at line end" -msgstr "-Z, --ignore-trailing-space Freiraum am Zeilenende ignorieren." +msgstr "-Z, --ignore-trailing-space Leerraum am Zeilenende ignorieren." -#: src/diff.c:930 +#: src/diff.c:931 msgid "" "-b, --ignore-space-change ignore changes in the amount of white space" msgstr "-b, --ignore-space-change Änderungen im Leerraum ignorieren." -#: src/diff.c:931 +#: src/diff.c:932 msgid "-w, --ignore-all-space ignore all white space" -msgstr "-w, --ignore-all-space Freiraum ignorieren." +msgstr "-w, --ignore-all-space Leerraum ignorieren." -#: src/diff.c:932 +#: src/diff.c:933 msgid "" "-B, --ignore-blank-lines ignore changes where lines are all blank" msgstr "" -"-B, --ignore-blank-lines Die Änderungen übergehen, wo alle Zeilen " -"leer sind." +"-B, --ignore-blank-lines Änderungen ignorieren, bei denen alle " +"Zeilen\n" +" leer sind." -#: src/diff.c:933 +#: src/diff.c:934 msgid "-I, --ignore-matching-lines=RE ignore changes where all lines match RE" msgstr "" "-I, --ignore-matching-lines=RE Änderungen ignorieren, bei denen alle " "Zeilen\n" -" auf das Muster RE passen." +" auf das Muster RE passen." -#: src/diff.c:935 +#: src/diff.c:936 msgid "-a, --text treat all files as text" msgstr "-a, --text Alle Dateien als Text behandeln." -#: src/diff.c:936 +#: src/diff.c:937 msgid " --strip-trailing-cr strip trailing carriage return on input" msgstr "" -" --strip-trailing-cr Wagenrücklauf (CR) am Zeilenende\n" -" beim Einlesen entfernen." +" --strip-trailing-cr Wagenrücklauf (CR) am Zeilenende beim\n" +" Einlesen entfernen." -#: src/diff.c:938 +#: src/diff.c:939 msgid " --binary read and write data in binary mode" msgstr "" " --binary Daten im Binärmodus lesen und schreiben." -#: src/diff.c:941 +#: src/diff.c:942 msgid "" "-D, --ifdef=NAME output merged file with '#ifdef NAME' diffs" msgstr "" "-D, --ifdef=NAME Zusammengefügte Datei mit »#ifdef NAME« in\n" -" die Ausgabe mischen." +" die Ausgabe mischen." -#: src/diff.c:942 +#: src/diff.c:943 msgid " --GTYPE-group-format=GFMT format GTYPE input groups with GFMT" msgstr " --GTYPE-group-format=GFMT GTYPE-Eingabe mit GFMT formatieren." -#: src/diff.c:943 +#: src/diff.c:944 msgid " --line-format=LFMT format all input lines with LFMT" msgstr "" " --line-format=LFMT Alle Eingabe-Zeilen mit LFMT formatieren." -#: src/diff.c:944 +#: src/diff.c:945 msgid " --LTYPE-line-format=LFMT format LTYPE input lines with LFMT" msgstr " --LTYPE-line-format=LFMT LTYPE-Eingabe mit LFMT formatieren." -#: src/diff.c:945 +#: src/diff.c:946 msgid "" " These format options provide fine-grained control over the output\n" " of diff, generalizing -D/--ifdef." msgstr "" " Diese Formatoptionen stellen haargenaue Kontrolle über die Eingabe\n" -" von diff bereit, indem -D/--ifdef verallgemeinert wird." +" von diff bereit, indem -D/--ifdef verallgemeinert wird." -#: src/diff.c:947 +#: src/diff.c:948 msgid " LTYPE is 'old', 'new', or 'unchanged'. GTYPE is LTYPE or 'changed'." msgstr "" -" LTYPE kann »old«, »new« oder »unchanged« sein. GTYPE ist LTYPE oder " -"»changed«." +" LTYPE kann »old«, »new« oder »unchanged« sein.\n" +" GTYPE ist LTYPE oder »changed«." -#: src/diff.c:948 +#: src/diff.c:949 msgid "" " GFMT (only) may contain:\n" " %< lines from FILE1\n" @@ -1044,8 +1033,8 @@ msgstr "" " %= Zeilen, die sowohl zu DATEI1 als auch zu DATEI2 gehören.\n" " %[-][BREITE][.[PRÄZ]]{doxX}BUCHST Ausgabe nach printf-Regeln für " "BUCHST.\n" -" Folgende BUCHTSTaben gelten für neue Gruppen, Kleinschreibung für " -"alte:\n" +" Die folgenden BUCHSTaben gelten für neue Gruppen,\n" +" die entsprechenden Kleinbuchstaben für alte:\n" " F Erste Zeilennummer.\n" " L Letzte Zeilennummer.\n" " N Zahl der Zeilen = L-F+1.\n" @@ -1053,7 +1042,7 @@ msgstr "" " M L+1.\n" " %(A=B?T:E) Falls A gleich B, dann T, sonst E." -#: src/diff.c:960 +#: src/diff.c:961 msgid "" " LFMT (only) may contain:\n" " %L contents of line\n" @@ -1065,7 +1054,7 @@ msgstr "" " %l Inhalt der Zeile, ohne Zeilenumbruch am Ende.\n" " %[-][BREITE][.[PRÄZ]]{doxX}n Zeilennummer im printf-Stil." -#: src/diff.c:964 +#: src/diff.c:965 msgid "" " Both GFMT and LFMT may contain:\n" " %% %\n" @@ -1079,246 +1068,246 @@ msgstr "" " %c'\\OOO' das Zeichen mit dem Oktalcode OOO\n" " C Das Zeichen C (andere Zeichen stellen sich selbst dar)" -#: src/diff.c:970 -msgid "-d, --minimal try hard to find a smaller set of changes" -msgstr "" -"-d, --minimal Aufwendig nach einem kleineren Satz von Änderungen " -"suchen." - #: src/diff.c:971 -msgid " --horizon-lines=NUM keep NUM lines of the common prefix and suffix" +msgid "-d, --minimal try hard to find a smaller set of changes" msgstr "" -" --horizon-lines=ZAHL ZAHL Zeilen mit gemeinsamem Prä- und Suffix " -"behalten." +"-d, --minimal Intensiv nach einer kleineren Menge von " +"Änderungen\n" +" suchen." #: src/diff.c:972 -msgid "" -" --speed-large-files assume large files and many scattered small changes" +msgid " --horizon-lines=NUM keep NUM lines of the common prefix and suffix" msgstr "" -" --speed-large-files Es werden große Dateien und viele verstreute, " -"kleine\n" -" Änderungen vermutet." +" --horizon-lines=ZAHL ZAHL Zeilen mit gemeinsamem Präfix und Suffix\n" +" behalten." #: src/diff.c:973 msgid "" -" --color[=WHEN] colorize the output; WHEN can be 'never', 'always'," +" --speed-large-files assume large files and many scattered small changes" msgstr "" +" --speed-large-files Es werden große Dateien mit vielen verstreuten,\n" +" kleinen Änderungen vermutet." #: src/diff.c:974 -#, fuzzy -msgid " or 'auto' (the default)" -msgstr " --normal Ein normales Diff ausgeben (Standard)." - -#: src/diff.c:975 msgid "" -" --palette=PALETTE specify the colors to use when --color is active" +" --color[=WHEN] colorize the output; WHEN can be 'never', " +"'always',\n" +" or 'auto' (the default)" msgstr "" +" --color[=WANN] Die Ausgabe einfärben; WANN kann »never«, " +"»always«,\n" +" oder »auto« sein (Voreinstellung)" #: src/diff.c:976 msgid "" -" PALETTE is a colon-separated list terminfo " -"capabilities" +" --palette=PALETTE the colors to use when --color is active; PALETTE " +"is\n" +" a colon-separated list of terminfo capabilities" msgstr "" +" --palette=PALETTE Die zu verwendenden Farben, wenn --color aktiv " +"ist;\n" +" PALETTE ist eine durch Doppelpunkte getrennte\n" +" Liste aus terminfo-Capabilities." -#: src/diff.c:978 +#: src/diff.c:979 msgid " --help display this help and exit" -msgstr " --help Diese Hilfe anzeigen und beenden." +msgstr " --help Diese Hilfe anzeigen und beenden." -#: src/diff.c:979 +#: src/diff.c:980 msgid "-v, --version output version information and exit" -msgstr "-v, -version Versionsinformation ausgeben und beenden." +msgstr "-v, -version Versionsinformation ausgeben und beenden." -#: src/diff.c:981 -#, fuzzy +#: src/diff.c:982 msgid "FILES are 'FILE1 FILE2' or 'DIR1 DIR2' or 'DIR FILE' or 'FILE DIR'." msgstr "" -"DATEIEN sind »DATEI1 DATEI2« oder »VERZ1 VERZ2« oder »VERZ DATEI...«\n" -"oder »DATEI... VERZ«." +"DATEIEN sind »DATEI1 DATEI2« oder »VERZ1 VERZ2« oder »VERZ DATEI«\n" +" oder »DATEI VERZ«." -#: src/diff.c:982 +#: src/diff.c:983 msgid "" "If --from-file or --to-file is given, there are no restrictions on FILE(s)." msgstr "" "Wenn --from-file oder --to-file angegeben werden, gibt es keine\n" -"Einschränkungen für DATEI(EN)." +" Einschränkungen für DATEI(EN)." -#: src/diff.c:983 src/diff3.c:526 src/sdiff.c:219 +#: src/diff.c:984 src/diff3.c:528 src/sdiff.c:219 msgid "If a FILE is '-', read standard input." msgstr "Wenn DATEI »-« ist, von der Standardeingabe lesen." -#: src/diff.c:993 +#: src/diff.c:994 #, c-format msgid "Usage: %s [OPTION]... FILES\n" msgstr "Aufruf: %s [OPTION]... DATEIEN\n" -#: src/diff.c:994 +#: src/diff.c:995 msgid "Compare FILES line by line." msgstr "DATEIEN Zeile für Zeile vergleichen." -#: src/diff.c:1028 +#: src/diff.c:1029 #, c-format msgid "conflicting %s option value '%s'" msgstr "Widersprüchlicher %s-Optionswert »%s«." -#: src/diff.c:1041 +#: src/diff.c:1042 #, c-format msgid "conflicting output style options" msgstr "Widersprüchliche Optionen für den Ausgabestil." -#: src/diff.c:1057 -#, fuzzy, c-format +#: src/diff.c:1058 +#, c-format msgid "invalid color '%s'" -msgstr "ungültige Breite »%s«." +msgstr "Ungültige Farbe »%s«." -#: src/diff.c:1113 src/diff.c:1323 +#: src/diff.c:1114 src/diff.c:1324 #, c-format msgid "Only in %s: %s\n" msgstr "Nur in %s: %s.\n" -#: src/diff.c:1247 +#: src/diff.c:1248 msgid "cannot compare '-' to a directory" msgstr "»-« kann nicht mit Verzeichnis verglichen werden." -#: src/diff.c:1282 +#: src/diff.c:1283 msgid "-D option not supported with directories" msgstr "Option -D nicht unterstützt bei Verzeichnissen" -#: src/diff.c:1291 +#: src/diff.c:1292 #, c-format msgid "Common subdirectories: %s and %s\n" msgstr "Gemeinsame Unterverzeichnisse: %s und %s.\n" -#: src/diff.c:1333 src/diff.c:1383 +#: src/diff.c:1334 src/diff.c:1384 #, c-format msgid "File %s is a %s while file %s is a %s\n" msgstr "Datei %s ist ein %s, während Datei %s ein %s ist.\n" -#: src/diff.c:1369 +#: src/diff.c:1370 #, c-format msgid "Symbolic links %s and %s differ\n" msgstr "Symbolische Verknüpfungen %s und %s sind verschieden.\n" -#: src/diff.c:1456 +#: src/diff.c:1457 #, c-format msgid "Files %s and %s are identical\n" msgstr "Dateien %s und %s sind identisch.\n" #. This is a proper name. See the gettext manual, section Names. -#: src/diff3.c:41 +#: src/diff3.c:42 msgid "Randy Smith" msgstr "Randy Smith" -#: src/diff3.c:348 +#: src/diff3.c:351 #, c-format msgid "incompatible options" msgstr "Inkompatible Optionen." -#: src/diff3.c:388 +#: src/diff3.c:391 msgid "'-' specified for more than one input file" msgstr "»-« für mehr als eine Eingabedatei angegeben." -#: src/diff3.c:439 src/diff3.c:1288 src/diff3.c:1692 src/diff3.c:1747 +#: src/diff3.c:442 src/diff3.c:1290 src/diff3.c:1693 src/diff3.c:1748 #: src/sdiff.c:307 src/sdiff.c:844 src/sdiff.c:855 msgid "read failed" msgstr "Lesefehler." -#: src/diff3.c:473 +#: src/diff3.c:475 msgid "-A, --show-all output all changes, bracketing conflicts" msgstr "" -"-A, --show-all Alle Änderungen ausgeben, Konflikte in Klammern." +"-A, --show-all Alle Änderungen ausgeben, Konflikte in Klammern." -#: src/diff3.c:475 +#: src/diff3.c:477 msgid "" "-e, --ed output ed script incorporating changes\n" " from OLDFILE to YOURFILE into MYFILE" msgstr "" -"-e, --ed ed-Script ausgeben, das die Änderungen\n" -" von DEINEDATEI und ALTEDATEI in MEINEDATEI\n" -" integriert." +"-e, --ed ed-Script ausgeben, das die Änderungen\n" +" von ALTEDATEI hin zu DEINEDATEI in\n" +" MEINEDATEI integriert." -#: src/diff3.c:477 +#: src/diff3.c:479 msgid "-E, --show-overlap like -e, but bracket conflicts" -msgstr "-E --show-overlap Wie -e, aber Konflikte in Klammern." +msgstr "-E --show-overlap Wie -e, aber Konflikte in Klammern." -#: src/diff3.c:478 +#: src/diff3.c:480 msgid "" "-3, --easy-only like -e, but incorporate only nonoverlapping " "changes" msgstr "" -"-3, --easy-only Wie -e, aber nur nichtüberlappende Änderungen " -"integrieren." +"-3, --easy-only Wie -e, aber nur nichtüberlappende Änderungen\n" +" integrieren." -#: src/diff3.c:479 +#: src/diff3.c:481 msgid "" "-x, --overlap-only like -e, but incorporate only overlapping changes" msgstr "" -"-x, --overlap-only Wie -e, aber nur überlappende Änderungen " -"integrieren." +"-x, --overlap-only Wie -e, aber nur überlappende Änderungen\n" +" integrieren." -#: src/diff3.c:480 +#: src/diff3.c:482 msgid "-X like -x, but bracket conflicts" -msgstr "-X Wie -x, aber Konflikte in Klammern." +msgstr "-X Wie -x, aber Konflikte in Klammern." -#: src/diff3.c:481 +#: src/diff3.c:483 msgid "-i append 'w' and 'q' commands to ed scripts" msgstr "" -"-i An ed-Skripte »w«- und »q«-Befehle anhängen." +"-i An ed-Skripte »w«- und »q«-Befehle anhängen." -#: src/diff3.c:483 +#: src/diff3.c:485 msgid "" "-m, --merge output actual merged file, according to\n" " -A if no other options are given" msgstr "" -"-m, --merge Zusammengefügte Datei ausgeben, wie -A,\n" -" falls keine anderen Optionen übergeben wurden." +"-m, --merge Zusammengefügte Datei ausgeben, wie -A,\n" +" falls keine anderen Optionen übergeben " +"wurden." -#: src/diff3.c:486 +#: src/diff3.c:488 msgid "-a, --text treat all files as text" -msgstr "-a, --text Alle Dateien als Text behandeln." +msgstr "-a, --text Alle Dateien als Text behandeln." -#: src/diff3.c:487 +#: src/diff3.c:489 msgid " --strip-trailing-cr strip trailing carriage return on input" msgstr "" -" --strip-trailing-cr Wagenrücklauf (CR) am Zeilenende beim Einlesen " -"entfernen." +" --strip-trailing-cr Wagenrücklauf (CR) am Zeilenende beim Einlesen\n" +" entfernen." -#: src/diff3.c:488 +#: src/diff3.c:490 msgid "-T, --initial-tab make tabs line up by prepending a tab" msgstr "" -"-T, --initial-tab Einrückungen durch vorangestellte Tabulatoren " -"erzeugen." +"-T, --initial-tab Einrückungen durch vorangestellte Tabulatoren\n" +" erzeugen." -#: src/diff3.c:489 +#: src/diff3.c:491 msgid " --diff-program=PROGRAM use PROGRAM to compare files" msgstr "" " --diff-program=PROGRAMM PROGRAMM zum Vergleichen von Dateien verwenden." -#: src/diff3.c:490 +#: src/diff3.c:492 msgid "" "-L, --label=LABEL use LABEL instead of file name\n" " (can be repeated up to three times)" msgstr "" -"-L, --label=LABEL LABEL statt des Dateinamens benutzen\n" -" (kann bis zu dreimal wiederholt werden)" +"-L, --label=LABEL LABEL statt des Dateinamens benutzen\n" +" (kann bis zu dreimal wiederholt werden)" -#: src/diff3.c:493 +#: src/diff3.c:495 msgid " --help display this help and exit" -msgstr " --help Diese Hilfe anzeigen und beenden." +msgstr " --help Diese Hilfe anzeigen und beenden." -#: src/diff3.c:494 +#: src/diff3.c:496 msgid "-v, --version output version information and exit" -msgstr "-v, --version Versionsinformation ausgeben und beenden." +msgstr "-v, --version Versionsinformation ausgeben und beenden." -#: src/diff3.c:503 +#: src/diff3.c:505 #, c-format msgid "Usage: %s [OPTION]... MYFILE OLDFILE YOURFILE\n" msgstr "Aufruf: %s [OPTION]... MEINEDATEI ALTEDATEI DEINEDATEI\n" -#: src/diff3.c:505 +#: src/diff3.c:507 msgid "Compare three files line by line." msgstr "Drei Dateien Zeile für Zeile vergleichen." -#: src/diff3.c:515 +#: src/diff3.c:517 msgid "" "\n" "The default output format is a somewhat human-readable representation of\n" @@ -1342,49 +1331,49 @@ msgstr "" "intern zusammenführt und die eigentliche, zusammengeführte Datei ausgegeben\n" "wird. Für ungewöhnliche Eingaben ist dies robuster, als ed zu benutzen.\n" -#: src/diff3.c:527 +#: src/diff3.c:529 msgid "Exit status is 0 if successful, 1 if conflicts, 2 if trouble." msgstr "" "Der Rückgabewert des Programms ist 0, falls es erfolgreich ist, 1 falls\n" "es Konflikte gibt und 2 falls Probleme auftreten." -#: src/diff3.c:720 +#: src/diff3.c:722 msgid "internal error: screwup in format of diff blocks" msgstr "Interner Fehler: Format für diff-Blöcke ist durcheinander." -#: src/diff3.c:1015 +#: src/diff3.c:1017 #, c-format msgid "%s: diff failed: " msgstr "%s: »diff« ist gescheitert: " -#: src/diff3.c:1037 +#: src/diff3.c:1039 msgid "internal error: invalid diff type in process_diff" msgstr "Interner Fehler: Ungültiger diff-Typ in process_diff." -#: src/diff3.c:1062 +#: src/diff3.c:1064 msgid "invalid diff format; invalid change separator" msgstr "Ungültiges Diff-Format; ungültiger Änderungstrenner." -#: src/diff3.c:1298 +#: src/diff3.c:1300 msgid "invalid diff format; incomplete last line" -msgstr "Ungültiges Diff-Format; fehlende letzte Zeile." +msgstr "Ungültiges Diff-Format; unvollständige letzte Zeile." -#: src/diff3.c:1322 src/sdiff.c:275 src/util.c:970 +#: src/diff3.c:1324 src/sdiff.c:275 src/util.c:969 #, c-format msgid "subsidiary program '%s' could not be invoked" msgstr "Unterprogramm »%s« konnte nicht aufgerufen werden." -#: src/diff3.c:1347 +#: src/diff3.c:1349 msgid "invalid diff format; incorrect leading line chars" -msgstr "Ungültiges Diff-Format; inkorrektes Zeichen in führender Zeile" +msgstr "Ungültiges Diff-Format; inkorrektes führendes Zeichen in Zeile." -#: src/diff3.c:1420 +#: src/diff3.c:1422 msgid "internal error: invalid diff type passed to output" msgstr "Interner Fehler: Ungültiger diff-Typ an Ausgabe übergeben." -#: src/diff3.c:1694 src/diff3.c:1751 +#: src/diff3.c:1695 src/diff3.c:1752 msgid "input file shrank" -msgstr "Eingabedatei schrumpfte." +msgstr "Eingabedatei ist überraschend geschrumpft." #: src/dir.c:156 #, c-format @@ -1397,7 +1386,7 @@ msgid "%s: recursive directory loop" msgstr "%s: Rekursive Verzeichnisschleife" #. This is a proper name. See the gettext manual, section Names. -#: src/sdiff.c:42 +#: src/sdiff.c:43 msgid "Thomas Lord" msgstr "Thomas Lord" @@ -1422,12 +1411,14 @@ msgstr "" #: src/sdiff.c:177 msgid "-Z, --ignore-trailing-space ignore white space at line end" -msgstr "-Z, --ignore-trailing-space Freiraum am Zeilenende ignorieren." +msgstr "-Z, --ignore-trailing-space Leerraum am Zeilenende ignorieren." #: src/sdiff.c:178 msgid "" "-b, --ignore-space-change ignore changes in the amount of white space" -msgstr "-b, --ignore-space-change Änderungen im Leerraum ignorieren." +msgstr "" +"-b, --ignore-space-change Änderungen an der Größe des Leerraums " +"ignorieren." #: src/sdiff.c:179 msgid "-W, --ignore-all-space ignore all white space" @@ -1436,15 +1427,15 @@ msgstr "-W, --ignore-all-space Leerraum ignorieren." #: src/sdiff.c:180 msgid "-B, --ignore-blank-lines ignore changes whose lines are all blank" msgstr "" -"-B, --ignore-blank-lines Die Änderungen übergehen, wo die Zeilen leer " -"sind." +"-B, --ignore-blank-lines Änderungen ignorieren, bei denen alle Zeilen " +"leer sind." #: src/sdiff.c:181 msgid "-I, --ignore-matching-lines=RE ignore changes all whose lines match RE" msgstr "" "-I, --ignore-matching-lines=RE Änderungen ignorieren, bei denen alle " "Zeilen\n" -" auf das Muster RE passen." +" auf das Muster RE passen." #: src/sdiff.c:182 msgid " --strip-trailing-cr strip trailing carriage return on input" @@ -1490,16 +1481,16 @@ msgstr "" #: src/sdiff.c:192 msgid "-d, --minimal try hard to find a smaller set of changes" msgstr "" -"-d, --minimal Aufwendig nach einem kleineren Satz von " +"-d, --minimal Intensiv nach einer kleineren Menge von " "Änderungen suchen." #: src/sdiff.c:193 msgid "" "-H, --speed-large-files assume large files, many scattered small changes" msgstr "" -"-H, --speed-large-files Es werden große Dateien und viele verstreute, " -"kleine\n" -" Änderungen vermutet." +"-H, --speed-large-files Es werden große Dateien mit vielen " +"verstreuten,\n" +" kleinen Änderungen vermutet." #: src/sdiff.c:194 msgid " --diff-program=PROGRAM use PROGRAM to compare files" @@ -1527,7 +1518,7 @@ msgstr "" #: src/sdiff.c:329 msgid "cannot interactively merge standard input" -msgstr "Die Standardeingabe kann nicht interaktiv gemischt werden." +msgstr "Die Standardeingabe kann nicht interaktiv zusammengebracht werden." #: src/sdiff.c:595 msgid "both files to be compared are directories" @@ -1558,15 +1549,37 @@ msgstr "" "v:\tAusführlich gemeinsame Zeilen übernehmen.\n" "q:\tBeenden.\n" -#: src/util.c:663 -#, fuzzy, c-format +#: src/util.c:662 +#, c-format msgid "unrecognized prefix: %s" -msgstr "%s: Unbekannte Option »--%s«.\n" +msgstr "Unbekanntes Präfix: %s" -#: src/util.c:693 +#: src/util.c:692 #, c-format msgid "unparsable value for --palette" -msgstr "" +msgstr "Wert für --palette ist nicht auswertbar" + +#~ msgid "%s: option '--%s' doesn't allow an argument\n" +#~ msgstr "%s: Option »--%s« erlaubt kein Argument.\n" + +#~ msgid "%s: unrecognized option '--%s'\n" +#~ msgstr "%s: Unbekannte Option »--%s«.\n" + +#~ msgid "%s: option '-W %s' is ambiguous\n" +#~ msgstr "%s: Option »-W %s« ist mehrdeutig\n" + +#~ msgid "%s: option '-W %s' doesn't allow an argument\n" +#~ msgstr "%s: Option »-W %s« erlaubt kein Argument.\n" + +#~ msgid "%s: option '-W %s' requires an argument\n" +#~ msgstr "%s: Option »-W %s« verlangt ein Argument.\n" + +#~ msgid " or 'auto' (the default)" +#~ msgstr " oder »auto« sein (Voreinstellung)" + +#~ msgid "" +#~ " --palette=PALETTE specify the colors to use when --color is active" +#~ msgstr " --palette=PALETTE Farben angeben, wenn --color aktiv ist." #~ msgid "" #~ "This program comes with NO WARRANTY, to the extent permitted by law.\n" diff --git a/po/diffutils.pot b/po/diffutils.pot index e46b771..be203e2 100644 --- a/po/diffutils.pot +++ b/po/diffutils.pot @@ -6,9 +6,9 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: GNU diffutils 3.5\n" +"Project-Id-Version: GNU diffutils 3.6\n" "Report-Msgid-Bugs-To: bug-diffutils@gnu.org\n" -"POT-Creation-Date: 2016-08-20 22:22-0700\n" +"POT-Creation-Date: 2017-05-21 13:26-0700\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -17,29 +17,29 @@ msgstr "" "Content-Type: text/plain; charset=CHARSET\n" "Content-Transfer-Encoding: 8bit\n" -#: lib/argmatch.c:133 +#: lib/argmatch.c:134 #, c-format msgid "invalid argument %s for %s" msgstr "" -#: lib/argmatch.c:134 +#: lib/argmatch.c:135 #, c-format msgid "ambiguous argument %s for %s" msgstr "" -#: lib/argmatch.c:153 +#: lib/argmatch.c:154 msgid "Valid arguments are:" msgstr "" -#: lib/c-stack.c:204 lib/c-stack.c:297 +#: lib/c-stack.c:203 lib/c-stack.c:296 msgid "program error" msgstr "" -#: lib/c-stack.c:205 lib/c-stack.c:298 +#: lib/c-stack.c:204 lib/c-stack.c:297 msgid "stack overflow" msgstr "" -#: lib/error.c:191 +#: lib/error.c:195 msgid "Unknown system error" msgstr "" @@ -139,66 +139,41 @@ msgstr "" msgid "weird file" msgstr "" -#: lib/getopt.c:575 lib/getopt.c:604 -#, c-format -msgid "%s: option '%s' is ambiguous; possibilities:" -msgstr "" - -#: lib/getopt.c:619 -#, c-format -msgid "%s: option '%s' is ambiguous\n" -msgstr "" - -#: lib/getopt.c:654 lib/getopt.c:658 +#: lib/getopt.c:278 #, c-format -msgid "%s: option '--%s' doesn't allow an argument\n" +msgid "%s: option '%s%s' is ambiguous\n" msgstr "" -#: lib/getopt.c:667 lib/getopt.c:672 +#: lib/getopt.c:284 #, c-format -msgid "%s: option '%c%s' doesn't allow an argument\n" +msgid "%s: option '%s%s' is ambiguous; possibilities:" msgstr "" -#: lib/getopt.c:715 lib/getopt.c:734 +#: lib/getopt.c:319 #, c-format -msgid "%s: option '--%s' requires an argument\n" +msgid "%s: unrecognized option '%s%s'\n" msgstr "" -#: lib/getopt.c:772 lib/getopt.c:775 +#: lib/getopt.c:345 #, c-format -msgid "%s: unrecognized option '--%s'\n" +msgid "%s: option '%s%s' doesn't allow an argument\n" msgstr "" -#: lib/getopt.c:783 lib/getopt.c:786 +#: lib/getopt.c:360 #, c-format -msgid "%s: unrecognized option '%c%s'\n" +msgid "%s: option '%s%s' requires an argument\n" msgstr "" -#: lib/getopt.c:835 lib/getopt.c:838 +#: lib/getopt.c:621 #, c-format msgid "%s: invalid option -- '%c'\n" msgstr "" -#: lib/getopt.c:891 lib/getopt.c:908 lib/getopt.c:1118 lib/getopt.c:1136 +#: lib/getopt.c:636 lib/getopt.c:682 #, c-format msgid "%s: option requires an argument -- '%c'\n" msgstr "" -#: lib/getopt.c:964 lib/getopt.c:980 -#, c-format -msgid "%s: option '-W %s' is ambiguous\n" -msgstr "" - -#: lib/getopt.c:1004 lib/getopt.c:1022 -#, c-format -msgid "%s: option '-W %s' doesn't allow an argument\n" -msgstr "" - -#: lib/getopt.c:1043 lib/getopt.c:1061 -#, c-format -msgid "%s: option '-W %s' requires an argument\n" -msgstr "" - #. TRANSLATORS: #. Get translations for open and closing quotation marks. #. The message catalog should translate "`" to a left @@ -220,11 +195,11 @@ msgstr "" #. If you don't know what to put here, please see #. <http://en.wikipedia.org/wiki/Quotation_marks_in_other_languages> #. and use glyphs suitable for your language. -#: lib/quotearg.c:347 +#: lib/quotearg.c:362 msgid "`" msgstr "" -#: lib/quotearg.c:348 +#: lib/quotearg.c:363 msgid "'" msgstr "" @@ -488,7 +463,7 @@ msgstr "" msgid "General help using GNU software: <http://www.gnu.org/gethelp/>\n" msgstr "" -#: src/analyze.c:454 src/diff.c:1400 +#: src/analyze.c:454 src/diff.c:1401 #, c-format msgid "Files %s and %s differ\n" msgstr "" @@ -498,21 +473,21 @@ msgstr "" msgid "Binary files %s and %s differ\n" msgstr "" -#: src/analyze.c:697 src/diff3.c:1463 src/util.c:1255 +#: src/analyze.c:706 src/diff3.c:1465 src/util.c:1254 msgid "No newline at end of file" msgstr "" #. This is a proper name. See the gettext manual, section Names. -#: src/cmp.c:43 +#: src/cmp.c:44 msgid "Torbjorn Granlund" msgstr "" #. This is a proper name. See the gettext manual, section Names. -#: src/cmp.c:44 +#: src/cmp.c:45 msgid "David MacKenzie" msgstr "" -#: src/cmp.c:118 src/diff.c:875 src/diff3.c:459 src/sdiff.c:158 +#: src/cmp.c:119 src/diff.c:877 src/diff3.c:462 src/sdiff.c:159 #, c-format msgid "Try '%s --help' for more information." msgstr "" @@ -527,12 +502,12 @@ msgstr "" msgid "options -l and -s are incompatible" msgstr "" -#: src/cmp.c:155 src/diff.c:884 src/diff3.c:467 src/sdiff.c:167 src/sdiff.c:315 -#: src/sdiff.c:322 src/sdiff.c:874 src/util.c:853 src/util.c:953 src/util.c:960 +#: src/cmp.c:155 src/diff.c:885 src/diff3.c:469 src/sdiff.c:167 src/sdiff.c:315 +#: src/sdiff.c:322 src/sdiff.c:874 src/util.c:852 src/util.c:952 src/util.c:959 msgid "write failed" msgstr "" -#: src/cmp.c:157 src/diff.c:886 src/diff.c:1465 src/diff3.c:469 src/sdiff.c:169 +#: src/cmp.c:157 src/diff.c:887 src/diff.c:1466 src/diff3.c:471 src/sdiff.c:169 msgid "standard output" msgstr "" @@ -586,7 +561,7 @@ msgid "" "at the beginning of each file (zero by default)." msgstr "" -#: src/cmp.c:185 src/diff.c:996 src/diff3.c:507 src/sdiff.c:210 +#: src/cmp.c:185 src/diff.c:997 src/diff3.c:509 src/sdiff.c:210 msgid "" "Mandatory arguments to long options are mandatory for short options too.\n" msgstr "" @@ -602,7 +577,7 @@ msgstr "" msgid "If a FILE is '-' or missing, read standard input." msgstr "" -#: src/cmp.c:195 src/diff.c:984 src/sdiff.c:220 +#: src/cmp.c:195 src/diff.c:985 src/sdiff.c:220 msgid "Exit status is 0 if inputs are the same, 1 if different, 2 if trouble." msgstr "" @@ -611,304 +586,319 @@ msgstr "" msgid "invalid --bytes value '%s'" msgstr "" -#: src/cmp.c:266 src/diff.c:793 src/diff3.c:353 src/sdiff.c:565 +#: src/cmp.c:266 src/diff.c:795 src/diff3.c:356 src/sdiff.c:565 #, c-format msgid "missing operand after '%s'" msgstr "" -#: src/cmp.c:278 src/diff.c:795 src/diff3.c:355 src/sdiff.c:567 +#: src/cmp.c:278 src/diff.c:797 src/diff3.c:358 src/sdiff.c:567 #, c-format msgid "extra operand '%s'" msgstr "" -#: src/cmp.c:494 +#: src/cmp.c:498 #, c-format msgid "%s %s differ: byte %s, line %s\n" msgstr "" -#: src/cmp.c:510 +#: src/cmp.c:514 #, c-format msgid "%s %s differ: byte %s, line %s is %3o %s %3o %s\n" msgstr "" -#: src/cmp.c:562 +#: src/cmp.c:571 +#, c-format +msgid "cmp: EOF on %s which is empty\n" +msgstr "" + +#: src/cmp.c:585 #, c-format -msgid "cmp: EOF on %s\n" +msgid "cmp: EOF on %s after byte %s, line %s\n" +msgstr "" + +#: src/cmp.c:586 +#, c-format +msgid "cmp: EOF on %s after byte %s, in line %s\n" +msgstr "" + +#: src/cmp.c:592 +#, c-format +msgid "cmp: EOF on %s after byte %s\n" msgstr "" #. This is a proper name. See the gettext manual, section Names. -#: src/diff.c:49 +#: src/diff.c:50 msgid "Paul Eggert" msgstr "" #. This is a proper name. See the gettext manual, section Names. -#: src/diff.c:50 +#: src/diff.c:51 msgid "Mike Haertel" msgstr "" #. This is a proper name. See the gettext manual, section Names. -#: src/diff.c:51 +#: src/diff.c:52 msgid "David Hayes" msgstr "" #. This is a proper name. See the gettext manual, section Names. -#: src/diff.c:52 +#: src/diff.c:53 msgid "Richard Stallman" msgstr "" #. This is a proper name. See the gettext manual, section Names. -#: src/diff.c:53 +#: src/diff.c:54 msgid "Len Tower" msgstr "" -#: src/diff.c:351 +#: src/diff.c:353 #, c-format msgid "invalid context length '%s'" msgstr "" -#: src/diff.c:434 +#: src/diff.c:436 #, c-format msgid "pagination not supported on this host" msgstr "" -#: src/diff.c:449 src/diff3.c:335 +#: src/diff.c:451 src/diff3.c:336 #, c-format msgid "too many file label options" msgstr "" -#: src/diff.c:526 +#: src/diff.c:528 #, c-format msgid "invalid width '%s'" msgstr "" -#: src/diff.c:530 +#: src/diff.c:532 msgid "conflicting width options" msgstr "" -#: src/diff.c:555 +#: src/diff.c:557 #, c-format msgid "invalid horizon length '%s'" msgstr "" -#: src/diff.c:611 +#: src/diff.c:613 #, c-format msgid "invalid tabsize '%s'" msgstr "" -#: src/diff.c:615 +#: src/diff.c:617 msgid "conflicting tabsize options" msgstr "" -#: src/diff.c:770 +#: src/diff.c:772 msgid "--from-file and --to-file both specified" msgstr "" -#: src/diff.c:890 +#: src/diff.c:891 msgid " --normal output a normal diff (the default)" msgstr "" -#: src/diff.c:891 +#: src/diff.c:892 msgid "-q, --brief report only when files differ" msgstr "" -#: src/diff.c:892 +#: src/diff.c:893 msgid "-s, --report-identical-files report when two files are the same" msgstr "" -#: src/diff.c:893 +#: src/diff.c:894 msgid "" "-c, -C NUM, --context[=NUM] output NUM (default 3) lines of copied context" msgstr "" -#: src/diff.c:894 +#: src/diff.c:895 msgid "" "-u, -U NUM, --unified[=NUM] output NUM (default 3) lines of unified context" msgstr "" -#: src/diff.c:895 +#: src/diff.c:896 msgid "-e, --ed output an ed script" msgstr "" -#: src/diff.c:896 +#: src/diff.c:897 msgid "-n, --rcs output an RCS format diff" msgstr "" -#: src/diff.c:897 +#: src/diff.c:898 msgid "-y, --side-by-side output in two columns" msgstr "" -#: src/diff.c:898 +#: src/diff.c:899 msgid "" "-W, --width=NUM output at most NUM (default 130) print columns" msgstr "" -#: src/diff.c:899 +#: src/diff.c:900 msgid "" " --left-column output only the left column of common lines" msgstr "" -#: src/diff.c:900 +#: src/diff.c:901 msgid " --suppress-common-lines do not output common lines" msgstr "" -#: src/diff.c:902 +#: src/diff.c:903 msgid "-p, --show-c-function show which C function each change is in" msgstr "" -#: src/diff.c:903 +#: src/diff.c:904 msgid "-F, --show-function-line=RE show the most recent line matching RE" msgstr "" -#: src/diff.c:904 +#: src/diff.c:905 msgid "" " --label LABEL use LABEL instead of file name and timestamp\n" " (can be repeated)" msgstr "" -#: src/diff.c:907 +#: src/diff.c:908 msgid "-t, --expand-tabs expand tabs to spaces in output" msgstr "" -#: src/diff.c:908 +#: src/diff.c:909 msgid "-T, --initial-tab make tabs line up by prepending a tab" msgstr "" -#: src/diff.c:909 +#: src/diff.c:910 msgid "" " --tabsize=NUM tab stops every NUM (default 8) print columns" msgstr "" -#: src/diff.c:910 +#: src/diff.c:911 msgid "" " --suppress-blank-empty suppress space or tab before empty output lines" msgstr "" -#: src/diff.c:911 +#: src/diff.c:912 msgid "-l, --paginate pass output through 'pr' to paginate it" msgstr "" -#: src/diff.c:913 +#: src/diff.c:914 msgid "" "-r, --recursive recursively compare any subdirectories found" msgstr "" -#: src/diff.c:914 +#: src/diff.c:915 msgid " --no-dereference don't follow symbolic links" msgstr "" -#: src/diff.c:915 +#: src/diff.c:916 msgid "-N, --new-file treat absent files as empty" msgstr "" -#: src/diff.c:916 +#: src/diff.c:917 msgid " --unidirectional-new-file treat absent first files as empty" msgstr "" -#: src/diff.c:917 +#: src/diff.c:918 msgid " --ignore-file-name-case ignore case when comparing file names" msgstr "" -#: src/diff.c:918 +#: src/diff.c:919 msgid " --no-ignore-file-name-case consider case when comparing file names" msgstr "" -#: src/diff.c:919 +#: src/diff.c:920 msgid "-x, --exclude=PAT exclude files that match PAT" msgstr "" -#: src/diff.c:920 +#: src/diff.c:921 msgid "" "-X, --exclude-from=FILE exclude files that match any pattern in FILE" msgstr "" -#: src/diff.c:921 +#: src/diff.c:922 msgid "" "-S, --starting-file=FILE start with FILE when comparing directories" msgstr "" -#: src/diff.c:922 +#: src/diff.c:923 msgid "" " --from-file=FILE1 compare FILE1 to all operands;\n" " FILE1 can be a directory" msgstr "" -#: src/diff.c:924 +#: src/diff.c:925 msgid "" " --to-file=FILE2 compare all operands to FILE2;\n" " FILE2 can be a directory" msgstr "" -#: src/diff.c:927 +#: src/diff.c:928 msgid "" "-i, --ignore-case ignore case differences in file contents" msgstr "" -#: src/diff.c:928 +#: src/diff.c:929 msgid "-E, --ignore-tab-expansion ignore changes due to tab expansion" msgstr "" -#: src/diff.c:929 +#: src/diff.c:930 msgid "-Z, --ignore-trailing-space ignore white space at line end" msgstr "" -#: src/diff.c:930 +#: src/diff.c:931 msgid "" "-b, --ignore-space-change ignore changes in the amount of white space" msgstr "" -#: src/diff.c:931 +#: src/diff.c:932 msgid "-w, --ignore-all-space ignore all white space" msgstr "" -#: src/diff.c:932 +#: src/diff.c:933 msgid "" "-B, --ignore-blank-lines ignore changes where lines are all blank" msgstr "" -#: src/diff.c:933 +#: src/diff.c:934 msgid "-I, --ignore-matching-lines=RE ignore changes where all lines match RE" msgstr "" -#: src/diff.c:935 +#: src/diff.c:936 msgid "-a, --text treat all files as text" msgstr "" -#: src/diff.c:936 +#: src/diff.c:937 msgid " --strip-trailing-cr strip trailing carriage return on input" msgstr "" -#: src/diff.c:938 +#: src/diff.c:939 msgid " --binary read and write data in binary mode" msgstr "" -#: src/diff.c:941 +#: src/diff.c:942 msgid "" "-D, --ifdef=NAME output merged file with '#ifdef NAME' diffs" msgstr "" -#: src/diff.c:942 +#: src/diff.c:943 msgid " --GTYPE-group-format=GFMT format GTYPE input groups with GFMT" msgstr "" -#: src/diff.c:943 +#: src/diff.c:944 msgid " --line-format=LFMT format all input lines with LFMT" msgstr "" -#: src/diff.c:944 +#: src/diff.c:945 msgid " --LTYPE-line-format=LFMT format LTYPE input lines with LFMT" msgstr "" -#: src/diff.c:945 +#: src/diff.c:946 msgid "" " These format options provide fine-grained control over the output\n" " of diff, generalizing -D/--ifdef." msgstr "" -#: src/diff.c:947 +#: src/diff.c:948 msgid " LTYPE is 'old', 'new', or 'unchanged'. GTYPE is LTYPE or 'changed'." msgstr "" -#: src/diff.c:948 +#: src/diff.c:949 msgid "" " GFMT (only) may contain:\n" " %< lines from FILE1\n" @@ -924,7 +914,7 @@ msgid "" " %(A=B?T:E) if A equals B then T else E" msgstr "" -#: src/diff.c:960 +#: src/diff.c:961 msgid "" " LFMT (only) may contain:\n" " %L contents of line\n" @@ -932,7 +922,7 @@ msgid "" " %[-][WIDTH][.[PREC]]{doxX}n printf-style spec for input line number" msgstr "" -#: src/diff.c:964 +#: src/diff.c:965 msgid "" " Both GFMT and LFMT may contain:\n" " %% %\n" @@ -941,215 +931,209 @@ msgid "" " C the character C (other characters represent themselves)" msgstr "" -#: src/diff.c:970 -msgid "-d, --minimal try hard to find a smaller set of changes" -msgstr "" - #: src/diff.c:971 -msgid " --horizon-lines=NUM keep NUM lines of the common prefix and suffix" +msgid "-d, --minimal try hard to find a smaller set of changes" msgstr "" #: src/diff.c:972 -msgid "" -" --speed-large-files assume large files and many scattered small changes" +msgid " --horizon-lines=NUM keep NUM lines of the common prefix and suffix" msgstr "" #: src/diff.c:973 msgid "" -" --color[=WHEN] colorize the output; WHEN can be 'never', 'always'," +" --speed-large-files assume large files and many scattered small changes" msgstr "" #: src/diff.c:974 -msgid " or 'auto' (the default)" -msgstr "" - -#: src/diff.c:975 msgid "" -" --palette=PALETTE specify the colors to use when --color is active" +" --color[=WHEN] colorize the output; WHEN can be 'never', " +"'always',\n" +" or 'auto' (the default)" msgstr "" #: src/diff.c:976 msgid "" -" PALETTE is a colon-separated list terminfo " -"capabilities" +" --palette=PALETTE the colors to use when --color is active; PALETTE " +"is\n" +" a colon-separated list of terminfo capabilities" msgstr "" -#: src/diff.c:978 +#: src/diff.c:979 msgid " --help display this help and exit" msgstr "" -#: src/diff.c:979 +#: src/diff.c:980 msgid "-v, --version output version information and exit" msgstr "" -#: src/diff.c:981 +#: src/diff.c:982 msgid "FILES are 'FILE1 FILE2' or 'DIR1 DIR2' or 'DIR FILE' or 'FILE DIR'." msgstr "" -#: src/diff.c:982 +#: src/diff.c:983 msgid "" "If --from-file or --to-file is given, there are no restrictions on FILE(s)." msgstr "" -#: src/diff.c:983 src/diff3.c:526 src/sdiff.c:219 +#: src/diff.c:984 src/diff3.c:528 src/sdiff.c:219 msgid "If a FILE is '-', read standard input." msgstr "" -#: src/diff.c:993 +#: src/diff.c:994 #, c-format msgid "Usage: %s [OPTION]... FILES\n" msgstr "" -#: src/diff.c:994 +#: src/diff.c:995 msgid "Compare FILES line by line." msgstr "" -#: src/diff.c:1028 +#: src/diff.c:1029 #, c-format msgid "conflicting %s option value '%s'" msgstr "" -#: src/diff.c:1041 +#: src/diff.c:1042 #, c-format msgid "conflicting output style options" msgstr "" -#: src/diff.c:1057 +#: src/diff.c:1058 #, c-format msgid "invalid color '%s'" msgstr "" -#: src/diff.c:1113 src/diff.c:1323 +#: src/diff.c:1114 src/diff.c:1324 #, c-format msgid "Only in %s: %s\n" msgstr "" -#: src/diff.c:1247 +#: src/diff.c:1248 msgid "cannot compare '-' to a directory" msgstr "" -#: src/diff.c:1282 +#: src/diff.c:1283 msgid "-D option not supported with directories" msgstr "" -#: src/diff.c:1291 +#: src/diff.c:1292 #, c-format msgid "Common subdirectories: %s and %s\n" msgstr "" -#: src/diff.c:1333 src/diff.c:1383 +#: src/diff.c:1334 src/diff.c:1384 #, c-format msgid "File %s is a %s while file %s is a %s\n" msgstr "" -#: src/diff.c:1369 +#: src/diff.c:1370 #, c-format msgid "Symbolic links %s and %s differ\n" msgstr "" -#: src/diff.c:1456 +#: src/diff.c:1457 #, c-format msgid "Files %s and %s are identical\n" msgstr "" #. This is a proper name. See the gettext manual, section Names. -#: src/diff3.c:41 +#: src/diff3.c:42 msgid "Randy Smith" msgstr "" -#: src/diff3.c:348 +#: src/diff3.c:351 #, c-format msgid "incompatible options" msgstr "" -#: src/diff3.c:388 +#: src/diff3.c:391 msgid "'-' specified for more than one input file" msgstr "" -#: src/diff3.c:439 src/diff3.c:1288 src/diff3.c:1692 src/diff3.c:1747 +#: src/diff3.c:442 src/diff3.c:1290 src/diff3.c:1693 src/diff3.c:1748 #: src/sdiff.c:307 src/sdiff.c:844 src/sdiff.c:855 msgid "read failed" msgstr "" -#: src/diff3.c:473 +#: src/diff3.c:475 msgid "-A, --show-all output all changes, bracketing conflicts" msgstr "" -#: src/diff3.c:475 +#: src/diff3.c:477 msgid "" "-e, --ed output ed script incorporating changes\n" " from OLDFILE to YOURFILE into MYFILE" msgstr "" -#: src/diff3.c:477 +#: src/diff3.c:479 msgid "-E, --show-overlap like -e, but bracket conflicts" msgstr "" -#: src/diff3.c:478 +#: src/diff3.c:480 msgid "" "-3, --easy-only like -e, but incorporate only nonoverlapping " "changes" msgstr "" -#: src/diff3.c:479 +#: src/diff3.c:481 msgid "" "-x, --overlap-only like -e, but incorporate only overlapping changes" msgstr "" -#: src/diff3.c:480 +#: src/diff3.c:482 msgid "-X like -x, but bracket conflicts" msgstr "" -#: src/diff3.c:481 +#: src/diff3.c:483 msgid "-i append 'w' and 'q' commands to ed scripts" msgstr "" -#: src/diff3.c:483 +#: src/diff3.c:485 msgid "" "-m, --merge output actual merged file, according to\n" " -A if no other options are given" msgstr "" -#: src/diff3.c:486 +#: src/diff3.c:488 msgid "-a, --text treat all files as text" msgstr "" -#: src/diff3.c:487 +#: src/diff3.c:489 msgid " --strip-trailing-cr strip trailing carriage return on input" msgstr "" -#: src/diff3.c:488 +#: src/diff3.c:490 msgid "-T, --initial-tab make tabs line up by prepending a tab" msgstr "" -#: src/diff3.c:489 +#: src/diff3.c:491 msgid " --diff-program=PROGRAM use PROGRAM to compare files" msgstr "" -#: src/diff3.c:490 +#: src/diff3.c:492 msgid "" "-L, --label=LABEL use LABEL instead of file name\n" " (can be repeated up to three times)" msgstr "" -#: src/diff3.c:493 +#: src/diff3.c:495 msgid " --help display this help and exit" msgstr "" -#: src/diff3.c:494 +#: src/diff3.c:496 msgid "-v, --version output version information and exit" msgstr "" -#: src/diff3.c:503 +#: src/diff3.c:505 #, c-format msgid "Usage: %s [OPTION]... MYFILE OLDFILE YOURFILE\n" msgstr "" -#: src/diff3.c:505 +#: src/diff3.c:507 msgid "Compare three files line by line." msgstr "" -#: src/diff3.c:515 +#: src/diff3.c:517 msgid "" "\n" "The default output format is a somewhat human-readable representation of\n" @@ -1163,45 +1147,45 @@ msgid "" "robust than using ed.\n" msgstr "" -#: src/diff3.c:527 +#: src/diff3.c:529 msgid "Exit status is 0 if successful, 1 if conflicts, 2 if trouble." msgstr "" -#: src/diff3.c:720 +#: src/diff3.c:722 msgid "internal error: screwup in format of diff blocks" msgstr "" -#: src/diff3.c:1015 +#: src/diff3.c:1017 #, c-format msgid "%s: diff failed: " msgstr "" -#: src/diff3.c:1037 +#: src/diff3.c:1039 msgid "internal error: invalid diff type in process_diff" msgstr "" -#: src/diff3.c:1062 +#: src/diff3.c:1064 msgid "invalid diff format; invalid change separator" msgstr "" -#: src/diff3.c:1298 +#: src/diff3.c:1300 msgid "invalid diff format; incomplete last line" msgstr "" -#: src/diff3.c:1322 src/sdiff.c:275 src/util.c:970 +#: src/diff3.c:1324 src/sdiff.c:275 src/util.c:969 #, c-format msgid "subsidiary program '%s' could not be invoked" msgstr "" -#: src/diff3.c:1347 +#: src/diff3.c:1349 msgid "invalid diff format; incorrect leading line chars" msgstr "" -#: src/diff3.c:1420 +#: src/diff3.c:1422 msgid "internal error: invalid diff type passed to output" msgstr "" -#: src/diff3.c:1694 src/diff3.c:1751 +#: src/diff3.c:1695 src/diff3.c:1752 msgid "input file shrank" msgstr "" @@ -1216,7 +1200,7 @@ msgid "%s: recursive directory loop" msgstr "" #. This is a proper name. See the gettext manual, section Names. -#: src/sdiff.c:42 +#: src/sdiff.c:43 msgid "Thomas Lord" msgstr "" @@ -1338,12 +1322,12 @@ msgid "" "q:\tQuit.\n" msgstr "" -#: src/util.c:663 +#: src/util.c:662 #, c-format msgid "unrecognized prefix: %s" msgstr "" -#: src/util.c:693 +#: src/util.c:692 #, c-format msgid "unparsable value for --palette" msgstr "" Binary files differ@@ -1,48 +1,47 @@ # translation of diffutils to Greek # Copyright (C) 2004 Free Software Foundation, Inc. # This file is distributed under the same license as the diffutils package. -# # Lefteris Dimitroulakis <edimitro@tee.gr>, 2004. -# Lefteris Dimitroulakis <ledimitro@gmail.com>, 2013, 2014. +# Lefteris Dimitroulakis <ledimitro@gmail.com>, 2013, 2014, 2017. msgid "" msgstr "" -"Project-Id-Version: diffutils-3.3-pre1\n" +"Project-Id-Version: diffutils-3.5.25\n" "Report-Msgid-Bugs-To: bug-diffutils@gnu.org\n" -"POT-Creation-Date: 2016-08-20 22:22-0700\n" -"PO-Revision-Date: 2014-11-28 23:51+0200\n" +"POT-Creation-Date: 2017-05-21 13:26-0700\n" +"PO-Revision-Date: 2017-05-13 01:10+0300\n" "Last-Translator: Lefteris Dimitroulakis <ledimitro@gmail.com>\n" "Language-Team: Greek <team@lists.gnome.gr>\n" "Language: el\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"X-Bugs: Report translation errors to the Language-Team address.\n" "X-Generator: Lokalize 1.5\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: lib/argmatch.c:133 -#, fuzzy, c-format +#: lib/argmatch.c:134 +#, c-format msgid "invalid argument %s for %s" -msgstr "μη ÎγκυÏο %s%s ÏŒÏισμα «%s»" +msgstr "μη ÎγκυÏο ÏŒÏισμα %s για %s" -#: lib/argmatch.c:134 +#: lib/argmatch.c:135 #, c-format msgid "ambiguous argument %s for %s" -msgstr "" +msgstr "ασαφÎÏ‚ ÏŒÏισμα %s για %s" -#: lib/argmatch.c:153 -#, fuzzy +#: lib/argmatch.c:154 msgid "Valid arguments are:" -msgstr "μη ÎγκυÏο %s%s ÏŒÏισμα «%s»" +msgstr "ΈγκυÏο οÏίσματα είναι:" -#: lib/c-stack.c:204 lib/c-stack.c:297 +#: lib/c-stack.c:203 lib/c-stack.c:296 msgid "program error" msgstr "σφάλμα Ï€ÏογÏάμματος" -#: lib/c-stack.c:205 lib/c-stack.c:298 +#: lib/c-stack.c:204 lib/c-stack.c:297 msgid "stack overflow" msgstr "υπεÏχείλιση στοίβας" -#: lib/error.c:191 +#: lib/error.c:195 msgid "Unknown system error" msgstr "Άγνωστο σφάλμα συστήματος" @@ -88,7 +87,7 @@ msgstr "ειδικό αÏχείο χαÏακτήÏων" #: lib/file-type.c:72 msgid "contiguous data" -msgstr "" +msgstr "συνεχόμενα δεδομÎνα" #: lib/file-type.c:75 msgid "fifo" @@ -96,43 +95,39 @@ msgstr "fifo" #: lib/file-type.c:78 msgid "door" -msgstr "" +msgstr "door" #: lib/file-type.c:81 -#, fuzzy msgid "multiplexed block special file" msgstr "ειδικό αÏχείο μπλοκ" #: lib/file-type.c:84 -#, fuzzy msgid "multiplexed character special file" msgstr "ειδικό αÏχείο χαÏακτήÏων" #: lib/file-type.c:87 msgid "multiplexed file" -msgstr "" +msgstr "multiplexed file" #: lib/file-type.c:90 -#, fuzzy msgid "named file" -msgstr "αλλόκοτο αÏχείο" +msgstr "named file" #: lib/file-type.c:93 -#, fuzzy msgid "network special file" -msgstr "ειδικό αÏχείο μπλοκ" +msgstr "ειδικό αÏχείο δικτÏου" #: lib/file-type.c:96 msgid "migrated file with data" -msgstr "" +msgstr "migrated file with data" #: lib/file-type.c:99 msgid "migrated file without data" -msgstr "" +msgstr "migrated file without data" #: lib/file-type.c:102 msgid "port" -msgstr "" +msgstr "θÏÏα" #: lib/file-type.c:105 msgid "socket" @@ -140,72 +135,47 @@ msgstr "socket" #: lib/file-type.c:108 msgid "whiteout" -msgstr "" +msgstr "whiteout" #: lib/file-type.c:110 msgid "weird file" msgstr "αλλόκοτο αÏχείο" -#: lib/getopt.c:575 lib/getopt.c:604 -#, c-format -msgid "%s: option '%s' is ambiguous; possibilities:" -msgstr "%s: η επιλογή «%s» είναι ασαφής·επιλογÎÏ‚:" - -#: lib/getopt.c:619 -#, fuzzy, c-format -msgid "%s: option '%s' is ambiguous\n" -msgstr "%s: η επιλογή «-W %s» είναι ασαφής\n" - -#: lib/getopt.c:654 lib/getopt.c:658 +#: lib/getopt.c:278 #, c-format -msgid "%s: option '--%s' doesn't allow an argument\n" -msgstr "%s: η επιλογή «--%s» δεν επιτÏÎπει ÏŒÏισμα\n" +msgid "%s: option '%s%s' is ambiguous\n" +msgstr "%s: η επιλογή «%s%s» είναι ασαφής\n" -#: lib/getopt.c:667 lib/getopt.c:672 +#: lib/getopt.c:284 #, c-format -msgid "%s: option '%c%s' doesn't allow an argument\n" -msgstr "%s: η επιλογή «%c%s» δεν επιτÏÎπει ÏŒÏισμα\n" +msgid "%s: option '%s%s' is ambiguous; possibilities:" +msgstr "%s: η επιλογή «%s%s» είναι ασαφής· επιλογÎÏ‚: " -#: lib/getopt.c:715 lib/getopt.c:734 +#: lib/getopt.c:319 #, c-format -msgid "%s: option '--%s' requires an argument\n" -msgstr "%s: η επιλογή «--%s» απαιτεί ÏŒÏισμα\n" +msgid "%s: unrecognized option '%s%s'\n" +msgstr "%s: η επιλογή «%s%s» δεν αναγνωÏίζεται\n" -#: lib/getopt.c:772 lib/getopt.c:775 +#: lib/getopt.c:345 #, c-format -msgid "%s: unrecognized option '--%s'\n" -msgstr "%s: η επιλογή «--%s» δεν αναγνωÏίζεται\n" +msgid "%s: option '%s%s' doesn't allow an argument\n" +msgstr "%s: η επιλογή «%s%s» δεν επιτÏÎπει ÏŒÏισμα\n" -#: lib/getopt.c:783 lib/getopt.c:786 +#: lib/getopt.c:360 #, c-format -msgid "%s: unrecognized option '%c%s'\n" -msgstr "%s: η επιλογή «%c%s» δεν αναγνωÏίζεται\n" +msgid "%s: option '%s%s' requires an argument\n" +msgstr "%s: η επιλογή «%s%s» απαιτεί ÏŒÏισμα\n" -#: lib/getopt.c:835 lib/getopt.c:838 +#: lib/getopt.c:621 #, c-format msgid "%s: invalid option -- '%c'\n" msgstr "%s: η επιλογή -- «%c» δεν είναι ÎγκυÏη\n" -#: lib/getopt.c:891 lib/getopt.c:908 lib/getopt.c:1118 lib/getopt.c:1136 +#: lib/getopt.c:636 lib/getopt.c:682 #, c-format msgid "%s: option requires an argument -- '%c'\n" msgstr "%s: η επιλογή απαιτεί ÏŒÏισμα -- «%c»\n" -#: lib/getopt.c:964 lib/getopt.c:980 -#, c-format -msgid "%s: option '-W %s' is ambiguous\n" -msgstr "%s: η επιλογή «-W %s» είναι ασαφής\n" - -#: lib/getopt.c:1004 lib/getopt.c:1022 -#, c-format -msgid "%s: option '-W %s' doesn't allow an argument\n" -msgstr "%s: η επιλογή «-W %s» δεν επιτÏÎπει ÏŒÏισμα\n" - -#: lib/getopt.c:1043 lib/getopt.c:1061 -#, c-format -msgid "%s: option '-W %s' requires an argument\n" -msgstr "%s: η επιλογή «-W %s» απαιτεί ÏŒÏισμα\n" - #. TRANSLATORS: #. Get translations for open and closing quotation marks. #. The message catalog should translate "`" to a left @@ -227,11 +197,11 @@ msgstr "%s: η επιλογή «-W %s» απαιτεί ÏŒÏισμα\n" #. If you don't know what to put here, please see #. <http://en.wikipedia.org/wiki/Quotation_marks_in_other_languages> #. and use glyphs suitable for your language. -#: lib/quotearg.c:347 +#: lib/quotearg.c:362 msgid "`" msgstr "«" -#: lib/quotearg.c:348 +#: lib/quotearg.c:363 msgid "'" msgstr "»" @@ -264,9 +234,8 @@ msgid "Invalid back reference" msgstr "ΆκυÏη πίσω παÏαπομπή" #: lib/regcomp.c:156 -#, fuzzy msgid "Unmatched [, [^, [:, [., or [=" -msgstr "Δε βÏÎθηκε [ ή [^" +msgstr "Δεν βÏÎθηκε [, [^, [:, [., or [=" #: lib/regcomp.c:159 msgid "Unmatched ( or \\(" @@ -278,11 +247,11 @@ msgstr "Δε βÏÎθηκε \\{" #: lib/regcomp.c:165 msgid "Invalid content of \\{\\}" -msgstr "Το πεÏιεχόμενο του \\{\\} είναι άκυÏο" +msgstr "Το πεÏιεχόμενο του \\{\\} είναι μη ÎγκυÏο" #: lib/regcomp.c:168 msgid "Invalid range end" -msgstr "ΆκυÏο Ï€ÎÏας διαστήματος" +msgstr "Μη ÎγκυÏο Ï€ÎÏας διαστήματος" #: lib/regcomp.c:171 msgid "Memory exhausted" @@ -522,7 +491,7 @@ msgid "General help using GNU software: <http://www.gnu.org/gethelp/>\n" msgstr "" "Γενική βοήθεια στη χÏήση Î»Î¿Î³Î¹ÏƒÎ¼Î¹ÎºÎ¿Ï GNU: <http://www.gnu.org/gethelp/>\n" -#: src/analyze.c:454 src/diff.c:1400 +#: src/analyze.c:454 src/diff.c:1401 #, c-format msgid "Files %s and %s differ\n" msgstr "Τα αÏχεία %s και %s διαφÎÏουν\n" @@ -532,21 +501,21 @@ msgstr "Τα αÏχεία %s και %s διαφÎÏουν\n" msgid "Binary files %s and %s differ\n" msgstr "Τα δυαδικά αÏχεία %s και %s διαφÎÏουν\n" -#: src/analyze.c:697 src/diff3.c:1463 src/util.c:1255 +#: src/analyze.c:706 src/diff3.c:1465 src/util.c:1254 msgid "No newline at end of file" msgstr "Δεν υπάÏχει χαÏακτήÏας νÎας γÏαμμής στο Ï„Îλος του αÏχείου" #. This is a proper name. See the gettext manual, section Names. -#: src/cmp.c:43 +#: src/cmp.c:44 msgid "Torbjorn Granlund" msgstr "Torbjorn Granlund" #. This is a proper name. See the gettext manual, section Names. -#: src/cmp.c:44 +#: src/cmp.c:45 msgid "David MacKenzie" msgstr "David MacKenzie" -#: src/cmp.c:118 src/diff.c:875 src/diff3.c:459 src/sdiff.c:158 +#: src/cmp.c:119 src/diff.c:877 src/diff3.c:462 src/sdiff.c:159 #, c-format msgid "Try '%s --help' for more information." msgstr "Δοκιμάστε «%s --help» για πεÏισσότεÏες πληÏοφοÏίες." @@ -561,12 +530,12 @@ msgstr "άκυÏη τιμή --ignore-initial «%s»" msgid "options -l and -s are incompatible" msgstr "οι επιλογÎÏ‚ -l και -s είναι ασÏμβατες" -#: src/cmp.c:155 src/diff.c:884 src/diff3.c:467 src/sdiff.c:167 src/sdiff.c:315 -#: src/sdiff.c:322 src/sdiff.c:874 src/util.c:853 src/util.c:953 src/util.c:960 +#: src/cmp.c:155 src/diff.c:885 src/diff3.c:469 src/sdiff.c:167 src/sdiff.c:315 +#: src/sdiff.c:322 src/sdiff.c:874 src/util.c:852 src/util.c:952 src/util.c:959 msgid "write failed" msgstr "η εγγÏαφή απÎτυχε" -#: src/cmp.c:157 src/diff.c:886 src/diff.c:1465 src/diff3.c:469 src/sdiff.c:169 +#: src/cmp.c:157 src/diff.c:887 src/diff.c:1466 src/diff3.c:471 src/sdiff.c:169 msgid "standard output" msgstr "κανονική Îξοδος" @@ -626,9 +595,9 @@ msgid "" msgstr "" "Οι Ï€ÏοαιÏετικÎÏ‚ παÏάμετÏοι SKIP1 και SKIP2 καθοÏίζουν τον αÏιθμό των bytes " "Ï€Ïος παÏάβλεψη\n" -"στην αÏχή κάθε αÏχείου (η Ï€Ïοεπιλογή είναι μηδÎν)." +"στην αÏχή κάθε αÏχείου (η Ï€Ïοεπιλογή είναι μηδÎν). " -#: src/cmp.c:185 src/diff.c:996 src/diff3.c:507 src/sdiff.c:210 +#: src/cmp.c:185 src/diff.c:997 src/diff3.c:509 src/sdiff.c:210 msgid "" "Mandatory arguments to long options are mandatory for short options too.\n" msgstr "" @@ -650,7 +619,7 @@ msgstr "" msgid "If a FILE is '-' or missing, read standard input." msgstr "Αν Îνα ΑΡΧΕΙΟ είναι «-» ή απών, τότε ανάγνωση από την κανονική είσοδο." -#: src/cmp.c:195 src/diff.c:984 src/sdiff.c:220 +#: src/cmp.c:195 src/diff.c:985 src/sdiff.c:220 msgid "Exit status is 0 if inputs are the same, 1 if different, 2 if trouble." msgstr "" "Η Îξοδος είναι 0 αν τα δεδομÎνα αÏχεία είναι ίδια, 1 αν είναι διαφοÏετικά,\n" @@ -661,246 +630,260 @@ msgstr "" msgid "invalid --bytes value '%s'" msgstr "άκυÏη τιμή «%s» για την επιλογή --bytes " -#: src/cmp.c:266 src/diff.c:793 src/diff3.c:353 src/sdiff.c:565 +#: src/cmp.c:266 src/diff.c:795 src/diff3.c:356 src/sdiff.c:565 #, c-format msgid "missing operand after '%s'" msgstr "απών τελεστÎος μετά από «%s»" -#: src/cmp.c:278 src/diff.c:795 src/diff3.c:355 src/sdiff.c:567 +#: src/cmp.c:278 src/diff.c:797 src/diff3.c:358 src/sdiff.c:567 #, c-format msgid "extra operand '%s'" msgstr "συμπληÏωματικός τελεστÎος «%s»" -#: src/cmp.c:494 +#: src/cmp.c:498 #, c-format msgid "%s %s differ: byte %s, line %s\n" msgstr "%s %s διαφÎÏουν: byte %s, γÏαμμή %s\n" -#: src/cmp.c:510 +#: src/cmp.c:514 #, c-format msgid "%s %s differ: byte %s, line %s is %3o %s %3o %s\n" msgstr "%s %s διαφÎÏουν: byte %s, γÏαμμή %s είναι %3o %s %3o %s\n" -#: src/cmp.c:562 +#: src/cmp.c:571 +#, c-format +msgid "cmp: EOF on %s which is empty\n" +msgstr "cmp: EOF στο %s που είναι κενό\n" + +#: src/cmp.c:585 #, c-format -msgid "cmp: EOF on %s\n" -msgstr "cmp: ΤÎλος-ΑÏχείου (EOF) σε %s\n" +msgid "cmp: EOF on %s after byte %s, line %s\n" +msgstr "cmp: EOF στο %s μετά το byte %s, γÏαμμή %s\n" + +#: src/cmp.c:586 +#, c-format +msgid "cmp: EOF on %s after byte %s, in line %s\n" +msgstr "cmp: EOF στο %s μετά το byte %s, στη γÏαμμή %s\n" + +#: src/cmp.c:592 +#, c-format +msgid "cmp: EOF on %s after byte %s\n" +msgstr "cmp: EOF στο %s μετά το byte %s\n" #. This is a proper name. See the gettext manual, section Names. -#: src/diff.c:49 +#: src/diff.c:50 msgid "Paul Eggert" msgstr "Paul Eggert" #. This is a proper name. See the gettext manual, section Names. -#: src/diff.c:50 +#: src/diff.c:51 msgid "Mike Haertel" msgstr "Mike Haertel" #. This is a proper name. See the gettext manual, section Names. -#: src/diff.c:51 +#: src/diff.c:52 msgid "David Hayes" msgstr "David Hayes" #. This is a proper name. See the gettext manual, section Names. -#: src/diff.c:52 +#: src/diff.c:53 msgid "Richard Stallman" msgstr "Richard Stallman" #. This is a proper name. See the gettext manual, section Names. -#: src/diff.c:53 +#: src/diff.c:54 msgid "Len Tower" msgstr "Len Tower" -#: src/diff.c:351 +#: src/diff.c:353 #, c-format msgid "invalid context length '%s'" msgstr "μη ÎγκυÏο μήκος συμφÏαζομÎνων «%s»" -#: src/diff.c:434 +#: src/diff.c:436 #, c-format msgid "pagination not supported on this host" msgstr "Η αÏίθμιση σελίδων δεν υποστηÏίζεται σ' αυτόν τον υπολογιστή" -#: src/diff.c:449 src/diff3.c:335 +#: src/diff.c:451 src/diff3.c:336 #, c-format msgid "too many file label options" msgstr "πάÏα πολλÎÏ‚ επιλογÎÏ‚ ετικÎττας αÏχείου" -#: src/diff.c:526 +#: src/diff.c:528 #, c-format msgid "invalid width '%s'" -msgstr "άκυÏο πλάτος «%s»" +msgstr "μη ÎγκυÏο πλάτος «%s»" -#: src/diff.c:530 +#: src/diff.c:532 msgid "conflicting width options" msgstr "αντικÏουόμενες επιλογÎÏ‚ πλάτους" -#: src/diff.c:555 +#: src/diff.c:557 #, c-format msgid "invalid horizon length '%s'" -msgstr "άκυÏο μήκος οÏίζοντα «%s»" +msgstr "μη ÎγκυÏο μήκος οÏίζοντα «%s»" -#: src/diff.c:611 +#: src/diff.c:613 #, c-format msgid "invalid tabsize '%s'" -msgstr "άκυÏο μήκος στηλοθÎτησης `%s'" +msgstr "μη ÎγκυÏο μήκος στηλοθÎτησης `%s'" -#: src/diff.c:615 +#: src/diff.c:617 msgid "conflicting tabsize options" msgstr "αντικÏουόμενες επιλογÎÏ‚ μήκους στηλοθÎτησης" -#: src/diff.c:770 +#: src/diff.c:772 msgid "--from-file and --to-file both specified" -msgstr "--from-file και --to-file Îχουν οÏιστεί μαζί" +msgstr "--from-file και --to-file Îχουν οÏιστεί αμφότεÏα" -#: src/diff.c:890 +#: src/diff.c:891 msgid " --normal output a normal diff (the default)" msgstr " --normal ΔημιουÏγία ενός ÎºÎ±Î½Î¿Î½Î¹ÎºÎ¿Ï `diff' (Ï€Ïοεπιλογή)" -#: src/diff.c:891 +#: src/diff.c:892 msgid "-q, --brief report only when files differ" msgstr "-q --brief αποτÎλεσμα στην Îξοδο μόνο αν Ï„' αÏχεία διαφÎÏουν" -#: src/diff.c:892 +#: src/diff.c:893 msgid "-s, --report-identical-files report when two files are the same" msgstr "-s, --report-identical-files Ειδοποιεί όταν δÏο αÏχεία είναι ίδια" -#: src/diff.c:893 +#: src/diff.c:894 msgid "" "-c, -C NUM, --context[=NUM] output NUM (default 3) lines of copied context" msgstr "" "-c, -C NUM, --context[=NUM] Îξοδος NUM (Ï€Ïοεπιλογή 3) γÏαμμÎÏ‚ of copied " "context" -#: src/diff.c:894 +#: src/diff.c:895 msgid "" "-u, -U NUM, --unified[=NUM] output NUM (default 3) lines of unified context" msgstr "" "-u, -U NUM, --unified[=NUM] output NUM (default 3) lines of unified context" -#: src/diff.c:895 +#: src/diff.c:896 msgid "-e, --ed output an ed script" msgstr "-e, --ed εμφανίζει Îνα ed script" -#: src/diff.c:896 +#: src/diff.c:897 msgid "-n, --rcs output an RCS format diff" msgstr "-n --rcs ΔημιουÏγία αÏχείου «diff» σε μοÏφή RCS." -#: src/diff.c:897 +#: src/diff.c:898 msgid "-y, --side-by-side output in two columns" msgstr "-y, --side-by-side Îξοδος σε δυο στήλες" -#: src/diff.c:898 +#: src/diff.c:899 msgid "" "-W, --width=NUM output at most NUM (default 130) print columns" msgstr "" "-W, --width=NUM output at most NUM (default 130) print columns" -#: src/diff.c:899 +#: src/diff.c:900 msgid "" " --left-column output only the left column of common lines" msgstr "" "--left-column Εμφάνιση μόνο της αÏιστεÏής στήλης των ταυτόσημων γÏαμμών." -#: src/diff.c:900 +#: src/diff.c:901 msgid " --suppress-common-lines do not output common lines" msgstr "-s --suppress-common-lines Οι ταυτόσημες γÏαμμÎÏ‚ δεν εμφανίζονται." -#: src/diff.c:902 +#: src/diff.c:903 msgid "-p, --show-c-function show which C function each change is in" msgstr "" "-p, --show-c-function εμφάνιση σε ποιά συνάÏτηση C βÏίσκεται κάθε αλλαγή" -#: src/diff.c:903 +#: src/diff.c:904 msgid "-F, --show-function-line=RE show the most recent line matching RE" msgstr "" "-F, --show-function-line=RE εμφάνιση του πιο Ï€Ïόσφατου ταιÏιάσματος " "γÏαμμής RE" -#: src/diff.c:904 -#, fuzzy +#: src/diff.c:905 msgid "" " --label LABEL use LABEL instead of file name and timestamp\n" " (can be repeated)" msgstr "" -"-L, --label=LABEL χÏήση LABEL αντί ονόματος αÏχείου\n" +"-L, --label=LABEL χÏήση LABEL αντί ονόματος αÏχείου και timestamp\n" " (μποÏεί να επαναληφθεί)" -#: src/diff.c:907 +#: src/diff.c:908 msgid "-t, --expand-tabs expand tabs to spaces in output" msgstr "-t, --expand-tabs ΜετατÏοπή στηλοθετών σε διαστήματα στην Îξοδο." -#: src/diff.c:908 +#: src/diff.c:909 msgid "-T, --initial-tab make tabs line up by prepending a tab" msgstr "" "-T, --initial-tab Στοίχιση των στηλοθετών με την επιπÏόσθεση ενός στην " "αÏχή." -#: src/diff.c:909 +#: src/diff.c:910 msgid "" " --tabsize=NUM tab stops every NUM (default 8) print columns" msgstr "" " --tabsize=ΑΡ Ο αÏιθμός διαστημάτων του στηλοθÎτη είναι ΑΡ (Ï€Ïοεπιλογή 8)" -#: src/diff.c:910 +#: src/diff.c:911 msgid "" " --suppress-blank-empty suppress space or tab before empty output lines" msgstr "" " --suppress-blank-empty απάλειψη διαστήματος ή στ/θÎτη Ï€Ïιν από κενÎÏ‚ " "γÏαμμÎÏ‚ στην Îξοδο" -#: src/diff.c:911 +#: src/diff.c:912 msgid "-l, --paginate pass output through 'pr' to paginate it" msgstr "" " -l, --paginate Έξοδος δια μÎσου του «pr» ώστε να αÏιθμιθοÏν οι σελίδες" -#: src/diff.c:913 +#: src/diff.c:914 msgid "" "-r, --recursive recursively compare any subdirectories found" msgstr "-r, --recursive ΑναδÏομική σÏγκÏιση όσων υποκαταλόγων βÏεθοÏν" -#: src/diff.c:914 +#: src/diff.c:915 msgid " --no-dereference don't follow symbolic links" msgstr " --no-dereference μην ακολουθείς συμβολικοÏÏ‚ συνδÎσμους" -#: src/diff.c:915 +#: src/diff.c:916 msgid "-N, --new-file treat absent files as empty" msgstr "-N, --new-file ΘεωÏεί τα απόντα αÏχεία ως κενά" -#: src/diff.c:916 +#: src/diff.c:917 msgid " --unidirectional-new-file treat absent first files as empty" msgstr "--unidirectional-new-file ΘεωÏεί τα απόντα Ï€Ïώτα αÏχεία ως κενά." -#: src/diff.c:917 +#: src/diff.c:918 msgid " --ignore-file-name-case ignore case when comparing file names" msgstr "" "--ignore-file-name-case Αγνοεί τις διαφοÏÎÏ‚ λόγω πεζών-κεφαλαίων\n" " κατά τη σÏγκÏιση ονομάτων αÏχείων." -#: src/diff.c:918 +#: src/diff.c:919 msgid " --no-ignore-file-name-case consider case when comparing file names" msgstr "" "--no-ignore-file-name-case Λαμβάνει Ï…Ï€' όψιν τις διαφοÏÎÏ‚ λόγω\n" " πεζών-κεφαλαίων κατά τη σÏγκÏιση ονομάτων αÏχείων." -#: src/diff.c:919 +#: src/diff.c:920 msgid "-x, --exclude=PAT exclude files that match PAT" msgstr "-x, --exclude=PAT ΕξαίÏεση αÏχείων με όνομα που ταιÏιάζει με PAT." -#: src/diff.c:920 +#: src/diff.c:921 msgid "" "-X, --exclude-from=FILE exclude files that match any pattern in FILE" msgstr "" "-X, --exclude-from=ΑΡΧΕΙΟ ΕξαίÏεση αÏχείων με όνομα που ταιÏάζει\n" " με τα ονόματα που βÏίσκονται στο ΑΡΧΕΙΟ" -#: src/diff.c:921 +#: src/diff.c:922 msgid "" "-S, --starting-file=FILE start with FILE when comparing directories" msgstr "" "-S, --starting-file=ΑΡΧΕΙΟ Εκκίνηση σÏγκÏισης καταλόγων από το ΑΡΧΕΙΟ" -#: src/diff.c:922 +#: src/diff.c:923 msgid "" " --from-file=FILE1 compare FILE1 to all operands;\n" " FILE1 can be a directory" @@ -908,7 +891,7 @@ msgstr "" "--from-file=ΑΡΧΕΙΟ1 ΣÏγκÏιση ΑΡΧΕΙΟ1 με όλους τους τελεστÎους·\n" " ΑΡΧΕΙΟ1 μποÏεί να είναι κατάλογος" -#: src/diff.c:924 +#: src/diff.c:925 msgid "" " --to-file=FILE2 compare all operands to FILE2;\n" " FILE2 can be a directory" @@ -916,79 +899,79 @@ msgstr "" "--to-file=ΑΡΧΕΙΟ2 ΣÏγκÏιση όλων των τελεστÎων στο ΑΡΧΕΙΟ2·\n" " ΑΡΧΕΙΟ2 μποÏεί να είναι κατάλογος" -#: src/diff.c:927 +#: src/diff.c:928 msgid "" "-i, --ignore-case ignore case differences in file contents" msgstr "" "-i, --ignore-case Αγνοεί τις διαφοÏÎÏ‚ λόγω πεζών-κεφαλαίων στα πεÏιεχόμενα " "των αÏχείων" -#: src/diff.c:928 +#: src/diff.c:929 msgid "-E, --ignore-tab-expansion ignore changes due to tab expansion" msgstr "" "-E, --ignore-tab-expansion Αγνοεί αλλαγÎÏ‚ οφειλόμενες στη στηλοθÎτηση" -#: src/diff.c:929 +#: src/diff.c:930 msgid "-Z, --ignore-trailing-space ignore white space at line end" msgstr "" "-Z, --ignore-trailing-space αγνοεί λευκά διαστήματα στο Ï„Îλος γÏαμμής" -#: src/diff.c:930 +#: src/diff.c:931 msgid "" "-b, --ignore-space-change ignore changes in the amount of white space" msgstr "" "-b, --ignore-space-change Αγνοεί αλλαγÎÏ‚ οφειλόμενες στον αÏιθμό λευκών " "διαστημάτων." -#: src/diff.c:931 +#: src/diff.c:932 msgid "-w, --ignore-all-space ignore all white space" msgstr "-w, --ignore-all-space Αγνοεί όλα τα λευκά διαστήματα." -#: src/diff.c:932 +#: src/diff.c:933 msgid "" "-B, --ignore-blank-lines ignore changes where lines are all blank" msgstr "" "-B, --ignore-blank-lines Αγνοεί αλλαγÎÏ‚ οφειλόμενες στις λευκÎÏ‚ γÏαμμÎÏ‚" -#: src/diff.c:933 +#: src/diff.c:934 msgid "-I, --ignore-matching-lines=RE ignore changes where all lines match RE" msgstr "" "-I, --ignore-matching-lines=RE Αγνοεί αλλαγÎÏ‚ που οι γÏαμμÎÏ‚ τους " "ταιÏιάζουν με RE." -#: src/diff.c:935 +#: src/diff.c:936 msgid "-a, --text treat all files as text" msgstr "-a, --text ΘεωÏεί όλα τα αÏχεία ως κείμενο." -#: src/diff.c:936 +#: src/diff.c:937 msgid " --strip-trailing-cr strip trailing carriage return on input" msgstr "--strip-trailing-cr Απαλειφή του χαÏακτήÏα επιστÏοφής στην είσοδο." -#: src/diff.c:938 +#: src/diff.c:939 msgid " --binary read and write data in binary mode" msgstr "--binary Ανάγνωση και εγγÏαφή πληÏοφοÏίας σε δυαδική μοÏφή." -#: src/diff.c:941 +#: src/diff.c:942 msgid "" "-D, --ifdef=NAME output merged file with '#ifdef NAME' diffs" msgstr "" "-D, --ifdef=ΟÎΟΜΑ Έξοδος συγχωνευμÎνου αÏχείου με τις διαφοÏÎÏ‚ «#ifdef " "NAME»." -#: src/diff.c:942 +#: src/diff.c:943 msgid " --GTYPE-group-format=GFMT format GTYPE input groups with GFMT" msgstr "--GTYPE-group-format=GFMT μοÏφοποίηση ομάδων εισόδου GTYPE με GFMT." -#: src/diff.c:943 +#: src/diff.c:944 msgid " --line-format=LFMT format all input lines with LFMT" msgstr "" "--line-format=LFMT μοÏφοποίηση όλων των γÏαμμών εισόδου με LFMT" -#: src/diff.c:944 +#: src/diff.c:945 msgid " --LTYPE-line-format=LFMT format LTYPE input lines with LFMT" msgstr "--LTYPE-line-format=LFMT μοÏφοποίηση γÏαμμών εισόδου LTYPE με LFMT." -#: src/diff.c:945 +#: src/diff.c:946 msgid "" " These format options provide fine-grained control over the output\n" " of diff, generalizing -D/--ifdef." @@ -996,12 +979,12 @@ msgstr "" "ΑυτÎÏ‚ οι επιλογÎÏ‚ μοÏφής παÏÎχουν λεπτομεÏή Îλεγχο πάνω στην Îξοδο\n" " του diff, γενικεÏοντας -D/--ifdef." -#: src/diff.c:947 +#: src/diff.c:948 msgid " LTYPE is 'old', 'new', or 'unchanged'. GTYPE is LTYPE or 'changed'." msgstr "" " LTYPE είναι «old», «new», ή «unchanged». GTYPE είναι LTYPE ή «changed»." -#: src/diff.c:948 +#: src/diff.c:949 msgid "" " GFMT (only) may contain:\n" " %< lines from FILE1\n" @@ -1030,7 +1013,7 @@ msgstr "" " M L+1\n" " %(A=B?T:E) αν A ίσον B τότε T αλλιώς E" -#: src/diff.c:960 +#: src/diff.c:961 msgid "" " LFMT (only) may contain:\n" " %L contents of line\n" @@ -1043,7 +1026,7 @@ msgstr "" " %[-][ΠΛΑΤΟΣ][.[PREC]]{doxX}n την Ï€ÏοδιαγÏαφή του αÏÎ¹Î¸Î¼Î¿Ï Î³Ïαμμής\n" " εισόδου κατά τη μοÏφή της printf()" -#: src/diff.c:964 +#: src/diff.c:965 msgid "" " Both GFMT and LFMT may contain:\n" " %% %\n" @@ -1057,161 +1040,160 @@ msgstr "" " %c'\\OOO' το χαÏακτήÏα με οκταδικό κωδικό OOO\n" " C το χαÏακτήÏα C (οι άλλοι χαÏακτήÏες αναπαÏιστοÏν τον εαυτόν τους)" -#: src/diff.c:970 +#: src/diff.c:971 msgid "-d, --minimal try hard to find a smaller set of changes" msgstr "-d --minimal Ï€Ïοσπάθεια εÏÏεσης μικÏότεÏου συνόλου διαφοÏών." -#: src/diff.c:971 +#: src/diff.c:972 msgid " --horizon-lines=NUM keep NUM lines of the common prefix and suffix" msgstr "" "--horizon-lines=ΑΡ ΔιατηÏεί ΑΡ γÏαμμÎÏ‚ με ταυτόσημα Ï€ÏοθÎματα κι επιθÎματα." -#: src/diff.c:972 +#: src/diff.c:973 msgid "" " --speed-large-files assume large files and many scattered small changes" msgstr "" "--speed-large-files ΥποθÎτει μεγάλα αÏχεία με πολλÎÏ‚ σκόÏπιες μικÏοαλλαγÎÏ‚." -#: src/diff.c:973 -msgid "" -" --color[=WHEN] colorize the output; WHEN can be 'never', 'always'," -msgstr "" - #: src/diff.c:974 -#, fuzzy -msgid " or 'auto' (the default)" -msgstr " --normal ΔημιουÏγία ενός ÎºÎ±Î½Î¿Î½Î¹ÎºÎ¿Ï `diff' (Ï€Ïοεπιλογή)" - -#: src/diff.c:975 msgid "" -" --palette=PALETTE specify the colors to use when --color is active" +" --color[=WHEN] colorize the output; WHEN can be 'never', " +"'always',\n" +" or 'auto' (the default)" msgstr "" +" --color[=WHEN] χÏωματίζει την Îξοδο, WHEN μποÏεί να είναι «ποτλ, " +"«πάντα»,\n" +" ή «αυτόματο» (Ï€Ïοεπιλογή)" #: src/diff.c:976 msgid "" -" PALETTE is a colon-separated list terminfo " -"capabilities" +" --palette=PALETTE the colors to use when --color is active; PALETTE " +"is\n" +" a colon-separated list of terminfo capabilities" msgstr "" +" --palette=PALETTE τα Ï€Ïος χÏήση χÏώματα όταν η επιλογή --color Îχει " +"ενεÏγοποιηθεί, PALETTE είναι\n" +" μια λίστα ικανοτήτων terminfo που χωÏίζονται από " +"δίστιγμα. capabilities" -#: src/diff.c:978 +#: src/diff.c:979 msgid " --help display this help and exit" msgstr " --help εμφάνιση αυτής εδώ της βοήθειας κι Îξοδος" -#: src/diff.c:979 +#: src/diff.c:980 msgid "-v, --version output version information and exit" msgstr "-v --version Εμφάνιση πληÏοφοÏιών Îκδοσης κι Îξοδος" -#: src/diff.c:981 -#, fuzzy +#: src/diff.c:982 msgid "FILES are 'FILE1 FILE2' or 'DIR1 DIR2' or 'DIR FILE' or 'FILE DIR'." msgstr "" "ΑΡΧΕΙΑ είναι «ΑΡΧΕΙΟ1 ΑΡΧΕΙΟ2» ή «ΚΑΤ1 ΚΑΤ2» ή «ΚΑΤ ΑΡΧΕΙΟ...» ή «ΑΡΧΕΙΟ..." "ΚΑΤ»." -#: src/diff.c:982 +#: src/diff.c:983 msgid "" "If --from-file or --to-file is given, there are no restrictions on FILE(s)." msgstr "" "Αν δίδεται το --from-file ή το --to-file, τότε δεν υπάÏχει πεÏιοÏισμός στα " -"ΑΡΧΕΙΑ." +"ΑΡΧΕΙΑ. " -#: src/diff.c:983 src/diff3.c:526 src/sdiff.c:219 +#: src/diff.c:984 src/diff3.c:528 src/sdiff.c:219 msgid "If a FILE is '-', read standard input." -msgstr "Αν Îνα ΑΡΧΕΙΟ είναι «-», τότε ανάγνωση από την τυπική είσοδο." +msgstr "Αν Îνα ΑΡΧΕΙΟ είναι «-», τότε ανάγνωση από την τυπική είσοδο. " -#: src/diff.c:993 +#: src/diff.c:994 #, c-format msgid "Usage: %s [OPTION]... FILES\n" msgstr "ΧÏήση: %s [ΕΠΙΛΟΓΗ]... ΑΡΧΕΙΑ\n" -#: src/diff.c:994 +#: src/diff.c:995 msgid "Compare FILES line by line." msgstr "ΣÏγκÏιση αÏχείων γÏαμμή Ï€Ïος γÏαμμή." -#: src/diff.c:1028 +#: src/diff.c:1029 #, c-format msgid "conflicting %s option value '%s'" msgstr "η επιλογή %s είναι αντικÏουόμενη με την τιμή «%s»" -#: src/diff.c:1041 +#: src/diff.c:1042 #, c-format msgid "conflicting output style options" msgstr "αντικÏουόμενες επιλογÎÏ‚ για τη μοÏφή εξόδου" -#: src/diff.c:1057 -#, fuzzy, c-format +#: src/diff.c:1058 +#, c-format msgid "invalid color '%s'" -msgstr "άκυÏο πλάτος «%s»" +msgstr "μη ÎγκυÏο χÏώμα «%s»" -#: src/diff.c:1113 src/diff.c:1323 +#: src/diff.c:1114 src/diff.c:1324 #, c-format msgid "Only in %s: %s\n" msgstr "Μόνο στο %s: %s\n" -#: src/diff.c:1247 +#: src/diff.c:1248 msgid "cannot compare '-' to a directory" msgstr "ΑδÏνατη η σÏγκÏιση του «-» με Îνα κατάλογο" -#: src/diff.c:1282 +#: src/diff.c:1283 msgid "-D option not supported with directories" msgstr "Η επιλογή -D δεν υποστηÏίζεται για καταλόγους" -#: src/diff.c:1291 +#: src/diff.c:1292 #, c-format msgid "Common subdirectories: %s and %s\n" msgstr "Οι υποκατάλογοι %s και %s είναι ταυτόσημοι\n" -#: src/diff.c:1333 src/diff.c:1383 +#: src/diff.c:1334 src/diff.c:1384 #, c-format msgid "File %s is a %s while file %s is a %s\n" msgstr "Το αÏχείο %s είναι %s ενώ το αÏχείο %s είναι %s\n" -#: src/diff.c:1369 +#: src/diff.c:1370 #, c-format msgid "Symbolic links %s and %s differ\n" msgstr "Οι συμβολικοί σÏνδεσμοι %s και %s διαφÎÏουν\n" -#: src/diff.c:1456 +#: src/diff.c:1457 #, c-format msgid "Files %s and %s are identical\n" msgstr "Τα αÏχεία %s καί %s είναι πανομοιότυπα\n" #. This is a proper name. See the gettext manual, section Names. -#: src/diff3.c:41 +#: src/diff3.c:42 msgid "Randy Smith" msgstr "Randy Smith" -#: src/diff3.c:348 +#: src/diff3.c:351 #, c-format msgid "incompatible options" msgstr "ασÏμβατες επιλογÎÏ‚" -#: src/diff3.c:388 +#: src/diff3.c:391 msgid "'-' specified for more than one input file" msgstr "«-» οÏίστηκε για πεÏισσότεÏα από Îνα αÏχεία εισόδου" -#: src/diff3.c:439 src/diff3.c:1288 src/diff3.c:1692 src/diff3.c:1747 +#: src/diff3.c:442 src/diff3.c:1290 src/diff3.c:1693 src/diff3.c:1748 #: src/sdiff.c:307 src/sdiff.c:844 src/sdiff.c:855 msgid "read failed" msgstr "αποτυχία ανάγνωσης" -#: src/diff3.c:473 +#: src/diff3.c:475 msgid "-A, --show-all output all changes, bracketing conflicts" msgstr "-A --show-all Έξοδος όλων των διαφοÏών σε αγκÏλες." -#: src/diff3.c:475 +#: src/diff3.c:477 msgid "" "-e, --ed output ed script incorporating changes\n" " from OLDFILE to YOURFILE into MYFILE" msgstr "" -"-e, --ed Îξοδος ενός ed script που πεÏιλαμβάνει τις αλλαγÎÏ‚ από OLDFILE σε " -"YOURFILE στο MYFILE" +"-e, --ed Îξοδος ενός ed script που πεÏιλαμβάνει τις αλλαγÎÏ‚\n" +"από OLDFILE σε YOURFILE στο MYFILE " -#: src/diff3.c:477 +#: src/diff3.c:479 msgid "-E, --show-overlap like -e, but bracket conflicts" msgstr "-E, --show-overlap όπως -e, αλλά οι διαφοÏÎÏ‚ σε αγκÏλες" -#: src/diff3.c:478 +#: src/diff3.c:480 msgid "" "-3, --easy-only like -e, but incorporate only nonoverlapping " "changes" @@ -1219,22 +1201,22 @@ msgstr "" "-3, --easy-only όπως -e, αλλά πεÏιλαμβάνει μόνο τις μη " "αλληλοεπικαλυπτόμενες αλλαγÎÏ‚" -#: src/diff3.c:479 +#: src/diff3.c:481 msgid "" "-x, --overlap-only like -e, but incorporate only overlapping changes" msgstr "" "-x, --overlap-only όπως -e, αλλά πεÏιλαμβάνει μόνο τις αλληλοκαλυπτόμενες " "αλλαγÎÏ‚" -#: src/diff3.c:480 +#: src/diff3.c:482 msgid "-X like -x, but bracket conflicts" msgstr "-X like -x, but bracket conflicts" -#: src/diff3.c:481 +#: src/diff3.c:483 msgid "-i append 'w' and 'q' commands to ed scripts" msgstr "-i Ï€ÏοσάÏτηση των εντολών «w» και «q» στα σενάÏια του «ed»" -#: src/diff3.c:483 +#: src/diff3.c:485 msgid "" "-m, --merge output actual merged file, according to\n" " -A if no other options are given" @@ -1242,50 +1224,50 @@ msgstr "" "-m, --merge Îξοδος του συγχωνευμÎνου αÏχείου σÏμφωνα με την\n" " -A αν δεν δίνεται άλλη επιλογή" -#: src/diff3.c:486 +#: src/diff3.c:488 msgid "-a, --text treat all files as text" msgstr "-a, --text ΘεωÏεί όλα τα αÏχεία ως κείμενο." -#: src/diff3.c:487 +#: src/diff3.c:489 msgid " --strip-trailing-cr strip trailing carriage return on input" msgstr "--strip-trailing-cr Απαλειφή του χαÏακτήÏα επιστÏοφής στην είσοδο." -#: src/diff3.c:488 +#: src/diff3.c:490 msgid "-T, --initial-tab make tabs line up by prepending a tab" msgstr "" "-T, --initial-tab στοίχιση των στηλοθετών με την επιπÏόσθεση ενός στην " "αÏχή." -#: src/diff3.c:489 +#: src/diff3.c:491 msgid " --diff-program=PROGRAM use PROGRAM to compare files" msgstr "--diff-program=ΠΡΟΓΡ ΧÏήση του ΠΡΟΓΡάμματος στη σÏγκÏιση αÏχείων." -#: src/diff3.c:490 +#: src/diff3.c:492 msgid "" "-L, --label=LABEL use LABEL instead of file name\n" " (can be repeated up to three times)" msgstr "" "-L, --label=LABEL χÏήση LABEL αντί ονόματος αÏχείου\n" -" (μποÏεί να επαναληφθεί μÎχÏι Ï„Ïεις φοÏÎÏ‚)" +" (μποÏεί να επαναληφθεί μÎχÏι Ï„Ïεις φοÏÎÏ‚) " -#: src/diff3.c:493 +#: src/diff3.c:495 msgid " --help display this help and exit" -msgstr " --help εμφάνιση αυτής εδώ της βοήθειας κι Îξοδος" +msgstr " --help εμφάνιση αυτής εδώ της βοήθειας κι Îξοδος " -#: src/diff3.c:494 +#: src/diff3.c:496 msgid "-v, --version output version information and exit" msgstr "-v, --version εμφάνιση πληÏοφοÏιών Îκδοσης κι Îξοδος" -#: src/diff3.c:503 +#: src/diff3.c:505 #, c-format msgid "Usage: %s [OPTION]... MYFILE OLDFILE YOURFILE\n" msgstr "ΧÏήση: %s [ΕΠΙΛΟΓΗ]... MYFILE OLDFILE YOURFILE\n" -#: src/diff3.c:505 +#: src/diff3.c:507 msgid "Compare three files line by line." msgstr "ΣÏγκÏιση Ï„Ïιών αÏχείων γÏαμμή Ï€Ïος γÏαμμή." -#: src/diff3.c:515 +#: src/diff3.c:517 msgid "" "\n" "The default output format is a somewhat human-readable representation of\n" @@ -1312,45 +1294,45 @@ msgstr "" "είσοδο, αυτό είναι\n" "σταθεÏότεÏο απο την χÏήση του ed.\n" -#: src/diff3.c:527 +#: src/diff3.c:529 msgid "Exit status is 0 if successful, 1 if conflicts, 2 if trouble." msgstr "Σε επιτυχία η Îξοδος είναι 0, σε σÏγκÏουση 1 και σε Ï€Ïόβλημα 2." -#: src/diff3.c:720 +#: src/diff3.c:722 msgid "internal error: screwup in format of diff blocks" msgstr "εσωτεÏικό σφάλμα: μπÎÏδεμα στις μοÏφÎÏ‚ των μπλοκ diff" -#: src/diff3.c:1015 +#: src/diff3.c:1017 #, c-format msgid "%s: diff failed: " msgstr "%s: αποτυχία του diff: " -#: src/diff3.c:1037 +#: src/diff3.c:1039 msgid "internal error: invalid diff type in process_diff" -msgstr "εσωτεÏικό σφάλμα: άκυÏος Ï„Ïπος diff στο process_diff" +msgstr "εσωτεÏικό σφάλμα: μη ÎγκυÏος Ï„Ïπος diff στο process_diff" -#: src/diff3.c:1062 +#: src/diff3.c:1064 msgid "invalid diff format; invalid change separator" -msgstr "άκυÏη μοÏφή diff· άκυÏος οÏιοθÎτης αλλαγής" +msgstr "άκυÏη μοÏφή diff· μη ÎγκυÏος οÏιοθÎτης αλλαγής" -#: src/diff3.c:1298 +#: src/diff3.c:1300 msgid "invalid diff format; incomplete last line" msgstr "άκυÏη μοÏφή diff· ασυμπλήÏωτη τελευταία γÏαμμή" -#: src/diff3.c:1322 src/sdiff.c:275 src/util.c:970 +#: src/diff3.c:1324 src/sdiff.c:275 src/util.c:969 #, c-format msgid "subsidiary program '%s' could not be invoked" msgstr "το υποπÏόγÏαμμα «%s» δεν ήταν δυνατόν να κληθεί" -#: src/diff3.c:1347 +#: src/diff3.c:1349 msgid "invalid diff format; incorrect leading line chars" msgstr "άκυÏη μοÏφή diff· λάθος χαÏακτήÏες στη γÏαμμή αποτελεσμάτων" -#: src/diff3.c:1420 +#: src/diff3.c:1422 msgid "internal error: invalid diff type passed to output" -msgstr "εσωτεÏικό σφάλμα: άκυÏος Ï„Ïπος diff Ï€ÎÏασε στην Îξοδο" +msgstr "εσωτεÏικό σφάλμα: μη ÎγκυÏος Ï„Ïπος diff Ï€ÎÏασε στην Îξοδο" -#: src/diff3.c:1694 src/diff3.c:1751 +#: src/diff3.c:1695 src/diff3.c:1752 msgid "input file shrank" msgstr "Το αÏχείο εισόδου συÏÏικνώθηκε" @@ -1365,7 +1347,7 @@ msgid "%s: recursive directory loop" msgstr "%s: αναδÏομικός βÏόχος στον κατάλογο" #. This is a proper name. See the gettext manual, section Names. -#: src/sdiff.c:42 +#: src/sdiff.c:43 msgid "Thomas Lord" msgstr "Thomas Lord" @@ -1512,20 +1494,12 @@ msgstr "" "v:\tΣυμπεÏιλαμβάνει τις ταυτόσημες γÏαμμÎÏ‚ και το επισημαίνει.\n" "q:\tΈξοδος.\n" -#: src/util.c:663 -#, fuzzy, c-format +#: src/util.c:662 +#, c-format msgid "unrecognized prefix: %s" -msgstr "%s: η επιλογή «--%s» δεν αναγνωÏίζεται\n" +msgstr "άγνωστο Ï€Ïόθεμα: %s" -#: src/util.c:693 +#: src/util.c:692 #, c-format msgid "unparsable value for --palette" -msgstr "" - -#~ msgid "-v, --version output version information and exit" -#~ msgstr "-v --version εμφάνιση Îκδοσης κι Îξοδος." - -#~ msgid " --label LABEL use LABEL instead of file name (can be repeated)" -#~ msgstr "" -#~ " --label LABEL χÏήση LABEL αντί ονόματος αÏχείου (μποÏεί να " -#~ "επαναληφθεί)" +msgstr "unparsable τιμή για --palette " Binary files differ@@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: GNU diffutils 3.3-pre1\n" "Report-Msgid-Bugs-To: bug-diffutils@gnu.org\n" -"POT-Creation-Date: 2016-08-20 22:22-0700\n" +"POT-Creation-Date: 2017-05-21 13:26-0700\n" "PO-Revision-Date: 2013-10-31 13:16-0300\n" "Last-Translator: Felipe Castro <fefcas@gmail.com>\n" "Language-Team: Esperanto <translation-team-eo@lists.sourceforge.net>\n" @@ -16,32 +16,33 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" +"X-Bugs: Report translation errors to the Language-Team address.\n" "X-Generator: Poedit 1.5.4\n" -#: lib/argmatch.c:133 +#: lib/argmatch.c:134 #, fuzzy, c-format msgid "invalid argument %s for %s" msgstr "malvalida %s%s-argumento '%s'" -#: lib/argmatch.c:134 +#: lib/argmatch.c:135 #, c-format msgid "ambiguous argument %s for %s" msgstr "" -#: lib/argmatch.c:153 +#: lib/argmatch.c:154 #, fuzzy msgid "Valid arguments are:" msgstr "malvalida %s%s-argumento '%s'" -#: lib/c-stack.c:204 lib/c-stack.c:297 +#: lib/c-stack.c:203 lib/c-stack.c:296 msgid "program error" msgstr "program-eraro" -#: lib/c-stack.c:205 lib/c-stack.c:298 +#: lib/c-stack.c:204 lib/c-stack.c:297 msgid "stack overflow" msgstr "stako tro granda" -#: lib/error.c:191 +#: lib/error.c:195 msgid "Unknown system error" msgstr "Nekonata sistemeraro" @@ -145,66 +146,41 @@ msgstr "" msgid "weird file" msgstr "stranga dosiero" -#: lib/getopt.c:575 lib/getopt.c:604 -#, c-format -msgid "%s: option '%s' is ambiguous; possibilities:" -msgstr "%s: la modifilo '%s' estas plursenca; ebloj:" - -#: lib/getopt.c:619 +#: lib/getopt.c:278 #, fuzzy, c-format -msgid "%s: option '%s' is ambiguous\n" +msgid "%s: option '%s%s' is ambiguous\n" msgstr "%s: la modifilo '-W %s' estas plursenca\n" -#: lib/getopt.c:654 lib/getopt.c:658 -#, c-format -msgid "%s: option '--%s' doesn't allow an argument\n" -msgstr "%s: la modifilo '--%s' ne permesas argumenton\n" +#: lib/getopt.c:284 +#, fuzzy, c-format +msgid "%s: option '%s%s' is ambiguous; possibilities:" +msgstr "%s: la modifilo '%s' estas plursenca; ebloj:" -#: lib/getopt.c:667 lib/getopt.c:672 -#, c-format -msgid "%s: option '%c%s' doesn't allow an argument\n" +#: lib/getopt.c:319 +#, fuzzy, c-format +msgid "%s: unrecognized option '%s%s'\n" +msgstr "%s: nerekonata modifilo '%c%s'\n" + +#: lib/getopt.c:345 +#, fuzzy, c-format +msgid "%s: option '%s%s' doesn't allow an argument\n" msgstr "%s: la modifilo '%c%s' ne permesas argumenton\n" -#: lib/getopt.c:715 lib/getopt.c:734 -#, c-format -msgid "%s: option '--%s' requires an argument\n" +#: lib/getopt.c:360 +#, fuzzy, c-format +msgid "%s: option '%s%s' requires an argument\n" msgstr "%s: la modifilo '--%s' postulas argumenton\n" -#: lib/getopt.c:772 lib/getopt.c:775 -#, c-format -msgid "%s: unrecognized option '--%s'\n" -msgstr "%s: nerekonata modifilo '--%s'\n" - -#: lib/getopt.c:783 lib/getopt.c:786 -#, c-format -msgid "%s: unrecognized option '%c%s'\n" -msgstr "%s: nerekonata modifilo '%c%s'\n" - -#: lib/getopt.c:835 lib/getopt.c:838 +#: lib/getopt.c:621 #, c-format msgid "%s: invalid option -- '%c'\n" msgstr "%s: malvalida modifilo -- '%c'\n" -#: lib/getopt.c:891 lib/getopt.c:908 lib/getopt.c:1118 lib/getopt.c:1136 +#: lib/getopt.c:636 lib/getopt.c:682 #, c-format msgid "%s: option requires an argument -- '%c'\n" msgstr "%s: la modifilo postulas argumenton -- '%c'\n" -#: lib/getopt.c:964 lib/getopt.c:980 -#, c-format -msgid "%s: option '-W %s' is ambiguous\n" -msgstr "%s: la modifilo '-W %s' estas plursenca\n" - -#: lib/getopt.c:1004 lib/getopt.c:1022 -#, c-format -msgid "%s: option '-W %s' doesn't allow an argument\n" -msgstr "%s: la modifilo '-W %s' ne permesas argumenton\n" - -#: lib/getopt.c:1043 lib/getopt.c:1061 -#, c-format -msgid "%s: option '-W %s' requires an argument\n" -msgstr "%s: la modifilo '-W %s' postulas argumenton\n" - #. TRANSLATORS: #. Get translations for open and closing quotation marks. #. The message catalog should translate "`" to a left @@ -226,11 +202,11 @@ msgstr "%s: la modifilo '-W %s' postulas argumenton\n" #. If you don't know what to put here, please see #. <http://en.wikipedia.org/wiki/Quotation_marks_in_other_languages> #. and use glyphs suitable for your language. -#: lib/quotearg.c:347 +#: lib/quotearg.c:362 msgid "`" msgstr "‘" -#: lib/quotearg.c:348 +#: lib/quotearg.c:363 msgid "'" msgstr "’" @@ -524,7 +500,7 @@ msgid "General help using GNU software: <http://www.gnu.org/gethelp/>\n" msgstr "" "Äœenerala helpo por uzi programaron GNU: <http://www.gnu.org/gethelp/>\n" -#: src/analyze.c:454 src/diff.c:1400 +#: src/analyze.c:454 src/diff.c:1401 #, c-format msgid "Files %s and %s differ\n" msgstr "Dosieroj %s kaj %s estas malsamaj\n" @@ -534,21 +510,21 @@ msgstr "Dosieroj %s kaj %s estas malsamaj\n" msgid "Binary files %s and %s differ\n" msgstr "Ciferecaj dosieroj %s kaj %s estas malsamaj\n" -#: src/analyze.c:697 src/diff3.c:1463 src/util.c:1255 +#: src/analyze.c:706 src/diff3.c:1465 src/util.c:1254 msgid "No newline at end of file" msgstr "Mankas linifino ĉe fino de dosiero" #. This is a proper name. See the gettext manual, section Names. -#: src/cmp.c:43 +#: src/cmp.c:44 msgid "Torbjorn Granlund" msgstr "Torbjorn GRANLUND" #. This is a proper name. See the gettext manual, section Names. -#: src/cmp.c:44 +#: src/cmp.c:45 msgid "David MacKenzie" msgstr "David MACKENZIE" -#: src/cmp.c:118 src/diff.c:875 src/diff3.c:459 src/sdiff.c:158 +#: src/cmp.c:119 src/diff.c:877 src/diff3.c:462 src/sdiff.c:159 #, c-format msgid "Try '%s --help' for more information." msgstr "Provu '%s --help' por pli da informoj." @@ -563,12 +539,12 @@ msgstr "malvalida valoro '%s' de --ignore-initial" msgid "options -l and -s are incompatible" msgstr "modifiloj -l kaj -s malakordas" -#: src/cmp.c:155 src/diff.c:884 src/diff3.c:467 src/sdiff.c:167 src/sdiff.c:315 -#: src/sdiff.c:322 src/sdiff.c:874 src/util.c:853 src/util.c:953 src/util.c:960 +#: src/cmp.c:155 src/diff.c:885 src/diff3.c:469 src/sdiff.c:167 src/sdiff.c:315 +#: src/sdiff.c:322 src/sdiff.c:874 src/util.c:852 src/util.c:952 src/util.c:959 msgid "write failed" msgstr "skriberaro" -#: src/cmp.c:157 src/diff.c:886 src/diff.c:1465 src/diff3.c:469 src/sdiff.c:169 +#: src/cmp.c:157 src/diff.c:887 src/diff.c:1466 src/diff3.c:471 src/sdiff.c:169 msgid "standard output" msgstr "normala eligo" @@ -631,7 +607,7 @@ msgstr "" "La nedevigaj SALT1 kaj SALT2 indikas la nombron da bajtoj por salti\n" "en la komenco de ĉiu dosiero (aprioras nulo)." -#: src/cmp.c:185 src/diff.c:996 src/diff3.c:507 src/sdiff.c:210 +#: src/cmp.c:185 src/diff.c:997 src/diff3.c:509 src/sdiff.c:210 msgid "" "Mandatory arguments to long options are mandatory for short options too.\n" msgstr "" @@ -651,7 +627,7 @@ msgstr "" msgid "If a FILE is '-' or missing, read standard input." msgstr "Se DOSIERO estas '-' aÅ mankas, legi la normalan enigon." -#: src/cmp.c:195 src/diff.c:984 src/sdiff.c:220 +#: src/cmp.c:195 src/diff.c:985 src/sdiff.c:220 msgid "Exit status is 0 if inputs are the same, 1 if different, 2 if trouble." msgstr "" "Elig-valoro estas 0 se enigoj estas samaj, 1 se malsamaj, 2 se problemaj." @@ -661,163 +637,178 @@ msgstr "" msgid "invalid --bytes value '%s'" msgstr "malvalida valoro '%s' de --bytes" -#: src/cmp.c:266 src/diff.c:793 src/diff3.c:353 src/sdiff.c:565 +#: src/cmp.c:266 src/diff.c:795 src/diff3.c:356 src/sdiff.c:565 #, c-format msgid "missing operand after '%s'" msgstr "mankas argumento post '%s'" -#: src/cmp.c:278 src/diff.c:795 src/diff3.c:355 src/sdiff.c:567 +#: src/cmp.c:278 src/diff.c:797 src/diff3.c:358 src/sdiff.c:567 #, c-format msgid "extra operand '%s'" msgstr "superflua argumento '%s'" -#: src/cmp.c:494 +#: src/cmp.c:498 #, c-format msgid "%s %s differ: byte %s, line %s\n" msgstr "%s %s malsamas: bajto %s, linio %s\n" -#: src/cmp.c:510 +#: src/cmp.c:514 #, c-format msgid "%s %s differ: byte %s, line %s is %3o %s %3o %s\n" msgstr "%s %s malsamas: bajto %s, linio %s estas %3o %s %3o %s\n" -#: src/cmp.c:562 -#, c-format -msgid "cmp: EOF on %s\n" +#: src/cmp.c:571 +#, fuzzy, c-format +msgid "cmp: EOF on %s which is empty\n" +msgstr "cmp: EOF ĉe %s\n" + +#: src/cmp.c:585 +#, fuzzy, c-format +msgid "cmp: EOF on %s after byte %s, line %s\n" +msgstr "%s %s malsamas: bajto %s, linio %s\n" + +#: src/cmp.c:586 +#, fuzzy, c-format +msgid "cmp: EOF on %s after byte %s, in line %s\n" +msgstr "%s %s malsamas: bajto %s, linio %s\n" + +#: src/cmp.c:592 +#, fuzzy, c-format +msgid "cmp: EOF on %s after byte %s\n" msgstr "cmp: EOF ĉe %s\n" #. This is a proper name. See the gettext manual, section Names. -#: src/diff.c:49 +#: src/diff.c:50 msgid "Paul Eggert" msgstr "Paul EGGERT" #. This is a proper name. See the gettext manual, section Names. -#: src/diff.c:50 +#: src/diff.c:51 msgid "Mike Haertel" msgstr "Mike HAERTEL" #. This is a proper name. See the gettext manual, section Names. -#: src/diff.c:51 +#: src/diff.c:52 msgid "David Hayes" msgstr "David HAYES" #. This is a proper name. See the gettext manual, section Names. -#: src/diff.c:52 +#: src/diff.c:53 msgid "Richard Stallman" msgstr "Richard STALLMANN" #. This is a proper name. See the gettext manual, section Names. -#: src/diff.c:53 +#: src/diff.c:54 msgid "Len Tower" msgstr "Len TOWER" -#: src/diff.c:351 +#: src/diff.c:353 #, c-format msgid "invalid context length '%s'" msgstr "malvalida longo '%s' de kunteksto" -#: src/diff.c:434 +#: src/diff.c:436 #, c-format msgid "pagination not supported on this host" msgstr "dispaÄigo ne eblas kun ĉi tiu sistemo" -#: src/diff.c:449 src/diff3.c:335 +#: src/diff.c:451 src/diff3.c:336 #, c-format msgid "too many file label options" msgstr "tro multe da dosier-etikedaj modifiloj" -#: src/diff.c:526 +#: src/diff.c:528 #, c-format msgid "invalid width '%s'" msgstr "malvalida larÄo '%s'" -#: src/diff.c:530 +#: src/diff.c:532 msgid "conflicting width options" msgstr "malakordaj modifiloj pri larÄo" -#: src/diff.c:555 +#: src/diff.c:557 #, c-format msgid "invalid horizon length '%s'" msgstr "malvalida horizonta longo '%s'" -#: src/diff.c:611 +#: src/diff.c:613 #, c-format msgid "invalid tabsize '%s'" msgstr "malvalida TAB-larÄo '%s'" -#: src/diff.c:615 +#: src/diff.c:617 msgid "conflicting tabsize options" msgstr "malkongruaj modifiloj pri TAB-larÄo" -#: src/diff.c:770 +#: src/diff.c:772 msgid "--from-file and --to-file both specified" msgstr "--from-file kaj --to-file ambaÅ specifitaj" -#: src/diff.c:890 +#: src/diff.c:891 msgid " --normal output a normal diff (the default)" msgstr " --normal montri normalan malsamon (aprioras)" -#: src/diff.c:891 +#: src/diff.c:892 msgid "-q, --brief report only when files differ" msgstr "-q, --brief montri nur kiam la dosieroj malsamas" -#: src/diff.c:892 +#: src/diff.c:893 msgid "-s, --report-identical-files report when two files are the same" msgstr "-s, --report-identical-files montri kiam du dosieroj samas" -#: src/diff.c:893 +#: src/diff.c:894 msgid "" "-c, -C NUM, --context[=NUM] output NUM (default 3) lines of copied context" msgstr "" "-c, -C NUM, --context[=NUM] montri NUM (aprioras 3) liniojn da kopiita " "kunteksto" -#: src/diff.c:894 +#: src/diff.c:895 msgid "" "-u, -U NUM, --unified[=NUM] output NUM (default 3) lines of unified context" msgstr "" "-u, -U NUM, --unified[=NUM] montri NUM (aprioras 3) liniojn da unuigita " "kunteksto" -#: src/diff.c:895 +#: src/diff.c:896 msgid "-e, --ed output an ed script" msgstr "-e, --ed montri ed-skripton" -#: src/diff.c:896 +#: src/diff.c:897 msgid "-n, --rcs output an RCS format diff" msgstr "-n, --rcs montri malsamon laÅ RCS-formo" -#: src/diff.c:897 +#: src/diff.c:898 msgid "-y, --side-by-side output in two columns" msgstr "-y, --side-by-side montri en du kolumnoj" -#: src/diff.c:898 +#: src/diff.c:899 msgid "" "-W, --width=NUM output at most NUM (default 130) print columns" msgstr "" "-W, --width=NUM montri maksimume NUM (aprioras 130) kolumnojn" -#: src/diff.c:899 +#: src/diff.c:900 msgid "" " --left-column output only the left column of common lines" msgstr "" " --left-column montri nur la maldekstran kolumnon de komunaj " "linioj" -#: src/diff.c:900 +#: src/diff.c:901 msgid " --suppress-common-lines do not output common lines" msgstr " --suppress-common-lines ne montri komunajn liniojn" -#: src/diff.c:902 +#: src/diff.c:903 msgid "-p, --show-c-function show which C function each change is in" msgstr "-p, --show-c-function montri en kiu C-funkcio ĉiu ÅanÄo estas" -#: src/diff.c:903 +#: src/diff.c:904 msgid "-F, --show-function-line=RE show the most recent line matching RE" msgstr "" "-F, --show-function-line=RE montri la plej freÅa linio kongruanta al RE" -#: src/diff.c:904 +#: src/diff.c:905 #, fuzzy msgid "" " --label LABEL use LABEL instead of file name and timestamp\n" @@ -826,84 +817,84 @@ msgstr "" " --label ETIKEDO uzi ETIKEDOn anstataÅ dosiernomo\n" " (povas esti ripetata)" -#: src/diff.c:907 +#: src/diff.c:908 msgid "-t, --expand-tabs expand tabs to spaces in output" msgstr "-t, --expand-tabs etendigi tabojn al spacoj en la eligo" -#: src/diff.c:908 +#: src/diff.c:909 msgid "-T, --initial-tab make tabs line up by prepending a tab" msgstr "-T, --initial-tab Äustigi tabojn per antaÅmeto de tabo" -#: src/diff.c:909 +#: src/diff.c:910 msgid "" " --tabsize=NUM tab stops every NUM (default 8) print columns" msgstr "" " --tabsize=NUM tab-lokoj estas post ĉiuj NUM (aprioras 8) " "kolumnoj" -#: src/diff.c:910 +#: src/diff.c:911 msgid "" " --suppress-blank-empty suppress space or tab before empty output lines" msgstr "" " --suppress-blank-empty forkaÅi spacon aÅ tabon antaÅ malplenaj " "eligitaj linioj" -#: src/diff.c:911 +#: src/diff.c:912 msgid "-l, --paginate pass output through 'pr' to paginate it" msgstr "" "-l, --paginate pasigi la eligon tra 'pr' por enpaÄigi Äin" -#: src/diff.c:913 +#: src/diff.c:914 msgid "" "-r, --recursive recursively compare any subdirectories found" msgstr "" "-r, --recursive rikure kompari trovitajn subdosierujojn" -#: src/diff.c:914 +#: src/diff.c:915 msgid " --no-dereference don't follow symbolic links" msgstr " --no-dereference ne sekvi simbolajn ligojn" -#: src/diff.c:915 +#: src/diff.c:916 msgid "-N, --new-file treat absent files as empty" msgstr "" "-N, --new-file trakti mankantajn dosierojn kiel malplenajn" -#: src/diff.c:916 +#: src/diff.c:917 msgid " --unidirectional-new-file treat absent first files as empty" msgstr "" " --unidirectional-new-file trakti mankantajn unuajn dosierojn kiel " "malplenajn" -#: src/diff.c:917 +#: src/diff.c:918 msgid " --ignore-file-name-case ignore case when comparing file names" msgstr "" " --ignore-file-name-case preteratenti usklecon dum komparo de " "dosiernomoj" -#: src/diff.c:918 +#: src/diff.c:919 msgid " --no-ignore-file-name-case consider case when comparing file names" msgstr "" " --no-ignore-file-name-case konsideri usklecon dum komparo de dosiernomoj" -#: src/diff.c:919 +#: src/diff.c:920 msgid "-x, --exclude=PAT exclude files that match PAT" msgstr "" "-x, --exclude=ÅœABLONO forigi dosierojn, kiuj kongruas kun ÅœABLONO" -#: src/diff.c:920 +#: src/diff.c:921 msgid "" "-X, --exclude-from=FILE exclude files that match any pattern in FILE" msgstr "" "-X, --exclude-from=DOSIERO forigi dosierojn, kiuj kongruas kun iu " "Åablono en DOSIERO" -#: src/diff.c:921 +#: src/diff.c:922 msgid "" "-S, --starting-file=FILE start with FILE when comparing directories" msgstr "" "-S, --starting-file=DOSIERO komenci per DOSIERO, komparante dosierujojn" -#: src/diff.c:922 +#: src/diff.c:923 msgid "" " --from-file=FILE1 compare FILE1 to all operands;\n" " FILE1 can be a directory" @@ -911,7 +902,7 @@ msgstr "" " --from-file=DOSIERO1 kompari DOSIERO1 kun ĉiuj argumentoj;\n" " DOSIERO1 povas esti dosierujo" -#: src/diff.c:924 +#: src/diff.c:925 msgid "" " --to-file=FILE2 compare all operands to FILE2;\n" " FILE2 can be a directory" @@ -919,78 +910,78 @@ msgstr "" " --to-file=DOSIERO2 kompari ĉiujn argumentojn kun DOSIERO2;\n" " DOSIERO2 povas esti dosierujo" -#: src/diff.c:927 +#: src/diff.c:928 msgid "" "-i, --ignore-case ignore case differences in file contents" msgstr "" "-i, --ignore-case preteratenti malsamojn en uskleco en " "dosierenhavo" -#: src/diff.c:928 +#: src/diff.c:929 msgid "-E, --ignore-tab-expansion ignore changes due to tab expansion" msgstr "" "-E, --ignore-tab-expansion preteratenti ÅanÄojn kaÅzatajn de tab-" "etendigo" -#: src/diff.c:929 +#: src/diff.c:930 msgid "-Z, --ignore-trailing-space ignore white space at line end" msgstr "-Z, --ignore-trailing-space preteratenti blank-spacon ĉe linifino" -#: src/diff.c:930 +#: src/diff.c:931 msgid "" "-b, --ignore-space-change ignore changes in the amount of white space" msgstr "" "-b, --ignore-space-change preteratenti ÅanÄojn en kvanto da blank-spaco" -#: src/diff.c:931 +#: src/diff.c:932 msgid "-w, --ignore-all-space ignore all white space" msgstr "-w, --ignore-all-space preteratenti ĉiun blankan spacon" -#: src/diff.c:932 +#: src/diff.c:933 msgid "" "-B, --ignore-blank-lines ignore changes where lines are all blank" msgstr "" "-B, --ignore-blank-lines preteratenti ÅanÄojn, kie linioj estas ĉiuj " "malplenaj" -#: src/diff.c:933 +#: src/diff.c:934 msgid "-I, --ignore-matching-lines=RE ignore changes where all lines match RE" msgstr "" "-I, --ignore-matching-lines=RE preteratenti ÅanÄojn, kie ĉiuj linioj " "kongruas al RE" -#: src/diff.c:935 +#: src/diff.c:936 msgid "-a, --text treat all files as text" msgstr "-a, --text trakti ĉiujn dosierojn kiel tekstajn" -#: src/diff.c:936 +#: src/diff.c:937 msgid " --strip-trailing-cr strip trailing carriage return on input" msgstr " --strip-trailing-cr forigi linifinan CR ĉe enigo" -#: src/diff.c:938 +#: src/diff.c:939 msgid " --binary read and write data in binary mode" msgstr " --binary legi kaj skribi datumaron ciferece" -#: src/diff.c:941 +#: src/diff.c:942 msgid "" "-D, --ifdef=NAME output merged file with '#ifdef NAME' diffs" msgstr "" "-D, --ifdef=NOMO montri kunfanditan dosieron kun malsamoj " "'#ifdef NOMO'" -#: src/diff.c:942 +#: src/diff.c:943 msgid " --GTYPE-group-format=GFMT format GTYPE input groups with GFMT" msgstr " --GTYPE-group-format=GFMT enformigi enig-grupojn GTYPE per GFMT" -#: src/diff.c:943 +#: src/diff.c:944 msgid " --line-format=LFMT format all input lines with LFMT" msgstr " --line-format=LFMT enformigi ĉiujn enigliniojn per LFMT" -#: src/diff.c:944 +#: src/diff.c:945 msgid " --LTYPE-line-format=LFMT format LTYPE input lines with LFMT" msgstr " --LTYPE-line-format=LFMT enformigi enig-grupojn LTYPE per LFMT" -#: src/diff.c:945 +#: src/diff.c:946 msgid "" " These format options provide fine-grained control over the output\n" " of diff, generalizing -D/--ifdef." @@ -998,12 +989,12 @@ msgstr "" " Tiuj enformigaj modifiloj provizas rafinitan regadon pri la eligo\n" " de diff, Äeneraliganta -D/--ifdef." -#: src/diff.c:947 +#: src/diff.c:948 msgid " LTYPE is 'old', 'new', or 'unchanged'. GTYPE is LTYPE or 'changed'." msgstr "" " LTYPE estas 'old', 'new' aÅ 'unchanged'. GTYPE estas LTYPE aÅ 'changed'." -#: src/diff.c:948 +#: src/diff.c:949 msgid "" " GFMT (only) may contain:\n" " %< lines from FILE1\n" @@ -1031,7 +1022,7 @@ msgstr "" " M L+1\n" " %(A=B?T:E) se A egalas al B, do T, male E" -#: src/diff.c:960 +#: src/diff.c:961 msgid "" " LFMT (only) may contain:\n" " %L contents of line\n" @@ -1043,7 +1034,7 @@ msgstr "" " %l enhavo linio, sen eventuala linifino\n" " %[-][LARÄœO][.[PREC]]{doxX}n printf-stila indiko de lininumero" -#: src/diff.c:964 +#: src/diff.c:965 msgid "" " Both GFMT and LFMT may contain:\n" " %% %\n" @@ -1057,151 +1048,144 @@ msgstr "" " %c'\\000' la signo kun okuma kodo OOO\n" " C la signo C (aliaj signoj reprezentas ili mem)" -#: src/diff.c:970 +#: src/diff.c:971 msgid "-d, --minimal try hard to find a smaller set of changes" msgstr "-d, --minimal strebe serĉi pli etan aron da ÅanÄoj" -#: src/diff.c:971 +#: src/diff.c:972 msgid " --horizon-lines=NUM keep NUM lines of the common prefix and suffix" msgstr "" " --horizon-lines=NUM teni NUM liniojn de la komuna prefikso kaj sufikso" -#: src/diff.c:972 +#: src/diff.c:973 msgid "" " --speed-large-files assume large files and many scattered small changes" msgstr "" " --speed-large-files atendi grandajn dosierojn kaj multajn disajn " "ÅanÄetojn" -#: src/diff.c:973 -msgid "" -" --color[=WHEN] colorize the output; WHEN can be 'never', 'always'," -msgstr "" - #: src/diff.c:974 -#, fuzzy -msgid " or 'auto' (the default)" -msgstr " --normal montri normalan malsamon (aprioras)" - -#: src/diff.c:975 msgid "" -" --palette=PALETTE specify the colors to use when --color is active" +" --color[=WHEN] colorize the output; WHEN can be 'never', " +"'always',\n" +" or 'auto' (the default)" msgstr "" #: src/diff.c:976 msgid "" -" PALETTE is a colon-separated list terminfo " -"capabilities" +" --palette=PALETTE the colors to use when --color is active; PALETTE " +"is\n" +" a colon-separated list of terminfo capabilities" msgstr "" -#: src/diff.c:978 +#: src/diff.c:979 msgid " --help display this help and exit" msgstr " --help montri ĉi tiun helpon kaj eliri" -#: src/diff.c:979 +#: src/diff.c:980 msgid "-v, --version output version information and exit" msgstr "-v, --version montri informon pri versio kaj eliri" -#: src/diff.c:981 +#: src/diff.c:982 #, fuzzy msgid "FILES are 'FILE1 FILE2' or 'DIR1 DIR2' or 'DIR FILE' or 'FILE DIR'." msgstr "" "DOSIEROJ estas 'DOSIERO1 DOSIERO2' aÅ 'UJO1 UJO2' aÅ 'UJO DOSIERO...' aÅ " "'DOSIERO... UJO'." -#: src/diff.c:982 +#: src/diff.c:983 msgid "" "If --from-file or --to-file is given, there are no restrictions on FILE(s)." msgstr "" "Se --from-file aÅ --to-file estas donita, ne estas limigoj por DOSIERO(j)." -#: src/diff.c:983 src/diff3.c:526 src/sdiff.c:219 +#: src/diff.c:984 src/diff3.c:528 src/sdiff.c:219 msgid "If a FILE is '-', read standard input." msgstr "Se DOSIERO estas '-', legi la ĉefenigujon." -#: src/diff.c:993 +#: src/diff.c:994 #, c-format msgid "Usage: %s [OPTION]... FILES\n" msgstr "Uzmaniero: %s [MODIFILO]... DOSIEROJ\n" -#: src/diff.c:994 +#: src/diff.c:995 msgid "Compare FILES line by line." msgstr "Kompari DOSIEROJn linion post linio." -#: src/diff.c:1028 +#: src/diff.c:1029 #, c-format msgid "conflicting %s option value '%s'" msgstr "malakorda valoro de opcio %s: '%s'" -#: src/diff.c:1041 +#: src/diff.c:1042 #, c-format msgid "conflicting output style options" msgstr "malakordaj modifiloj pri elig-stilo" -#: src/diff.c:1057 +#: src/diff.c:1058 #, fuzzy, c-format msgid "invalid color '%s'" msgstr "malvalida larÄo '%s'" -#: src/diff.c:1113 src/diff.c:1323 +#: src/diff.c:1114 src/diff.c:1324 #, c-format msgid "Only in %s: %s\n" msgstr "Nur en %s: %s\n" -#: src/diff.c:1247 +#: src/diff.c:1248 msgid "cannot compare '-' to a directory" msgstr "ne eblas kompari '-' al dosierujo" -#: src/diff.c:1282 +#: src/diff.c:1283 msgid "-D option not supported with directories" msgstr "modifilo -D ne estas subtenata kun dosierujoj" -#: src/diff.c:1291 +#: src/diff.c:1292 #, c-format msgid "Common subdirectories: %s and %s\n" msgstr "Komunaj subdosierujoj: %s kaj %s\n" -#: src/diff.c:1333 src/diff.c:1383 +#: src/diff.c:1334 src/diff.c:1384 #, c-format msgid "File %s is a %s while file %s is a %s\n" msgstr "Dosiero %s estas %s, dum dosiero %s estas %s\n" -#: src/diff.c:1369 +#: src/diff.c:1370 #, c-format msgid "Symbolic links %s and %s differ\n" msgstr "Simbolaj ligoj %s kaj %s malsamas\n" -#: src/diff.c:1456 +#: src/diff.c:1457 #, c-format msgid "Files %s and %s are identical\n" msgstr "Dosieroj %s kaj %s samas\n" #. This is a proper name. See the gettext manual, section Names. -#: src/diff3.c:41 +#: src/diff3.c:42 msgid "Randy Smith" msgstr "Randy SMITH" -#: src/diff3.c:348 +#: src/diff3.c:351 #, c-format msgid "incompatible options" msgstr "malkongruaj modifiloj" -#: src/diff3.c:388 +#: src/diff3.c:391 msgid "'-' specified for more than one input file" msgstr "'-' indikita por pli ol unu enigdosiero" -#: src/diff3.c:439 src/diff3.c:1288 src/diff3.c:1692 src/diff3.c:1747 +#: src/diff3.c:442 src/diff3.c:1290 src/diff3.c:1693 src/diff3.c:1748 #: src/sdiff.c:307 src/sdiff.c:844 src/sdiff.c:855 msgid "read failed" msgstr "lego fiaskis" -#: src/diff3.c:473 +#: src/diff3.c:475 msgid "-A, --show-all output all changes, bracketing conflicts" msgstr "" "-A, --show-all montri ĉiujn ÅanÄojn, kun konfliktoj inter " "krampoj" -#: src/diff3.c:475 +#: src/diff3.c:477 msgid "" "-e, --ed output ed script incorporating changes\n" " from OLDFILE to YOURFILE into MYFILE" @@ -1209,11 +1193,11 @@ msgstr "" "-e, --ed montri ed-skripton enkorpigantan ÅanÄojn\n" " de PRADOSIERO al VIADOSIERO en MIADOSIEROn" -#: src/diff3.c:477 +#: src/diff3.c:479 msgid "-E, --show-overlap like -e, but bracket conflicts" msgstr "-E, --show-overlap kiel -e, sed kun konfliktoj inter krampoj" -#: src/diff3.c:478 +#: src/diff3.c:480 msgid "" "-3, --easy-only like -e, but incorporate only nonoverlapping " "changes" @@ -1221,23 +1205,23 @@ msgstr "" "-3, --easy-only kiel -e, sed enkorpigi nur ne-interkovriÄantajn " "ÅanÄojn" -#: src/diff3.c:479 +#: src/diff3.c:481 msgid "" "-x, --overlap-only like -e, but incorporate only overlapping changes" msgstr "" "-x, --overlap-only kiel -e, sed enkorpigi nur interkovriÄantajn " "ÅanÄojn" -#: src/diff3.c:480 +#: src/diff3.c:482 msgid "-X like -x, but bracket conflicts" msgstr "-X kiel -x, sed kun konfliktoj inter krampoj" -#: src/diff3.c:481 +#: src/diff3.c:483 msgid "-i append 'w' and 'q' commands to ed scripts" msgstr "" "-i aldoni la komandojn 'w' kaj 'q' al ed-skriptoj" -#: src/diff3.c:483 +#: src/diff3.c:485 msgid "" "-m, --merge output actual merged file, according to\n" " -A if no other options are given" @@ -1245,23 +1229,23 @@ msgstr "" "-m, --merge montri veran kunfanditan dosieron, akorde al\n" " -A se neniu alia modifilo ĉeestas" -#: src/diff3.c:486 +#: src/diff3.c:488 msgid "-a, --text treat all files as text" msgstr "-a, --text trakti ĉiujn dosierojn kiel tekstajn" -#: src/diff3.c:487 +#: src/diff3.c:489 msgid " --strip-trailing-cr strip trailing carriage return on input" msgstr " --strip-trailing-cr forigi linifinan CR ĉe enigo" -#: src/diff3.c:488 +#: src/diff3.c:490 msgid "-T, --initial-tab make tabs line up by prepending a tab" msgstr "-T, --initial-tab Äustigi tabojn per antaÅmeto de tabo" -#: src/diff3.c:489 +#: src/diff3.c:491 msgid " --diff-program=PROGRAM use PROGRAM to compare files" msgstr " --diff-program=PROGRAMO uzi PROGRAMOn por kompari dosierojn" -#: src/diff3.c:490 +#: src/diff3.c:492 msgid "" "-L, --label=LABEL use LABEL instead of file name\n" " (can be repeated up to three times)" @@ -1269,24 +1253,24 @@ msgstr "" "-L, --label=ETIKEDO uzi ETIKEDOn anstataÅ dosiernomo\n" " (povas esti ripetata Äis 3 fojoj)" -#: src/diff3.c:493 +#: src/diff3.c:495 msgid " --help display this help and exit" msgstr " --help montri ĉi tiun helpon kaj eliri" -#: src/diff3.c:494 +#: src/diff3.c:496 msgid "-v, --version output version information and exit" msgstr "-v, --version eligi informon pri versio kaj eliri" -#: src/diff3.c:503 +#: src/diff3.c:505 #, c-format msgid "Usage: %s [OPTION]... MYFILE OLDFILE YOURFILE\n" msgstr "Uzmaniero: %s [MODIFILO]... MIADOSIERO PRADOSIERO VIADOSIERO\n" -#: src/diff3.c:505 +#: src/diff3.c:507 msgid "Compare three files line by line." msgstr "Kompari tri dosierojn linion post linio." -#: src/diff3.c:515 +#: src/diff3.c:517 msgid "" "\n" "The default output format is a somewhat human-readable representation of\n" @@ -1310,45 +1294,45 @@ msgstr "" "eligu la veran kunfanditan dosieron. Por ne-ordinara enigo, tio ĉi estas\n" "pli fortika ol la uzo de ed.\n" -#: src/diff3.c:527 +#: src/diff3.c:529 msgid "Exit status is 0 if successful, 1 if conflicts, 2 if trouble." msgstr "Elig-valoro estas 0 por sukceso, 1 por konfliktoj, 2 por problemo." -#: src/diff3.c:720 +#: src/diff3.c:722 msgid "internal error: screwup in format of diff blocks" msgstr "interna eraro: fuÅo en formato de diff-blokoj" -#: src/diff3.c:1015 +#: src/diff3.c:1017 #, c-format msgid "%s: diff failed: " msgstr "%s: diff malsukcesis: " -#: src/diff3.c:1037 +#: src/diff3.c:1039 msgid "internal error: invalid diff type in process_diff" msgstr "interna eraro: malvalida diff-speco en process_diff" -#: src/diff3.c:1062 +#: src/diff3.c:1064 msgid "invalid diff format; invalid change separator" msgstr "malvalida diff-formato; malvalida ÅanÄ-apartigilo" -#: src/diff3.c:1298 +#: src/diff3.c:1300 msgid "invalid diff format; incomplete last line" msgstr "malvalida diff-formato; malkompleta lasta linio" -#: src/diff3.c:1322 src/sdiff.c:275 src/util.c:970 +#: src/diff3.c:1324 src/sdiff.c:275 src/util.c:969 #, c-format msgid "subsidiary program '%s' could not be invoked" msgstr "ne eblis alvoki la subprogramon '%s'" -#: src/diff3.c:1347 +#: src/diff3.c:1349 msgid "invalid diff format; incorrect leading line chars" msgstr "malvalida diff-formato; malÄusta signo en antaÅa linio" -#: src/diff3.c:1420 +#: src/diff3.c:1422 msgid "internal error: invalid diff type passed to output" msgstr "interna eraro: malvalida diff-speco donita al eligo" -#: src/diff3.c:1694 src/diff3.c:1751 +#: src/diff3.c:1695 src/diff3.c:1752 msgid "input file shrank" msgstr "enigdosiero Årumpis" @@ -1363,7 +1347,7 @@ msgid "%s: recursive directory loop" msgstr "%s: rikura dosieruja ciklo" #. This is a proper name. See the gettext manual, section Names. -#: src/sdiff.c:42 +#: src/sdiff.c:43 msgid "Thomas Lord" msgstr "Thomas LORD" @@ -1512,12 +1496,31 @@ msgstr "" "v:\tlaÅte transpreni komunajn liniojn.\n" "q:\tĉesi.\n" -#: src/util.c:663 +#: src/util.c:662 #, fuzzy, c-format msgid "unrecognized prefix: %s" msgstr "%s: nerekonata modifilo '--%s'\n" -#: src/util.c:693 +#: src/util.c:692 #, c-format msgid "unparsable value for --palette" msgstr "" + +#, fuzzy +#~ msgid " or 'auto' (the default)" +#~ msgstr " --normal montri normalan malsamon (aprioras)" + +#~ msgid "%s: option '--%s' doesn't allow an argument\n" +#~ msgstr "%s: la modifilo '--%s' ne permesas argumenton\n" + +#~ msgid "%s: unrecognized option '--%s'\n" +#~ msgstr "%s: nerekonata modifilo '--%s'\n" + +#~ msgid "%s: option '-W %s' is ambiguous\n" +#~ msgstr "%s: la modifilo '-W %s' estas plursenca\n" + +#~ msgid "%s: option '-W %s' doesn't allow an argument\n" +#~ msgstr "%s: la modifilo '-W %s' ne permesas argumenton\n" + +#~ msgid "%s: option '-W %s' requires an argument\n" +#~ msgstr "%s: la modifilo '-W %s' postulas argumenton\n" Binary files differ@@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: GNU diffutils 3.3-pre1\n" "Report-Msgid-Bugs-To: bug-diffutils@gnu.org\n" -"POT-Creation-Date: 2016-08-20 22:22-0700\n" +"POT-Creation-Date: 2017-05-21 13:26-0700\n" "PO-Revision-Date: 2013-02-19 00:30+0100\n" "Last-Translator: Santiago Vila Doncel <sanvila@unex.es>\n" "Language-Team: Spanish <es@li.org>\n" @@ -16,31 +16,32 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8-bit\n" +"X-Bugs: Report translation errors to the Language-Team address.\n" -#: lib/argmatch.c:133 +#: lib/argmatch.c:134 #, fuzzy, c-format msgid "invalid argument %s for %s" msgstr "argumento de %s%s inválido '%s'" -#: lib/argmatch.c:134 +#: lib/argmatch.c:135 #, c-format msgid "ambiguous argument %s for %s" msgstr "" -#: lib/argmatch.c:153 +#: lib/argmatch.c:154 #, fuzzy msgid "Valid arguments are:" msgstr "argumento de %s%s inválido '%s'" -#: lib/c-stack.c:204 lib/c-stack.c:297 +#: lib/c-stack.c:203 lib/c-stack.c:296 msgid "program error" msgstr "error del programa" -#: lib/c-stack.c:205 lib/c-stack.c:298 +#: lib/c-stack.c:204 lib/c-stack.c:297 msgid "stack overflow" msgstr "desbordamiento de pila" -#: lib/error.c:191 +#: lib/error.c:195 msgid "Unknown system error" msgstr "Error del sistema desconocido" @@ -155,66 +156,41 @@ msgstr "" msgid "weird file" msgstr "fichero extraño" -#: lib/getopt.c:575 lib/getopt.c:604 -#, c-format -msgid "%s: option '%s' is ambiguous; possibilities:" -msgstr "%s: la opción '%s' es ambigua; posibilidades:" - -#: lib/getopt.c:619 +#: lib/getopt.c:278 #, fuzzy, c-format -msgid "%s: option '%s' is ambiguous\n" +msgid "%s: option '%s%s' is ambiguous\n" msgstr "%s: la opción '-W %s' es ambigua\n" -#: lib/getopt.c:654 lib/getopt.c:658 -#, c-format -msgid "%s: option '--%s' doesn't allow an argument\n" -msgstr "%s: la opción '--%s' no admite ningún argumento\n" +#: lib/getopt.c:284 +#, fuzzy, c-format +msgid "%s: option '%s%s' is ambiguous; possibilities:" +msgstr "%s: la opción '%s' es ambigua; posibilidades:" -#: lib/getopt.c:667 lib/getopt.c:672 -#, c-format -msgid "%s: option '%c%s' doesn't allow an argument\n" +#: lib/getopt.c:319 +#, fuzzy, c-format +msgid "%s: unrecognized option '%s%s'\n" +msgstr "%s: opción no reconocida '%c%s'\n" + +#: lib/getopt.c:345 +#, fuzzy, c-format +msgid "%s: option '%s%s' doesn't allow an argument\n" msgstr "%s: la opción '%c%s' no admite ningún argumento\n" -#: lib/getopt.c:715 lib/getopt.c:734 -#, c-format -msgid "%s: option '--%s' requires an argument\n" +#: lib/getopt.c:360 +#, fuzzy, c-format +msgid "%s: option '%s%s' requires an argument\n" msgstr "%s: la opción '--%s' requiere un argumento\n" -#: lib/getopt.c:772 lib/getopt.c:775 -#, c-format -msgid "%s: unrecognized option '--%s'\n" -msgstr "%s: opción no reconocida '--%s'\n" - -#: lib/getopt.c:783 lib/getopt.c:786 -#, c-format -msgid "%s: unrecognized option '%c%s'\n" -msgstr "%s: opción no reconocida '%c%s'\n" - -#: lib/getopt.c:835 lib/getopt.c:838 +#: lib/getopt.c:621 #, c-format msgid "%s: invalid option -- '%c'\n" msgstr "%s: opción inválida -- '%c'\n" -#: lib/getopt.c:891 lib/getopt.c:908 lib/getopt.c:1118 lib/getopt.c:1136 +#: lib/getopt.c:636 lib/getopt.c:682 #, c-format msgid "%s: option requires an argument -- '%c'\n" msgstr "%s: la opción requiere un argumento -- '%c'\n" -#: lib/getopt.c:964 lib/getopt.c:980 -#, c-format -msgid "%s: option '-W %s' is ambiguous\n" -msgstr "%s: la opción '-W %s' es ambigua\n" - -#: lib/getopt.c:1004 lib/getopt.c:1022 -#, c-format -msgid "%s: option '-W %s' doesn't allow an argument\n" -msgstr "%s: la opción '-W %s' no admite ningún argumento\n" - -#: lib/getopt.c:1043 lib/getopt.c:1061 -#, c-format -msgid "%s: option '-W %s' requires an argument\n" -msgstr "%s: la opción '-W %s' requiere un argumento\n" - #. TRANSLATORS: #. Get translations for open and closing quotation marks. #. The message catalog should translate "`" to a left @@ -236,11 +212,11 @@ msgstr "%s: la opción '-W %s' requiere un argumento\n" #. If you don't know what to put here, please see #. <http://en.wikipedia.org/wiki/Quotation_marks_in_other_languages> #. and use glyphs suitable for your language. -#: lib/quotearg.c:347 +#: lib/quotearg.c:362 msgid "`" msgstr "«" -#: lib/quotearg.c:348 +#: lib/quotearg.c:363 msgid "'" msgstr "»" @@ -578,7 +554,7 @@ msgstr "" "Ayuda general sobre el uso de software de GNU: <http://www.gnu.org/gethelp/" ">\n" -#: src/analyze.c:454 src/diff.c:1400 +#: src/analyze.c:454 src/diff.c:1401 #, c-format msgid "Files %s and %s differ\n" msgstr "Los ficheros %s y %s son distintos\n" @@ -588,21 +564,21 @@ msgstr "Los ficheros %s y %s son distintos\n" msgid "Binary files %s and %s differ\n" msgstr "Los ficheros binarios %s y %s son distintos\n" -#: src/analyze.c:697 src/diff3.c:1463 src/util.c:1255 +#: src/analyze.c:706 src/diff3.c:1465 src/util.c:1254 msgid "No newline at end of file" msgstr "No hay ningún carácter de nueva lÃnea al final del fichero" #. This is a proper name. See the gettext manual, section Names. -#: src/cmp.c:43 +#: src/cmp.c:44 msgid "Torbjorn Granlund" msgstr "Torbjörn Granlund" #. This is a proper name. See the gettext manual, section Names. -#: src/cmp.c:44 +#: src/cmp.c:45 msgid "David MacKenzie" msgstr "David MacKenzie" -#: src/cmp.c:118 src/diff.c:875 src/diff3.c:459 src/sdiff.c:158 +#: src/cmp.c:119 src/diff.c:877 src/diff3.c:462 src/sdiff.c:159 #, c-format msgid "Try '%s --help' for more information." msgstr "Pruebe '%s --help' para más información." @@ -617,12 +593,12 @@ msgstr "valor --ignore-initial inválido '%s'" msgid "options -l and -s are incompatible" msgstr "las opciones -l y -s son incompatibles" -#: src/cmp.c:155 src/diff.c:884 src/diff3.c:467 src/sdiff.c:167 src/sdiff.c:315 -#: src/sdiff.c:322 src/sdiff.c:874 src/util.c:853 src/util.c:953 src/util.c:960 +#: src/cmp.c:155 src/diff.c:885 src/diff3.c:469 src/sdiff.c:167 src/sdiff.c:315 +#: src/sdiff.c:322 src/sdiff.c:874 src/util.c:852 src/util.c:952 src/util.c:959 msgid "write failed" msgstr "la escritura falló" -#: src/cmp.c:157 src/diff.c:886 src/diff.c:1465 src/diff3.c:469 src/sdiff.c:169 +#: src/cmp.c:157 src/diff.c:887 src/diff.c:1466 src/diff3.c:471 src/sdiff.c:169 msgid "standard output" msgstr "salida estándar" @@ -689,7 +665,7 @@ msgstr "" "Los parámetros opcionales SALTO1 y SALTO2 especifican el número de\n" "bytes que se saltan en cada fichero (cero por omisión)." -#: src/cmp.c:185 src/diff.c:996 src/diff3.c:507 src/sdiff.c:210 +#: src/cmp.c:185 src/diff.c:997 src/diff3.c:509 src/sdiff.c:210 msgid "" "Mandatory arguments to long options are mandatory for short options too.\n" msgstr "" @@ -712,7 +688,7 @@ msgstr "" msgid "If a FILE is '-' or missing, read standard input." msgstr "Si un FICHERO es '-' o no se especifica, lee la entrada estándar." -#: src/cmp.c:195 src/diff.c:984 src/sdiff.c:220 +#: src/cmp.c:195 src/diff.c:985 src/sdiff.c:220 msgid "Exit status is 0 if inputs are the same, 1 if different, 2 if trouble." msgstr "" "El estado de salida es 0 si las entradas son iguales, 1 si son diferentes,\n" @@ -723,62 +699,77 @@ msgstr "" msgid "invalid --bytes value '%s'" msgstr "valor --bytes inválido '%s'" -#: src/cmp.c:266 src/diff.c:793 src/diff3.c:353 src/sdiff.c:565 +#: src/cmp.c:266 src/diff.c:795 src/diff3.c:356 src/sdiff.c:565 #, c-format msgid "missing operand after '%s'" msgstr "falta un operando después de '%s'" -#: src/cmp.c:278 src/diff.c:795 src/diff3.c:355 src/sdiff.c:567 +#: src/cmp.c:278 src/diff.c:797 src/diff3.c:358 src/sdiff.c:567 #, c-format msgid "extra operand '%s'" msgstr "operando extra '%s'" -#: src/cmp.c:494 +#: src/cmp.c:498 #, c-format msgid "%s %s differ: byte %s, line %s\n" msgstr "%s %s son distintos: byte %s, lÃnea %s\n" -#: src/cmp.c:510 +#: src/cmp.c:514 #, c-format msgid "%s %s differ: byte %s, line %s is %3o %s %3o %s\n" msgstr "%s %s son distintos: el byte %s, en la lÃnea %s es %3o %s %3o %s\n" -#: src/cmp.c:562 -#, c-format -msgid "cmp: EOF on %s\n" +#: src/cmp.c:571 +#, fuzzy, c-format +msgid "cmp: EOF on %s which is empty\n" +msgstr "cmp: fin de fichero encontrado en %s\n" + +#: src/cmp.c:585 +#, fuzzy, c-format +msgid "cmp: EOF on %s after byte %s, line %s\n" +msgstr "%s %s son distintos: byte %s, lÃnea %s\n" + +#: src/cmp.c:586 +#, fuzzy, c-format +msgid "cmp: EOF on %s after byte %s, in line %s\n" +msgstr "%s %s son distintos: byte %s, lÃnea %s\n" + +#: src/cmp.c:592 +#, fuzzy, c-format +msgid "cmp: EOF on %s after byte %s\n" msgstr "cmp: fin de fichero encontrado en %s\n" #. This is a proper name. See the gettext manual, section Names. -#: src/diff.c:49 +#: src/diff.c:50 msgid "Paul Eggert" msgstr "Paul Eggert" #. This is a proper name. See the gettext manual, section Names. -#: src/diff.c:50 +#: src/diff.c:51 msgid "Mike Haertel" msgstr "Mike Haertel" #. This is a proper name. See the gettext manual, section Names. -#: src/diff.c:51 +#: src/diff.c:52 msgid "David Hayes" msgstr "David Hayes" #. This is a proper name. See the gettext manual, section Names. -#: src/diff.c:52 +#: src/diff.c:53 msgid "Richard Stallman" msgstr "Richard Stallman" #. This is a proper name. See the gettext manual, section Names. -#: src/diff.c:53 +#: src/diff.c:54 msgid "Len Tower" msgstr "Len Tower" -#: src/diff.c:351 +#: src/diff.c:353 #, c-format msgid "invalid context length '%s'" msgstr "longitud de contexto inválida '%s'" -#: src/diff.c:434 +#: src/diff.c:436 #, c-format msgid "pagination not supported on this host" msgstr "este sistema no admite paginación" @@ -792,78 +783,78 @@ msgstr "este sistema no admite paginación" # se refiere. la opción de etiqueta de fichero se ha especificado demasiadas # veces. O más cortito, dejarlo como está :) em+ # Me parece que asà está bien ... -#: src/diff.c:449 src/diff3.c:335 +#: src/diff.c:451 src/diff3.c:336 #, c-format msgid "too many file label options" msgstr "demasiadas opciones de etiqueta de fichero" -#: src/diff.c:526 +#: src/diff.c:528 #, c-format msgid "invalid width '%s'" msgstr "ancho inválido '%s'" -#: src/diff.c:530 +#: src/diff.c:532 msgid "conflicting width options" msgstr "opciones de ancho conflictivas" -#: src/diff.c:555 +#: src/diff.c:557 #, c-format msgid "invalid horizon length '%s'" msgstr "longitud del horizonte inválida '%s'" -#: src/diff.c:611 +#: src/diff.c:613 #, c-format msgid "invalid tabsize '%s'" msgstr "tamaño de tab inválido '%s'" -#: src/diff.c:615 +#: src/diff.c:617 msgid "conflicting tabsize options" msgstr "opciones de tamaño de tab conflictivas" -#: src/diff.c:770 +#: src/diff.c:772 msgid "--from-file and --to-file both specified" msgstr "se ha especificado tanto --from-file como --to-file" -#: src/diff.c:890 +#: src/diff.c:891 msgid " --normal output a normal diff (the default)" msgstr " --normal produce un diff normal (predeterminado)" -#: src/diff.c:891 +#: src/diff.c:892 msgid "-q, --brief report only when files differ" msgstr "" "-q --brief indica sólo si los ficheros son diferentes o no" -#: src/diff.c:892 +#: src/diff.c:893 msgid "-s, --report-identical-files report when two files are the same" msgstr "" "-s --report-identical-files notifica cuándo dos ficheros son idénticos" -#: src/diff.c:893 +#: src/diff.c:894 msgid "" "-c, -C NUM, --context[=NUM] output NUM (default 3) lines of copied context" msgstr "" "-c, -C NÚM, --context[=NÚM] muestra NÚM (por omisión 3) lÃneas de contexto" -#: src/diff.c:894 +#: src/diff.c:895 msgid "" "-u, -U NUM, --unified[=NUM] output NUM (default 3) lines of unified context" msgstr "" "-u, -U NÚM, --unified[=NÚM] muestra NÚM (por omisión 3) lÃnea de contexto\n" " unificado" -#: src/diff.c:895 +#: src/diff.c:896 msgid "-e, --ed output an ed script" msgstr "-e --ed produce un script ed" -#: src/diff.c:896 +#: src/diff.c:897 msgid "-n, --rcs output an RCS format diff" msgstr "-n --rcs produce un diff en formato RCS" -#: src/diff.c:897 +#: src/diff.c:898 msgid "-y, --side-by-side output in two columns" msgstr "-y, --side-by-side muestra en dos columnas" -#: src/diff.c:898 +#: src/diff.c:899 msgid "" "-W, --width=NUM output at most NUM (default 130) print columns" msgstr "" @@ -871,28 +862,28 @@ msgstr "" "impresión\n" " (por omisión 130)" -#: src/diff.c:899 +#: src/diff.c:900 msgid "" " --left-column output only the left column of common lines" msgstr "" " --left-column muestra sólo en la columna izquierda las lÃneas " "comunes" -#: src/diff.c:900 +#: src/diff.c:901 msgid " --suppress-common-lines do not output common lines" msgstr " --suppress-common-lines no muestra las lÃneas comunes" -#: src/diff.c:902 +#: src/diff.c:903 msgid "-p, --show-c-function show which C function each change is in" msgstr "" "-p, --show-c-function muestra en qué función C está cada cambio" -#: src/diff.c:903 +#: src/diff.c:904 msgid "-F, --show-function-line=RE show the most recent line matching RE" msgstr "" "-F, --show-function-line=ER muestra la lÃnea más reciente que encaje con ER" -#: src/diff.c:904 +#: src/diff.c:905 #, fuzzy msgid "" " --label LABEL use LABEL instead of file name and timestamp\n" @@ -903,18 +894,18 @@ msgstr "" " (se puede repetir)" # Aquà a lo mejor también: la salida -> el resultado. sv -#: src/diff.c:907 +#: src/diff.c:908 msgid "-t, --expand-tabs expand tabs to spaces in output" msgstr "" "-t --expand-tabs expande los tabuladores a espacios en la salida" -#: src/diff.c:908 +#: src/diff.c:909 msgid "-T, --initial-tab make tabs line up by prepending a tab" msgstr "" "-T, --initial-tab hace que los tabuladores se alineen\n" " anteponiendo uno" -#: src/diff.c:909 +#: src/diff.c:910 msgid "" " --tabsize=NUM tab stops every NUM (default 8) print columns" msgstr "" @@ -922,7 +913,7 @@ msgstr "" "columnas\n" " de impresión (por omisión, 8)" -#: src/diff.c:910 +#: src/diff.c:911 msgid "" " --suppress-blank-empty suppress space or tab before empty output lines" msgstr "" @@ -940,53 +931,53 @@ msgstr "" # Te mandaré el gettext, para que veas lo que vale un peine... sv # X'D ... no soy tan malo ... ipg # Medita de nuevo si no usas resultado em -#: src/diff.c:911 +#: src/diff.c:912 msgid "-l, --paginate pass output through 'pr' to paginate it" msgstr "" "-l, --paginate pasa la salida a través de 'pr' para paginarla" -#: src/diff.c:913 +#: src/diff.c:914 msgid "" "-r, --recursive recursively compare any subdirectories found" msgstr "" "-r, --recursive compara recursivamente todos los " "subdirectorios" -#: src/diff.c:914 +#: src/diff.c:915 msgid " --no-dereference don't follow symbolic links" msgstr " --no-dereference no sigue los enlaces simbólicos" -#: src/diff.c:915 +#: src/diff.c:916 msgid "-N, --new-file treat absent files as empty" msgstr "" "-N, --new-file trata los ficheros que no existan como vacÃos" -#: src/diff.c:916 +#: src/diff.c:917 msgid " --unidirectional-new-file treat absent first files as empty" msgstr "" " --unidirectional-new-file trata los ficheros originales que no " "existan\n" " como vacÃos" -#: src/diff.c:917 +#: src/diff.c:918 msgid " --ignore-file-name-case ignore case when comparing file names" msgstr "" " --ignore-file-name-case descarta las diferencias entre mayúsculas y\n" " minúsculas al comparar los nombres de los " "ficheros" -#: src/diff.c:918 +#: src/diff.c:919 msgid " --no-ignore-file-name-case consider case when comparing file names" msgstr "" "--no-ignore-file-name-case considera distintas mayúsculas y minúsculas\n" " cuando compara los nombres de los ficheros" -#: src/diff.c:919 +#: src/diff.c:920 msgid "-x, --exclude=PAT exclude files that match PAT" msgstr "" "-x, --exclude=PAT excluye los ficheros que coincidan con PAT" -#: src/diff.c:920 +#: src/diff.c:921 msgid "" "-X, --exclude-from=FILE exclude files that match any pattern in FILE" msgstr "" @@ -994,14 +985,14 @@ msgstr "" "alguna\n" " expresión regular de FICHERO" -#: src/diff.c:921 +#: src/diff.c:922 msgid "" "-S, --starting-file=FILE start with FILE when comparing directories" msgstr "" "-S, --starting-file=FICHERO comienza por FICHERO cuando se comparan\n" " directorios" -#: src/diff.c:922 +#: src/diff.c:923 msgid "" " --from-file=FILE1 compare FILE1 to all operands;\n" " FILE1 can be a directory" @@ -1009,7 +1000,7 @@ msgstr "" " --from-file=FICHERO1 compara FICHERO1 con todos los operandos;\n" " FICHERO1 puede ser un directorio" -#: src/diff.c:924 +#: src/diff.c:925 msgid "" " --to-file=FILE2 compare all operands to FILE2;\n" " FILE2 can be a directory" @@ -1017,7 +1008,7 @@ msgstr "" " --to-file=FICHERO2 compara todos los operandos con FICHERO2\n" " FICHERO2 puede ser un directorio" -#: src/diff.c:927 +#: src/diff.c:928 msgid "" "-i, --ignore-case ignore case differences in file contents" msgstr "" @@ -1025,58 +1016,58 @@ msgstr "" "minúsculas\n" " en el contenido de los ficheros" -#: src/diff.c:928 +#: src/diff.c:929 msgid "-E, --ignore-tab-expansion ignore changes due to tab expansion" msgstr "" "-E, --ignore-tab-expansion descarta cambios debidos a expansiones de " "tabs" -#: src/diff.c:929 +#: src/diff.c:930 msgid "-Z, --ignore-trailing-space ignore white space at line end" msgstr "" "-Z, --ignore-trailing-space descarta espacio en blanco al final de lÃnea" -#: src/diff.c:930 +#: src/diff.c:931 msgid "" "-b, --ignore-space-change ignore changes in the amount of white space" msgstr "" "-b, --ignore-space-change descarta las diferencias en la cantidad de\n" " espacio en blanco" -#: src/diff.c:931 +#: src/diff.c:932 msgid "-w, --ignore-all-space ignore all white space" msgstr "-w, --ignore-all-space descarta los espacios en blanco" -#: src/diff.c:932 +#: src/diff.c:933 msgid "" "-B, --ignore-blank-lines ignore changes where lines are all blank" msgstr "" "-B, --ignore-blank-lines descarta los cambios en lÃneas completamente " "vacÃas" -#: src/diff.c:933 +#: src/diff.c:934 msgid "-I, --ignore-matching-lines=RE ignore changes where all lines match RE" msgstr "" "-I, --ignore-matching-lines=EXPR-REG descarta las lÃneas que coincidan con " "EXPR-REG" -#: src/diff.c:935 +#: src/diff.c:936 msgid "-a, --text treat all files as text" msgstr "" "-a, --text trata todos los ficheros como de tipo texto" -#: src/diff.c:936 +#: src/diff.c:937 msgid " --strip-trailing-cr strip trailing carriage return on input" msgstr "" " --strip-trailing-cr elimina los retornos de carro finales en la " "entrada" -#: src/diff.c:938 +#: src/diff.c:939 msgid " --binary read and write data in binary mode" msgstr "" " --binary lee y escribe los datos en modo binario" -#: src/diff.c:941 +#: src/diff.c:942 msgid "" "-D, --ifdef=NAME output merged file with '#ifdef NAME' diffs" msgstr "" @@ -1086,23 +1077,23 @@ msgstr "" # Propongo similar -> parecida. Ver gettext. sv # Hmmm ... prefiero similar. Antes estaba puesto `parecida' y la verdad, # no quedaba tan bien. ipg -#: src/diff.c:942 +#: src/diff.c:943 msgid " --GTYPE-group-format=GFMT format GTYPE input groups with GFMT" msgstr "" " --GTYPE-group-format=GFMT formatea los grupos de entrada GTYPE con GFMT" -#: src/diff.c:943 +#: src/diff.c:944 msgid " --line-format=LFMT format all input lines with LFMT" msgstr "" " --line-format=LFMT formatea todas las lÃneas de entrada con LFMT" # Ãdem. sv -#: src/diff.c:944 +#: src/diff.c:945 msgid " --LTYPE-line-format=LFMT format LTYPE input lines with LFMT" msgstr "" " --LTYPE-line-format=LFMT formatea las lÃneas de entrada LTYPE con LFMT" -#: src/diff.c:945 +#: src/diff.c:946 msgid "" " These format options provide fine-grained control over the output\n" " of diff, generalizing -D/--ifdef." @@ -1111,13 +1102,13 @@ msgstr "" "resultado\n" " de diff, generalizando -D/--ifdef." -#: src/diff.c:947 +#: src/diff.c:948 msgid " LTYPE is 'old', 'new', or 'unchanged'. GTYPE is LTYPE or 'changed'." msgstr "" " LTYPE es 'old' (antiguo), 'new' (nuevo) o 'unchanged' (sin cambios).\n" " GTYPE es como LTYPE o 'changed' (cambiado)." -#: src/diff.c:948 +#: src/diff.c:949 msgid "" " GFMT (only) may contain:\n" " %< lines from FILE1\n" @@ -1146,7 +1137,7 @@ msgstr "" " M L+1\n" " %(A=B?T:E) si A es igual a B entonces T en caso contrario E" -#: src/diff.c:960 +#: src/diff.c:961 msgid "" " LFMT (only) may contain:\n" " %L contents of line\n" @@ -1160,7 +1151,7 @@ msgstr "" "el\n" " número de lÃnea de entrada" -#: src/diff.c:964 +#: src/diff.c:965 msgid "" " Both GFMT and LFMT may contain:\n" " %% %\n" @@ -1174,17 +1165,17 @@ msgstr "" " %c'\\OOO' el carácter con código octal OOO\n" " C el carácter C (los otros caracteres se representan a sà mismos)" -#: src/diff.c:970 +#: src/diff.c:971 msgid "-d, --minimal try hard to find a smaller set of changes" msgstr "" "-d, --minimal se esfuerza en encontrar un grupo de cambios menor" -#: src/diff.c:971 +#: src/diff.c:972 msgid " --horizon-lines=NUM keep NUM lines of the common prefix and suffix" msgstr "" " --horizon-lines=NÚM mantiene NÚM lÃneas de prefijos y sufijos comunes" -#: src/diff.c:972 +#: src/diff.c:973 msgid "" " --speed-large-files assume large files and many scattered small changes" msgstr "" @@ -1192,130 +1183,123 @@ msgstr "" "son\n" " numerosos, pequeños y dispersos" -#: src/diff.c:973 -msgid "" -" --color[=WHEN] colorize the output; WHEN can be 'never', 'always'," -msgstr "" - #: src/diff.c:974 -#, fuzzy -msgid " or 'auto' (the default)" -msgstr " --normal produce un diff normal (predeterminado)" - -#: src/diff.c:975 msgid "" -" --palette=PALETTE specify the colors to use when --color is active" +" --color[=WHEN] colorize the output; WHEN can be 'never', " +"'always',\n" +" or 'auto' (the default)" msgstr "" #: src/diff.c:976 msgid "" -" PALETTE is a colon-separated list terminfo " -"capabilities" +" --palette=PALETTE the colors to use when --color is active; PALETTE " +"is\n" +" a colon-separated list of terminfo capabilities" msgstr "" -#: src/diff.c:978 +#: src/diff.c:979 msgid " --help display this help and exit" msgstr " --help muestra esta ayuda y finaliza" -#: src/diff.c:979 +#: src/diff.c:980 msgid "-v, --version output version information and exit" msgstr "-v, --version informa de la versión y finaliza" -#: src/diff.c:981 +#: src/diff.c:982 #, fuzzy msgid "FILES are 'FILE1 FILE2' or 'DIR1 DIR2' or 'DIR FILE' or 'FILE DIR'." msgstr "" "FICHEROS puede ser 'FICHERO1 FICHERO2' o 'DIRECTORIO1 DIRECTORIO2'\n" " o 'DIRECTORIO FICHERO...' o 'FICHERO... DIRECTORIO'." -#: src/diff.c:982 +#: src/diff.c:983 msgid "" "If --from-file or --to-file is given, there are no restrictions on FILE(s)." msgstr "Si se da --from-file o --to-file, no hay restricciones en FICHERO(s)." -#: src/diff.c:983 src/diff3.c:526 src/sdiff.c:219 +#: src/diff.c:984 src/diff3.c:528 src/sdiff.c:219 msgid "If a FILE is '-', read standard input." msgstr "Si un FICHERO es '-', lee la entrada estándar." -#: src/diff.c:993 +#: src/diff.c:994 #, c-format msgid "Usage: %s [OPTION]... FILES\n" msgstr "Modo de empleo: %s [OPCIÓN]... FICHEROS\n" -#: src/diff.c:994 +#: src/diff.c:995 msgid "Compare FILES line by line." msgstr "Compara FICHEROS lÃnea por lÃnea." -#: src/diff.c:1028 +#: src/diff.c:1029 #, c-format msgid "conflicting %s option value '%s'" msgstr "la opción %s tiene el valor conflictivo '%s'" -#: src/diff.c:1041 +#: src/diff.c:1042 #, c-format msgid "conflicting output style options" msgstr "las especificaciones del estilo de salida son conflictivas" -#: src/diff.c:1057 +#: src/diff.c:1058 #, fuzzy, c-format msgid "invalid color '%s'" msgstr "ancho inválido '%s'" -#: src/diff.c:1113 src/diff.c:1323 +#: src/diff.c:1114 src/diff.c:1324 #, c-format msgid "Only in %s: %s\n" msgstr "Sólo en %s: %s\n" -#: src/diff.c:1247 +#: src/diff.c:1248 msgid "cannot compare '-' to a directory" msgstr "no se puede comparar '-' con un directorio" -#: src/diff.c:1282 +#: src/diff.c:1283 msgid "-D option not supported with directories" msgstr "la opción -D no se puede usar con directorios" -#: src/diff.c:1291 +#: src/diff.c:1292 #, c-format msgid "Common subdirectories: %s and %s\n" msgstr "Subdirectorios comunes: %s y %s\n" # Nota: El segundo y el cuarto `%s' son tipos de fichero. # Por ejemplo, "texto C", "texto FORTRAN", etc. -#: src/diff.c:1333 src/diff.c:1383 +#: src/diff.c:1334 src/diff.c:1384 #, c-format msgid "File %s is a %s while file %s is a %s\n" msgstr "El fichero %s es un %s mientras que el %s es un %s\n" -#: src/diff.c:1369 +#: src/diff.c:1370 #, c-format msgid "Symbolic links %s and %s differ\n" msgstr "Los enlaces simbólicos %s y %s son distintos\n" -#: src/diff.c:1456 +#: src/diff.c:1457 #, c-format msgid "Files %s and %s are identical\n" msgstr "Los ficheros %s y %s son idénticos\n" #. This is a proper name. See the gettext manual, section Names. -#: src/diff3.c:41 +#: src/diff3.c:42 msgid "Randy Smith" msgstr "Randy Smith" -#: src/diff3.c:348 +#: src/diff3.c:351 #, c-format msgid "incompatible options" msgstr "opciones incompatibles" -#: src/diff3.c:388 +#: src/diff3.c:391 msgid "'-' specified for more than one input file" msgstr "se ha especificado '-' para más de un fichero de entrada" -#: src/diff3.c:439 src/diff3.c:1288 src/diff3.c:1692 src/diff3.c:1747 +#: src/diff3.c:442 src/diff3.c:1290 src/diff3.c:1693 src/diff3.c:1748 #: src/sdiff.c:307 src/sdiff.c:844 src/sdiff.c:855 msgid "read failed" msgstr "la lectura falló" -#: src/diff3.c:473 +#: src/diff3.c:475 msgid "-A, --show-all output all changes, bracketing conflicts" msgstr "" "-A, --show-all muestra todos los cambios, encerrando los " @@ -1331,7 +1315,7 @@ msgstr "" # MYFILE MI-FICHERO # # Pongo eso por ahora, pero espero una sugerencia mejor ;) -#: src/diff3.c:475 +#: src/diff3.c:477 msgid "" "-e, --ed output ed script incorporating changes\n" " from OLDFILE to YOURFILE into MYFILE" @@ -1339,13 +1323,13 @@ msgstr "" "-e, --ed muestra un `script' ed incorporando los cambios entre\n" " FICHERO-ANTIGUO y TU-FICHERO a MI-FICHERO" -#: src/diff3.c:477 +#: src/diff3.c:479 msgid "-E, --show-overlap like -e, but bracket conflicts" msgstr "" "-E, --show-overlap como -e, pero encerrando los conflictos\n" " entre corchetes" -#: src/diff3.c:478 +#: src/diff3.c:480 msgid "" "-3, --easy-only like -e, but incorporate only nonoverlapping " "changes" @@ -1354,7 +1338,7 @@ msgstr "" "que\n" " no se superponen" -#: src/diff3.c:479 +#: src/diff3.c:481 msgid "" "-x, --overlap-only like -e, but incorporate only overlapping changes" msgstr "" @@ -1362,17 +1346,17 @@ msgstr "" "se\n" " solapan" -#: src/diff3.c:480 +#: src/diff3.c:482 msgid "-X like -x, but bracket conflicts" msgstr "" "-X como -x, pero encierra conflictos entre corchetes" -#: src/diff3.c:481 +#: src/diff3.c:483 msgid "-i append 'w' and 'q' commands to ed scripts" msgstr "" "-i añade las órdenes 'w' y 'q' a los scripts ed" -#: src/diff3.c:483 +#: src/diff3.c:485 msgid "" "-m, --merge output actual merged file, according to\n" " -A if no other options are given" @@ -1381,29 +1365,29 @@ msgstr "" "si\n" " no se especifica ninguna otra opción" -#: src/diff3.c:486 +#: src/diff3.c:488 msgid "-a, --text treat all files as text" msgstr "" "-a, --text trata todos los ficheros como de tipo texto" -#: src/diff3.c:487 +#: src/diff3.c:489 msgid " --strip-trailing-cr strip trailing carriage return on input" msgstr "" " --strip-trailing-cr elimina los retornos de carro finales en la " "entrada" -#: src/diff3.c:488 +#: src/diff3.c:490 msgid "-T, --initial-tab make tabs line up by prepending a tab" msgstr "" "-T, --initial-tab hace que los tabuladores se alineen anteponiendo " "uno" -#: src/diff3.c:489 +#: src/diff3.c:491 msgid " --diff-program=PROGRAM use PROGRAM to compare files" msgstr "" " --diff-program=PROGRAMA utiliza PROGRAMA para comparar los ficheros" -#: src/diff3.c:490 +#: src/diff3.c:492 msgid "" "-L, --label=LABEL use LABEL instead of file name\n" " (can be repeated up to three times)" @@ -1412,24 +1396,24 @@ msgstr "" "fichero\n" " (se puede reperir hasta tres veces)" -#: src/diff3.c:493 +#: src/diff3.c:495 msgid " --help display this help and exit" msgstr " --help muestra esta ayuda y finaliza" -#: src/diff3.c:494 +#: src/diff3.c:496 msgid "-v, --version output version information and exit" msgstr "-v --version informa de la versión y finaliza" -#: src/diff3.c:503 +#: src/diff3.c:505 #, c-format msgid "Usage: %s [OPTION]... MYFILE OLDFILE YOURFILE\n" msgstr "Modo de empleo: %s [OPCIÓN]... MI-FICHERO FICHERO-ANTIGUO TU-FICHERO\n" -#: src/diff3.c:505 +#: src/diff3.c:507 msgid "Compare three files line by line." msgstr "Compara tres ficheros lÃnea por lÃnea." -#: src/diff3.c:515 +#: src/diff3.c:517 msgid "" "\n" "The default output format is a somewhat human-readable representation of\n" @@ -1456,49 +1440,49 @@ msgstr "" "es\n" "más robusto que usar ed.\n" -#: src/diff3.c:527 +#: src/diff3.c:529 msgid "Exit status is 0 if successful, 1 if conflicts, 2 if trouble." msgstr "" "El estado de salida es 0 en caso de éxito, 1 si hay conflictos, 2 en caso " "de\n" "problema." -#: src/diff3.c:720 +#: src/diff3.c:722 msgid "internal error: screwup in format of diff blocks" msgstr "error interno: fallo en el formato de los bloques diff" -#: src/diff3.c:1015 +#: src/diff3.c:1017 #, c-format msgid "%s: diff failed: " msgstr "%s: diff falló: " -#: src/diff3.c:1037 +#: src/diff3.c:1039 msgid "internal error: invalid diff type in process_diff" msgstr "error interno: tipo de diff inválido en process_diff" -#: src/diff3.c:1062 +#: src/diff3.c:1064 msgid "invalid diff format; invalid change separator" msgstr "formato de diff inválido; separador de cambio inválido" -#: src/diff3.c:1298 +#: src/diff3.c:1300 msgid "invalid diff format; incomplete last line" msgstr "formato de diff inválido; lÃnea final incompleta" -#: src/diff3.c:1322 src/sdiff.c:275 src/util.c:970 +#: src/diff3.c:1324 src/sdiff.c:275 src/util.c:969 #, c-format msgid "subsidiary program '%s' could not be invoked" msgstr "no se ha podido invocar al programa subsidiario '%s'" -#: src/diff3.c:1347 +#: src/diff3.c:1349 msgid "invalid diff format; incorrect leading line chars" msgstr "" "formato de diff inválido; caracteres incorrectos al comienzo de la lÃnea" -#: src/diff3.c:1420 +#: src/diff3.c:1422 msgid "internal error: invalid diff type passed to output" msgstr "error interno: tipo de diff inválido pasado a la salida" -#: src/diff3.c:1694 src/diff3.c:1751 +#: src/diff3.c:1695 src/diff3.c:1752 msgid "input file shrank" msgstr "el fichero de entrada ha menguado" @@ -1513,7 +1497,7 @@ msgid "%s: recursive directory loop" msgstr "%s: bucle de directorio recursivo" #. This is a proper name. See the gettext manual, section Names. -#: src/sdiff.c:42 +#: src/sdiff.c:43 msgid "Thomas Lord" msgstr "Thomas Lord" @@ -1718,16 +1702,36 @@ msgstr "" "v: Incluye lÃneas comunes verbosamente.\n" "q: Salir.\n" -#: src/util.c:663 +#: src/util.c:662 #, fuzzy, c-format msgid "unrecognized prefix: %s" msgstr "%s: opción no reconocida '--%s'\n" -#: src/util.c:693 +#: src/util.c:692 #, c-format msgid "unparsable value for --palette" msgstr "" +#, fuzzy +#~ msgid " or 'auto' (the default)" +#~ msgstr "" +#~ " --normal produce un diff normal (predeterminado)" + +#~ msgid "%s: option '--%s' doesn't allow an argument\n" +#~ msgstr "%s: la opción '--%s' no admite ningún argumento\n" + +#~ msgid "%s: unrecognized option '--%s'\n" +#~ msgstr "%s: opción no reconocida '--%s'\n" + +#~ msgid "%s: option '-W %s' is ambiguous\n" +#~ msgstr "%s: la opción '-W %s' es ambigua\n" + +#~ msgid "%s: option '-W %s' doesn't allow an argument\n" +#~ msgstr "%s: la opción '-W %s' no admite ningún argumento\n" + +#~ msgid "%s: option '-W %s' requires an argument\n" +#~ msgstr "%s: la opción '-W %s' requiere un argumento\n" + #~ msgid "" #~ "-b --ignore-space-change ignore changes in the amount of white " #~ "space" Binary files differ@@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: diffutils 3.3-pre1\n" "Report-Msgid-Bugs-To: bug-diffutils@gnu.org\n" -"POT-Creation-Date: 2016-08-20 22:22-0700\n" +"POT-Creation-Date: 2017-05-21 13:26-0700\n" "PO-Revision-Date: 2016-05-26 21:28+0300\n" "Last-Translator: Lauri Nurmi <lanurmi@iki.fi>\n" "Language-Team: Finnish <translation-team-fi@lists.sourceforge.net>\n" @@ -15,33 +15,34 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"X-Bugs: Report translation errors to the Language-Team address.\n" "X-Generator: Poedit 1.8.7\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: lib/argmatch.c:133 +#: lib/argmatch.c:134 #, fuzzy, c-format msgid "invalid argument %s for %s" msgstr "argumentti %s on virheellinen %s:lle" -#: lib/argmatch.c:134 +#: lib/argmatch.c:135 #, c-format msgid "ambiguous argument %s for %s" msgstr "" -#: lib/argmatch.c:153 +#: lib/argmatch.c:154 #, fuzzy msgid "Valid arguments are:" msgstr "argumentti %s on virheellinen %s:lle" -#: lib/c-stack.c:204 lib/c-stack.c:297 +#: lib/c-stack.c:203 lib/c-stack.c:296 msgid "program error" msgstr "ohjelmavirhe" -#: lib/c-stack.c:205 lib/c-stack.c:298 +#: lib/c-stack.c:204 lib/c-stack.c:297 msgid "stack overflow" msgstr "pinon ylivuoto" -#: lib/error.c:191 +#: lib/error.c:195 msgid "Unknown system error" msgstr "Tuntematon järjestelmävirhe" @@ -145,66 +146,41 @@ msgstr "" msgid "weird file" msgstr "outo tiedosto" -#: lib/getopt.c:575 lib/getopt.c:604 -#, c-format -msgid "%s: option '%s' is ambiguous; possibilities:" -msgstr "%s: valitsin â€%s†on moniselitteinen; vaihtoehdot:" - -#: lib/getopt.c:619 +#: lib/getopt.c:278 #, fuzzy, c-format -msgid "%s: option '%s' is ambiguous\n" +msgid "%s: option '%s%s' is ambiguous\n" msgstr "%s: valitsin â€-W %s†on moniselitteinen\n" -#: lib/getopt.c:654 lib/getopt.c:658 -#, c-format -msgid "%s: option '--%s' doesn't allow an argument\n" -msgstr "%s: valitsin â€--%s†ei salli argumenttia\n" +#: lib/getopt.c:284 +#, fuzzy, c-format +msgid "%s: option '%s%s' is ambiguous; possibilities:" +msgstr "%s: valitsin â€%s†on moniselitteinen; vaihtoehdot:" -#: lib/getopt.c:667 lib/getopt.c:672 -#, c-format -msgid "%s: option '%c%s' doesn't allow an argument\n" +#: lib/getopt.c:319 +#, fuzzy, c-format +msgid "%s: unrecognized option '%s%s'\n" +msgstr "%s: tunnistamaton valitsin â€%c%sâ€\n" + +#: lib/getopt.c:345 +#, fuzzy, c-format +msgid "%s: option '%s%s' doesn't allow an argument\n" msgstr "%s: valitsin â€%c%s†ei salli argumenttia\n" -#: lib/getopt.c:715 lib/getopt.c:734 -#, c-format -msgid "%s: option '--%s' requires an argument\n" +#: lib/getopt.c:360 +#, fuzzy, c-format +msgid "%s: option '%s%s' requires an argument\n" msgstr "%s: valitsin â€--%s†vaatii argumentin\n" -#: lib/getopt.c:772 lib/getopt.c:775 -#, c-format -msgid "%s: unrecognized option '--%s'\n" -msgstr "%s: tunnistamaton valitsin â€--%sâ€\n" - -#: lib/getopt.c:783 lib/getopt.c:786 -#, c-format -msgid "%s: unrecognized option '%c%s'\n" -msgstr "%s: tunnistamaton valitsin â€%c%sâ€\n" - -#: lib/getopt.c:835 lib/getopt.c:838 +#: lib/getopt.c:621 #, c-format msgid "%s: invalid option -- '%c'\n" msgstr "%s: virheellinen valitsin -- â€%câ€\n" -#: lib/getopt.c:891 lib/getopt.c:908 lib/getopt.c:1118 lib/getopt.c:1136 +#: lib/getopt.c:636 lib/getopt.c:682 #, c-format msgid "%s: option requires an argument -- '%c'\n" msgstr "%s: valitsin vaatii argumentin -- â€%câ€\n" -#: lib/getopt.c:964 lib/getopt.c:980 -#, c-format -msgid "%s: option '-W %s' is ambiguous\n" -msgstr "%s: valitsin â€-W %s†on moniselitteinen\n" - -#: lib/getopt.c:1004 lib/getopt.c:1022 -#, c-format -msgid "%s: option '-W %s' doesn't allow an argument\n" -msgstr "%s: valitsin â€-W %s†ei salli argumenttia\n" - -#: lib/getopt.c:1043 lib/getopt.c:1061 -#, c-format -msgid "%s: option '-W %s' requires an argument\n" -msgstr "%s: valitsin â€%s†vaatii argumentin\n" - #. TRANSLATORS: #. Get translations for open and closing quotation marks. #. The message catalog should translate "`" to a left @@ -226,11 +202,11 @@ msgstr "%s: valitsin â€%s†vaatii argumentin\n" #. If you don't know what to put here, please see #. <http://en.wikipedia.org/wiki/Quotation_marks_in_other_languages> #. and use glyphs suitable for your language. -#: lib/quotearg.c:347 +#: lib/quotearg.c:362 msgid "`" msgstr "â€" -#: lib/quotearg.c:348 +#: lib/quotearg.c:363 msgid "'" msgstr "â€" @@ -522,7 +498,7 @@ msgid "General help using GNU software: <http://www.gnu.org/gethelp/>\n" msgstr "" "Yleisohjeita GNU-ohjelmistojen käyttöön: <http://www.gnu.org/gethelp/>\n" -#: src/analyze.c:454 src/diff.c:1400 +#: src/analyze.c:454 src/diff.c:1401 #, c-format msgid "Files %s and %s differ\n" msgstr "Tiedostot %s ja %s eroavat\n" @@ -532,21 +508,21 @@ msgstr "Tiedostot %s ja %s eroavat\n" msgid "Binary files %s and %s differ\n" msgstr "Binääritiedostot %s ja %s eroavat\n" -#: src/analyze.c:697 src/diff3.c:1463 src/util.c:1255 +#: src/analyze.c:706 src/diff3.c:1465 src/util.c:1254 msgid "No newline at end of file" msgstr "Ei rivinvaihtoa tiedoston lopussa" #. This is a proper name. See the gettext manual, section Names. -#: src/cmp.c:43 +#: src/cmp.c:44 msgid "Torbjorn Granlund" msgstr "Torbjörn Granlund" #. This is a proper name. See the gettext manual, section Names. -#: src/cmp.c:44 +#: src/cmp.c:45 msgid "David MacKenzie" msgstr "David MacKenzie" -#: src/cmp.c:118 src/diff.c:875 src/diff3.c:459 src/sdiff.c:158 +#: src/cmp.c:119 src/diff.c:877 src/diff3.c:462 src/sdiff.c:159 #, c-format msgid "Try '%s --help' for more information." msgstr "Komento â€%s --help†antaa lisää tietoa." @@ -561,12 +537,12 @@ msgstr "virheellinen alkuarvo jäsenelle %qE" msgid "options -l and -s are incompatible" msgstr "valitsimet -l ja -s eivät ole yhteensopivia" -#: src/cmp.c:155 src/diff.c:884 src/diff3.c:467 src/sdiff.c:167 src/sdiff.c:315 -#: src/sdiff.c:322 src/sdiff.c:874 src/util.c:853 src/util.c:953 src/util.c:960 +#: src/cmp.c:155 src/diff.c:885 src/diff3.c:469 src/sdiff.c:167 src/sdiff.c:315 +#: src/sdiff.c:322 src/sdiff.c:874 src/util.c:852 src/util.c:952 src/util.c:959 msgid "write failed" msgstr "kirjoitus epäonnistui" -#: src/cmp.c:157 src/diff.c:886 src/diff.c:1465 src/diff3.c:469 src/sdiff.c:169 +#: src/cmp.c:157 src/diff.c:887 src/diff.c:1466 src/diff3.c:471 src/sdiff.c:169 msgid "standard output" msgstr "vakiotuloste" @@ -630,7 +606,7 @@ msgstr "" "OHITA1 ja OHITA2 ovat jokaisen tiedostn alusta ohitettavien tavujen\n" "määrä (oletusarvo on nolla)." -#: src/cmp.c:185 src/diff.c:996 src/diff3.c:507 src/sdiff.c:210 +#: src/cmp.c:185 src/diff.c:997 src/diff3.c:509 src/sdiff.c:210 msgid "" "Mandatory arguments to long options are mandatory for short options too.\n" msgstr "" @@ -650,7 +626,7 @@ msgstr "" msgid "If a FILE is '-' or missing, read standard input." msgstr "Jos TIEDOSTOa ei ole annettu, tai se on â€-â€, luetaan vakiosyötettä." -#: src/cmp.c:195 src/diff.c:984 src/sdiff.c:220 +#: src/cmp.c:195 src/diff.c:985 src/sdiff.c:220 msgid "Exit status is 0 if inputs are the same, 1 if different, 2 if trouble." msgstr "" "Paluuarvo on 0, jos syötteet ovat samoja, 1 jos erilaisia, " @@ -661,166 +637,181 @@ msgstr "" msgid "invalid --bytes value '%s'" msgstr "virheellinen arvo â€%s†valitsimelle --bytes" -#: src/cmp.c:266 src/diff.c:793 src/diff3.c:353 src/sdiff.c:565 +#: src/cmp.c:266 src/diff.c:795 src/diff3.c:356 src/sdiff.c:565 #, c-format msgid "missing operand after '%s'" msgstr "puuttuva operandi argumentin â€%s†jälkeen" -#: src/cmp.c:278 src/diff.c:795 src/diff3.c:355 src/sdiff.c:567 +#: src/cmp.c:278 src/diff.c:797 src/diff3.c:358 src/sdiff.c:567 #, c-format msgid "extra operand '%s'" msgstr "ylimääräinen operandi â€%sâ€" -#: src/cmp.c:494 +#: src/cmp.c:498 #, c-format msgid "%s %s differ: byte %s, line %s\n" msgstr "%s %s eroavat: tavu %s, rivi %s\n" -#: src/cmp.c:510 +#: src/cmp.c:514 #, c-format msgid "%s %s differ: byte %s, line %s is %3o %s %3o %s\n" msgstr "%s %s eroavat: tavu %s, rivi %s on %3o %s %3o %s\n" -#: src/cmp.c:562 -#, c-format -msgid "cmp: EOF on %s\n" +#: src/cmp.c:571 +#, fuzzy, c-format +msgid "cmp: EOF on %s which is empty\n" +msgstr "cmp: Tiedoston %s loppu\n" + +#: src/cmp.c:585 +#, fuzzy, c-format +msgid "cmp: EOF on %s after byte %s, line %s\n" +msgstr "%s %s eroavat: tavu %s, rivi %s\n" + +#: src/cmp.c:586 +#, fuzzy, c-format +msgid "cmp: EOF on %s after byte %s, in line %s\n" +msgstr "%s %s eroavat: tavu %s, rivi %s\n" + +#: src/cmp.c:592 +#, fuzzy, c-format +msgid "cmp: EOF on %s after byte %s\n" msgstr "cmp: Tiedoston %s loppu\n" #. This is a proper name. See the gettext manual, section Names. -#: src/diff.c:49 +#: src/diff.c:50 msgid "Paul Eggert" msgstr "Paul Eggert" #. This is a proper name. See the gettext manual, section Names. -#: src/diff.c:50 +#: src/diff.c:51 msgid "Mike Haertel" msgstr "Mike Haertel" #. This is a proper name. See the gettext manual, section Names. -#: src/diff.c:51 +#: src/diff.c:52 msgid "David Hayes" msgstr "David Hayes" #. This is a proper name. See the gettext manual, section Names. -#: src/diff.c:52 +#: src/diff.c:53 msgid "Richard Stallman" msgstr "Richard Stallman" #. This is a proper name. See the gettext manual, section Names. -#: src/diff.c:53 +#: src/diff.c:54 msgid "Len Tower" msgstr "Len Tower" -#: src/diff.c:351 +#: src/diff.c:353 #, c-format msgid "invalid context length '%s'" msgstr "virheellinen kontekstin pituus â€%sâ€" -#: src/diff.c:434 +#: src/diff.c:436 #, c-format msgid "pagination not supported on this host" msgstr "tämä isäntä ei tue sivunumerointia" -#: src/diff.c:449 src/diff3.c:335 +#: src/diff.c:451 src/diff3.c:336 #, c-format msgid "too many file label options" msgstr "liian monta tiedostonimivalitsinta" -#: src/diff.c:526 +#: src/diff.c:528 #, c-format msgid "invalid width '%s'" msgstr "virheellinen leveys \"%s\"" -#: src/diff.c:530 +#: src/diff.c:532 msgid "conflicting width options" msgstr "ristiriitaiset leveysvalinnat" -#: src/diff.c:555 +#: src/diff.c:557 #, c-format msgid "invalid horizon length '%s'" msgstr "virheellinen horisontin pituus \"%s\"" -#: src/diff.c:611 +#: src/diff.c:613 #, c-format msgid "invalid tabsize '%s'" msgstr "virheellinen sarkaimen koko \"%s\"" -#: src/diff.c:615 +#: src/diff.c:617 msgid "conflicting tabsize options" msgstr "ristiriitaiset sarkaimen kokovalinnat" -#: src/diff.c:770 +#: src/diff.c:772 msgid "--from-file and --to-file both specified" msgstr "sekä valitsin --from-file että --to-file on määritetty" -#: src/diff.c:890 +#: src/diff.c:891 #, fuzzy msgid " --normal output a normal diff (the default)" msgstr "--normal Tulosta normaali diff." -#: src/diff.c:891 +#: src/diff.c:892 #, fuzzy msgid "-q, --brief report only when files differ" msgstr "-q --brief Kertoo vain, eroavatko tiedostot." -#: src/diff.c:892 +#: src/diff.c:893 #, fuzzy msgid "-s, --report-identical-files report when two files are the same" msgstr "-s --report-identical-files Ilmoita, jos kaksi tiedostoa ovat samat." -#: src/diff.c:893 +#: src/diff.c:894 msgid "" "-c, -C NUM, --context[=NUM] output NUM (default 3) lines of copied context" msgstr "" -#: src/diff.c:894 +#: src/diff.c:895 #, fuzzy msgid "" "-u, -U NUM, --unified[=NUM] output NUM (default 3) lines of unified context" msgstr "" "-w MÄÄRÄ --width=MÄÄRÄ Tulosta enintään MÄÄRÄ (oletus 130) merkkiä riville." -#: src/diff.c:895 +#: src/diff.c:896 #, fuzzy msgid "-e, --ed output an ed script" msgstr "-e --ed Tulosta ed-skripti." -#: src/diff.c:896 +#: src/diff.c:897 #, fuzzy msgid "-n, --rcs output an RCS format diff" msgstr "-n --rcs Tulosta RCS-muotoinen diff." -#: src/diff.c:897 +#: src/diff.c:898 msgid "-y, --side-by-side output in two columns" msgstr "" -#: src/diff.c:898 +#: src/diff.c:899 #, fuzzy msgid "" "-W, --width=NUM output at most NUM (default 130) print columns" msgstr "" "-w MÄÄRÄ --width=MÄÄRÄ Tulosta enintään MÄÄRÄ (oletus 130) merkkiä riville." -#: src/diff.c:899 +#: src/diff.c:900 #, fuzzy msgid "" " --left-column output only the left column of common lines" msgstr "-l --left-column Tulosta vain yhteisten rivien vasen palsta" -#: src/diff.c:900 +#: src/diff.c:901 #, fuzzy msgid " --suppress-common-lines do not output common lines" msgstr "-s --suppress-common-lines Älä tulosta yhteisiä rivejä." -#: src/diff.c:902 +#: src/diff.c:903 msgid "-p, --show-c-function show which C function each change is in" msgstr "" -#: src/diff.c:903 +#: src/diff.c:904 msgid "-F, --show-function-line=RE show the most recent line matching RE" msgstr "" -#: src/diff.c:904 +#: src/diff.c:905 #, fuzzy msgid "" " --label LABEL use LABEL instead of file name and timestamp\n" @@ -829,74 +820,74 @@ msgstr "" "--from-file=TIEDOSTO1 Vertaa TIEDOSTO1:ä kaikkiin operandeihin. TIEDOSTO1 " "voi olla hakemisto." -#: src/diff.c:907 +#: src/diff.c:908 #, fuzzy msgid "-t, --expand-tabs expand tabs to spaces in output" msgstr "-t --expand-tabs Laajentaa sarkaimet välilyönneiksi tulosteessa." -#: src/diff.c:908 +#: src/diff.c:909 #, fuzzy msgid "-T, --initial-tab make tabs line up by prepending a tab" msgstr "-T --initial-tab Lisää sarkain rivien alkuun." -#: src/diff.c:909 +#: src/diff.c:910 #, fuzzy msgid "" " --tabsize=NUM tab stops every NUM (default 8) print columns" msgstr "--tabsize=KOKO Sarkaimen koko on KOKO (oletus 8) merkkiä." -#: src/diff.c:910 +#: src/diff.c:911 msgid "" " --suppress-blank-empty suppress space or tab before empty output lines" msgstr "" -#: src/diff.c:911 +#: src/diff.c:912 msgid "-l, --paginate pass output through 'pr' to paginate it" msgstr "" "-l --paginate Ohjaa tuloste ohjelman \"pr\" läpi sivunumerointia varten." -#: src/diff.c:913 +#: src/diff.c:914 msgid "" "-r, --recursive recursively compare any subdirectories found" msgstr "" "-r, --recursive vertaa löytyneitä alihakemistoja " "rekursiivisesti" -#: src/diff.c:914 +#: src/diff.c:915 msgid " --no-dereference don't follow symbolic links" msgstr "" -#: src/diff.c:915 +#: src/diff.c:916 #, fuzzy msgid "-N, --new-file treat absent files as empty" msgstr "-N --new-file Käsittele puuttuvia tiedostoja tyhjinä." -#: src/diff.c:916 +#: src/diff.c:917 #, fuzzy msgid " --unidirectional-new-file treat absent first files as empty" msgstr "--unidirectional-new-file Käsittele puuttuvia tiedostoja tyhjinä." -#: src/diff.c:917 +#: src/diff.c:918 #, fuzzy msgid " --ignore-file-name-case ignore case when comparing file names" msgstr "" "--ignore-file-name-case Älä huomioi kirjainkokoa tiedostojen nimiä " "verrattaessa." -#: src/diff.c:918 +#: src/diff.c:919 #, fuzzy msgid " --no-ignore-file-name-case consider case when comparing file names" msgstr "" "--no-ignore-file-name-case Kirjainkoko huomioidaan tiedostonimiä " "verrattaessa." -#: src/diff.c:919 +#: src/diff.c:920 #, fuzzy msgid "-x, --exclude=PAT exclude files that match PAT" msgstr "" "-x HAHMO --exclude=HAHMO Jätä pois tiedostot, jotka vastaavat HAHMOa." -#: src/diff.c:920 +#: src/diff.c:921 #, fuzzy msgid "" "-X, --exclude-from=FILE exclude files that match any pattern in FILE" @@ -904,7 +895,7 @@ msgstr "" "-X TIEDOSTO --exclude-from=TIEDOSTO Jätä pois TIEDOSTOssa listatut " "tiedostot." -#: src/diff.c:921 +#: src/diff.c:922 #, fuzzy msgid "" "-S, --starting-file=FILE start with FILE when comparing directories" @@ -912,7 +903,7 @@ msgstr "" "-S TIEDOSTO --starting-file=TIEDOSTO Aloita TIEDOSTOlla verrattaessa " "hakemistoja." -#: src/diff.c:922 +#: src/diff.c:923 #, fuzzy msgid "" " --from-file=FILE1 compare FILE1 to all operands;\n" @@ -921,7 +912,7 @@ msgstr "" "--from-file=TIEDOSTO1 Vertaa TIEDOSTO1:ä kaikkiin operandeihin. TIEDOSTO1 " "voi olla hakemisto." -#: src/diff.c:924 +#: src/diff.c:925 #, fuzzy msgid "" " --to-file=FILE2 compare all operands to FILE2;\n" @@ -930,7 +921,7 @@ msgstr "" "--to-file=TIEDOSTO2 Vertaa kaikkia operandeja TIEDOSTO2:een. TIEDOSTO2 voi " "olla hakemisto." -#: src/diff.c:927 +#: src/diff.c:928 #, fuzzy msgid "" "-i, --ignore-case ignore case differences in file contents" @@ -938,54 +929,54 @@ msgstr "" "-i --ignore-case Älä huomioi kirjainkokoa tiedostojen sisältöä " "verrattaessa." -#: src/diff.c:928 +#: src/diff.c:929 #, fuzzy msgid "-E, --ignore-tab-expansion ignore changes due to tab expansion" msgstr "" "-E --ignore-tab-expansion Älä huomioi sarkainten laajennuksesta johtuvia " "eroja." -#: src/diff.c:929 +#: src/diff.c:930 #, fuzzy msgid "-Z, --ignore-trailing-space ignore white space at line end" msgstr "-w --ignore-all-white-space Älä huomioi tyhjiä merkkejä." -#: src/diff.c:930 +#: src/diff.c:931 #, fuzzy msgid "" "-b, --ignore-space-change ignore changes in the amount of white space" msgstr "" "-b --ignore-space-change Älä huomioi tyhjistä merkeistä johtuvia eroja." -#: src/diff.c:931 +#: src/diff.c:932 msgid "-w, --ignore-all-space ignore all white space" msgstr "-w --ignore-all-white-space älä huomioi tyhjiä merkkejä" -#: src/diff.c:932 +#: src/diff.c:933 msgid "" "-B, --ignore-blank-lines ignore changes where lines are all blank" msgstr "-B --ignore-blank-lines älä huomioi tyhjistä riveistä johtuvia eroja" -#: src/diff.c:933 +#: src/diff.c:934 #, fuzzy msgid "-I, --ignore-matching-lines=RE ignore changes where all lines match RE" msgstr "" "-I SI --ignore-matching-lines=SI Älä huomioi eroavia rivejä, jotka " "vastaavat säännöllistä lauseketta." -#: src/diff.c:935 +#: src/diff.c:936 msgid "-a, --text treat all files as text" msgstr "-a --text käsittelee kaikki tiedostot tekstinä" -#: src/diff.c:936 +#: src/diff.c:937 msgid " --strip-trailing-cr strip trailing carriage return on input" msgstr "--strip-trailing-cr poista vaununpalautus syötteen lopusta" -#: src/diff.c:938 +#: src/diff.c:939 msgid " --binary read and write data in binary mode" msgstr " --binary lue ja kirjoita dataa binääritilassa" -#: src/diff.c:941 +#: src/diff.c:942 #, fuzzy msgid "" "-D, --ifdef=NAME output merged file with '#ifdef NAME' diffs" @@ -993,35 +984,35 @@ msgstr "" "-D NIMI --ifdef=NIMI Tulosta yhdistetty tiedosto näyttämään \"#ifdef NIMI" "\"-erot." -#: src/diff.c:942 +#: src/diff.c:943 #, fuzzy msgid " --GTYPE-group-format=GFMT format GTYPE input groups with GFMT" msgstr "" "--GTYYPPI-group-format=GMUOTO Sama, muotoile GTYYPPIset syöteryhmät " "GMUOTOon." -#: src/diff.c:943 +#: src/diff.c:944 msgid " --line-format=LFMT format all input lines with LFMT" msgstr " --line-format=LMUOTO muotoile kaikki syöterivit LMUOTOon" -#: src/diff.c:944 +#: src/diff.c:945 #, fuzzy msgid " --LTYPE-line-format=LFMT format LTYPE input lines with LFMT" msgstr " --line-format=LMUOTO muotoile kaikki syöterivit LMUOTOon" -#: src/diff.c:945 +#: src/diff.c:946 msgid "" " These format options provide fine-grained control over the output\n" " of diff, generalizing -D/--ifdef." msgstr "" -#: src/diff.c:947 +#: src/diff.c:948 msgid " LTYPE is 'old', 'new', or 'unchanged'. GTYPE is LTYPE or 'changed'." msgstr "" " LTYYPPI on \"old\", \"new\" tai \"unchanged\". GTYYPPI on LTYYPPI tai " "\"changed\"." -#: src/diff.c:948 +#: src/diff.c:949 #, fuzzy msgid "" " GFMT (only) may contain:\n" @@ -1050,7 +1041,7 @@ msgstr "" " E F-1\n" " M L+1" -#: src/diff.c:960 +#: src/diff.c:961 #, fuzzy msgid "" " LFMT (only) may contain:\n" @@ -1063,7 +1054,7 @@ msgstr "" " %l rivin sisältö, mahdollinen edeltävä rivinvaihto poislukien\n" " %[-][LEVEYS][.[TARKK]]{doxX}n syöterivin numero printf-tyylillä" -#: src/diff.c:964 +#: src/diff.c:965 #, fuzzy msgid "" " Both GFMT and LFMT may contain:\n" @@ -1077,19 +1068,19 @@ msgstr "" " %c'C' yksittäinen merkki C\n" " %c'\\OOO' yksittäinen merkki oktaalikoodilla OOO" -#: src/diff.c:970 +#: src/diff.c:971 #, fuzzy msgid "-d, --minimal try hard to find a smaller set of changes" msgstr "-d --minimal Yrittää löytää pienemmän määrän muutoksia." -#: src/diff.c:971 +#: src/diff.c:972 #, fuzzy msgid " --horizon-lines=NUM keep NUM lines of the common prefix and suffix" msgstr "" "--horizon-lines=MÄÄRÄ Säilytä MÄÄRÄ riviä yhteisestä etu- ja " "jälkiliitteestä." -#: src/diff.c:972 +#: src/diff.c:973 #, fuzzy msgid "" " --speed-large-files assume large files and many scattered small changes" @@ -1097,140 +1088,133 @@ msgstr "" "-H --speed-large-files Oleta suuret tiedostot, joissa pieniä muutoksia " "ympäri tiedoston." -#: src/diff.c:973 -msgid "" -" --color[=WHEN] colorize the output; WHEN can be 'never', 'always'," -msgstr "" - #: src/diff.c:974 -#, fuzzy -msgid " or 'auto' (the default)" -msgstr "--normal Tulosta normaali diff." - -#: src/diff.c:975 msgid "" -" --palette=PALETTE specify the colors to use when --color is active" +" --color[=WHEN] colorize the output; WHEN can be 'never', " +"'always',\n" +" or 'auto' (the default)" msgstr "" #: src/diff.c:976 msgid "" -" PALETTE is a colon-separated list terminfo " -"capabilities" +" --palette=PALETTE the colors to use when --color is active; PALETTE " +"is\n" +" a colon-separated list of terminfo capabilities" msgstr "" -#: src/diff.c:978 +#: src/diff.c:979 #, fuzzy msgid " --help display this help and exit" msgstr " --help näytä tämä ohje ja poistu" -#: src/diff.c:979 +#: src/diff.c:980 msgid "-v, --version output version information and exit" msgstr "-v, --version näytä versiotiedot ja poistu" -#: src/diff.c:981 +#: src/diff.c:982 #, fuzzy msgid "FILES are 'FILE1 FILE2' or 'DIR1 DIR2' or 'DIR FILE' or 'FILE DIR'." msgstr "" "TIEDOSTOT ovat \"TIEDOSTO1 TIEDOSTO2\" tai \"HAK1 HAK2\" tai \"HAK " "TIEDOSTO...\" tai \"TIEDOSTO... HAK\"." -#: src/diff.c:982 +#: src/diff.c:983 #, fuzzy msgid "" "If --from-file or --to-file is given, there are no restrictions on FILE(s)." msgstr "Tiedoston lisääminen hakemiston %s ulkopuolelta epäonnistui" -#: src/diff.c:983 src/diff3.c:526 src/sdiff.c:219 +#: src/diff.c:984 src/diff3.c:528 src/sdiff.c:219 #, fuzzy msgid "If a FILE is '-', read standard input." msgstr "" "\n" "Jos TIEDOSTOa ei ole annettu, tai se on â€-â€, luetaan vakiosyötettä.\n" -#: src/diff.c:993 +#: src/diff.c:994 #, c-format msgid "Usage: %s [OPTION]... FILES\n" msgstr "Käyttö: %s [VALITSIN]... TIEDOSTOT\n" -#: src/diff.c:994 +#: src/diff.c:995 msgid "Compare FILES line by line." msgstr "Vertaa TIEDOSTOja rivi riviltä." -#: src/diff.c:1028 +#: src/diff.c:1029 #, fuzzy, c-format msgid "conflicting %s option value '%s'" msgstr "ristiriitaiset tyypit kohteelle %<%c%s%>:lle" -#: src/diff.c:1041 +#: src/diff.c:1042 #, c-format msgid "conflicting output style options" msgstr "ristiriitaiset tulostustyylin valinnat" -#: src/diff.c:1057 +#: src/diff.c:1058 #, fuzzy, c-format msgid "invalid color '%s'" msgstr "virheellinen leveys \"%s\"" -#: src/diff.c:1113 src/diff.c:1323 +#: src/diff.c:1114 src/diff.c:1324 #, c-format msgid "Only in %s: %s\n" msgstr "Vain hakemistossa %s: %s\n" -#: src/diff.c:1247 +#: src/diff.c:1248 #, fuzzy msgid "cannot compare '-' to a directory" msgstr "hakemiston %s luominen ei onnistu" -#: src/diff.c:1282 +#: src/diff.c:1283 msgid "-D option not supported with directories" msgstr "valitsin -D ei toimi hakemistojen kanssa" -#: src/diff.c:1291 +#: src/diff.c:1292 #, c-format msgid "Common subdirectories: %s and %s\n" msgstr "Yhteiset alihakemistot: %s ja %s\n" -#: src/diff.c:1333 src/diff.c:1383 +#: src/diff.c:1334 src/diff.c:1384 #, c-format msgid "File %s is a %s while file %s is a %s\n" msgstr "Tiedosto %s on %s, kun taas tiedosto %s on %s\n" -#: src/diff.c:1369 +#: src/diff.c:1370 #, fuzzy, c-format msgid "Symbolic links %s and %s differ\n" msgstr "Tiedostot %s ja %s eroavat\n" -#: src/diff.c:1456 +#: src/diff.c:1457 #, c-format msgid "Files %s and %s are identical\n" msgstr "Tiedostot %s ja %s ovat identtiset\n" #. This is a proper name. See the gettext manual, section Names. -#: src/diff3.c:41 +#: src/diff3.c:42 msgid "Randy Smith" msgstr "Randy Smith" -#: src/diff3.c:348 +#: src/diff3.c:351 #, c-format msgid "incompatible options" msgstr "yhteensopimattomat valitsimet" -#: src/diff3.c:388 +#: src/diff3.c:391 #, fuzzy msgid "'-' specified for more than one input file" msgstr "Voidaan antaa vain yksi syötetiedosto!\n" -#: src/diff3.c:439 src/diff3.c:1288 src/diff3.c:1692 src/diff3.c:1747 +#: src/diff3.c:442 src/diff3.c:1290 src/diff3.c:1693 src/diff3.c:1748 #: src/sdiff.c:307 src/sdiff.c:844 src/sdiff.c:855 msgid "read failed" msgstr "lukeminen epäonnistui" -#: src/diff3.c:473 +#: src/diff3.c:475 #, fuzzy msgid "-A, --show-all output all changes, bracketing conflicts" msgstr "-A --show-all Tulosta kaikki muutokset, ristiriidat merkiten." -#: src/diff3.c:475 +#: src/diff3.c:477 #, fuzzy msgid "" "-e, --ed output ed script incorporating changes\n" @@ -1239,83 +1223,83 @@ msgstr "" "-e --ed Tulosta VANHANTIEDOSTON yhdistämättömät muutokset TIEDOSTOOSI " "verrattuna TIEDOSTOONI." -#: src/diff3.c:477 +#: src/diff3.c:479 #, fuzzy msgid "-E, --show-overlap like -e, but bracket conflicts" msgstr "" "-E --show-overlap Tulosta yhdistämättömät muutokset, ristiriidat merkiten." -#: src/diff3.c:478 +#: src/diff3.c:480 #, fuzzy msgid "" "-3, --easy-only like -e, but incorporate only nonoverlapping " "changes" msgstr "-3 --easy-only Tulosta yhdistämättömät ei-päällekkäiset muutokset." -#: src/diff3.c:479 +#: src/diff3.c:481 #, fuzzy msgid "" "-x, --overlap-only like -e, but incorporate only overlapping changes" msgstr "-x --overlap-only Tulosta päällekkäiset muutokset." -#: src/diff3.c:480 +#: src/diff3.c:482 msgid "-X like -x, but bracket conflicts" msgstr "" -#: src/diff3.c:481 +#: src/diff3.c:483 #, fuzzy msgid "-i append 'w' and 'q' commands to ed scripts" msgstr "-i Lisää komennot \"w\" ja \"q\" ed-skripteihin." -#: src/diff3.c:483 +#: src/diff3.c:485 msgid "" "-m, --merge output actual merged file, according to\n" " -A if no other options are given" msgstr "" -#: src/diff3.c:486 +#: src/diff3.c:488 msgid "-a, --text treat all files as text" msgstr "-a, --text käsittele kaikki tiedostot tekstinä" -#: src/diff3.c:487 +#: src/diff3.c:489 #, fuzzy msgid " --strip-trailing-cr strip trailing carriage return on input" msgstr "--strip-trailing-cr poista vaununpalautus syötteen lopusta" -#: src/diff3.c:488 +#: src/diff3.c:490 #, fuzzy msgid "-T, --initial-tab make tabs line up by prepending a tab" msgstr "-T --initial-tab Lisää sarkain rivien alkuun." -#: src/diff3.c:489 +#: src/diff3.c:491 #, fuzzy msgid " --diff-program=PROGRAM use PROGRAM to compare files" msgstr "--diff-program=OHJELMA Käytä OHJELMAa tiedostojen vertaamiseen." -#: src/diff3.c:490 +#: src/diff3.c:492 msgid "" "-L, --label=LABEL use LABEL instead of file name\n" " (can be repeated up to three times)" msgstr "" -#: src/diff3.c:493 +#: src/diff3.c:495 msgid " --help display this help and exit" msgstr " --help näytä tämä ohje ja poistu" -#: src/diff3.c:494 +#: src/diff3.c:496 msgid "-v, --version output version information and exit" msgstr "-v, --version näytä versiotiedot ja poistu" -#: src/diff3.c:503 +#: src/diff3.c:505 #, c-format msgid "Usage: %s [OPTION]... MYFILE OLDFILE YOURFILE\n" msgstr "Käyttö: %s [VALITSIN]... TIEDOSTONI VANHATIEDOSTO TIEDOSTOSI\n" -#: src/diff3.c:505 +#: src/diff3.c:507 msgid "Compare three files line by line." msgstr "Vertaa kolmea tiedostoa rivi riviltä." -#: src/diff3.c:515 +#: src/diff3.c:517 msgid "" "\n" "The default output format is a somewhat human-readable representation of\n" @@ -1329,46 +1313,46 @@ msgid "" "robust than using ed.\n" msgstr "" -#: src/diff3.c:527 +#: src/diff3.c:529 msgid "Exit status is 0 if successful, 1 if conflicts, 2 if trouble." msgstr "" "Paluuarvo on onnistuessa 0, ristiriitatilanteissa 1, ja ongelmatilanteissa 2." -#: src/diff3.c:720 +#: src/diff3.c:722 msgid "internal error: screwup in format of diff blocks" msgstr "sisäinen virhe: virhe diff-lohkojen muodossa" -#: src/diff3.c:1015 +#: src/diff3.c:1017 #, c-format msgid "%s: diff failed: " msgstr "%s: diff epäonnistui: " -#: src/diff3.c:1037 +#: src/diff3.c:1039 msgid "internal error: invalid diff type in process_diff" msgstr "sisäinen virhe: virheellinen diff-tyyppi funktiossa process_diff" -#: src/diff3.c:1062 +#: src/diff3.c:1064 msgid "invalid diff format; invalid change separator" msgstr "virheellinen diff-muoto; virheellinen muutoserotin" -#: src/diff3.c:1298 +#: src/diff3.c:1300 msgid "invalid diff format; incomplete last line" msgstr "virheellinen diff-muoto; viimeinen rivi vajaa" -#: src/diff3.c:1322 src/sdiff.c:275 src/util.c:970 +#: src/diff3.c:1324 src/sdiff.c:275 src/util.c:969 #, fuzzy, c-format msgid "subsidiary program '%s' could not be invoked" msgstr "apuohjelmaa \"%s\" ei voitu käynnistää" -#: src/diff3.c:1347 +#: src/diff3.c:1349 msgid "invalid diff format; incorrect leading line chars" msgstr "virheellinen diff-muoto; väärät rivin alkumerkit" -#: src/diff3.c:1420 +#: src/diff3.c:1422 msgid "internal error: invalid diff type passed to output" msgstr "sisäinen virhe: virheellinen diff-muoto välitetty tulosteeseen" -#: src/diff3.c:1694 src/diff3.c:1751 +#: src/diff3.c:1695 src/diff3.c:1752 msgid "input file shrank" msgstr "syötetiedosto kutistui" @@ -1383,7 +1367,7 @@ msgid "%s: recursive directory loop" msgstr "%s: syöte sisältää silmukan:" #. This is a proper name. See the gettext manual, section Names. -#: src/sdiff.c:42 +#: src/sdiff.c:43 msgid "Thomas Lord" msgstr "Thomas Lord" @@ -1541,16 +1525,35 @@ msgstr "" "v:\tSisällytä yhteiset rivit automaattisesti, ilmoittaen.\n" "q:\tLopeta.\n" -#: src/util.c:663 +#: src/util.c:662 #, fuzzy, c-format msgid "unrecognized prefix: %s" msgstr "%s: tunnistamaton valitsin â€--%sâ€\n" -#: src/util.c:693 +#: src/util.c:692 #, c-format msgid "unparsable value for --palette" msgstr "" +#, fuzzy +#~ msgid " or 'auto' (the default)" +#~ msgstr "--normal Tulosta normaali diff." + +#~ msgid "%s: option '--%s' doesn't allow an argument\n" +#~ msgstr "%s: valitsin â€--%s†ei salli argumenttia\n" + +#~ msgid "%s: unrecognized option '--%s'\n" +#~ msgstr "%s: tunnistamaton valitsin â€--%sâ€\n" + +#~ msgid "%s: option '-W %s' is ambiguous\n" +#~ msgstr "%s: valitsin â€-W %s†on moniselitteinen\n" + +#~ msgid "%s: option '-W %s' doesn't allow an argument\n" +#~ msgstr "%s: valitsin â€-W %s†ei salli argumenttia\n" + +#~ msgid "%s: option '-W %s' requires an argument\n" +#~ msgstr "%s: valitsin â€%s†vaatii argumentin\n" + #~ msgid "%s: illegal option -- %c\n" #~ msgstr "%s: virheellinen valitsin -- %c\n" @@ -1,48 +1,47 @@ # Messages français pour GNU concernant diffutils. -# Copyright (C) 2012 Free Software Foundation, Inc. +# Copyright (C) 2017 Free Software Foundation, Inc. # This file is distributed under the same license as the diffutils package. # # Michel Robitaille <robitail@IRO.UMontreal.CA>, 1996. -# Frédéric Marchal <fmarchal@perso.be>, 2012. +# Frédéric Marchal <fmarchal@perso.be>, 2017. msgid "" msgstr "" -"Project-Id-Version: GNU diffutils 3.3-pre1\n" +"Project-Id-Version: GNU diffutils 3.5.25\n" "Report-Msgid-Bugs-To: bug-diffutils@gnu.org\n" -"POT-Creation-Date: 2016-08-20 22:22-0700\n" -"PO-Revision-Date: 2012-10-31 08:16+0100\n" +"POT-Creation-Date: 2017-05-21 13:26-0700\n" +"PO-Revision-Date: 2017-05-11 17:26+0200\n" "Last-Translator: Frédéric Marchal <fmarchal@perso.be>\n" "Language-Team: French <traduc@traduc.org>\n" "Language: fr\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8-bit\n" +"X-Bugs: Report translation errors to the Language-Team address.\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" -"X-Generator: Lokalize 1.0\n" -#: lib/argmatch.c:133 -#, fuzzy, c-format +#: lib/argmatch.c:134 +#, c-format msgid "invalid argument %s for %s" -msgstr "argument pour %s%s pas valable: « %s »" +msgstr "argument %s pas valable pour %s" -#: lib/argmatch.c:134 +#: lib/argmatch.c:135 #, c-format msgid "ambiguous argument %s for %s" -msgstr "" +msgstr "argument %s ambigu pour %s" -#: lib/argmatch.c:153 -#, fuzzy +#: lib/argmatch.c:154 msgid "Valid arguments are:" -msgstr "argument pour %s%s pas valable: « %s »" +msgstr "Les arguments valables sont:" -#: lib/c-stack.c:204 lib/c-stack.c:297 +#: lib/c-stack.c:203 lib/c-stack.c:296 msgid "program error" msgstr "erreur du programme" -#: lib/c-stack.c:205 lib/c-stack.c:298 +#: lib/c-stack.c:204 lib/c-stack.c:297 msgid "stack overflow" msgstr "débordement de pile" -#: lib/error.c:191 +#: lib/error.c:195 msgid "Unknown system error" msgstr "Erreur système inconnue" @@ -88,7 +87,7 @@ msgstr "fichier spécial-caractères" #: lib/file-type.c:72 msgid "contiguous data" -msgstr "" +msgstr "données contigües" #: lib/file-type.c:75 msgid "fifo" @@ -96,116 +95,88 @@ msgstr "« fifo »" #: lib/file-type.c:78 msgid "door" -msgstr "" +msgstr "porte" #: lib/file-type.c:81 -#, fuzzy msgid "multiplexed block special file" -msgstr "fichier spécial-blocs" +msgstr "fichier spécial avec des blocs multiplexés" #: lib/file-type.c:84 -#, fuzzy msgid "multiplexed character special file" -msgstr "fichier spécial-caractères" +msgstr "fichier spécial avec des caractères multiplexés" #: lib/file-type.c:87 msgid "multiplexed file" -msgstr "" +msgstr "fichier multiplexé" #: lib/file-type.c:90 -#, fuzzy msgid "named file" -msgstr "fichier bizarre" +msgstr "fichier nommé" #: lib/file-type.c:93 -#, fuzzy msgid "network special file" -msgstr "fichier spécial-blocs" +msgstr "fichier spécial réseau" #: lib/file-type.c:96 msgid "migrated file with data" -msgstr "" +msgstr "fichier migré avec les données" #: lib/file-type.c:99 msgid "migrated file without data" -msgstr "" +msgstr "fichier migré sans les données" #: lib/file-type.c:102 msgid "port" -msgstr "" +msgstr "port" #: lib/file-type.c:105 msgid "socket" msgstr "« socket »" +# fichier sur un système de fichier en lecture seule qui est voilé pour faire croire qu'il a été effacé #: lib/file-type.c:108 msgid "whiteout" -msgstr "" +msgstr "voilé (whiteout)" #: lib/file-type.c:110 msgid "weird file" msgstr "fichier bizarre" -#: lib/getopt.c:575 lib/getopt.c:604 -#, c-format -msgid "%s: option '%s' is ambiguous; possibilities:" -msgstr "%s: l'option « %s » est ambiguë ; les possibilités sont :" - -#: lib/getopt.c:619 -#, fuzzy, c-format -msgid "%s: option '%s' is ambiguous\n" -msgstr "%s: l'option « -W %s » est ambiguë\n" - -#: lib/getopt.c:654 lib/getopt.c:658 +#: lib/getopt.c:278 #, c-format -msgid "%s: option '--%s' doesn't allow an argument\n" -msgstr "%s: l'option « --%s » n'accepte aucun argument\n" +msgid "%s: option '%s%s' is ambiguous\n" +msgstr "%s: l'option « %s%s » est ambiguë\n" -#: lib/getopt.c:667 lib/getopt.c:672 +#: lib/getopt.c:284 #, c-format -msgid "%s: option '%c%s' doesn't allow an argument\n" -msgstr "%s: l'option « %c%s » n'accepte aucun argument\n" +msgid "%s: option '%s%s' is ambiguous; possibilities:" +msgstr "%s: l'option « %s%s » est ambiguë ; les possibilités sont :" -#: lib/getopt.c:715 lib/getopt.c:734 +#: lib/getopt.c:319 #, c-format -msgid "%s: option '--%s' requires an argument\n" -msgstr "%s: l'option « --%s » requiert un argument\n" +msgid "%s: unrecognized option '%s%s'\n" +msgstr "%s: l'option « %s%s » n'est pas reconnue\n" -#: lib/getopt.c:772 lib/getopt.c:775 +#: lib/getopt.c:345 #, c-format -msgid "%s: unrecognized option '--%s'\n" -msgstr "%s: l'option « --%s » n'est pas reconnue\n" +msgid "%s: option '%s%s' doesn't allow an argument\n" +msgstr "%s: l'option « %s%s » n'accepte aucun argument\n" -#: lib/getopt.c:783 lib/getopt.c:786 +#: lib/getopt.c:360 #, c-format -msgid "%s: unrecognized option '%c%s'\n" -msgstr "%s: l'option « %c%s » n'est pas reconnue\n" +msgid "%s: option '%s%s' requires an argument\n" +msgstr "%s: l'option « %s%s » requiert un argument\n" -#: lib/getopt.c:835 lib/getopt.c:838 +#: lib/getopt.c:621 #, c-format msgid "%s: invalid option -- '%c'\n" msgstr "%s: l'option -- « %c » est invalide\n" -#: lib/getopt.c:891 lib/getopt.c:908 lib/getopt.c:1118 lib/getopt.c:1136 +#: lib/getopt.c:636 lib/getopt.c:682 #, c-format msgid "%s: option requires an argument -- '%c'\n" msgstr "%s: l'option -- « %c » requiert un argument\n" -#: lib/getopt.c:964 lib/getopt.c:980 -#, c-format -msgid "%s: option '-W %s' is ambiguous\n" -msgstr "%s: l'option « -W %s » est ambiguë\n" - -#: lib/getopt.c:1004 lib/getopt.c:1022 -#, c-format -msgid "%s: option '-W %s' doesn't allow an argument\n" -msgstr "%s: l'option « -W %s » n'accepte aucun argument.\n" - -#: lib/getopt.c:1043 lib/getopt.c:1061 -#, c-format -msgid "%s: option '-W %s' requires an argument\n" -msgstr "%s: l'option « -W %s » requiert un argument\n" - #. TRANSLATORS: #. Get translations for open and closing quotation marks. #. The message catalog should translate "`" to a left @@ -227,11 +198,11 @@ msgstr "%s: l'option « -W %s » requiert un argument\n" #. If you don't know what to put here, please see #. <http://en.wikipedia.org/wiki/Quotation_marks_in_other_languages> #. and use glyphs suitable for your language. -#: lib/quotearg.c:347 +#: lib/quotearg.c:362 msgid "`" msgstr "« " -#: lib/quotearg.c:348 +#: lib/quotearg.c:363 msgid "'" msgstr " »" @@ -264,9 +235,8 @@ msgid "Invalid back reference" msgstr "La référence arrière est invalide" #: lib/regcomp.c:156 -#, fuzzy msgid "Unmatched [, [^, [:, [., or [=" -msgstr "[ or [^ sans vis-à -vis" +msgstr "[, [^, [:, [. ou [= sans vis-à -vis" #: lib/regcomp.c:159 msgid "Unmatched ( or \\(" @@ -501,14 +471,14 @@ msgid "" "Report bugs to: %s\n" msgstr "" "\n" -"Signalez les bugs à : %s\n" +"Signalez les bogues à : %s\n" #: lib/version-etc.c:247 #, c-format msgid "Report %s bugs to: %s\n" msgstr "" -"Signalez les bugs de %s à : %s\n" -"Signalez les bugs de traduction à traduc@traduc.org\n" +"Signalez les bogues de %s à : %s\n" +"Signalez les bogues de traduction à traduc@traduc.org\n" #: lib/version-etc.c:251 #, c-format @@ -526,7 +496,7 @@ msgstr "" "Aide générale sur l'utilisation des logiciels GNU: <http://www.gnu.org/" "gethelp/>\n" -#: src/analyze.c:454 src/diff.c:1400 +#: src/analyze.c:454 src/diff.c:1401 #, c-format msgid "Files %s and %s differ\n" msgstr "Les fichiers %s et %s sont différents\n" @@ -536,21 +506,21 @@ msgstr "Les fichiers %s et %s sont différents\n" msgid "Binary files %s and %s differ\n" msgstr "Les fichiers binaires %s et %s sont différents\n" -#: src/analyze.c:697 src/diff3.c:1463 src/util.c:1255 +#: src/analyze.c:706 src/diff3.c:1465 src/util.c:1254 msgid "No newline at end of file" msgstr "Pas de fin de ligne à la fin du fichier" #. This is a proper name. See the gettext manual, section Names. -#: src/cmp.c:43 +#: src/cmp.c:44 msgid "Torbjorn Granlund" msgstr "Torbjorn Granlund" #. This is a proper name. See the gettext manual, section Names. -#: src/cmp.c:44 +#: src/cmp.c:45 msgid "David MacKenzie" msgstr "David MacKenzie" -#: src/cmp.c:118 src/diff.c:875 src/diff3.c:459 src/sdiff.c:158 +#: src/cmp.c:119 src/diff.c:877 src/diff3.c:462 src/sdiff.c:159 #, c-format msgid "Try '%s --help' for more information." msgstr "Utilisez « %s --help » pour en savoir d'avantage." @@ -565,12 +535,12 @@ msgstr "valeur invalide pour --ignore-initial: « %s »" msgid "options -l and -s are incompatible" msgstr "options -l et -s sont incompatibles" -#: src/cmp.c:155 src/diff.c:884 src/diff3.c:467 src/sdiff.c:167 src/sdiff.c:315 -#: src/sdiff.c:322 src/sdiff.c:874 src/util.c:853 src/util.c:953 src/util.c:960 +#: src/cmp.c:155 src/diff.c:885 src/diff3.c:469 src/sdiff.c:167 src/sdiff.c:315 +#: src/sdiff.c:322 src/sdiff.c:874 src/util.c:852 src/util.c:952 src/util.c:959 msgid "write failed" msgstr "échec d'écriture" -#: src/cmp.c:157 src/diff.c:886 src/diff.c:1465 src/diff3.c:469 src/sdiff.c:169 +#: src/cmp.c:157 src/diff.c:887 src/diff.c:1466 src/diff3.c:471 src/sdiff.c:169 msgid "standard output" msgstr "sortie standard" @@ -634,7 +604,7 @@ msgstr "" "escamoter\n" "au début de chaque fichier (zéro par défaut)." -#: src/cmp.c:185 src/diff.c:996 src/diff3.c:507 src/sdiff.c:210 +#: src/cmp.c:185 src/diff.c:997 src/diff3.c:509 src/sdiff.c:210 msgid "" "Mandatory arguments to long options are mandatory for short options too.\n" msgstr "" @@ -656,7 +626,7 @@ msgstr "" msgid "If a FILE is '-' or missing, read standard input." msgstr "Si un FICHIER est « - » ou manquant, lire sur l'entrée standard." -#: src/cmp.c:195 src/diff.c:984 src/sdiff.c:220 +#: src/cmp.c:195 src/diff.c:985 src/sdiff.c:220 msgid "Exit status is 0 if inputs are the same, 1 if different, 2 if trouble." msgstr "" "Le statut de fin d'exécution est 0 si les entrées sont les mêmes, 1 si " @@ -667,267 +637,282 @@ msgstr "" msgid "invalid --bytes value '%s'" msgstr "valeur invalide pour --bytes: « %s »" -#: src/cmp.c:266 src/diff.c:793 src/diff3.c:353 src/sdiff.c:565 +#: src/cmp.c:266 src/diff.c:795 src/diff3.c:356 src/sdiff.c:565 #, c-format msgid "missing operand after '%s'" msgstr "opérande manquante après « %s »" -#: src/cmp.c:278 src/diff.c:795 src/diff3.c:355 src/sdiff.c:567 +#: src/cmp.c:278 src/diff.c:797 src/diff3.c:358 src/sdiff.c:567 #, c-format msgid "extra operand '%s'" msgstr "opérande supplémentaire « %s »" -#: src/cmp.c:494 +#: src/cmp.c:498 #, c-format msgid "%s %s differ: byte %s, line %s\n" msgstr "%s %s sont différents: octet %s, ligne %s\n" -#: src/cmp.c:510 +#: src/cmp.c:514 #, c-format msgid "%s %s differ: byte %s, line %s is %3o %s %3o %s\n" msgstr "%s %s diffèrent: octet %s, ligne %s est %3o %s %3o %s\n" -#: src/cmp.c:562 +#: src/cmp.c:571 +#, c-format +msgid "cmp: EOF on %s which is empty\n" +msgstr "cmp: Fin-de-fichier (EOF) sur %s qui est vide\n" + +#: src/cmp.c:585 +#, c-format +msgid "cmp: EOF on %s after byte %s, line %s\n" +msgstr "cmp: Fin-de-fichier (EOF) sur %s après l'octet %s, ligne %s\n" + +#: src/cmp.c:586 +#, c-format +msgid "cmp: EOF on %s after byte %s, in line %s\n" +msgstr "cmp: Fin-de-fichier (EOF) sur %s après l'octet %s, ligne %s\n" + +#: src/cmp.c:592 #, c-format -msgid "cmp: EOF on %s\n" -msgstr "cmp: Fin-de-fichier (EOF) sur %s\n" +msgid "cmp: EOF on %s after byte %s\n" +msgstr "cmp: Fin-de-fichier (EOF) sur %s après l'octet %s\n" #. This is a proper name. See the gettext manual, section Names. -#: src/diff.c:49 +#: src/diff.c:50 msgid "Paul Eggert" msgstr "Paul Eggert" #. This is a proper name. See the gettext manual, section Names. -#: src/diff.c:50 +#: src/diff.c:51 msgid "Mike Haertel" msgstr "Mike Haertel" #. This is a proper name. See the gettext manual, section Names. -#: src/diff.c:51 +#: src/diff.c:52 msgid "David Hayes" msgstr "David Hayes" #. This is a proper name. See the gettext manual, section Names. -#: src/diff.c:52 +#: src/diff.c:53 msgid "Richard Stallman" msgstr "Richard Stallman" #. This is a proper name. See the gettext manual, section Names. -#: src/diff.c:53 +#: src/diff.c:54 msgid "Len Tower" msgstr "Len Tower" -#: src/diff.c:351 +#: src/diff.c:353 #, c-format msgid "invalid context length '%s'" msgstr "longueur du contexte invalide « %s »" -#: src/diff.c:434 +#: src/diff.c:436 #, c-format msgid "pagination not supported on this host" msgstr "La pagination n'est pas supporté sur cette machine" -#: src/diff.c:449 src/diff3.c:335 +#: src/diff.c:451 src/diff3.c:336 #, c-format msgid "too many file label options" msgstr "Trop de noms de fichiers dans les options" -#: src/diff.c:526 +#: src/diff.c:528 #, c-format msgid "invalid width '%s'" msgstr "largeur invalide « %s »" -#: src/diff.c:530 +#: src/diff.c:532 msgid "conflicting width options" msgstr "options de largeur conflictuelles" -#: src/diff.c:555 +#: src/diff.c:557 #, c-format msgid "invalid horizon length '%s'" msgstr "longueur d'horizon invalide « %s »" -#: src/diff.c:611 +#: src/diff.c:613 #, c-format msgid "invalid tabsize '%s'" msgstr "taille de tabulation invalide « %s »" -#: src/diff.c:615 +#: src/diff.c:617 msgid "conflicting tabsize options" msgstr "options conflictuelles de taille de tabulation" -#: src/diff.c:770 +#: src/diff.c:772 msgid "--from-file and --to-file both specified" msgstr "--from-file et --to-file ont été spécifiés ensemble" -#: src/diff.c:890 +#: src/diff.c:891 msgid " --normal output a normal diff (the default)" msgstr "" " --normal Produire un « diff » en format normal (par " "défaut)" -#: src/diff.c:891 +#: src/diff.c:892 msgid "-q, --brief report only when files differ" msgstr "" "-q, --brief Indiquer seulement si les fichiers diffèrent" -#: src/diff.c:892 +#: src/diff.c:893 msgid "-s, --report-identical-files report when two files are the same" msgstr "" "-s, --report-identical-files Indiquer si les deux fichiers sont identiques" -#: src/diff.c:893 +#: src/diff.c:894 msgid "" "-c, -C NUM, --context[=NUM] output NUM (default 3) lines of copied context" msgstr "" "-c, -C N, --context[=N] Afficher N (3 par défaut) lignes du " "contexte copié" -#: src/diff.c:894 +#: src/diff.c:895 msgid "" "-u, -U NUM, --unified[=NUM] output NUM (default 3) lines of unified context" msgstr "" "-u, -U N, --unified[=N] Afficher N (3 par défaut) lignes dans " "le context unifié" -#: src/diff.c:895 +#: src/diff.c:896 msgid "-e, --ed output an ed script" msgstr "-e, --ed Générer un script pour « ed »" -#: src/diff.c:896 +#: src/diff.c:897 msgid "-n, --rcs output an RCS format diff" msgstr "" "-n, --rcs Générer un fichier « diff » au format RCS" -#: src/diff.c:897 +#: src/diff.c:898 msgid "-y, --side-by-side output in two columns" msgstr "-y, --side-by-side Affichage sur deux colonnes" -#: src/diff.c:898 +#: src/diff.c:899 msgid "" "-W, --width=NUM output at most NUM (default 130) print columns" msgstr "" "-w, --width=N Limiter la sortie à au plus N colonnes " "imprimées (130 par défaut)" -#: src/diff.c:899 +#: src/diff.c:900 msgid "" " --left-column output only the left column of common lines" msgstr "" " --left-column Afficher les lignes identiques uniquement dans " "la colonne de gauche" -#: src/diff.c:900 +#: src/diff.c:901 msgid " --suppress-common-lines do not output common lines" msgstr " --suppress-common-lines Ne pas afficher les lignes identiques" -#: src/diff.c:902 +#: src/diff.c:903 msgid "-p, --show-c-function show which C function each change is in" msgstr "" "-p, --show-c-function Afficher dans quelle fonction C le changement " "se trouve" -#: src/diff.c:903 +#: src/diff.c:904 msgid "-F, --show-function-line=RE show the most recent line matching RE" msgstr "" "-F, --show-function-line=RE Montrer la ligne la plus récente correspondant " "à RE" -#: src/diff.c:904 -#, fuzzy +#: src/diff.c:905 msgid "" " --label LABEL use LABEL instead of file name and timestamp\n" " (can be repeated)" msgstr "" -" --label ÉTIQUETTE Utiliser ÉTIQUETTE au lieu du nom de fichier\n" +" --label ÉTIQUETTE utiliser ÉTIQUETTE au lieu du nom de fichier " +"et de l'horodatage\n" " (peut être répété)" -#: src/diff.c:907 +#: src/diff.c:908 msgid "-t, --expand-tabs expand tabs to spaces in output" msgstr "" "-t, --expand-tabs Étaler les tabulateurs en espaces dans la " "sortie" -#: src/diff.c:908 +#: src/diff.c:909 msgid "-T, --initial-tab make tabs line up by prepending a tab" msgstr "" "-T, --initial-tab Aligner les tabulateurs en préfixant un " "tabulateur" -#: src/diff.c:909 +#: src/diff.c:910 msgid "" " --tabsize=NUM tab stops every NUM (default 8) print columns" msgstr "" " --tabsize=N Les balises de tabulation sont à chaque N (8 " "par défaut) colonnes" -#: src/diff.c:910 +#: src/diff.c:911 msgid "" " --suppress-blank-empty suppress space or tab before empty output lines" msgstr "" " --suppress-blank-empty Supprimer les espaces et les tabulations avant " "les lignes vides" -#: src/diff.c:911 +#: src/diff.c:912 msgid "-l, --paginate pass output through 'pr' to paginate it" msgstr "" "-l, --paginate Relayer la sortie à « pr » afin de la paginer" -#: src/diff.c:913 +#: src/diff.c:914 msgid "" "-r, --recursive recursively compare any subdirectories found" msgstr "" "-r, --recursive Comparer récursivement les sous-répertoires " "trouvés" -#: src/diff.c:914 +#: src/diff.c:915 msgid " --no-dereference don't follow symbolic links" msgstr " --no-dereference Ne pas suivre les liens symboliques" -#: src/diff.c:915 +#: src/diff.c:916 msgid "-N, --new-file treat absent files as empty" msgstr "" "-N, --new-file Traiter les fichiers absents comme des " "fichiers vides" -#: src/diff.c:916 +#: src/diff.c:917 msgid " --unidirectional-new-file treat absent first files as empty" msgstr "" " --unidirectional-new-file Traiter les premiers fichiers absents comme " "vides" -#: src/diff.c:917 +#: src/diff.c:918 msgid " --ignore-file-name-case ignore case when comparing file names" msgstr "" " --ignore-file-name-case Ignorer la casse lors de la comparaison des " "noms de fichiers" -#: src/diff.c:918 +#: src/diff.c:919 msgid " --no-ignore-file-name-case consider case when comparing file names" msgstr "" " --no-ignore-file-name-case Tenir compte de la casse lors de la " "comparaison des noms de fichiers" -#: src/diff.c:919 +#: src/diff.c:920 msgid "-x, --exclude=PAT exclude files that match PAT" msgstr "" "-x, --exclude=PAT Exclure les fichiers dont les noms concordent " "avec le PATron" -#: src/diff.c:920 +#: src/diff.c:921 msgid "" "-X, --exclude-from=FILE exclude files that match any pattern in FILE" msgstr "" "-X, --exclude-from=FICHIER Exclure les fichiers dont les noms\n" " concordent avec ceux contenus dans le FICHIER" -#: src/diff.c:921 +#: src/diff.c:922 msgid "" "-S, --starting-file=FILE start with FILE when comparing directories" msgstr "" "-S, --starting-file=FICHIER Débuter la comparaison des répertoires par le " "FICHIER" -#: src/diff.c:922 +#: src/diff.c:923 msgid "" " --from-file=FILE1 compare FILE1 to all operands;\n" " FILE1 can be a directory" @@ -935,7 +920,7 @@ msgstr "" " --from-file=FICHIER1 Comparer le FICHIER1 à toutes les opérandes.\n" " FICHIER1 peut être un répertoire" -#: src/diff.c:924 +#: src/diff.c:925 msgid "" " --to-file=FILE2 compare all operands to FILE2;\n" " FILE2 can be a directory" @@ -943,86 +928,86 @@ msgstr "" " --to-file=FICHIER2 Comparer toutes les opérandes à FICHIER2.\n" " FICHIER2 peut être un répertoire" -#: src/diff.c:927 +#: src/diff.c:928 msgid "" "-i, --ignore-case ignore case differences in file contents" msgstr "" "-i, --ignore-case Ignorer les différences de casses dans le " "contenu des fichiers" -#: src/diff.c:928 +#: src/diff.c:929 msgid "-E, --ignore-tab-expansion ignore changes due to tab expansion" msgstr "" "-E, --ignore-tab-expansion Ignorer les changements liés à l'expansion des " "tabulations" -#: src/diff.c:929 +#: src/diff.c:930 msgid "-Z, --ignore-trailing-space ignore white space at line end" msgstr "" "-Z, --ignore-trailing-space Ignorer les blancs d'espacement à la fin " "de la ligne" -#: src/diff.c:930 +#: src/diff.c:931 msgid "" "-b, --ignore-space-change ignore changes in the amount of white space" msgstr "" "-b, --ignore-space-change Ignorer les changements dans le nombre " "d'espaces" -#: src/diff.c:931 +#: src/diff.c:932 msgid "-w, --ignore-all-space ignore all white space" msgstr "-w, --ignore-all-space Ignorer tout blanc d'espacement" -#: src/diff.c:932 +#: src/diff.c:933 msgid "" "-B, --ignore-blank-lines ignore changes where lines are all blank" msgstr "" "-B, --ignore-blank-lines Ignorer les changements dont toutes les lignes " "sont blanches" -#: src/diff.c:933 +#: src/diff.c:934 msgid "-I, --ignore-matching-lines=RE ignore changes where all lines match RE" msgstr "" "-I, --ignore-matching-lines=RE Ignorer les différences dont toutes les\n" " lignes concordent avec l'expression régulière RE" -#: src/diff.c:935 +#: src/diff.c:936 msgid "-a, --text treat all files as text" msgstr "" "-a, --text Traiter tous les fichiers comme des textes" -#: src/diff.c:936 +#: src/diff.c:937 msgid " --strip-trailing-cr strip trailing carriage return on input" msgstr "" " --strip-trailing-cr Éliminer les retours de chariot de l'entrée" -#: src/diff.c:938 +#: src/diff.c:939 msgid " --binary read and write data in binary mode" msgstr " --binary Lire et écrire les données en binaire" -#: src/diff.c:941 +#: src/diff.c:942 msgid "" "-D, --ifdef=NAME output merged file with '#ifdef NAME' diffs" msgstr "" "-D, --ifdef=NOM Afficher les fichiers fusionnés en marquant les " "différences par des « #ifdef NOM »" -#: src/diff.c:942 +#: src/diff.c:943 msgid " --GTYPE-group-format=GFMT format GTYPE input groups with GFMT" msgstr "" " --GTYPE-group-format=GFMT Formater les groupes d'entrée GTYPE avec GFMT" -#: src/diff.c:943 +#: src/diff.c:944 msgid " --line-format=LFMT format all input lines with LFMT" msgstr "" " --line-format=LFMT Formater toutes les lignes d'entrée avec LFMT" -#: src/diff.c:944 +#: src/diff.c:945 msgid " --LTYPE-line-format=LFMT format LTYPE input lines with LFMT" msgstr "" " --LTYPE-line-format=LFMT Formater les lignes d'entrée LTYPE avec LFMT" -#: src/diff.c:945 +#: src/diff.c:946 msgid "" " These format options provide fine-grained control over the output\n" " of diff, generalizing -D/--ifdef." @@ -1030,13 +1015,13 @@ msgstr "" " Ces options de formatage fournissent un contrôle fin sur la sortie\n" " de diff et généralise -D/--ifdef." -#: src/diff.c:947 +#: src/diff.c:948 msgid " LTYPE is 'old', 'new', or 'unchanged'. GTYPE is LTYPE or 'changed'." msgstr "" " LTYPE peut être soit « old », « new », ou « unchanged ». GTYPE prend une " "des valeurs de LTYPE ou « changed »." -#: src/diff.c:948 +#: src/diff.c:949 msgid "" " GFMT (only) may contain:\n" " %< lines from FILE1\n" @@ -1066,7 +1051,7 @@ msgstr "" " E F-1\n" " M L+1 %(A=B?T:E) si A égal B alors T sinon E" -#: src/diff.c:960 +#: src/diff.c:961 msgid "" " LFMT (only) may contain:\n" " %L contents of line\n" @@ -1079,7 +1064,7 @@ msgstr "" " %[-][LARGEUR][.[PREC]]{doxX}n la spécification du numéro de ligne\n" " d'entrée selon le format de printf" -#: src/diff.c:964 +#: src/diff.c:965 msgid "" " Both GFMT and LFMT may contain:\n" " %% %\n" @@ -1093,159 +1078,156 @@ msgstr "" " %c'\\OOO» le caractère dont le code octal est OOO C le " "caractère C (les autres caractères se représentent eux-mêmes)" -#: src/diff.c:970 +#: src/diff.c:971 msgid "-d, --minimal try hard to find a smaller set of changes" msgstr "" -"-d, --minimal Rechercher assidûment le plus petit ensemble de " +"-d, --minimal rechercher assidûment le plus petit ensemble de " "différences" -#: src/diff.c:971 +#: src/diff.c:972 msgid " --horizon-lines=NUM keep NUM lines of the common prefix and suffix" msgstr "" -" --horizon-lines=N Retenir N lignes ayant des préfixes et suffixes " +" --horizon-lines=N retenir N lignes ayant des préfixes et suffixes " "identiques" -#: src/diff.c:972 -msgid "" -" --speed-large-files assume large files and many scattered small changes" -msgstr "" -" --speed-large-files Suppose de grands fichiers et de nombreux " -"petits changements éparpillés" - #: src/diff.c:973 msgid "" -" --color[=WHEN] colorize the output; WHEN can be 'never', 'always'," +" --speed-large-files assume large files and many scattered small changes" msgstr "" +" --speed-large-files suppose de grands fichiers et de nombreux petits " +"changements éparpillés" #: src/diff.c:974 -#, fuzzy -msgid " or 'auto' (the default)" -msgstr "" -" --normal Produire un « diff » en format normal (par " -"défaut)" - -#: src/diff.c:975 msgid "" -" --palette=PALETTE specify the colors to use when --color is active" +" --color[=WHEN] colorize the output; WHEN can be 'never', " +"'always',\n" +" or 'auto' (the default)" msgstr "" +" --color[=QUAND] coloriser la sortie; QUAND peut être " +"« never » (jamais),\n" +" « always » (toujours) ou « auto » (par défaut)" #: src/diff.c:976 msgid "" -" PALETTE is a colon-separated list terminfo " -"capabilities" +" --palette=PALETTE the colors to use when --color is active; PALETTE " +"is\n" +" a colon-separated list of terminfo capabilities" msgstr "" +" --palette=PALETTE les couleurs à utiliser quand --color est actif; " +"PALETTE\n" +" est une liste de capacités terminfo séparées par " +"des virgules" -#: src/diff.c:978 +#: src/diff.c:979 msgid " --help display this help and exit" -msgstr " --help Afficher cette aide et terminer" +msgstr " --help afficher cette aide et terminer" -#: src/diff.c:979 +#: src/diff.c:980 msgid "-v, --version output version information and exit" msgstr "" -"-v, --version Afficher le nom et la version du logiciel et " +"-v, --version afficher le nom et la version du logiciel et " "terminer" -#: src/diff.c:981 -#, fuzzy +#: src/diff.c:982 msgid "FILES are 'FILE1 FILE2' or 'DIR1 DIR2' or 'DIR FILE' or 'FILE DIR'." msgstr "" -"FICHIERS sont « FICHIER1 FICHIER2 » ou « RÉP1 RÉP2 » ou « RÉP FICHIER... » " -"ou « FICHIER... RÉP »." +"FICHIERS sont « FICHIER1 FICHIER2 » ou « RÉP1 RÉP2 » ou « RÉP FICHIER » ou " +"« FICHIER RÉP »." -#: src/diff.c:982 +#: src/diff.c:983 msgid "" "If --from-file or --to-file is given, there are no restrictions on FILE(s)." msgstr "" "Si --from-file ou --to-file sont fournis, il n'y a pas de restriction sur " "les FICHIERS." -#: src/diff.c:983 src/diff3.c:526 src/sdiff.c:219 +#: src/diff.c:984 src/diff3.c:528 src/sdiff.c:219 msgid "If a FILE is '-', read standard input." msgstr "Si un FICHIER est « - » alors lire depuis l'entrée standard." -#: src/diff.c:993 +#: src/diff.c:994 #, c-format msgid "Usage: %s [OPTION]... FILES\n" msgstr "Usage: %s [OPTION]... FICHIERS\n" -#: src/diff.c:994 +#: src/diff.c:995 msgid "Compare FILES line by line." msgstr "Comparer les fichiers ligne par ligne." -#: src/diff.c:1028 +#: src/diff.c:1029 #, c-format msgid "conflicting %s option value '%s'" msgstr "valeur conflictuelle de l'option %s: « %s »" -#: src/diff.c:1041 +#: src/diff.c:1042 #, c-format msgid "conflicting output style options" msgstr "options de style de sortie conflictuelles" -#: src/diff.c:1057 -#, fuzzy, c-format +#: src/diff.c:1058 +#, c-format msgid "invalid color '%s'" -msgstr "largeur invalide « %s »" +msgstr "couleur « %s » invalide" -#: src/diff.c:1113 src/diff.c:1323 +#: src/diff.c:1114 src/diff.c:1324 #, c-format msgid "Only in %s: %s\n" msgstr "Seulement dans %s: %s\n" -#: src/diff.c:1247 +#: src/diff.c:1248 msgid "cannot compare '-' to a directory" msgstr "ne peut comparer « - » avec un répertoire" -#: src/diff.c:1282 +#: src/diff.c:1283 msgid "-D option not supported with directories" msgstr "L'option -D ne traite pas les répertoires" -#: src/diff.c:1291 +#: src/diff.c:1292 #, c-format msgid "Common subdirectories: %s and %s\n" msgstr "Les sous-répertoires %s et %s sont identiques\n" -#: src/diff.c:1333 src/diff.c:1383 +#: src/diff.c:1334 src/diff.c:1384 #, c-format msgid "File %s is a %s while file %s is a %s\n" msgstr "Le fichier %s est un %s alors que le fichier %s est un %s\n" -#: src/diff.c:1369 +#: src/diff.c:1370 #, c-format msgid "Symbolic links %s and %s differ\n" msgstr "Les liens symboliques %s et %s sont différents\n" -#: src/diff.c:1456 +#: src/diff.c:1457 #, c-format msgid "Files %s and %s are identical\n" msgstr "Les fichiers %s et %s sont identiques\n" #. This is a proper name. See the gettext manual, section Names. -#: src/diff3.c:41 +#: src/diff3.c:42 msgid "Randy Smith" msgstr "Randy Smith" -#: src/diff3.c:348 +#: src/diff3.c:351 #, c-format msgid "incompatible options" msgstr "options incompatibles" -#: src/diff3.c:388 +#: src/diff3.c:391 msgid "'-' specified for more than one input file" msgstr "« - » fourni pour plus d'un fichier d'entrée" -#: src/diff3.c:439 src/diff3.c:1288 src/diff3.c:1692 src/diff3.c:1747 +#: src/diff3.c:442 src/diff3.c:1290 src/diff3.c:1693 src/diff3.c:1748 #: src/sdiff.c:307 src/sdiff.c:844 src/sdiff.c:855 msgid "read failed" msgstr "lecture non-réussie" -#: src/diff3.c:473 +#: src/diff3.c:475 msgid "-A, --show-all output all changes, bracketing conflicts" msgstr "" "-A, --show-all Afficher toutes les différences avec les " "conflits entre crochets" -#: src/diff3.c:475 +#: src/diff3.c:477 msgid "" "-e, --ed output ed script incorporating changes\n" " from OLDFILE to YOURFILE into MYFILE" @@ -1255,12 +1237,12 @@ msgstr "" " du fichier ORIGINAL vers le fichier MODIFIÉ\n" " vers le fichier de SORTIE" -#: src/diff3.c:477 +#: src/diff3.c:479 msgid "-E, --show-overlap like -e, but bracket conflicts" msgstr "" "-E, --show-overlap Comme -e mais les conflits sont entre crochets" -#: src/diff3.c:478 +#: src/diff3.c:480 msgid "" "-3, --easy-only like -e, but incorporate only nonoverlapping " "changes" @@ -1268,24 +1250,24 @@ msgstr "" "-3, --easy-only Comme -e mais n'inclut que les changements qui " "ne se recoupent pas" -#: src/diff3.c:479 +#: src/diff3.c:481 msgid "" "-x, --overlap-only like -e, but incorporate only overlapping changes" msgstr "" "-x, --overlap-only Comme -e mais inclut les changements qui se recoupent" -#: src/diff3.c:480 +#: src/diff3.c:482 msgid "-X like -x, but bracket conflicts" msgstr "" "-X Comme -x mais le conflits sont entre crochets" -#: src/diff3.c:481 +#: src/diff3.c:483 msgid "-i append 'w' and 'q' commands to ed scripts" msgstr "" "-i Ajouter les commandes « w » et « q » au script " "« ed »" -#: src/diff3.c:483 +#: src/diff3.c:485 msgid "" "-m, --merge output actual merged file, according to\n" " -A if no other options are given" @@ -1294,29 +1276,29 @@ msgstr "" "autre\n" " option n'est spécifiée" -#: src/diff3.c:486 +#: src/diff3.c:488 msgid "-a, --text treat all files as text" msgstr "" "-a, --text Traiter tous les fichiers comme des textes" -#: src/diff3.c:487 +#: src/diff3.c:489 msgid " --strip-trailing-cr strip trailing carriage return on input" msgstr "" " --strip-trailing-cr Éliminer les retours de chariot de l'entrée" -#: src/diff3.c:488 +#: src/diff3.c:490 msgid "-T, --initial-tab make tabs line up by prepending a tab" msgstr "" "-T, --initial-tab Aligner les tabulateurs en préfixant un " "tabulateur" -#: src/diff3.c:489 +#: src/diff3.c:491 msgid " --diff-program=PROGRAM use PROGRAM to compare files" msgstr "" " --diff-program=PROG Utiliser le PROGramme pour comparer les " "fichiers" -#: src/diff3.c:490 +#: src/diff3.c:492 msgid "" "-L, --label=LABEL use LABEL instead of file name\n" " (can be repeated up to three times)" @@ -1325,26 +1307,26 @@ msgstr "" "fichier\n" " (peut être répété jusqu'à trois fois)" -#: src/diff3.c:493 +#: src/diff3.c:495 msgid " --help display this help and exit" msgstr " --help Afficher cette aide et terminer" -#: src/diff3.c:494 +#: src/diff3.c:496 msgid "-v, --version output version information and exit" msgstr "" "-v, --version Afficher le nom et la version du logiciel et " "terminer" -#: src/diff3.c:503 +#: src/diff3.c:505 #, c-format msgid "Usage: %s [OPTION]... MYFILE OLDFILE YOURFILE\n" msgstr "Usage: %s [OPTION]... MYFILE OLDFILE YOURFILE\n" -#: src/diff3.c:505 +#: src/diff3.c:507 msgid "Compare three files line by line." msgstr "Comparer trois fichiers ligne par ligne." -#: src/diff3.c:515 +#: src/diff3.c:517 msgid "" "\n" "The default output format is a somewhat human-readable representation of\n" @@ -1370,48 +1352,48 @@ msgstr "" "plus\n" "robuste que d'utiliser ed.\n" -#: src/diff3.c:527 +#: src/diff3.c:529 msgid "Exit status is 0 if successful, 1 if conflicts, 2 if trouble." msgstr "" "Le statut de fin d'exécution est 0 si réussite, 1 si en conflit et 2 si " "problématique." -#: src/diff3.c:720 +#: src/diff3.c:722 msgid "internal error: screwup in format of diff blocks" msgstr "erreur interne: mélange dans le format des blocs « diff »" -#: src/diff3.c:1015 +#: src/diff3.c:1017 #, c-format msgid "%s: diff failed: " msgstr "%s: échec de « diff » : " -#: src/diff3.c:1037 +#: src/diff3.c:1039 msgid "internal error: invalid diff type in process_diff" msgstr "erreur interne: type de « diff » invalide dans process_diff" -#: src/diff3.c:1062 +#: src/diff3.c:1064 msgid "invalid diff format; invalid change separator" msgstr "format de « diff » invalide ; séparateur de changement invalide" -#: src/diff3.c:1298 +#: src/diff3.c:1300 msgid "invalid diff format; incomplete last line" msgstr "format de « diff » invalide ; dernière ligne incomplète" -#: src/diff3.c:1322 src/sdiff.c:275 src/util.c:970 +#: src/diff3.c:1324 src/sdiff.c:275 src/util.c:969 #, c-format msgid "subsidiary program '%s' could not be invoked" msgstr "programme subsidiaire « %s » n'a pu être invoqué" -#: src/diff3.c:1347 +#: src/diff3.c:1349 msgid "invalid diff format; incorrect leading line chars" msgstr "" "format de « diff » invalide ; caractères incorrects au début de la ligne" -#: src/diff3.c:1420 +#: src/diff3.c:1422 msgid "internal error: invalid diff type passed to output" msgstr "erreur interne : type de « diff » invalide fourni en sortie" -#: src/diff3.c:1694 src/diff3.c:1751 +#: src/diff3.c:1695 src/diff3.c:1752 msgid "input file shrank" msgstr "le fichier d'entrée a rétréci" @@ -1426,7 +1408,7 @@ msgid "%s: recursive directory loop" msgstr "%s: boucle récursive dans le répertoire" #. This is a proper name. See the gettext manual, section Names. -#: src/sdiff.c:42 +#: src/sdiff.c:43 msgid "Thomas Lord" msgstr "Thomas Lord" @@ -1584,15 +1566,39 @@ msgstr "" "v:\tInclure les lignes identiques et le signaler.\n" "q:\tQuitter.\n" -#: src/util.c:663 -#, fuzzy, c-format +#: src/util.c:662 +#, c-format msgid "unrecognized prefix: %s" -msgstr "%s: l'option « --%s » n'est pas reconnue\n" +msgstr "préfixe non reconnu: %s" -#: src/util.c:693 +#: src/util.c:692 #, c-format msgid "unparsable value for --palette" -msgstr "" +msgstr "valeur impossible à analyser pour --palette" + +#~ msgid "%s: option '--%s' doesn't allow an argument\n" +#~ msgstr "%s: l'option « --%s » n'accepte aucun argument\n" + +#~ msgid "%s: unrecognized option '--%s'\n" +#~ msgstr "%s: l'option « --%s » n'est pas reconnue\n" + +#~ msgid "%s: option '-W %s' is ambiguous\n" +#~ msgstr "%s: l'option « -W %s » est ambiguë\n" + +#~ msgid "%s: option '-W %s' doesn't allow an argument\n" +#~ msgstr "%s: l'option « -W %s » n'accepte aucun argument.\n" + +#~ msgid "%s: option '-W %s' requires an argument\n" +#~ msgstr "%s: l'option « -W %s » requiert un argument\n" + +#~ msgid " or 'auto' (the default)" +#~ msgstr " ou « auto » (par défaut)" + +#~ msgid "" +#~ " --palette=PALETTE specify the colors to use when --color is active" +#~ msgstr "" +#~ " --palette=PALETTE spécifier les couleurs à utiliser quand --color " +#~ "est actif" #~ msgid "-i SKIP1:SKIP2 --ignore-initial=SKIP1:SKIP2" #~ msgstr "-i SAUT1:SAUT2 --ignore-initial=SAUT1:SAUT2" Binary files differ@@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: diffutils 2.8.7\n" "Report-Msgid-Bugs-To: bug-diffutils@gnu.org\n" -"POT-Creation-Date: 2016-08-20 22:22-0700\n" +"POT-Creation-Date: 2017-05-21 13:26-0700\n" "PO-Revision-Date: 2004-12-03 13:47-0500\n" "Last-Translator: Kevin Patrick Scannell <scannell@SLU.EDU>\n" "Language-Team: Irish <ga@li.org>\n" @@ -15,31 +15,31 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=ISO-8859-1\n" "Content-Transfer-Encoding: 8bit\n" +"X-Bugs: Report translation errors to the Language-Team address.\n" -#: lib/argmatch.c:133 -#, fuzzy, c-format +#: lib/argmatch.c:134 +#, c-format msgid "invalid argument %s for %s" -msgstr "luach neamhbhailí --bytes `%s'" +msgstr "" -#: lib/argmatch.c:134 +#: lib/argmatch.c:135 #, c-format msgid "ambiguous argument %s for %s" msgstr "" -#: lib/argmatch.c:153 -#, fuzzy +#: lib/argmatch.c:154 msgid "Valid arguments are:" -msgstr "luach neamhbhailí --bytes `%s'" +msgstr "" -#: lib/c-stack.c:204 lib/c-stack.c:297 +#: lib/c-stack.c:203 lib/c-stack.c:296 msgid "program error" msgstr "earráid chláir" -#: lib/c-stack.c:205 lib/c-stack.c:298 +#: lib/c-stack.c:204 lib/c-stack.c:297 msgid "stack overflow" msgstr "cruach thar maoil" -#: lib/error.c:191 +#: lib/error.c:195 msgid "Unknown system error" msgstr "Earráid chórais anaithnid" @@ -145,66 +145,41 @@ msgstr "" msgid "weird file" msgstr "comhad aisteach" -#: lib/getopt.c:575 lib/getopt.c:604 +#: lib/getopt.c:278 #, fuzzy, c-format -msgid "%s: option '%s' is ambiguous; possibilities:" +msgid "%s: option '%s%s' is ambiguous\n" msgstr "%s: Tá an rogha `%s' débhríoch\n" -#: lib/getopt.c:619 +#: lib/getopt.c:284 #, fuzzy, c-format -msgid "%s: option '%s' is ambiguous\n" -msgstr "%s: Tá an rogha `-W %s' débhríoch\n" +msgid "%s: option '%s%s' is ambiguous; possibilities:" +msgstr "%s: Tá an rogha `%s' débhríoch\n" -#: lib/getopt.c:654 lib/getopt.c:658 +#: lib/getopt.c:319 #, fuzzy, c-format -msgid "%s: option '--%s' doesn't allow an argument\n" -msgstr "%s: ní cheadaítear argóint i ndiaidh na rogha `--%s'\n" +msgid "%s: unrecognized option '%s%s'\n" +msgstr "%s: rogha anaithnid `%c%s'\n" -#: lib/getopt.c:667 lib/getopt.c:672 +#: lib/getopt.c:345 #, fuzzy, c-format -msgid "%s: option '%c%s' doesn't allow an argument\n" +msgid "%s: option '%s%s' doesn't allow an argument\n" msgstr "%s: ní cheadaítear argóint i ndiaidh na rogha `%c%s'\n" -#: lib/getopt.c:715 lib/getopt.c:734 +#: lib/getopt.c:360 #, fuzzy, c-format -msgid "%s: option '--%s' requires an argument\n" +msgid "%s: option '%s%s' requires an argument\n" msgstr "%s: ní foláir argóint don rogha `%s'\n" -#: lib/getopt.c:772 lib/getopt.c:775 -#, fuzzy, c-format -msgid "%s: unrecognized option '--%s'\n" -msgstr "%s: rogha anaithnid `--%s'\n" - -#: lib/getopt.c:783 lib/getopt.c:786 -#, fuzzy, c-format -msgid "%s: unrecognized option '%c%s'\n" -msgstr "%s: rogha anaithnid `%c%s'\n" - -#: lib/getopt.c:835 lib/getopt.c:838 +#: lib/getopt.c:621 #, fuzzy, c-format msgid "%s: invalid option -- '%c'\n" msgstr "%s: rogha neamhbhailí -- %c\n" -#: lib/getopt.c:891 lib/getopt.c:908 lib/getopt.c:1118 lib/getopt.c:1136 +#: lib/getopt.c:636 lib/getopt.c:682 #, fuzzy, c-format msgid "%s: option requires an argument -- '%c'\n" msgstr "%s: ní foláir argóint don rogha -- %c\n" -#: lib/getopt.c:964 lib/getopt.c:980 -#, fuzzy, c-format -msgid "%s: option '-W %s' is ambiguous\n" -msgstr "%s: Tá an rogha `-W %s' débhríoch\n" - -#: lib/getopt.c:1004 lib/getopt.c:1022 -#, fuzzy, c-format -msgid "%s: option '-W %s' doesn't allow an argument\n" -msgstr "%s: ní cheadaítear argóint i ndiaidh na rogha `-W %s'\n" - -#: lib/getopt.c:1043 lib/getopt.c:1061 -#, fuzzy, c-format -msgid "%s: option '-W %s' requires an argument\n" -msgstr "%s: ní foláir argóint don rogha `%s'\n" - #. TRANSLATORS: #. Get translations for open and closing quotation marks. #. The message catalog should translate "`" to a left @@ -226,11 +201,11 @@ msgstr "%s: ní foláir argóint don rogha `%s'\n" #. If you don't know what to put here, please see #. <http://en.wikipedia.org/wiki/Quotation_marks_in_other_languages> #. and use glyphs suitable for your language. -#: lib/quotearg.c:347 +#: lib/quotearg.c:362 msgid "`" msgstr "" -#: lib/quotearg.c:348 +#: lib/quotearg.c:363 msgid "'" msgstr "" @@ -517,7 +492,7 @@ msgstr "" msgid "General help using GNU software: <http://www.gnu.org/gethelp/>\n" msgstr "" -#: src/analyze.c:454 src/diff.c:1400 +#: src/analyze.c:454 src/diff.c:1401 #, c-format msgid "Files %s and %s differ\n" msgstr "Tá difríocht idir na comhaid %s agus %s\n" @@ -527,21 +502,21 @@ msgstr "Tá difríocht idir na comhaid %s agus %s\n" msgid "Binary files %s and %s differ\n" msgstr "Tá difríocht idir na comhaid %s agus %s\n" -#: src/analyze.c:697 src/diff3.c:1463 src/util.c:1255 +#: src/analyze.c:706 src/diff3.c:1465 src/util.c:1254 msgid "No newline at end of file" msgstr "Gan líne nua ag an chomhadchríoch" #. This is a proper name. See the gettext manual, section Names. -#: src/cmp.c:43 +#: src/cmp.c:44 msgid "Torbjorn Granlund" msgstr "Torbjorn Granlund" #. This is a proper name. See the gettext manual, section Names. -#: src/cmp.c:44 +#: src/cmp.c:45 msgid "David MacKenzie" msgstr "" -#: src/cmp.c:118 src/diff.c:875 src/diff3.c:459 src/sdiff.c:158 +#: src/cmp.c:119 src/diff.c:877 src/diff3.c:462 src/sdiff.c:159 #, fuzzy, c-format msgid "Try '%s --help' for more information." msgstr "Bain triail as `%s --help' chun tuilleadh eolais a fháil." @@ -556,12 +531,12 @@ msgstr "luach neamhbhailí --ignore-initial `%s'" msgid "options -l and -s are incompatible" msgstr "Níl na roghanna -l agus -s comhoiriúnach" -#: src/cmp.c:155 src/diff.c:884 src/diff3.c:467 src/sdiff.c:167 src/sdiff.c:315 -#: src/sdiff.c:322 src/sdiff.c:874 src/util.c:853 src/util.c:953 src/util.c:960 +#: src/cmp.c:155 src/diff.c:885 src/diff3.c:469 src/sdiff.c:167 src/sdiff.c:315 +#: src/sdiff.c:322 src/sdiff.c:874 src/util.c:852 src/util.c:952 src/util.c:959 msgid "write failed" msgstr "teipeadh ag scríobh" -#: src/cmp.c:157 src/diff.c:886 src/diff.c:1465 src/diff3.c:469 src/sdiff.c:169 +#: src/cmp.c:157 src/diff.c:887 src/diff.c:1466 src/diff3.c:471 src/sdiff.c:169 msgid "standard output" msgstr "aschur caighdeánach" @@ -626,7 +601,7 @@ msgid "" msgstr "" "Is éard atá i SCIP1 agus SCIP2 ná líonta na mbeart a scipeáil i ngach comhad." -#: src/cmp.c:185 src/diff.c:996 src/diff3.c:507 src/sdiff.c:210 +#: src/cmp.c:185 src/diff.c:997 src/diff3.c:509 src/sdiff.c:210 msgid "" "Mandatory arguments to long options are mandatory for short options too.\n" msgstr "" @@ -646,7 +621,7 @@ msgstr "" msgid "If a FILE is '-' or missing, read standard input." msgstr "Mura bhfuil COMHAD ann, nó más `-' é, léigh ón ionchur caighdeánach." -#: src/cmp.c:195 src/diff.c:984 src/sdiff.c:220 +#: src/cmp.c:195 src/diff.c:985 src/sdiff.c:220 msgid "Exit status is 0 if inputs are the same, 1 if different, 2 if trouble." msgstr "Stádas scortha: 0 más ionann iad, 1 más difriúil, 2 má tá fadhb ann." @@ -655,241 +630,254 @@ msgstr "Stádas scortha: 0 más ionann iad, 1 más difriúil, 2 má tá fadhb ann." msgid "invalid --bytes value '%s'" msgstr "luach neamhbhailí --bytes `%s'" -#: src/cmp.c:266 src/diff.c:793 src/diff3.c:353 src/sdiff.c:565 +#: src/cmp.c:266 src/diff.c:795 src/diff3.c:356 src/sdiff.c:565 #, fuzzy, c-format msgid "missing operand after '%s'" msgstr "ní foláir argóint i ndiaidh `%s'" -#: src/cmp.c:278 src/diff.c:795 src/diff3.c:355 src/sdiff.c:567 +#: src/cmp.c:278 src/diff.c:797 src/diff3.c:358 src/sdiff.c:567 #, fuzzy, c-format msgid "extra operand '%s'" msgstr "oibreann breise `%s'" -#: src/cmp.c:494 +#: src/cmp.c:498 #, c-format msgid "%s %s differ: byte %s, line %s\n" msgstr "%s %s difriúil: beart %s, líne %s\n" -#: src/cmp.c:510 +#: src/cmp.c:514 #, c-format msgid "%s %s differ: byte %s, line %s is %3o %s %3o %s\n" msgstr "%s %s difriúil: beart %s, líne %s = %3o %s %3o %s\n" -#: src/cmp.c:562 -#, c-format -msgid "cmp: EOF on %s\n" +#: src/cmp.c:571 +#, fuzzy, c-format +msgid "cmp: EOF on %s which is empty\n" +msgstr "cmp: EOF ar %s\n" + +#: src/cmp.c:585 +#, fuzzy, c-format +msgid "cmp: EOF on %s after byte %s, line %s\n" +msgstr "%s %s difriúil: beart %s, líne %s\n" + +#: src/cmp.c:586 +#, fuzzy, c-format +msgid "cmp: EOF on %s after byte %s, in line %s\n" +msgstr "%s %s difriúil: beart %s, líne %s\n" + +#: src/cmp.c:592 +#, fuzzy, c-format +msgid "cmp: EOF on %s after byte %s\n" msgstr "cmp: EOF ar %s\n" #. This is a proper name. See the gettext manual, section Names. -#: src/diff.c:49 +#: src/diff.c:50 msgid "Paul Eggert" msgstr "" #. This is a proper name. See the gettext manual, section Names. -#: src/diff.c:50 +#: src/diff.c:51 msgid "Mike Haertel" msgstr "" #. This is a proper name. See the gettext manual, section Names. -#: src/diff.c:51 +#: src/diff.c:52 msgid "David Hayes" msgstr "" #. This is a proper name. See the gettext manual, section Names. -#: src/diff.c:52 +#: src/diff.c:53 msgid "Richard Stallman" msgstr "" #. This is a proper name. See the gettext manual, section Names. -#: src/diff.c:53 +#: src/diff.c:54 msgid "Len Tower" msgstr "" -#: src/diff.c:351 +#: src/diff.c:353 #, fuzzy, c-format msgid "invalid context length '%s'" msgstr "Fad neamhbhailí comhthéacs `%s'" -#: src/diff.c:434 +#: src/diff.c:436 #, c-format msgid "pagination not supported on this host" msgstr "Ní thacaítear leis an uimhriú leathanach ar an óstríomhaire seo" -#: src/diff.c:449 src/diff3.c:335 +#: src/diff.c:451 src/diff3.c:336 #, c-format msgid "too many file label options" msgstr "an iomarca argóintí do lipéid chomhaid" -#: src/diff.c:526 +#: src/diff.c:528 #, fuzzy, c-format msgid "invalid width '%s'" msgstr "leithead neamhbhailí `%s'" -#: src/diff.c:530 +#: src/diff.c:532 msgid "conflicting width options" msgstr "roghanna leithid contrártha" -#: src/diff.c:555 +#: src/diff.c:557 #, fuzzy, c-format msgid "invalid horizon length '%s'" msgstr "fad léaslíne neamhbhailí `%s'" -#: src/diff.c:611 +#: src/diff.c:613 #, fuzzy, c-format msgid "invalid tabsize '%s'" msgstr "tá an mhéid tháib `%s' neamhbhailí" -#: src/diff.c:615 +#: src/diff.c:617 msgid "conflicting tabsize options" msgstr "Roghanna tábmhéid contrártha" -#: src/diff.c:770 +#: src/diff.c:772 msgid "--from-file and --to-file both specified" msgstr "tugadh --from-file agus --to-file lena chéile" -#: src/diff.c:890 +#: src/diff.c:891 #, fuzzy msgid " --normal output a normal diff (the default)" msgstr "--normal Aschuir diff coitianta." -#: src/diff.c:891 +#: src/diff.c:892 #, fuzzy msgid "-q, --brief report only when files differ" msgstr "-q --brief Ná taispeáin ach difriúil nó nach ea." -#: src/diff.c:892 +#: src/diff.c:893 #, fuzzy msgid "-s, --report-identical-files report when two files are the same" msgstr "" "-s --report-identical-files Tuairiscigh nuair atá dhá chomhad comhionanna." -#: src/diff.c:893 +#: src/diff.c:894 msgid "" "-c, -C NUM, --context[=NUM] output NUM (default 3) lines of copied context" msgstr "" -#: src/diff.c:894 +#: src/diff.c:895 #, fuzzy msgid "" "-u, -U NUM, --unified[=NUM] output NUM (default 3) lines of unified context" msgstr "" "-w UIMH --width=UIMH UIMH colún priontála ar a mhéad (réamhshocrú=130)." -#: src/diff.c:895 +#: src/diff.c:896 #, fuzzy msgid "-e, --ed output an ed script" msgstr "-e --ed Aschuir script `ed'." -#: src/diff.c:896 +#: src/diff.c:897 #, fuzzy msgid "-n, --rcs output an RCS format diff" msgstr "-n --rcs Aschuir diff i gcruth RCS." -#: src/diff.c:897 +#: src/diff.c:898 msgid "-y, --side-by-side output in two columns" msgstr "" -#: src/diff.c:898 +#: src/diff.c:899 #, fuzzy msgid "" "-W, --width=NUM output at most NUM (default 130) print columns" msgstr "" "-w UIMH --width=UIMH UIMH colún priontála ar a mhéad (réamhshocrú=130)." -#: src/diff.c:899 +#: src/diff.c:900 #, fuzzy msgid "" " --left-column output only the left column of common lines" msgstr "-l --left-column Ná taispeáin an colún ar dheis más ionann iad." -#: src/diff.c:900 +#: src/diff.c:901 #, fuzzy msgid " --suppress-common-lines do not output common lines" msgstr "-s --suppress-common-lines Ná taispeáin línte atá i bpáirt acu." -#: src/diff.c:902 +#: src/diff.c:903 msgid "-p, --show-c-function show which C function each change is in" msgstr "" -#: src/diff.c:903 +#: src/diff.c:904 msgid "-F, --show-function-line=RE show the most recent line matching RE" msgstr "" -#: src/diff.c:904 -#, fuzzy +#: src/diff.c:905 msgid "" " --label LABEL use LABEL instead of file name and timestamp\n" " (can be repeated)" msgstr "" -"--from-file=COMHAD Cuir COMHAD (nó comhadlann) i gcomparáid le gach oibreann." -#: src/diff.c:907 +#: src/diff.c:908 #, fuzzy msgid "-t, --expand-tabs expand tabs to spaces in output" msgstr "-t --expand-tabs leathnaigh táib go spásanna san aschur." -#: src/diff.c:908 +#: src/diff.c:909 #, fuzzy msgid "-T, --initial-tab make tabs line up by prepending a tab" msgstr "" "-T --initial-tab Ailínigh táib trí tháb a chur in ionad spás tosaigh." -#: src/diff.c:909 +#: src/diff.c:910 #, fuzzy msgid "" " --tabsize=NUM tab stops every NUM (default 8) print columns" msgstr "--tabsize=UIMH Tábstop gach UIMH colún (réamhshocrú=8)." -#: src/diff.c:910 +#: src/diff.c:911 msgid "" " --suppress-blank-empty suppress space or tab before empty output lines" msgstr "" -#: src/diff.c:911 +#: src/diff.c:912 #, fuzzy msgid "-l, --paginate pass output through 'pr' to paginate it" msgstr "-l --paginate uimhrigh leathanaigh le `pr'." -#: src/diff.c:913 +#: src/diff.c:914 #, fuzzy msgid "" "-r, --recursive recursively compare any subdirectories found" msgstr "-r --recursive Cuir fochomhadlanna i gcomparáid go hathchúrsach." -#: src/diff.c:914 +#: src/diff.c:915 msgid " --no-dereference don't follow symbolic links" msgstr "" -#: src/diff.c:915 +#: src/diff.c:916 #, fuzzy msgid "-N, --new-file treat absent files as empty" msgstr "-N --new-file Caith le comhad ar iarraidh mar chomhad folamh." -#: src/diff.c:916 +#: src/diff.c:917 #, fuzzy msgid " --unidirectional-new-file treat absent first files as empty" msgstr "" "--unidirectional-new-file Más ar iarraidh, caith leis an chéad chomhad\n" " mar chomhad folamh." -#: src/diff.c:917 +#: src/diff.c:918 #, fuzzy msgid " --ignore-file-name-case ignore case when comparing file names" msgstr "--ignore-file-name-case Ná bí cásíogair le hainmneacha comhaid." -#: src/diff.c:918 +#: src/diff.c:919 #, fuzzy msgid " --no-ignore-file-name-case consider case when comparing file names" msgstr "" "--no-ignore-file-name-case Bí cásíogair maidir le hainmneacha comhaid." -#: src/diff.c:919 +#: src/diff.c:920 #, fuzzy msgid "-x, --exclude=PAT exclude files that match PAT" msgstr "" "-X SLONN --exclude=SLONN Fág comhaid as má tá siad comhoiriúnacha le SLONN." -#: src/diff.c:920 +#: src/diff.c:921 #, fuzzy msgid "" "-X, --exclude-from=FILE exclude files that match any pattern in FILE" @@ -898,7 +886,7 @@ msgstr "" "haon\n" " slonn ionadaíochta as an CHOMHAD." -#: src/diff.c:921 +#: src/diff.c:922 #, fuzzy msgid "" "-S, --starting-file=FILE start with FILE when comparing directories" @@ -906,7 +894,7 @@ msgstr "" "-S COMHAD --starting-file=COMHAD Tosaigh le COMHAD agus comhadlanna á " "gcóimheas." -#: src/diff.c:922 +#: src/diff.c:923 #, fuzzy msgid "" " --from-file=FILE1 compare FILE1 to all operands;\n" @@ -914,7 +902,7 @@ msgid "" msgstr "" "--from-file=COMHAD Cuir COMHAD (nó comhadlann) i gcomparáid le gach oibreann." -#: src/diff.c:924 +#: src/diff.c:925 #, fuzzy msgid "" " --to-file=FILE2 compare all operands to FILE2;\n" @@ -922,41 +910,41 @@ msgid "" msgstr "" "--to-file=COMHAD Cuir gach oibreann i gcomparáid le COMHAD (nó comhadlann)." -#: src/diff.c:927 +#: src/diff.c:928 #, fuzzy msgid "" "-i, --ignore-case ignore case differences in file contents" msgstr "-i --ignore-case Ná bí cásíogair le hinneachar na gcomhad." -#: src/diff.c:928 +#: src/diff.c:929 #, fuzzy msgid "-E, --ignore-tab-expansion ignore changes due to tab expansion" msgstr "" "-E --ignore-tab-expansion Déan neamhshuim ar athruithe ó leathnú na dtáib." -#: src/diff.c:929 +#: src/diff.c:930 #, fuzzy msgid "-Z, --ignore-trailing-space ignore white space at line end" msgstr "-w --ignore-all-space Déan neamhshuim ar spás bán go hiomlán." -#: src/diff.c:930 +#: src/diff.c:931 #, fuzzy msgid "" "-b, --ignore-space-change ignore changes in the amount of white space" msgstr "-b --ignore-space-change Déan neamhshuim ar mhéid an spáis bán." -#: src/diff.c:931 +#: src/diff.c:932 #, fuzzy msgid "-w, --ignore-all-space ignore all white space" msgstr "-w --ignore-all-space Déan neamhshuim ar spás bán go hiomlán." -#: src/diff.c:932 +#: src/diff.c:933 #, fuzzy msgid "" "-B, --ignore-blank-lines ignore changes where lines are all blank" msgstr "-B --ignore-blank-lines Déan neamhshuim ar línte folmha." -#: src/diff.c:933 +#: src/diff.c:934 #, fuzzy msgid "-I, --ignore-matching-lines=RE ignore changes where all lines match RE" msgstr "" @@ -964,23 +952,23 @@ msgstr "" "comhoiriúnach\n" " leis an slonn SI." -#: src/diff.c:935 +#: src/diff.c:936 #, fuzzy msgid "-a, --text treat all files as text" msgstr "-a --text Caith le gach comhad mar théacschomhad." -#: src/diff.c:936 +#: src/diff.c:937 #, fuzzy msgid " --strip-trailing-cr strip trailing carriage return on input" msgstr "" "--strip-trailing-cr Dealaigh aisfhilleadh carráiste ó gach líne ionchurtha." -#: src/diff.c:938 +#: src/diff.c:939 #, fuzzy msgid " --binary read and write data in binary mode" msgstr "--binary Léigh agus scríobh sonraí sa mhód dénártha." -#: src/diff.c:941 +#: src/diff.c:942 #, fuzzy msgid "" "-D, --ifdef=NAME output merged file with '#ifdef NAME' diffs" @@ -988,35 +976,35 @@ msgstr "" "-D AINM --ifdef=AINM Taispeáin comhad cumaiscthe chun na diff-aí\n" " `#ifdef AINM' a léiriú" -#: src/diff.c:942 +#: src/diff.c:943 #, fuzzy msgid " --GTYPE-group-format=GFMT format GTYPE input groups with GFMT" msgstr "" "--GCINL-group-format=GFMD Taispeáin grúpaí GCINL ionchuir de réir GFMD." -#: src/diff.c:943 +#: src/diff.c:944 #, fuzzy msgid " --line-format=LFMT format all input lines with LFMT" msgstr "--line-format=LFMD Taispeáin gach líne ionchuir de réir LFMD." -#: src/diff.c:944 +#: src/diff.c:945 #, fuzzy msgid " --LTYPE-line-format=LFMT format LTYPE input lines with LFMT" msgstr "" "--LCINL-line-format=LFMD Taispeáin línte LCINL ionchuir de réir LFMD." -#: src/diff.c:945 +#: src/diff.c:946 msgid "" " These format options provide fine-grained control over the output\n" " of diff, generalizing -D/--ifdef." msgstr "" -#: src/diff.c:947 +#: src/diff.c:948 #, fuzzy msgid " LTYPE is 'old', 'new', or 'unchanged'. GTYPE is LTYPE or 'changed'." msgstr " LCINL = `old', `new', nó `unchanged'. GCINL = LCINL nó `changed'." -#: src/diff.c:948 +#: src/diff.c:949 #, fuzzy msgid "" " GFMT (only) may contain:\n" @@ -1044,7 +1032,7 @@ msgstr "" " E F-1\n" " M L+1" -#: src/diff.c:960 +#: src/diff.c:961 #, fuzzy msgid "" " LFMT (only) may contain:\n" @@ -1057,7 +1045,7 @@ msgstr "" " %l ábhar na líne, gan aon líne nua\n" " %[-][LEITHEAD][.[SONRÚ]]{doxX}n sonrú do líne-uimhir mar C `printf'" -#: src/diff.c:964 +#: src/diff.c:965 #, fuzzy msgid "" " Both GFMT and LFMT may contain:\n" @@ -1071,158 +1059,151 @@ msgstr "" " %c'C' an carachtar litriúil C\n" " %c'\\OOO' an carachtar le cód ochtnártha OOO" -#: src/diff.c:970 +#: src/diff.c:971 #, fuzzy msgid "-d, --minimal try hard to find a smaller set of changes" msgstr "-d --minimal Obair go crua le haghaidh níos lú athruithe." -#: src/diff.c:971 +#: src/diff.c:972 #, fuzzy msgid " --horizon-lines=NUM keep NUM lines of the common prefix and suffix" msgstr "--horizon-lines=UIMH Coinnigh UIMH líne den réimír/iarmhír choiteann." -#: src/diff.c:972 +#: src/diff.c:973 #, fuzzy msgid "" " --speed-large-files assume large files and many scattered small changes" msgstr "" "-H --speed-large-files Comhaid móra agus go leor mionathruithe forleata." -#: src/diff.c:973 -msgid "" -" --color[=WHEN] colorize the output; WHEN can be 'never', 'always'," -msgstr "" - #: src/diff.c:974 -#, fuzzy -msgid " or 'auto' (the default)" -msgstr "--normal Aschuir diff coitianta." - -#: src/diff.c:975 msgid "" -" --palette=PALETTE specify the colors to use when --color is active" +" --color[=WHEN] colorize the output; WHEN can be 'never', " +"'always',\n" +" or 'auto' (the default)" msgstr "" #: src/diff.c:976 msgid "" -" PALETTE is a colon-separated list terminfo " -"capabilities" +" --palette=PALETTE the colors to use when --color is active; PALETTE " +"is\n" +" a colon-separated list of terminfo capabilities" msgstr "" -#: src/diff.c:978 +#: src/diff.c:979 msgid " --help display this help and exit" msgstr "" -#: src/diff.c:979 +#: src/diff.c:980 #, fuzzy msgid "-v, --version output version information and exit" msgstr "-v --version Taispeáin eolas faoin leagan." -#: src/diff.c:981 +#: src/diff.c:982 #, fuzzy msgid "FILES are 'FILE1 FILE2' or 'DIR1 DIR2' or 'DIR FILE' or 'FILE DIR'." msgstr "" "COMHAID = `COMHAD1 COMHAD2' nó `COMHADLANN1 COMHADLANN2' nó `COMHADLANN " "COMHAD...' nó `COMHAD... COMHADLANN'." -#: src/diff.c:982 +#: src/diff.c:983 #, fuzzy msgid "" "If --from-file or --to-file is given, there are no restrictions on FILE(s)." msgstr "" "Má tá --from-file nó --to-file tugtha, níl a leithéid de shrian ar COMHAID." -#: src/diff.c:983 src/diff3.c:526 src/sdiff.c:219 +#: src/diff.c:984 src/diff3.c:528 src/sdiff.c:219 #, fuzzy msgid "If a FILE is '-', read standard input." msgstr "Más '-' é an COMHAD, léigh ón ionchur caighdeánach." -#: src/diff.c:993 +#: src/diff.c:994 #, c-format msgid "Usage: %s [OPTION]... FILES\n" msgstr "Úsáid: %s [ROGHA]... COMHAID\n" -#: src/diff.c:994 +#: src/diff.c:995 #, fuzzy msgid "Compare FILES line by line." msgstr "Déan comparáid idir na comhaid, líne ar líne." -#: src/diff.c:1028 +#: src/diff.c:1029 #, fuzzy, c-format msgid "conflicting %s option value '%s'" msgstr "luach contrártha don rogha %s: `%s'" -#: src/diff.c:1041 +#: src/diff.c:1042 #, c-format msgid "conflicting output style options" msgstr "roghanna contrártha le haghaidh na stíle aschuir" -#: src/diff.c:1057 +#: src/diff.c:1058 #, fuzzy, c-format msgid "invalid color '%s'" -msgstr "leithead neamhbhailí `%s'" +msgstr "Fad neamhbhailí comhthéacs `%s'" -#: src/diff.c:1113 src/diff.c:1323 +#: src/diff.c:1114 src/diff.c:1324 #, c-format msgid "Only in %s: %s\n" msgstr "I %s amháin: %s\n" -#: src/diff.c:1247 +#: src/diff.c:1248 #, fuzzy msgid "cannot compare '-' to a directory" msgstr "ní féidir `-' a chur i gcomparáid le comhadlann" -#: src/diff.c:1282 +#: src/diff.c:1283 msgid "-D option not supported with directories" msgstr "Níl an rogha -D ar fáil do chomhadlanna" -#: src/diff.c:1291 +#: src/diff.c:1292 #, c-format msgid "Common subdirectories: %s and %s\n" msgstr "Fochomhadlanna i gcoitianta: %s agus %s\n" -#: src/diff.c:1333 src/diff.c:1383 +#: src/diff.c:1334 src/diff.c:1384 #, c-format msgid "File %s is a %s while file %s is a %s\n" msgstr "Tá comhad %s ina %s ach tá comhad %s ina %s\n" -#: src/diff.c:1369 +#: src/diff.c:1370 #, fuzzy, c-format msgid "Symbolic links %s and %s differ\n" msgstr "Tá difríocht idir na comhaid %s agus %s\n" -#: src/diff.c:1456 +#: src/diff.c:1457 #, c-format msgid "Files %s and %s are identical\n" msgstr "Is comhionann iad na comhaid %s agus %s\n" #. This is a proper name. See the gettext manual, section Names. -#: src/diff3.c:41 +#: src/diff3.c:42 msgid "Randy Smith" msgstr "" -#: src/diff3.c:348 +#: src/diff3.c:351 #, c-format msgid "incompatible options" msgstr "roghanna neamh-chomhoiriúnacha" -#: src/diff3.c:388 +#: src/diff3.c:391 #, fuzzy msgid "'-' specified for more than one input file" msgstr "bhí `-' tugtha le haghaidh níos mó ná inchomhad amháin" -#: src/diff3.c:439 src/diff3.c:1288 src/diff3.c:1692 src/diff3.c:1747 +#: src/diff3.c:442 src/diff3.c:1290 src/diff3.c:1693 src/diff3.c:1748 #: src/sdiff.c:307 src/sdiff.c:844 src/sdiff.c:855 msgid "read failed" msgstr "theip ar léamh" -#: src/diff3.c:473 +#: src/diff3.c:475 #, fuzzy msgid "-A, --show-all output all changes, bracketing conflicts" msgstr "" "-A --show-all Taispeáin gach athrú agus cuir coinbhleachtaí idir lúibíní." -#: src/diff3.c:475 +#: src/diff3.c:477 #, fuzzy msgid "" "-e, --ed output ed script incorporating changes\n" @@ -1231,90 +1212,90 @@ msgstr "" "-e --ed Scríobh i MOCHOMHAD na hathruithe neamhchumaiscthe ó SEANCHOMHAD " "go DOCHOMHAD." -#: src/diff3.c:477 +#: src/diff3.c:479 #, fuzzy msgid "-E, --show-overlap like -e, but bracket conflicts" msgstr "" "-E --show-overlap Taispeáin na hathruithe neamhchumaiscthe agus cuir " "coinbhleachtaí idir lúibíní." -#: src/diff3.c:478 +#: src/diff3.c:480 #, fuzzy msgid "" "-3, --easy-only like -e, but incorporate only nonoverlapping " "changes" msgstr "-3 --easy-only Taispeáin athruithe neamhchumaiscthe forluiteacha." -#: src/diff3.c:479 +#: src/diff3.c:481 #, fuzzy msgid "" "-x, --overlap-only like -e, but incorporate only overlapping changes" msgstr "-x --overlap-only Taispeáin na hathruithe forluiteacha." -#: src/diff3.c:480 +#: src/diff3.c:482 msgid "-X like -x, but bracket conflicts" msgstr "" -#: src/diff3.c:481 +#: src/diff3.c:483 #, fuzzy msgid "-i append 'w' and 'q' commands to ed scripts" msgstr "-i Cuir na horduithe `w' agus `q' le scripteanna `ed'." -#: src/diff3.c:483 +#: src/diff3.c:485 msgid "" "-m, --merge output actual merged file, according to\n" " -A if no other options are given" msgstr "" -#: src/diff3.c:486 +#: src/diff3.c:488 #, fuzzy msgid "-a, --text treat all files as text" msgstr "-a --text Caith le gach comhad mar théacschomhad." -#: src/diff3.c:487 +#: src/diff3.c:489 #, fuzzy msgid " --strip-trailing-cr strip trailing carriage return on input" msgstr "" "--strip-trailing-cr Dealaigh aisfhilleadh carráiste ó gach líne ionchurtha." -#: src/diff3.c:488 +#: src/diff3.c:490 #, fuzzy msgid "-T, --initial-tab make tabs line up by prepending a tab" msgstr "" "-T --initial-tab Ailínigh táib trí tháb a chur in ionad spás tosaigh." -#: src/diff3.c:489 +#: src/diff3.c:491 #, fuzzy msgid " --diff-program=PROGRAM use PROGRAM to compare files" msgstr "" "--diff-program=CLÁR Bain úsáid as an CLÁR chun comhaid a chur i " "gcomparáid." -#: src/diff3.c:490 +#: src/diff3.c:492 msgid "" "-L, --label=LABEL use LABEL instead of file name\n" " (can be repeated up to three times)" msgstr "" -#: src/diff3.c:493 +#: src/diff3.c:495 msgid " --help display this help and exit" msgstr "" -#: src/diff3.c:494 +#: src/diff3.c:496 #, fuzzy msgid "-v, --version output version information and exit" msgstr "-v --version Taispeáin eolas faoin leagan." -#: src/diff3.c:503 +#: src/diff3.c:505 #, c-format msgid "Usage: %s [OPTION]... MYFILE OLDFILE YOURFILE\n" msgstr "Úsáid: %s [ROGHA]... MOCHOMHAD SEANCHOMHAD DOCHOMHAD\n" -#: src/diff3.c:505 +#: src/diff3.c:507 msgid "Compare three files line by line." msgstr "Cuir trí chomhad i gcomparáid, líne ar líne." -#: src/diff3.c:515 +#: src/diff3.c:517 msgid "" "\n" "The default output format is a somewhat human-readable representation of\n" @@ -1328,46 +1309,46 @@ msgid "" "robust than using ed.\n" msgstr "" -#: src/diff3.c:527 +#: src/diff3.c:529 msgid "Exit status is 0 if successful, 1 if conflicts, 2 if trouble." msgstr "Stádas scortha = 0 (rathúil), 1 (coinbhleachtaí), 2 (trioblóid)." -#: src/diff3.c:720 +#: src/diff3.c:722 msgid "internal error: screwup in format of diff blocks" msgstr "earráid inmheánach: formáid de na bloic diff trína chéile" -#: src/diff3.c:1015 +#: src/diff3.c:1017 #, c-format msgid "%s: diff failed: " msgstr "%s: theip ar diff: " -#: src/diff3.c:1037 +#: src/diff3.c:1039 msgid "internal error: invalid diff type in process_diff" msgstr "earráid inmheánach: cineál neamhbhailí diff san fheidhm process_diff" -#: src/diff3.c:1062 +#: src/diff3.c:1064 msgid "invalid diff format; invalid change separator" msgstr "formáid diff neamhbhailí; teorantóir neamhbhailí idir athruithe" -#: src/diff3.c:1298 +#: src/diff3.c:1300 msgid "invalid diff format; incomplete last line" msgstr "formáid neamhbhailí diff; líne deiridh neamhiomlán" -#: src/diff3.c:1322 src/sdiff.c:275 src/util.c:970 +#: src/diff3.c:1324 src/sdiff.c:275 src/util.c:969 #, fuzzy, c-format msgid "subsidiary program '%s' could not be invoked" msgstr "níorbh fhéidir an fochlár `%s' a rith" -#: src/diff3.c:1347 +#: src/diff3.c:1349 msgid "invalid diff format; incorrect leading line chars" msgstr "formáid neamhbhailí diff; carachtair mhíchearta ag tosach na líne" -#: src/diff3.c:1420 +#: src/diff3.c:1422 msgid "internal error: invalid diff type passed to output" msgstr "" "earráid inmheánach: seachadadh cineál neamhbhailí diff go dtí an aschur" -#: src/diff3.c:1694 src/diff3.c:1751 +#: src/diff3.c:1695 src/diff3.c:1752 msgid "input file shrank" msgstr "crapadh an t-inchomhad" @@ -1383,7 +1364,7 @@ msgid "%s: recursive directory loop" msgstr "" #. This is a proper name. See the gettext manual, section Names. -#: src/sdiff.c:42 +#: src/sdiff.c:43 msgid "Thomas Lord" msgstr "" @@ -1547,16 +1528,36 @@ msgstr "" "v:\tCuir comhlínte san áireamh go foclach.\n" "q:\tScoir.\n" -#: src/util.c:663 +#: src/util.c:662 #, fuzzy, c-format msgid "unrecognized prefix: %s" msgstr "%s: rogha anaithnid `--%s'\n" -#: src/util.c:693 +#: src/util.c:692 #, c-format msgid "unparsable value for --palette" msgstr "" +#, fuzzy +#~ msgid "%s: option '--%s' doesn't allow an argument\n" +#~ msgstr "%s: ní cheadaítear argóint i ndiaidh na rogha `--%s'\n" + +#, fuzzy +#~ msgid "%s: unrecognized option '--%s'\n" +#~ msgstr "%s: rogha anaithnid `--%s'\n" + +#, fuzzy +#~ msgid "%s: option '-W %s' is ambiguous\n" +#~ msgstr "%s: Tá an rogha `-W %s' débhríoch\n" + +#, fuzzy +#~ msgid "%s: option '-W %s' doesn't allow an argument\n" +#~ msgstr "%s: ní cheadaítear argóint i ndiaidh na rogha `-W %s'\n" + +#, fuzzy +#~ msgid "%s: option '-W %s' requires an argument\n" +#~ msgstr "%s: ní foláir argóint don rogha `%s'\n" + #~ msgid "%s: illegal option -- %c\n" #~ msgstr "%s: rogha neamhcheadaithe -- %c\n" @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: GNU diffutils 3.2\n" "Report-Msgid-Bugs-To: bug-diffutils@gnu.org\n" -"POT-Creation-Date: 2016-08-20 22:22-0700\n" +"POT-Creation-Date: 2017-05-21 13:26-0700\n" "PO-Revision-Date: 2011-10-17 12:43+0100\n" "Last-Translator: Leandro Regueiro <leandro.regueiro@gmail.com>\n" "Language-Team: Galician <proxecto@trasno.net>\n" @@ -17,31 +17,32 @@ msgstr "" "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" -#: lib/argmatch.c:133 +#: lib/argmatch.c:134 #, fuzzy, c-format msgid "invalid argument %s for %s" msgstr "o argumento «%s» de %s%s é incorrecto" -#: lib/argmatch.c:134 +#: lib/argmatch.c:135 #, c-format msgid "ambiguous argument %s for %s" msgstr "" -#: lib/argmatch.c:153 +#: lib/argmatch.c:154 #, fuzzy msgid "Valid arguments are:" msgstr "o argumento «%s» de %s%s é incorrecto" -#: lib/c-stack.c:204 lib/c-stack.c:297 +#: lib/c-stack.c:203 lib/c-stack.c:296 msgid "program error" msgstr "erro do programa" -#: lib/c-stack.c:205 lib/c-stack.c:298 +#: lib/c-stack.c:204 lib/c-stack.c:297 msgid "stack overflow" msgstr "desbordamento da pila" -#: lib/error.c:191 +#: lib/error.c:195 msgid "Unknown system error" msgstr "Produciuse un erro descoñecido do sistema" @@ -145,66 +146,41 @@ msgstr "" msgid "weird file" msgstr "ficheiro estraño" -#: lib/getopt.c:575 lib/getopt.c:604 +#: lib/getopt.c:278 #, fuzzy, c-format -msgid "%s: option '%s' is ambiguous; possibilities:" -msgstr "'%s' está danado. A liña %d na sección Opción é incorrecta" +msgid "%s: option '%s%s' is ambiguous\n" +msgstr "%s: a opción «-W %s» é ambigua\n" -#: lib/getopt.c:619 +#: lib/getopt.c:284 #, fuzzy, c-format -msgid "%s: option '%s' is ambiguous\n" -msgstr "%s: a opción «-W %s» é ambigua\n" +msgid "%s: option '%s%s' is ambiguous; possibilities:" +msgstr "'%s' está danado. A liña %d na sección Opción é incorrecta" -#: lib/getopt.c:654 lib/getopt.c:658 -#, c-format -msgid "%s: option '--%s' doesn't allow an argument\n" -msgstr "%s: a opción «--%s» non permite un argumento\n" +#: lib/getopt.c:319 +#, fuzzy, c-format +msgid "%s: unrecognized option '%s%s'\n" +msgstr "%s: non se recoñece a opción «%c%s»\n" -#: lib/getopt.c:667 lib/getopt.c:672 -#, c-format -msgid "%s: option '%c%s' doesn't allow an argument\n" +#: lib/getopt.c:345 +#, fuzzy, c-format +msgid "%s: option '%s%s' doesn't allow an argument\n" msgstr "%s: a opción «%c%s» non permite un argumento\n" -#: lib/getopt.c:715 lib/getopt.c:734 -#, c-format -msgid "%s: option '--%s' requires an argument\n" +#: lib/getopt.c:360 +#, fuzzy, c-format +msgid "%s: option '%s%s' requires an argument\n" msgstr "%s: a opción «--%s» require un argumento\n" -#: lib/getopt.c:772 lib/getopt.c:775 -#, c-format -msgid "%s: unrecognized option '--%s'\n" -msgstr "%s: non se recoñece a opción «--%s»\n" - -#: lib/getopt.c:783 lib/getopt.c:786 -#, c-format -msgid "%s: unrecognized option '%c%s'\n" -msgstr "%s: non se recoñece a opción «%c%s»\n" - -#: lib/getopt.c:835 lib/getopt.c:838 +#: lib/getopt.c:621 #, c-format msgid "%s: invalid option -- '%c'\n" msgstr "%s: opción incorrecta -- «%c»\n" -#: lib/getopt.c:891 lib/getopt.c:908 lib/getopt.c:1118 lib/getopt.c:1136 +#: lib/getopt.c:636 lib/getopt.c:682 #, c-format msgid "%s: option requires an argument -- '%c'\n" msgstr "%s: a opción require un argumento -- «%c»\n" -#: lib/getopt.c:964 lib/getopt.c:980 -#, c-format -msgid "%s: option '-W %s' is ambiguous\n" -msgstr "%s: a opción «-W %s» é ambigua\n" - -#: lib/getopt.c:1004 lib/getopt.c:1022 -#, c-format -msgid "%s: option '-W %s' doesn't allow an argument\n" -msgstr "%s: a opción «-W %s» non permite un argumento\n" - -#: lib/getopt.c:1043 lib/getopt.c:1061 -#, c-format -msgid "%s: option '-W %s' requires an argument\n" -msgstr "%s: a opción «-W %s» require un argumento\n" - #. TRANSLATORS: #. Get translations for open and closing quotation marks. #. The message catalog should translate "`" to a left @@ -226,11 +202,11 @@ msgstr "%s: a opción «-W %s» require un argumento\n" #. If you don't know what to put here, please see #. <http://en.wikipedia.org/wiki/Quotation_marks_in_other_languages> #. and use glyphs suitable for your language. -#: lib/quotearg.c:347 +#: lib/quotearg.c:362 msgid "`" msgstr "«" -#: lib/quotearg.c:348 +#: lib/quotearg.c:363 msgid "'" msgstr "»" @@ -520,7 +496,7 @@ msgstr "%s páxina web: <http://www.gnu.org/software/%s/>\n" msgid "General help using GNU software: <http://www.gnu.org/gethelp/>\n" msgstr "Axuda xeral ao usar software GNU: <http://www.gnu.org/gethelp/>\n" -#: src/analyze.c:454 src/diff.c:1400 +#: src/analyze.c:454 src/diff.c:1401 #, c-format msgid "Files %s and %s differ\n" msgstr "Os ficheiros %s e %s son diferentes\n" @@ -530,21 +506,21 @@ msgstr "Os ficheiros %s e %s son diferentes\n" msgid "Binary files %s and %s differ\n" msgstr "Os ficheiros binarios %s e %s son diferentes\n" -#: src/analyze.c:697 src/diff3.c:1463 src/util.c:1255 +#: src/analyze.c:706 src/diff3.c:1465 src/util.c:1254 msgid "No newline at end of file" msgstr "Non hai un salto de liña na fin da liña" #. This is a proper name. See the gettext manual, section Names. -#: src/cmp.c:43 +#: src/cmp.c:44 msgid "Torbjorn Granlund" msgstr "Torbjorn Granlund" #. This is a proper name. See the gettext manual, section Names. -#: src/cmp.c:44 +#: src/cmp.c:45 msgid "David MacKenzie" msgstr "David MacKenzie" -#: src/cmp.c:118 src/diff.c:875 src/diff3.c:459 src/sdiff.c:158 +#: src/cmp.c:119 src/diff.c:877 src/diff3.c:462 src/sdiff.c:159 #, fuzzy, c-format msgid "Try '%s --help' for more information." msgstr "Probe «%s --help» para obter máis información." @@ -559,12 +535,12 @@ msgstr "valor de --ignore-initial «%s» non válido" msgid "options -l and -s are incompatible" msgstr "as opcións -l e -s son incompatÃbeis" -#: src/cmp.c:155 src/diff.c:884 src/diff3.c:467 src/sdiff.c:167 src/sdiff.c:315 -#: src/sdiff.c:322 src/sdiff.c:874 src/util.c:853 src/util.c:953 src/util.c:960 +#: src/cmp.c:155 src/diff.c:885 src/diff3.c:469 src/sdiff.c:167 src/sdiff.c:315 +#: src/sdiff.c:322 src/sdiff.c:874 src/util.c:852 src/util.c:952 src/util.c:959 msgid "write failed" msgstr "fallou a escritura" -#: src/cmp.c:157 src/diff.c:886 src/diff.c:1465 src/diff3.c:469 src/sdiff.c:169 +#: src/cmp.c:157 src/diff.c:887 src/diff.c:1466 src/diff3.c:471 src/sdiff.c:169 msgid "standard output" msgstr "saÃda estándar" @@ -627,7 +603,7 @@ msgid "" "at the beginning of each file (zero by default)." msgstr "N1 e N2 son o número de bytes a omitir en cada ficheiro." -#: src/cmp.c:185 src/diff.c:996 src/diff3.c:507 src/sdiff.c:210 +#: src/cmp.c:185 src/diff.c:997 src/diff3.c:509 src/sdiff.c:210 msgid "" "Mandatory arguments to long options are mandatory for short options too.\n" msgstr "" @@ -647,7 +623,7 @@ msgstr "" msgid "If a FILE is '-' or missing, read standard input." msgstr "Se un FICHEIRO é «-» ou non se indica, lese da entrada estándar." -#: src/cmp.c:195 src/diff.c:984 src/sdiff.c:220 +#: src/cmp.c:195 src/diff.c:985 src/sdiff.c:220 msgid "Exit status is 0 if inputs are the same, 1 if different, 2 if trouble." msgstr "" "O estado de saÃda é 0 se as entradas son iguais, 1 se son diferentes, 2 en " @@ -658,165 +634,180 @@ msgstr "" msgid "invalid --bytes value '%s'" msgstr "valor de --bytes «%s» non válido" -#: src/cmp.c:266 src/diff.c:793 src/diff3.c:353 src/sdiff.c:565 +#: src/cmp.c:266 src/diff.c:795 src/diff3.c:356 src/sdiff.c:565 #, fuzzy, c-format msgid "missing operand after '%s'" msgstr "falta un operando despois de «%s»" -#: src/cmp.c:278 src/diff.c:795 src/diff3.c:355 src/sdiff.c:567 +#: src/cmp.c:278 src/diff.c:797 src/diff3.c:358 src/sdiff.c:567 #, fuzzy, c-format msgid "extra operand '%s'" msgstr "operando «%s» sobrante" -#: src/cmp.c:494 +#: src/cmp.c:498 #, c-format msgid "%s %s differ: byte %s, line %s\n" msgstr "%s %s son diferentes: byte %s, liña %s\n" -#: src/cmp.c:510 +#: src/cmp.c:514 #, c-format msgid "%s %s differ: byte %s, line %s is %3o %s %3o %s\n" msgstr "%s %s son diferentes: byte %s, liña %s é %3o %s %3o %s\n" -#: src/cmp.c:562 -#, c-format -msgid "cmp: EOF on %s\n" +#: src/cmp.c:571 +#, fuzzy, c-format +msgid "cmp: EOF on %s which is empty\n" +msgstr "cmp: Fin de ficheiro en %s\n" + +#: src/cmp.c:585 +#, fuzzy, c-format +msgid "cmp: EOF on %s after byte %s, line %s\n" +msgstr "%s %s son diferentes: byte %s, liña %s\n" + +#: src/cmp.c:586 +#, fuzzy, c-format +msgid "cmp: EOF on %s after byte %s, in line %s\n" +msgstr "%s %s son diferentes: byte %s, liña %s\n" + +#: src/cmp.c:592 +#, fuzzy, c-format +msgid "cmp: EOF on %s after byte %s\n" msgstr "cmp: Fin de ficheiro en %s\n" #. This is a proper name. See the gettext manual, section Names. -#: src/diff.c:49 +#: src/diff.c:50 msgid "Paul Eggert" msgstr "Paul Eggert" #. This is a proper name. See the gettext manual, section Names. -#: src/diff.c:50 +#: src/diff.c:51 msgid "Mike Haertel" msgstr "Mike Haertel" #. This is a proper name. See the gettext manual, section Names. -#: src/diff.c:51 +#: src/diff.c:52 msgid "David Hayes" msgstr "David Hayes" #. This is a proper name. See the gettext manual, section Names. -#: src/diff.c:52 +#: src/diff.c:53 msgid "Richard Stallman" msgstr "Richard Stallman" #. This is a proper name. See the gettext manual, section Names. -#: src/diff.c:53 +#: src/diff.c:54 msgid "Len Tower" msgstr "Len Tower" -#: src/diff.c:351 +#: src/diff.c:353 #, fuzzy, c-format msgid "invalid context length '%s'" msgstr "lonxitude do contexto «%s» non válida" -#: src/diff.c:434 +#: src/diff.c:436 #, c-format msgid "pagination not supported on this host" msgstr "a paxinación non está admitida nesta máquina" -#: src/diff.c:449 src/diff3.c:335 +#: src/diff.c:451 src/diff3.c:336 #, c-format msgid "too many file label options" msgstr "demasiadas opcións de etiquetas de ficheiro" -#: src/diff.c:526 +#: src/diff.c:528 #, fuzzy, c-format msgid "invalid width '%s'" msgstr "largo «%s» non válido" -#: src/diff.c:530 +#: src/diff.c:532 msgid "conflicting width options" msgstr "opcións de largura conflitivas" -#: src/diff.c:555 +#: src/diff.c:557 #, fuzzy, c-format msgid "invalid horizon length '%s'" msgstr "lonxitude do horizonte «%s» non válida" -#: src/diff.c:611 +#: src/diff.c:613 #, fuzzy, c-format msgid "invalid tabsize '%s'" msgstr "tamaño de tabulación «%s» non válido" -#: src/diff.c:615 +#: src/diff.c:617 msgid "conflicting tabsize options" msgstr "opcións de tamaño de tabulación conflitivas" -#: src/diff.c:770 +#: src/diff.c:772 msgid "--from-file and --to-file both specified" msgstr "Especificáronse --from-file e --to-file ao mesmo tempo" -#: src/diff.c:890 +#: src/diff.c:891 #, fuzzy msgid " --normal output a normal diff (the default)" msgstr "Aparencia predefinida no modo normal" -#: src/diff.c:891 +#: src/diff.c:892 #, fuzzy msgid "-q, --brief report only when files differ" msgstr "-q --brief Producir unha saÃda só se os ficheiros teñen diferencias." -#: src/diff.c:892 +#: src/diff.c:893 #, fuzzy msgid "-s, --report-identical-files report when two files are the same" msgstr "" "-s --report-identical-files Informar cando dous ficheiros son o mesmo." -#: src/diff.c:893 +#: src/diff.c:894 msgid "" "-c, -C NUM, --context[=NUM] output NUM (default 3) lines of copied context" msgstr "" -#: src/diff.c:894 +#: src/diff.c:895 #, fuzzy msgid "" "-u, -U NUM, --unified[=NUM] output NUM (default 3) lines of unified context" msgstr "-w NÚM --width=NÚM Amosar como moito NÚM columnas (130 por omisión)." -#: src/diff.c:895 +#: src/diff.c:896 #, fuzzy msgid "-e, --ed output an ed script" msgstr "Gardar a saÃda da consola de Script-Fu" -#: src/diff.c:896 +#: src/diff.c:897 #, fuzzy msgid "-n, --rcs output an RCS format diff" msgstr "-n --rcs Producir un diff en formato RCS." -#: src/diff.c:897 +#: src/diff.c:898 msgid "-y, --side-by-side output in two columns" msgstr "" -#: src/diff.c:898 +#: src/diff.c:899 #, fuzzy msgid "" "-W, --width=NUM output at most NUM (default 130) print columns" msgstr "-w NÚM --width=NÚM Amosar como moito NÚM columnas (130 por omisión)." -#: src/diff.c:899 +#: src/diff.c:900 #, fuzzy msgid "" " --left-column output only the left column of common lines" msgstr "-l --left-column Amosar só a columna da esquerda nas liñas comúns." -#: src/diff.c:900 +#: src/diff.c:901 #, fuzzy msgid " --suppress-common-lines do not output common lines" msgstr "-s --suppress-common-lines Non amosar as liñas comúns." -#: src/diff.c:902 +#: src/diff.c:903 msgid "-p, --show-c-function show which C function each change is in" msgstr "" -#: src/diff.c:903 +#: src/diff.c:904 msgid "-F, --show-function-line=RE show the most recent line matching RE" msgstr "" -#: src/diff.c:904 +#: src/diff.c:905 #, fuzzy msgid "" " --label LABEL use LABEL instead of file name and timestamp\n" @@ -825,25 +816,25 @@ msgstr "" "--from-file=FICH1 Comparar FICH1 con todos os operandos. Pode ser " "directorio." -#: src/diff.c:907 +#: src/diff.c:908 #, fuzzy msgid "-t, --expand-tabs expand tabs to spaces in output" msgstr "-t --expand-tabs Expandir as tabulacións a espazos na saÃda." -#: src/diff.c:908 +#: src/diff.c:909 #, fuzzy msgid "-T, --initial-tab make tabs line up by prepending a tab" msgstr "" "-T --initial-tab Facer que as tabulacións queden aliñadas poñendo outra\n" " tabulación ao principio da liña." -#: src/diff.c:909 +#: src/diff.c:910 #, fuzzy msgid "" " --tabsize=NUM tab stops every NUM (default 8) print columns" msgstr "--tabsize=NÚM Tabulacións de NÚM columnas (8 por omisión)." -#: src/diff.c:910 +#: src/diff.c:911 #, fuzzy msgid "" " --suppress-blank-empty suppress space or tab before empty output lines" @@ -851,53 +842,53 @@ msgstr "" "--suppress-blank-empty Suprime espazos ou tabuladores antes dunha liña " "baleira." -#: src/diff.c:911 +#: src/diff.c:912 #, fuzzy msgid "-l, --paginate pass output through 'pr' to paginate it" msgstr "-l --paginate Pasar a saÃda por «pr» para paxinala." -#: src/diff.c:913 +#: src/diff.c:914 #, fuzzy msgid "" "-r, --recursive recursively compare any subdirectories found" msgstr "" "-r --recursive Comparar recursivamente os subdirectorios que se atopen." -#: src/diff.c:914 +#: src/diff.c:915 msgid " --no-dereference don't follow symbolic links" msgstr "" -#: src/diff.c:915 +#: src/diff.c:916 #, fuzzy msgid "-N, --new-file treat absent files as empty" msgstr "-N --new-file Tratar os ficheiros ausentes como baleiros." -#: src/diff.c:916 +#: src/diff.c:917 #, fuzzy msgid " --unidirectional-new-file treat absent first files as empty" msgstr "" "--unidirectional-new-file Tratar os ficheiros antigos ausentes como\r\n" "a baleiros." -#: src/diff.c:917 +#: src/diff.c:918 #, fuzzy msgid " --ignore-file-name-case ignore case when comparing file names" msgstr "" "--ignore-file-name-case Ignorar maiúsculas/minúsculas no nome do ficheiro." -#: src/diff.c:918 +#: src/diff.c:919 #, fuzzy msgid " --no-ignore-file-name-case consider case when comparing file names" msgstr "" "--no-ignore-file-name-case Ter en conta as maiúsculas/minúsculas\r\n" " ao comparar os nomes dos ficheiros." -#: src/diff.c:919 +#: src/diff.c:920 #, fuzzy msgid "-x, --exclude=PAT exclude files that match PAT" msgstr "-x MOD --exclude=MOD ExcluÃr os ficheiros que coinciden co MODelo." -#: src/diff.c:920 +#: src/diff.c:921 #, fuzzy msgid "" "-X, --exclude-from=FILE exclude files that match any pattern in FILE" @@ -905,14 +896,14 @@ msgstr "" "-X FICH --exclude-from=FICH ExcluÃr ficheiros que coinciden con algún\r\n" " modelo do FICHeiro." -#: src/diff.c:921 +#: src/diff.c:922 #, fuzzy msgid "" "-S, --starting-file=FILE start with FILE when comparing directories" msgstr "" "-S FICH --starting-file=FICH Comezar no FICHeiro ao comparar directorios." -#: src/diff.c:922 +#: src/diff.c:923 #, fuzzy msgid "" " --from-file=FILE1 compare FILE1 to all operands;\n" @@ -921,7 +912,7 @@ msgstr "" "--from-file=FICH1 Comparar FICH1 con todos os operandos. Pode ser " "directorio." -#: src/diff.c:924 +#: src/diff.c:925 #, fuzzy msgid "" " --to-file=FILE2 compare all operands to FILE2;\n" @@ -930,36 +921,36 @@ msgstr "" "--to-file=FICH2 Comparar todos os operandos con FICH2. Pode ser un " "directorio." -#: src/diff.c:927 +#: src/diff.c:928 #, fuzzy msgid "" "-i, --ignore-case ignore case differences in file contents" msgstr "" "-i --ignore-case Ignorar maiúsculas/minúsculas no contido do ficheiro." -#: src/diff.c:928 +#: src/diff.c:929 #, fuzzy msgid "-E, --ignore-tab-expansion ignore changes due to tab expansion" msgstr "" "-E --ignore-tab-expansion Ignorar os cambios pola expansión de tabulacións." -#: src/diff.c:929 +#: src/diff.c:930 #, fuzzy msgid "-Z, --ignore-trailing-space ignore white space at line end" msgstr "-w --ignore-all-space Ignorar todos os espazos en branco." -#: src/diff.c:930 +#: src/diff.c:931 #, fuzzy msgid "" "-b, --ignore-space-change ignore changes in the amount of white space" msgstr "-b --ignore-space-change Ignorar os cambios na cantidade de espazos." -#: src/diff.c:931 +#: src/diff.c:932 #, fuzzy msgid "-w, --ignore-all-space ignore all white space" msgstr "Todo visÃbel (ignorar patrón)" -#: src/diff.c:932 +#: src/diff.c:933 #, fuzzy msgid "" "-B, --ignore-blank-lines ignore changes where lines are all blank" @@ -967,7 +958,7 @@ msgstr "" "-B --ignore-blank-lines Ignorar os cambios que teñan todas as liñas en " "branco" -#: src/diff.c:933 +#: src/diff.c:934 #, fuzzy msgid "-I, --ignore-matching-lines=RE ignore changes where all lines match RE" msgstr "" @@ -975,31 +966,31 @@ msgstr "" "todas as liñas\r\n" " conteñan EXPR-REG." -#: src/diff.c:935 +#: src/diff.c:936 #, fuzzy msgid "-a, --text treat all files as text" msgstr "-a --text Tratar todos os ficheiros como texto" -#: src/diff.c:936 +#: src/diff.c:937 #, fuzzy msgid " --strip-trailing-cr strip trailing carriage return on input" msgstr "" "--strip-trailing-cr Eliminar os retornos de carro á fin das liñas de " "entrada." -#: src/diff.c:938 +#: src/diff.c:939 #, fuzzy msgid " --binary read and write data in binary mode" msgstr "--binary Ler e escribir datos en modo binario." -#: src/diff.c:941 +#: src/diff.c:942 #, fuzzy msgid "" "-D, --ifdef=NAME output merged file with '#ifdef NAME' diffs" msgstr "" "-D NOME -ifdef=NOME Amosar o ficheiro mesturado con diffs «#ifdef NOME»." -#: src/diff.c:942 +#: src/diff.c:943 #, fuzzy msgid " --GTYPE-group-format=GFMT format GTYPE input groups with GFMT" msgstr "" @@ -1007,14 +998,14 @@ msgstr "" "\r\n" " con GFMT." -#: src/diff.c:943 +#: src/diff.c:944 #, fuzzy msgid " --line-format=LFMT format all input lines with LFMT" msgstr "" "--line-format=LFMT Similar, mais formatar todas as liñas de entrada con " "LFMT." -#: src/diff.c:944 +#: src/diff.c:945 #, fuzzy msgid " --LTYPE-line-format=LFMT format LTYPE input lines with LFMT" msgstr "" @@ -1022,20 +1013,20 @@ msgstr "" "\r\n" " con LFMT." -#: src/diff.c:945 +#: src/diff.c:946 msgid "" " These format options provide fine-grained control over the output\n" " of diff, generalizing -D/--ifdef." msgstr "" -#: src/diff.c:947 +#: src/diff.c:948 #, fuzzy msgid " LTYPE is 'old', 'new', or 'unchanged'. GTYPE is LTYPE or 'changed'." msgstr "" " LTYPE é «old» (antigo), «new» (novo) ou «unchanged» (sen cambios).\r\n" " GTYPE é LTYPE ou «changed» (con cambios)." -#: src/diff.c:948 +#: src/diff.c:949 #, fuzzy msgid "" " GFMT (only) may contain:\n" @@ -1065,7 +1056,7 @@ msgstr "" " E F-1\n" " M L+1" -#: src/diff.c:960 +#: src/diff.c:961 #, fuzzy msgid "" " LFMT (only) may contain:\n" @@ -1078,7 +1069,7 @@ msgstr "" " %l contido da liña, excluÃndo os saltos de liña finais\n" " %[-][ANCHO][.[PREC]]{doxX}n especif. estilo printf do número da liña" -#: src/diff.c:964 +#: src/diff.c:965 #, fuzzy msgid "" " Both GFMT and LFMT may contain:\n" @@ -1092,17 +1083,17 @@ msgstr "" " %c«C» o carácter C\n" " %c«\\OOO» o carácter de código octal OOO" -#: src/diff.c:970 +#: src/diff.c:971 #, fuzzy msgid "-d, --minimal try hard to find a smaller set of changes" msgstr "-d --minimal Procurar atopar o conxunto de cambios máis pequeno." -#: src/diff.c:971 +#: src/diff.c:972 #, fuzzy msgid " --horizon-lines=NUM keep NUM lines of the common prefix and suffix" msgstr "--horizon-lines=NUM Manter NUM liñas do prefixo e sufixo comúns." -#: src/diff.c:972 +#: src/diff.c:973 #, fuzzy msgid "" " --speed-large-files assume large files and many scattered small changes" @@ -1110,140 +1101,133 @@ msgstr "" "-H --speed-large-files Asumir ficheiros longos e pequenos cambios " "dispersos." -#: src/diff.c:973 -msgid "" -" --color[=WHEN] colorize the output; WHEN can be 'never', 'always'," -msgstr "" - #: src/diff.c:974 -#, fuzzy -msgid " or 'auto' (the default)" -msgstr "Aparencia predefinida no modo normal" - -#: src/diff.c:975 msgid "" -" --palette=PALETTE specify the colors to use when --color is active" +" --color[=WHEN] colorize the output; WHEN can be 'never', " +"'always',\n" +" or 'auto' (the default)" msgstr "" #: src/diff.c:976 msgid "" -" PALETTE is a colon-separated list terminfo " -"capabilities" +" --palette=PALETTE the colors to use when --color is active; PALETTE " +"is\n" +" a colon-separated list of terminfo capabilities" msgstr "" -#: src/diff.c:978 +#: src/diff.c:979 msgid " --help display this help and exit" msgstr "" -#: src/diff.c:979 +#: src/diff.c:980 #, fuzzy msgid "-v, --version output version information and exit" msgstr "Mostrar información da versión e saÃr" -#: src/diff.c:981 +#: src/diff.c:982 #, fuzzy msgid "FILES are 'FILE1 FILE2' or 'DIR1 DIR2' or 'DIR FILE' or 'FILE DIR'." msgstr "" "Os FICHEIROS son «FICH1 FICH2», «DIR1 DIR2», «DIR FICH...» ou «FICH... DIR»." -#: src/diff.c:982 +#: src/diff.c:983 #, fuzzy msgid "" "If --from-file or --to-file is given, there are no restrictions on FILE(s)." msgstr "" "Se se indica --from-file ou --to-file, non hai restricións nos FICHEIROS." -#: src/diff.c:983 src/diff3.c:526 src/sdiff.c:219 +#: src/diff.c:984 src/diff3.c:528 src/sdiff.c:219 #, fuzzy msgid "If a FILE is '-', read standard input." msgstr "Se un FICHEIRO é «-», lese da entrada estándar." -#: src/diff.c:993 +#: src/diff.c:994 #, c-format msgid "Usage: %s [OPTION]... FILES\n" msgstr "Uso: %s [OPCIÓN]... FICHEIROS\n" -#: src/diff.c:994 +#: src/diff.c:995 #, fuzzy msgid "Compare FILES line by line." msgstr "Comparar os ficheiros liña a liña." -#: src/diff.c:1028 +#: src/diff.c:1029 #, fuzzy, c-format msgid "conflicting %s option value '%s'" msgstr "valor «%1$s» da opción %2$s conflitivo" -#: src/diff.c:1041 +#: src/diff.c:1042 #, c-format msgid "conflicting output style options" msgstr "opcións de estilo da saÃda conflitivas" -#: src/diff.c:1057 +#: src/diff.c:1058 #, fuzzy, c-format msgid "invalid color '%s'" -msgstr "largo «%s» non válido" +msgstr "lonxitude do contexto «%s» non válida" -#: src/diff.c:1113 src/diff.c:1323 +#: src/diff.c:1114 src/diff.c:1324 #, c-format msgid "Only in %s: %s\n" msgstr "Só en %s: %s\n" -#: src/diff.c:1247 +#: src/diff.c:1248 #, fuzzy msgid "cannot compare '-' to a directory" msgstr "non se pode comparar «-» cun directorio" -#: src/diff.c:1282 +#: src/diff.c:1283 msgid "-D option not supported with directories" msgstr "A opción -D non está admitida con directorios" -#: src/diff.c:1291 +#: src/diff.c:1292 #, c-format msgid "Common subdirectories: %s and %s\n" msgstr "Subdirectorios comúns: %s e %s\n" -#: src/diff.c:1333 src/diff.c:1383 +#: src/diff.c:1334 src/diff.c:1384 #, c-format msgid "File %s is a %s while file %s is a %s\n" msgstr "O ficheiro %s é un %s mentres que o ficheiro %s é un %s\n" -#: src/diff.c:1369 +#: src/diff.c:1370 #, fuzzy, c-format msgid "Symbolic links %s and %s differ\n" msgstr "Os ficheiros %s e %s son diferentes\n" -#: src/diff.c:1456 +#: src/diff.c:1457 #, c-format msgid "Files %s and %s are identical\n" msgstr "Os ficheiros %s e %s son idénticos\n" #. This is a proper name. See the gettext manual, section Names. -#: src/diff3.c:41 +#: src/diff3.c:42 msgid "Randy Smith" msgstr "Randy Smith" -#: src/diff3.c:348 +#: src/diff3.c:351 #, c-format msgid "incompatible options" msgstr "opcións incompatÃbeis" -#: src/diff3.c:388 +#: src/diff3.c:391 #, fuzzy msgid "'-' specified for more than one input file" msgstr "Especificouse «-» para máis dun ficheiro de entrada" -#: src/diff3.c:439 src/diff3.c:1288 src/diff3.c:1692 src/diff3.c:1747 +#: src/diff3.c:442 src/diff3.c:1290 src/diff3.c:1693 src/diff3.c:1748 #: src/sdiff.c:307 src/sdiff.c:844 src/sdiff.c:855 msgid "read failed" msgstr "fallou a lectura" -#: src/diff3.c:473 +#: src/diff3.c:475 #, fuzzy msgid "-A, --show-all output all changes, bracketing conflicts" msgstr "" "-a --show-all Amosar todos os cambios, cos conflitos entre parénteses." -#: src/diff3.c:475 +#: src/diff3.c:477 #, fuzzy msgid "" "-e, --ed output ed script incorporating changes\n" @@ -1251,91 +1235,91 @@ msgid "" msgstr "" "-e --ed Produce cambios sen mesturar de FICH-ANTIGO a TEU-FICH en MEU-FICH." -#: src/diff3.c:477 +#: src/diff3.c:479 #, fuzzy msgid "-E, --show-overlap like -e, but bracket conflicts" msgstr "" "-E --show-overlap Amosar cambios sen mesturar cos conflitos entre " "parénteses." -#: src/diff3.c:478 +#: src/diff3.c:480 #, fuzzy msgid "" "-3, --easy-only like -e, but incorporate only nonoverlapping " "changes" msgstr "-3 --easy-only Amosar cambios non sobrepostos e non mesturados." -#: src/diff3.c:479 +#: src/diff3.c:481 #, fuzzy msgid "" "-x, --overlap-only like -e, but incorporate only overlapping changes" msgstr "-x --overlap-only Amosar los cambios que se superpoñen." -#: src/diff3.c:480 +#: src/diff3.c:482 msgid "-X like -x, but bracket conflicts" msgstr "" -#: src/diff3.c:481 +#: src/diff3.c:483 #, fuzzy msgid "-i append 'w' and 'q' commands to ed scripts" msgstr "-i Engadir as ordes «w» e «q» aos scripts en ed." -#: src/diff3.c:483 +#: src/diff3.c:485 msgid "" "-m, --merge output actual merged file, according to\n" " -A if no other options are given" msgstr "" -#: src/diff3.c:486 +#: src/diff3.c:488 #, fuzzy msgid "-a, --text treat all files as text" msgstr "-a --text Tratar todos os ficheiros como texto" -#: src/diff3.c:487 +#: src/diff3.c:489 #, fuzzy msgid " --strip-trailing-cr strip trailing carriage return on input" msgstr "" "--strip-trailing-cr Eliminar os retornos de carro á fin das liñas de " "entrada." -#: src/diff3.c:488 +#: src/diff3.c:490 #, fuzzy msgid "-T, --initial-tab make tabs line up by prepending a tab" msgstr "" "-T --initial-tab Facer que as tabulacións queden aliñadas poñendo outra\n" " tabulación ao principio da liña." -#: src/diff3.c:489 +#: src/diff3.c:491 #, fuzzy msgid " --diff-program=PROGRAM use PROGRAM to compare files" msgstr "" "--diff-program=PROGRAMA Empregar o PROGRAMA para comparar os ficheiros." -#: src/diff3.c:490 +#: src/diff3.c:492 msgid "" "-L, --label=LABEL use LABEL instead of file name\n" " (can be repeated up to three times)" msgstr "" -#: src/diff3.c:493 +#: src/diff3.c:495 msgid " --help display this help and exit" msgstr "" -#: src/diff3.c:494 +#: src/diff3.c:496 #, fuzzy msgid "-v, --version output version information and exit" msgstr "Mostrar información da versión e saÃr" -#: src/diff3.c:503 +#: src/diff3.c:505 #, c-format msgid "Usage: %s [OPTION]... MYFILE OLDFILE YOURFILE\n" msgstr "Uso: %s [OPCIÓN]... MEU-FICH ANTIGO-FICH TEU-FICH\n" -#: src/diff3.c:505 +#: src/diff3.c:507 msgid "Compare three files line by line." msgstr "Comparar tres ficheiros liña a liña." -#: src/diff3.c:515 +#: src/diff3.c:517 msgid "" "\n" "The default output format is a somewhat human-readable representation of\n" @@ -1349,47 +1333,47 @@ msgid "" "robust than using ed.\n" msgstr "" -#: src/diff3.c:527 +#: src/diff3.c:529 msgid "Exit status is 0 if successful, 1 if conflicts, 2 if trouble." msgstr "" "O estado de saÃda é 0 se é correcto, 1 se hai conflitos, 2 en caso de " "problema." -#: src/diff3.c:720 +#: src/diff3.c:722 msgid "internal error: screwup in format of diff blocks" msgstr "erro interno: fallo no formato dos bloques diff" -#: src/diff3.c:1015 +#: src/diff3.c:1017 #, c-format msgid "%s: diff failed: " msgstr "%s: diff fallou: " -#: src/diff3.c:1037 +#: src/diff3.c:1039 msgid "internal error: invalid diff type in process_diff" msgstr "erro interno: tipo de diff non válido en process_diff" -#: src/diff3.c:1062 +#: src/diff3.c:1064 msgid "invalid diff format; invalid change separator" msgstr "formato de diff non válido; separador de cambios non válido" -#: src/diff3.c:1298 +#: src/diff3.c:1300 msgid "invalid diff format; incomplete last line" msgstr "formato de diff non válido: última liña incompleta" -#: src/diff3.c:1322 src/sdiff.c:275 src/util.c:970 +#: src/diff3.c:1324 src/sdiff.c:275 src/util.c:969 #, fuzzy, c-format msgid "subsidiary program '%s' could not be invoked" msgstr "non foi posÃbel invocar o programa subsidiario «%s»" -#: src/diff3.c:1347 +#: src/diff3.c:1349 msgid "invalid diff format; incorrect leading line chars" msgstr "formato de diff non válido: caracteres a principio de liña incorrectos" -#: src/diff3.c:1420 +#: src/diff3.c:1422 msgid "internal error: invalid diff type passed to output" msgstr "erro interno_ tipo de diff non válido pasado á saÃda" -#: src/diff3.c:1694 src/diff3.c:1751 +#: src/diff3.c:1695 src/diff3.c:1752 msgid "input file shrank" msgstr "o ficheiro de entrada minguou" @@ -1404,7 +1388,7 @@ msgid "%s: recursive directory loop" msgstr "%s: bucle de directorio recursivo" #. This is a proper name. See the gettext manual, section Names. -#: src/sdiff.c:42 +#: src/sdiff.c:43 msgid "Thomas Lord" msgstr "Thomas Lord" @@ -1570,16 +1554,35 @@ msgstr "" "v: Inclúe liñas comúns de xeito detallado.\n" "q: SaÃr.\n" -#: src/util.c:663 +#: src/util.c:662 #, fuzzy, c-format msgid "unrecognized prefix: %s" msgstr "%s: non se recoñece a opción «--%s»\n" -#: src/util.c:693 +#: src/util.c:692 #, c-format msgid "unparsable value for --palette" msgstr "" +#, fuzzy +#~ msgid " or 'auto' (the default)" +#~ msgstr "Aparencia predefinida no modo normal" + +#~ msgid "%s: option '--%s' doesn't allow an argument\n" +#~ msgstr "%s: a opción «--%s» non permite un argumento\n" + +#~ msgid "%s: unrecognized option '--%s'\n" +#~ msgstr "%s: non se recoñece a opción «--%s»\n" + +#~ msgid "%s: option '-W %s' is ambiguous\n" +#~ msgstr "%s: a opción «-W %s» é ambigua\n" + +#~ msgid "%s: option '-W %s' doesn't allow an argument\n" +#~ msgstr "%s: a opción «-W %s» non permite un argumento\n" + +#~ msgid "%s: option '-W %s' requires an argument\n" +#~ msgstr "%s: a opción «-W %s» require un argumento\n" + #~ msgid "-i SKIP1:SKIP2 --ignore-initial=SKIP1:SKIP2" #~ msgstr "-i N1:N2 --ignore-initial=N1:N2" @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: diffutils 2.8.3\n" "Report-Msgid-Bugs-To: bug-diffutils@gnu.org\n" -"POT-Creation-Date: 2016-08-20 22:22-0700\n" +"POT-Creation-Date: 2017-05-21 13:26-0700\n" "PO-Revision-Date: 2002-06-17 13:03+0300\n" "Last-Translator: Eli Zaretskii <eliz@gnu.org>\n" "Language-Team: Hebrew <eliz@gnu.org>\n" @@ -14,31 +14,31 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=ISO-8859-8\n" "Content-Transfer-Encoding: 8bit\n" +"X-Bugs: Report translation errors to the Language-Team address.\n" -#: lib/argmatch.c:133 -#, fuzzy, c-format +#: lib/argmatch.c:134 +#, c-format msgid "invalid argument %s for %s" -msgstr "--bytes ïééôàî øåáò `%s' éåâù êøò" +msgstr "" -#: lib/argmatch.c:134 +#: lib/argmatch.c:135 #, c-format msgid "ambiguous argument %s for %s" msgstr "" -#: lib/argmatch.c:153 -#, fuzzy +#: lib/argmatch.c:154 msgid "Valid arguments are:" -msgstr "--bytes ïééôàî øåáò `%s' éåâù êøò" +msgstr "" -#: lib/c-stack.c:204 lib/c-stack.c:297 +#: lib/c-stack.c:203 lib/c-stack.c:296 msgid "program error" msgstr "úéðëúá äøåîç äì÷ú" -#: lib/c-stack.c:205 lib/c-stack.c:298 +#: lib/c-stack.c:204 lib/c-stack.c:297 msgid "stack overflow" msgstr "úéðñçî úùéìâ" -#: lib/error.c:191 +#: lib/error.c:195 msgid "Unknown system error" msgstr "ääåæî-éúìá äì÷ú" @@ -142,66 +142,41 @@ msgstr "" msgid "weird file" msgstr "øæåî õáå÷" -#: lib/getopt.c:575 lib/getopt.c:604 +#: lib/getopt.c:278 #, fuzzy, c-format -msgid "%s: option '%s' is ambiguous; possibilities:" +msgid "%s: option '%s%s' is ambiguous\n" msgstr "%s úéðëú øåáò éòîùî-ãç åðéà `%s' ïééôàî\n" -#: lib/getopt.c:619 +#: lib/getopt.c:284 #, fuzzy, c-format -msgid "%s: option '%s' is ambiguous\n" -msgstr "%s úéðëú øåáò éòîùî-ãç åðéà `-W %s' ïééôàî\n" +msgid "%s: option '%s%s' is ambiguous; possibilities:" +msgstr "%s úéðëú øåáò éòîùî-ãç åðéà `%s' ïééôàî\n" -#: lib/getopt.c:654 lib/getopt.c:658 +#: lib/getopt.c:319 #, fuzzy, c-format -msgid "%s: option '--%s' doesn't allow an argument\n" -msgstr "%s úéðëú øåáò èðîåâøà ìá÷î åðéà `--%s' ïééôàî\n" +msgid "%s: unrecognized option '%s%s'\n" +msgstr "%s úéðëú øåáò `%c%s' ääåæî-éúìá ïééôàî\n" -#: lib/getopt.c:667 lib/getopt.c:672 +#: lib/getopt.c:345 #, fuzzy, c-format -msgid "%s: option '%c%s' doesn't allow an argument\n" +msgid "%s: option '%s%s' doesn't allow an argument\n" msgstr "%s úéðëú øåáò èðîåâøà ìá÷î åðéà `%c%s' ïééôàî\n" -#: lib/getopt.c:715 lib/getopt.c:734 +#: lib/getopt.c:360 #, fuzzy, c-format -msgid "%s: option '--%s' requires an argument\n" +msgid "%s: option '%s%s' requires an argument\n" msgstr "%s úéðëú øåáò èðîåâøà áééçî `%s' ïééôàî\n" -#: lib/getopt.c:772 lib/getopt.c:775 -#, fuzzy, c-format -msgid "%s: unrecognized option '--%s'\n" -msgstr "%s úéðëú øåáò `--%s' ääåæî-éúìá ïééôàî\n" - -#: lib/getopt.c:783 lib/getopt.c:786 -#, fuzzy, c-format -msgid "%s: unrecognized option '%c%s'\n" -msgstr "%s úéðëú øåáò `%c%s' ääåæî-éúìá ïééôàî\n" - -#: lib/getopt.c:835 lib/getopt.c:838 +#: lib/getopt.c:621 #, fuzzy, c-format msgid "%s: invalid option -- '%c'\n" msgstr "%s úéðëú øåáò éåâù ïééôàî -- %c\n" -#: lib/getopt.c:891 lib/getopt.c:908 lib/getopt.c:1118 lib/getopt.c:1136 +#: lib/getopt.c:636 lib/getopt.c:682 #, fuzzy, c-format msgid "%s: option requires an argument -- '%c'\n" msgstr "%s: èðîåâøà áééçî ïééôàî -- %c\n" -#: lib/getopt.c:964 lib/getopt.c:980 -#, fuzzy, c-format -msgid "%s: option '-W %s' is ambiguous\n" -msgstr "%s úéðëú øåáò éòîùî-ãç åðéà `-W %s' ïééôàî\n" - -#: lib/getopt.c:1004 lib/getopt.c:1022 -#, fuzzy, c-format -msgid "%s: option '-W %s' doesn't allow an argument\n" -msgstr "%s úéðëú øåáò èðîåâøà ìá÷î åðéà `-W %s' ïééôàî\n" - -#: lib/getopt.c:1043 lib/getopt.c:1061 -#, fuzzy, c-format -msgid "%s: option '-W %s' requires an argument\n" -msgstr "%s úéðëú øåáò èðîåâøà áééçî `%s' ïééôàî\n" - #. TRANSLATORS: #. Get translations for open and closing quotation marks. #. The message catalog should translate "`" to a left @@ -223,11 +198,11 @@ msgstr "%s úéðëú øåáò èðîåâøà áééçî `%s' ïééôàî\n" #. If you don't know what to put here, please see #. <http://en.wikipedia.org/wiki/Quotation_marks_in_other_languages> #. and use glyphs suitable for your language. -#: lib/quotearg.c:347 +#: lib/quotearg.c:362 msgid "`" msgstr "" -#: lib/quotearg.c:348 +#: lib/quotearg.c:363 msgid "'" msgstr "" @@ -493,7 +468,7 @@ msgstr "" msgid "General help using GNU software: <http://www.gnu.org/gethelp/>\n" msgstr "" -#: src/analyze.c:454 src/diff.c:1400 +#: src/analyze.c:454 src/diff.c:1401 #, c-format msgid "Files %s and %s differ\n" msgstr "äæî äæ íéðåù `%s'-å `%s' íéöá÷ä\n" @@ -503,21 +478,21 @@ msgstr "äæî äæ íéðåù `%s'-å `%s' íéöá÷ä\n" msgid "Binary files %s and %s differ\n" msgstr "äæî äæ íéðåù `%s'-å `%s' íééøðéá íéöá÷\n" -#: src/analyze.c:697 src/diff3.c:1463 src/util.c:1255 +#: src/analyze.c:706 src/diff3.c:1465 src/util.c:1254 msgid "No newline at end of file" msgstr "õáå÷ä óåñá äùãç-äøåù åú øñç" #. This is a proper name. See the gettext manual, section Names. -#: src/cmp.c:43 +#: src/cmp.c:44 msgid "Torbjorn Granlund" msgstr "" #. This is a proper name. See the gettext manual, section Names. -#: src/cmp.c:44 +#: src/cmp.c:45 msgid "David MacKenzie" msgstr "" -#: src/cmp.c:118 src/diff.c:875 src/diff3.c:459 src/sdiff.c:158 +#: src/cmp.c:119 src/diff.c:877 src/diff3.c:462 src/sdiff.c:159 #, fuzzy, c-format msgid "Try '%s --help' for more information." msgstr ".øúåé áø òãéî úâöäì `%s --help' ùé÷äì äñð" @@ -532,12 +507,12 @@ msgstr "--ignore-initial ïééôàî øåáò `%s' éåâù êøò" msgid "options -l and -s are incompatible" msgstr "äæ úà äæ íéøúåñ -s-å -l íéðééôàîä" -#: src/cmp.c:155 src/diff.c:884 src/diff3.c:467 src/sdiff.c:167 src/sdiff.c:315 -#: src/sdiff.c:322 src/sdiff.c:874 src/util.c:853 src/util.c:953 src/util.c:960 +#: src/cmp.c:155 src/diff.c:885 src/diff3.c:469 src/sdiff.c:167 src/sdiff.c:315 +#: src/sdiff.c:322 src/sdiff.c:874 src/util.c:852 src/util.c:952 src/util.c:959 msgid "write failed" msgstr "äáéúëá äì÷ú" -#: src/cmp.c:157 src/diff.c:886 src/diff.c:1465 src/diff3.c:469 src/sdiff.c:169 +#: src/cmp.c:157 src/diff.c:887 src/diff.c:1466 src/diff3.c:471 src/sdiff.c:169 msgid "standard output" msgstr "éð÷ú èìô õåøòì" @@ -598,7 +573,7 @@ msgid "" "at the beginning of each file (zero by default)." msgstr " .íéöá÷äî ãçà ìëá âìãì ùé íäéìò íéúáä éøôñî íä SKIP2-å SKIP1" -#: src/cmp.c:185 src/diff.c:996 src/diff3.c:507 src/sdiff.c:210 +#: src/cmp.c:185 src/diff.c:997 src/diff3.c:509 src/sdiff.c:210 msgid "" "Mandatory arguments to long options are mandatory for short options too.\n" msgstr "" @@ -618,7 +593,7 @@ msgstr "" msgid "If a FILE is '-' or missing, read standard input." msgstr " .éð÷ú èì÷ õåøòî àø÷ ,ïééåöî åðéà åà `-' åðéä FILE íà" -#: src/cmp.c:195 src/diff.c:984 src/sdiff.c:220 +#: src/cmp.c:195 src/diff.c:985 src/sdiff.c:220 msgid "Exit status is 0 if inputs are the same, 1 if different, 2 if trouble." msgstr "" @@ -627,251 +602,264 @@ msgstr "" msgid "invalid --bytes value '%s'" msgstr "--bytes ïééôàî øåáò `%s' éåâù êøò" -#: src/cmp.c:266 src/diff.c:793 src/diff3.c:353 src/sdiff.c:565 +#: src/cmp.c:266 src/diff.c:795 src/diff3.c:356 src/sdiff.c:565 #, fuzzy, c-format msgid "missing operand after '%s'" msgstr "`%s' éøçà øñç èðîåâøà" -#: src/cmp.c:278 src/diff.c:795 src/diff3.c:355 src/sdiff.c:567 +#: src/cmp.c:278 src/diff.c:797 src/diff3.c:358 src/sdiff.c:567 #, fuzzy, c-format msgid "extra operand '%s'" msgstr "`%s' éøçà øúåéî èðîåâøà" -#: src/cmp.c:494 +#: src/cmp.c:498 #, c-format msgid "%s %s differ: byte %s, line %s\n" msgstr "%s-å %s íéöá÷ä ïéá %s úéá ,%s äøåùî ìçä éðåù\n" -#: src/cmp.c:510 +#: src/cmp.c:514 #, c-format msgid "%s %s differ: byte %s, line %s is %3o %s %3o %s\n" msgstr "%s-å %s íéöá÷ä ïéá %s úéá ,%s äøåùî ìçä %3o %s %3o %s éðåù\n" -#: src/cmp.c:562 -#, c-format -msgid "cmp: EOF on %s\n" +#: src/cmp.c:571 +#, fuzzy, c-format +msgid "cmp: EOF on %s which is empty\n" +msgstr "cmp: %s õáå÷ óåñ\n" + +#: src/cmp.c:585 +#, fuzzy, c-format +msgid "cmp: EOF on %s after byte %s, line %s\n" +msgstr "%s-å %s íéöá÷ä ïéá %s úéá ,%s äøåùî ìçä éðåù\n" + +#: src/cmp.c:586 +#, fuzzy, c-format +msgid "cmp: EOF on %s after byte %s, in line %s\n" +msgstr "%s-å %s íéöá÷ä ïéá %s úéá ,%s äøåùî ìçä éðåù\n" + +#: src/cmp.c:592 +#, fuzzy, c-format +msgid "cmp: EOF on %s after byte %s\n" msgstr "cmp: %s õáå÷ óåñ\n" #. This is a proper name. See the gettext manual, section Names. -#: src/diff.c:49 +#: src/diff.c:50 msgid "Paul Eggert" msgstr "" #. This is a proper name. See the gettext manual, section Names. -#: src/diff.c:50 +#: src/diff.c:51 msgid "Mike Haertel" msgstr "" #. This is a proper name. See the gettext manual, section Names. -#: src/diff.c:51 +#: src/diff.c:52 msgid "David Hayes" msgstr "" #. This is a proper name. See the gettext manual, section Names. -#: src/diff.c:52 +#: src/diff.c:53 msgid "Richard Stallman" msgstr "" #. This is a proper name. See the gettext manual, section Names. -#: src/diff.c:53 +#: src/diff.c:54 msgid "Len Tower" msgstr "" -#: src/diff.c:351 +#: src/diff.c:353 #, fuzzy, c-format msgid "invalid context length '%s'" msgstr "`%s' éåâù øù÷ä êøåà" -#: src/diff.c:434 +#: src/diff.c:436 #, c-format msgid "pagination not supported on this host" msgstr "åæ úëøòîá èìôä ãåîéòá äëéîú ïéà" -#: src/diff.c:449 src/diff3.c:335 +#: src/diff.c:451 src/diff3.c:336 #, c-format msgid "too many file label options" msgstr "íéöá÷ úéååú øåáò -L éðééôàî éãî øúåé" -#: src/diff.c:526 +#: src/diff.c:528 #, fuzzy, c-format msgid "invalid width '%s'" msgstr "`%s' éåâù äøåù áçåø" -#: src/diff.c:530 +#: src/diff.c:532 msgid "conflicting width options" msgstr "íéøúåñ äøåù áçåø éðééôàî" -#: src/diff.c:555 +#: src/diff.c:557 #, fuzzy, c-format msgid "invalid horizon length '%s'" msgstr "--horizon-lines ïééôàîá `%s' éåâù úåøåù øôñî" -#: src/diff.c:611 +#: src/diff.c:613 #, fuzzy, c-format msgid "invalid tabsize '%s'" msgstr "`%s' éåâù Tab áçåø" -#: src/diff.c:615 +#: src/diff.c:617 msgid "conflicting tabsize options" msgstr "íéøúåñ Tab áçåø éðééôàî" -#: src/diff.c:770 +#: src/diff.c:772 msgid "--from-file and --to-file both specified" msgstr "--to-file ïäå --from-file ïä úðééö" -#: src/diff.c:890 +#: src/diff.c:891 #, fuzzy msgid " --normal output a normal diff (the default)" msgstr " .ìéâø èîøåôá íééåðéù ÷ôä --normal" -#: src/diff.c:891 +#: src/diff.c:892 #, fuzzy msgid "-q, --brief report only when files differ" msgstr " .íéðåù íéöá÷ä íà øåîà ÷ø -q --brief" -#: src/diff.c:892 +#: src/diff.c:893 #, fuzzy msgid "-s, --report-identical-files report when two files are the same" msgstr "" " .íéäæ íéöá÷ ìò çååã -s --report-identical-files" -#: src/diff.c:893 +#: src/diff.c:894 msgid "" "-c, -C NUM, --context[=NUM] output NUM (default 3) lines of copied context" msgstr "" -#: src/diff.c:894 +#: src/diff.c:895 #, fuzzy msgid "" "-u, -U NUM, --unified[=NUM] output NUM (default 3) lines of unified context" msgstr ".äøåùì (130 ç\"îøá) íéååú NUM øúåéä ìëì âöä -w NUM --width=NUM" -#: src/diff.c:895 +#: src/diff.c:896 #, fuzzy msgid "-e, --ed output an ed script" msgstr " .ed êøåò øåáò úåàøåä úîéùø ÷ôä -e --ed" -#: src/diff.c:896 +#: src/diff.c:897 #, fuzzy msgid "-n, --rcs output an RCS format diff" msgstr " .RCS èîøåôá íééåðéù ÷ôä -n --rcs" -#: src/diff.c:897 +#: src/diff.c:898 msgid "-y, --side-by-side output in two columns" msgstr "" -#: src/diff.c:898 +#: src/diff.c:899 #, fuzzy msgid "" "-W, --width=NUM output at most NUM (default 130) print columns" msgstr ".äøåùì (130 ç\"îøá) íéååú NUM øúåéä ìëì âöä -w NUM --width=NUM" -#: src/diff.c:899 +#: src/diff.c:900 #, fuzzy msgid "" " --left-column output only the left column of common lines" msgstr " .úéìàîùä úà ÷ø âöä ,úåäæ úåøåùä íà -l --left-column" -#: src/diff.c:900 +#: src/diff.c:901 #, fuzzy msgid " --suppress-common-lines do not output common lines" msgstr "" " .úåäæ úåøåù ììë âéöú ìà -s --suppress-common-lines" -#: src/diff.c:902 +#: src/diff.c:903 msgid "-p, --show-c-function show which C function each change is in" msgstr "" -#: src/diff.c:903 +#: src/diff.c:904 msgid "-F, --show-function-line=RE show the most recent line matching RE" msgstr "" -#: src/diff.c:904 -#, fuzzy +#: src/diff.c:905 msgid "" " --label LABEL use LABEL instead of file name and timestamp\n" " (can be repeated)" msgstr "" -".äé÷éú úåéäì ìåëé FILE1 .íéèðîåâøàä øàù ìëì FILE1 äååùä --from-file=FILE1" -#: src/diff.c:907 +#: src/diff.c:908 #, fuzzy msgid "-t, --expand-tabs expand tabs to spaces in output" msgstr " .èìôá íéçååøì TAB éååú êåôä -t --expand-tabs" -#: src/diff.c:908 +#: src/diff.c:909 #, fuzzy msgid "-T, --initial-tab make tabs line up by prepending a tab" msgstr " .äøåùä éðôì TAB \"ò íé-TAB øùé -T --initial-tab" -#: src/diff.c:909 +#: src/diff.c:910 #, fuzzy msgid "" " --tabsize=NUM tab stops every NUM (default 8) print columns" msgstr " .(8 ç\"îøá) úåãåîò NUM ìë Tab --tabsize=NUM" -#: src/diff.c:910 +#: src/diff.c:911 msgid "" " --suppress-blank-empty suppress space or tab before empty output lines" msgstr "" -#: src/diff.c:911 +#: src/diff.c:912 #, fuzzy msgid "-l, --paginate pass output through 'pr' to paginate it" msgstr " .ãåîéò íùì `pr' êøã èìô áúð -l --paginate" -#: src/diff.c:913 +#: src/diff.c:914 #, fuzzy msgid "" "-r, --recursive recursively compare any subdirectories found" msgstr " .éáéñøå÷ø ïôåàá úåé÷éú-úú äååùä -r --recursive" -#: src/diff.c:914 +#: src/diff.c:915 msgid " --no-dereference don't follow symbolic links" msgstr "" -#: src/diff.c:915 +#: src/diff.c:916 #, fuzzy msgid "-N, --new-file treat absent files as empty" msgstr " .íé÷éø åéä åìéàë íéøñç íéöá÷á ìôè -N --new-file" -#: src/diff.c:916 +#: src/diff.c:917 #, fuzzy msgid " --unidirectional-new-file treat absent first files as empty" msgstr "" " .íé÷éø åéä åìéàë íéøñç íéðåùàø íéöá÷á ìôè --unidirectional-new-file" -#: src/diff.c:917 +#: src/diff.c:918 #, fuzzy msgid " --ignore-file-name-case ignore case when comparing file names" msgstr ".íéöá÷ä úåîùá úåðè÷î úåìåãâ úåéúåà ìéãáú ìà --ignore-file-name-case" -#: src/diff.c:918 +#: src/diff.c:919 #, fuzzy msgid " --no-ignore-file-name-case consider case when comparing file names" msgstr "" " .íéöá÷ä úåîùá úåðè÷î úåìåãâ úåéúåà ìéãáú --no-ignore-file-name-case" -#: src/diff.c:919 +#: src/diff.c:920 #, fuzzy msgid "-x, --exclude=PAT exclude files that match PAT" msgstr " .PAT úéðáúì íéîéàúî íäéúåîùù íéöá÷ ìò âìã -x PAT --exclude=PAT" -#: src/diff.c:920 +#: src/diff.c:921 #, fuzzy msgid "" "-X, --exclude-from=FILE exclude files that match any pattern in FILE" msgstr "" "FILE-á úåéðáúì íéîéàúî íäéúåîùù íéöá÷ ìò âìã -X FILE --exclude-from=FILE" -#: src/diff.c:921 +#: src/diff.c:922 #, fuzzy msgid "" "-S, --starting-file=FILE start with FILE when comparing directories" msgstr "" " .FILE õáå÷á úåé÷éú úàååùä ìçúä -S FILE --starting-file=FILE" -#: src/diff.c:922 +#: src/diff.c:923 #, fuzzy msgid "" " --from-file=FILE1 compare FILE1 to all operands;\n" @@ -879,7 +867,7 @@ msgid "" msgstr "" ".äé÷éú úåéäì ìåëé FILE1 .íéèðîåâøàä øàù ìëì FILE1 äååùä --from-file=FILE1" -#: src/diff.c:924 +#: src/diff.c:925 #, fuzzy msgid "" " --to-file=FILE2 compare all operands to FILE2;\n" @@ -887,96 +875,96 @@ msgid "" msgstr "" " .äé÷éú úåéäì ìåëé FILE2 .FILE2-ì íéèðîåâøàä ìë äååùä --to-file=FILE2" -#: src/diff.c:927 +#: src/diff.c:928 #, fuzzy msgid "" "-i, --ignore-case ignore case differences in file contents" msgstr ".íéöá÷ä ïëåúá úåðè÷î úåìåãâ úåéúåà ìéãáú ìà -i --ignore-case" -#: src/diff.c:928 +#: src/diff.c:929 #, fuzzy msgid "-E, --ignore-tab-expansion ignore changes due to tab expansion" msgstr "" " .íéçååøì TAB ïéá íéìãáäî íìòúä -E --ignore-tab-expansion" -#: src/diff.c:929 +#: src/diff.c:930 #, fuzzy msgid "-Z, --ignore-trailing-space ignore white space at line end" msgstr " .íéçååøä ìëî íìòúä -w --ignore-all-space" -#: src/diff.c:930 +#: src/diff.c:931 #, fuzzy msgid "" "-b, --ignore-space-change ignore changes in the amount of white space" msgstr " .íéçååø úåîëá íéìãáäî íìòúä -b --ignore-space-change" -#: src/diff.c:931 +#: src/diff.c:932 #, fuzzy msgid "-w, --ignore-all-space ignore all white space" msgstr " .íéçååøä ìëî íìòúä -w --ignore-all-space" -#: src/diff.c:932 +#: src/diff.c:933 #, fuzzy msgid "" "-B, --ignore-blank-lines ignore changes where lines are all blank" msgstr " .úå÷éø íäéúåøåùù íééåðéùî íìòúä -B --ignore-blank-lines" -#: src/diff.c:933 +#: src/diff.c:934 #, fuzzy msgid "-I, --ignore-matching-lines=RE ignore changes where all lines match RE" msgstr "" ".RE úéðáúì úåîéàúî íäéúåøåùù íééåðéùî íìòúä -I RE --ignore-matching-lines=RE" -#: src/diff.c:935 +#: src/diff.c:936 #, fuzzy msgid "-a, --text treat all files as text" msgstr " .èñ÷è éöá÷áë íéöá÷ä ìëá ìôè -a --text" -#: src/diff.c:936 +#: src/diff.c:937 #, fuzzy msgid " --strip-trailing-cr strip trailing carriage return on input" msgstr " .èì÷ úøåù ìë óåñî CR éååú ÷ìñ --strip-trailing-cr" -#: src/diff.c:938 +#: src/diff.c:939 #, fuzzy msgid " --binary read and write data in binary mode" msgstr " .éøàðéá ïôåàá áåúëå àø÷ --binary" -#: src/diff.c:941 +#: src/diff.c:942 #, fuzzy msgid "" "-D, --ifdef=NAME output merged file with '#ifdef NAME' diffs" msgstr "`#ifdef NAME'-á íééåðéù ãøôä ,áìåùî õáå÷ ÷ôä -D NAME --ifdef=NAME" -#: src/diff.c:942 +#: src/diff.c:943 #, fuzzy msgid " --GTYPE-group-format=GFMT format GTYPE input groups with GFMT" msgstr "" "GFMT úøæòá GTYPE âåñî èì÷ úåöåá÷ èîøô êà ,ì\"ðë --GTYPE-group-format=GFMT" -#: src/diff.c:943 +#: src/diff.c:944 #, fuzzy msgid " --line-format=LFMT format all input lines with LFMT" msgstr " .LFMT úøæòá úåøåù èîøô êà ,ì\"ðë --line-format=LFMT" -#: src/diff.c:944 +#: src/diff.c:945 #, fuzzy msgid " --LTYPE-line-format=LFMT format LTYPE input lines with LFMT" msgstr "" ".LFMT úøæòá LTYPE âåñî èì÷ úåøåù èîøô êà ,ì\"ðë --LTYPE-group-format=LFMT" -#: src/diff.c:945 +#: src/diff.c:946 msgid "" " These format options provide fine-grained control over the output\n" " of diff, generalizing -D/--ifdef." msgstr "" -#: src/diff.c:947 +#: src/diff.c:948 #, fuzzy msgid " LTYPE is 'old', 'new', or 'unchanged'. GTYPE is LTYPE or 'changed'." msgstr " .`changed' åà LTYPE åîë GTYPE .`unchanged' åà `new' ,`old' àåä LTYPE" -#: src/diff.c:948 +#: src/diff.c:949 #, fuzzy msgid "" " GFMT (only) may contain:\n" @@ -1004,7 +992,7 @@ msgstr "" " F-1 E\n" " M+1 M" -#: src/diff.c:960 +#: src/diff.c:961 #, fuzzy msgid "" " LFMT (only) may contain:\n" @@ -1017,7 +1005,7 @@ msgstr "" " äøåùä óåñ åú èòîì äøåù ïëåú %l\n" "èì÷ úøåù øåáò printf ïåðâñá úæåøçî %[-][WIDTH][.[PREC]]{doxX}n" -#: src/diff.c:964 +#: src/diff.c:965 #, fuzzy msgid "" " Both GFMT and LFMT may contain:\n" @@ -1031,245 +1019,238 @@ msgstr "" " C ããåá åú %c'C'\n" " OOO éìè÷åà ãå÷ ìòá åú %c'\\OOO'" -#: src/diff.c:970 +#: src/diff.c:971 #, fuzzy msgid "-d, --minimal try hard to find a smaller set of changes" msgstr " .íééåðéùä úöåá÷ úà ïéè÷äì ìãúùä -d --minimal" -#: src/diff.c:971 +#: src/diff.c:972 #, fuzzy msgid " --horizon-lines=NUM keep NUM lines of the common prefix and suffix" msgstr "" ".íéöá÷ä íåéñå äìéçúá úåôúåùî úåøåù NUM øàùä --horizon-lines=NUM" -#: src/diff.c:972 +#: src/diff.c:973 #, fuzzy msgid "" " --speed-large-files assume large files and many scattered small changes" msgstr " .íé÷çåøîå íéðè÷ íééåðéùå íéìåãâ íéöá÷ çðä -H --speed-large-files" -#: src/diff.c:973 -msgid "" -" --color[=WHEN] colorize the output; WHEN can be 'never', 'always'," -msgstr "" - #: src/diff.c:974 -#, fuzzy -msgid " or 'auto' (the default)" -msgstr " .ìéâø èîøåôá íééåðéù ÷ôä --normal" - -#: src/diff.c:975 msgid "" -" --palette=PALETTE specify the colors to use when --color is active" +" --color[=WHEN] colorize the output; WHEN can be 'never', " +"'always',\n" +" or 'auto' (the default)" msgstr "" #: src/diff.c:976 msgid "" -" PALETTE is a colon-separated list terminfo " -"capabilities" +" --palette=PALETTE the colors to use when --color is active; PALETTE " +"is\n" +" a colon-separated list of terminfo capabilities" msgstr "" -#: src/diff.c:978 +#: src/diff.c:979 msgid " --help display this help and exit" msgstr "" -#: src/diff.c:979 +#: src/diff.c:980 #, fuzzy msgid "-v, --version output version information and exit" msgstr " .úéðëúä úñøéâ úà âöä -v --version" -#: src/diff.c:981 +#: src/diff.c:982 #, fuzzy msgid "FILES are 'FILE1 FILE2' or 'DIR1 DIR2' or 'DIR FILE' or 'FILE DIR'." msgstr "" ".`FILE... DIR' åà `DIR FILE...' åà `DIR1 DIR2' åà `FILE1 FILE2' íä FILES" -#: src/diff.c:982 +#: src/diff.c:983 #, fuzzy msgid "" "If --from-file or --to-file is given, there are no restrictions on FILE(s)." msgstr "" " .FILES ìò úåìáâî ïéà éæà ,--to-file åà --from-file ïééôàî ïåúð íà" -#: src/diff.c:983 src/diff3.c:526 src/sdiff.c:219 +#: src/diff.c:984 src/diff3.c:528 src/sdiff.c:219 #, fuzzy msgid "If a FILE is '-', read standard input." msgstr "" " .éð÷úä èì÷ä õøòî àø÷ ,`-' àåä FILE íà" -#: src/diff.c:993 +#: src/diff.c:994 #, c-format msgid "Usage: %s [OPTION]... FILES\n" msgstr "%s [OPTION]... FILES :ùåîéù ïôåà\n" -#: src/diff.c:994 +#: src/diff.c:995 #, fuzzy msgid "Compare FILES line by line." msgstr ".äøåù äøåù íéöá÷ éðù äååùä" -#: src/diff.c:1028 +#: src/diff.c:1029 #, fuzzy, c-format msgid "conflicting %s option value '%s'" msgstr "%s ïééôàî ìù íãå÷ êøò øúåñ `%s' êøò" -#: src/diff.c:1041 +#: src/diff.c:1042 #, c-format msgid "conflicting output style options" msgstr "èìô ïåðâñ ìù íéøúåñ íéðééôàî" -#: src/diff.c:1057 +#: src/diff.c:1058 #, fuzzy, c-format msgid "invalid color '%s'" -msgstr "`%s' éåâù äøåù áçåø" +msgstr "`%s' éåâù øù÷ä êøåà" -#: src/diff.c:1113 src/diff.c:1323 +#: src/diff.c:1114 src/diff.c:1324 #, c-format msgid "Only in %s: %s\n" msgstr "%s-á ÷ø àöîð %s\n" -#: src/diff.c:1247 +#: src/diff.c:1248 #, fuzzy msgid "cannot compare '-' to a directory" msgstr "äé÷éúì `-' úååùäì úåøùôà ïéà" -#: src/diff.c:1282 +#: src/diff.c:1283 msgid "-D option not supported with directories" msgstr "úåé÷éú øåáò -D ïééôàîá äëéîú ïéà" -#: src/diff.c:1291 +#: src/diff.c:1292 #, c-format msgid "Common subdirectories: %s and %s\n" msgstr "%s-å %s :úåäæ úåé÷éú-úú\n" -#: src/diff.c:1333 src/diff.c:1383 +#: src/diff.c:1334 src/diff.c:1384 #, c-format msgid "File %s is a %s while file %s is a %s\n" msgstr "%s %s-ì %s %s úååùäì ïúéð àì\n" -#: src/diff.c:1369 +#: src/diff.c:1370 #, fuzzy, c-format msgid "Symbolic links %s and %s differ\n" msgstr "äæî äæ íéðåù `%s'-å `%s' íéöá÷ä\n" -#: src/diff.c:1456 +#: src/diff.c:1457 #, c-format msgid "Files %s and %s are identical\n" msgstr "íéäæ íðéä %s-å %s íéöá÷ä\n" #. This is a proper name. See the gettext manual, section Names. -#: src/diff3.c:41 +#: src/diff3.c:42 #, fuzzy msgid "Randy Smith" msgstr ".Randy Smith é\"ò áúëð" -#: src/diff3.c:348 +#: src/diff3.c:351 #, c-format msgid "incompatible options" msgstr "íéøúåñ íéðééôàî" -#: src/diff3.c:388 +#: src/diff3.c:391 #, fuzzy msgid "'-' specified for more than one input file" msgstr "ãçà èì÷ õáå÷î øúåé øåáò `-' úðééö" -#: src/diff3.c:439 src/diff3.c:1288 src/diff3.c:1692 src/diff3.c:1747 +#: src/diff3.c:442 src/diff3.c:1290 src/diff3.c:1693 src/diff3.c:1748 #: src/sdiff.c:307 src/sdiff.c:844 src/sdiff.c:855 msgid "read failed" msgstr "äàéø÷á äì÷ú" -#: src/diff3.c:473 +#: src/diff3.c:475 #, fuzzy msgid "-A, --show-all output all changes, bracketing conflicts" msgstr " .íéè÷éìôðå÷ ïîñ ,íééåðéùä ìë úà âöä -A --show-all" -#: src/diff3.c:475 +#: src/diff3.c:477 #, fuzzy msgid "" "-e, --ed output ed script incorporating changes\n" " from OLDFILE to YOURFILE into MYFILE" msgstr "MYFILE êåú ìà YOURFILE-ì OLDFILE-î âåæéî àìì íééåðéù -e --ed" -#: src/diff3.c:477 +#: src/diff3.c:479 #, fuzzy msgid "-E, --show-overlap like -e, but bracket conflicts" msgstr "" " .íéè÷éìôðå÷ ïîñ ,âåæéî àìì íééåðéù âöä -E --show-overlap" -#: src/diff3.c:478 +#: src/diff3.c:480 #, fuzzy msgid "" "-3, --easy-only like -e, but incorporate only nonoverlapping " "changes" msgstr " .âåæéî àììå íéôôåç íðéàù íééåðéù âöä -3 --easy-only" -#: src/diff3.c:479 +#: src/diff3.c:481 #, fuzzy msgid "" "-x, --overlap-only like -e, but incorporate only overlapping changes" msgstr "" " .íéôôåç íééåðéù âöä -x --overlap-only" -#: src/diff3.c:480 +#: src/diff3.c:482 msgid "-X like -x, but bracket conflicts" msgstr "" -#: src/diff3.c:481 +#: src/diff3.c:483 #, fuzzy msgid "-i append 'w' and 'q' commands to ed scripts" msgstr " .ed úåãå÷ô íåéñá `q'-å `w' úåãå÷ô áåúë -i" -#: src/diff3.c:483 +#: src/diff3.c:485 msgid "" "-m, --merge output actual merged file, according to\n" " -A if no other options are given" msgstr "" -#: src/diff3.c:486 +#: src/diff3.c:488 #, fuzzy msgid "-a, --text treat all files as text" msgstr " .èñ÷è éöá÷áë íéöá÷ä ìëá ìôè -a --text" -#: src/diff3.c:487 +#: src/diff3.c:489 #, fuzzy msgid " --strip-trailing-cr strip trailing carriage return on input" msgstr " .èì÷ úøåù ìë óåñî CR éååú ÷ìñ --strip-trailing-cr" -#: src/diff3.c:488 +#: src/diff3.c:490 #, fuzzy msgid "-T, --initial-tab make tabs line up by prepending a tab" msgstr " .äøåùä éðôì TAB \"ò íé-TAB øùé -T --initial-tab" -#: src/diff3.c:489 +#: src/diff3.c:491 #, fuzzy msgid " --diff-program=PROGRAM use PROGRAM to compare files" msgstr "" " .íéöá÷ úàåùäì PROGRAM úéðëúá ùîúùä --diff-program=PROGRAM" -#: src/diff3.c:490 +#: src/diff3.c:492 msgid "" "-L, --label=LABEL use LABEL instead of file name\n" " (can be repeated up to three times)" msgstr "" -#: src/diff3.c:493 +#: src/diff3.c:495 msgid " --help display this help and exit" msgstr "" -#: src/diff3.c:494 +#: src/diff3.c:496 #, fuzzy msgid "-v, --version output version information and exit" msgstr " .úéðëúä úñøéâ úà âöä -v --version" -#: src/diff3.c:503 +#: src/diff3.c:505 #, c-format msgid "Usage: %s [OPTION]... MYFILE OLDFILE YOURFILE\n" msgstr "%s [OPTION]... MYFILE OLDFILE YOURFILE :ùåîéù ïôåà\n" -#: src/diff3.c:505 +#: src/diff3.c:507 msgid "Compare three files line by line." msgstr ".úéáì úéá íéöá÷ äùìù äååùä" -#: src/diff3.c:515 +#: src/diff3.c:517 msgid "" "\n" "The default output format is a somewhat human-readable representation of\n" @@ -1283,45 +1264,45 @@ msgid "" "robust than using ed.\n" msgstr "" -#: src/diff3.c:527 +#: src/diff3.c:529 msgid "Exit status is 0 if successful, 1 if conflicts, 2 if trouble." msgstr "" -#: src/diff3.c:720 +#: src/diff3.c:722 msgid "internal error: screwup in format of diff blocks" msgstr "diff éòè÷ èîøåôá äçéøî :úéîéðô äðëú úàéâù" -#: src/diff3.c:1015 +#: src/diff3.c:1017 #, c-format msgid "%s: diff failed: " msgstr "%s é\"ò diff úìòôäá äì÷ú :" -#: src/diff3.c:1037 +#: src/diff3.c:1039 msgid "internal error: invalid diff type in process_diff" msgstr "process_diff úééö÷ðåôá éåðéù ìù éåâù âåñ :úéîéðô äðëú úàéâù" -#: src/diff3.c:1062 +#: src/diff3.c:1064 msgid "invalid diff format; invalid change separator" msgstr "äéåâù íééåðéù úãøôä úæåøçî :éåðéù ìù éåâù èîøåô" -#: src/diff3.c:1298 +#: src/diff3.c:1300 msgid "invalid diff format; incomplete last line" msgstr "äîìù äðéà äðåøçà äøåù :éåðéù ìù éåâù èîøåô" -#: src/diff3.c:1322 src/sdiff.c:275 src/util.c:970 +#: src/diff3.c:1324 src/sdiff.c:275 src/util.c:969 #, fuzzy, c-format msgid "subsidiary program '%s' could not be invoked" msgstr "äàöîð àì `%s' úéðëú-úú" -#: src/diff3.c:1347 +#: src/diff3.c:1349 msgid "invalid diff format; incorrect leading line chars" msgstr "äøåù úìéçúá íééåâù íéååú :éåðéù ìù éåâù èîøåô" -#: src/diff3.c:1420 +#: src/diff3.c:1422 msgid "internal error: invalid diff type passed to output" msgstr "èìô éëøöì éåðéù ìù éåâù âåñ :úéîéðô äðëú úàéâù" -#: src/diff3.c:1694 src/diff3.c:1751 +#: src/diff3.c:1695 src/diff3.c:1752 msgid "input file shrank" msgstr "÷îèöä èì÷ õáå÷" @@ -1336,7 +1317,7 @@ msgid "%s: recursive directory loop" msgstr "" #. This is a proper name. See the gettext manual, section Names. -#: src/sdiff.c:42 +#: src/sdiff.c:43 #, fuzzy msgid "Thomas Lord" msgstr ".Thomas Lord é\"ò áúëð" @@ -1494,16 +1475,36 @@ msgstr "" "v -- ïúâöä êåú úåôúåùî úåøåù ÷úòä\n" "q -- äàéöé\n" -#: src/util.c:663 +#: src/util.c:662 #, fuzzy, c-format msgid "unrecognized prefix: %s" msgstr "%s úéðëú øåáò `--%s' ääåæî-éúìá ïééôàî\n" -#: src/util.c:693 +#: src/util.c:692 #, c-format msgid "unparsable value for --palette" msgstr "" +#, fuzzy +#~ msgid "%s: option '--%s' doesn't allow an argument\n" +#~ msgstr "%s úéðëú øåáò èðîåâøà ìá÷î åðéà `--%s' ïééôàî\n" + +#, fuzzy +#~ msgid "%s: unrecognized option '--%s'\n" +#~ msgstr "%s úéðëú øåáò `--%s' ääåæî-éúìá ïééôàî\n" + +#, fuzzy +#~ msgid "%s: option '-W %s' is ambiguous\n" +#~ msgstr "%s úéðëú øåáò éòîùî-ãç åðéà `-W %s' ïééôàî\n" + +#, fuzzy +#~ msgid "%s: option '-W %s' doesn't allow an argument\n" +#~ msgstr "%s úéðëú øåáò èðîåâøà ìá÷î åðéà `-W %s' ïééôàî\n" + +#, fuzzy +#~ msgid "%s: option '-W %s' requires an argument\n" +#~ msgstr "%s úéðëú øåáò èðîåâøà áééçî `%s' ïééôàî\n" + #~ msgid "%s: illegal option -- %c\n" #~ msgstr "%s: é÷åç-éúìá ïééôàî -- %c\n" @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: GNU diffutils 3.3-pre1\n" "Report-Msgid-Bugs-To: bug-diffutils@gnu.org\n" -"POT-Creation-Date: 2016-08-20 22:22-0700\n" +"POT-Creation-Date: 2017-05-21 13:26-0700\n" "PO-Revision-Date: 2012-12-21 00:37+0100\n" "Last-Translator: Tomislav Krznar <tomislav.krznar@gmail.com>\n" "Language-Team: Croatian <lokalizacija@linux.hr>\n" @@ -15,34 +15,35 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"X-Bugs: Report translation errors to the Language-Team address.\n" "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n" "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" "X-Generator: Gtranslator 2.91.5\n" -#: lib/argmatch.c:133 +#: lib/argmatch.c:134 #, fuzzy, c-format msgid "invalid argument %s for %s" msgstr "neispravan %s%s argument „%sâ€" -#: lib/argmatch.c:134 +#: lib/argmatch.c:135 #, c-format msgid "ambiguous argument %s for %s" msgstr "" -#: lib/argmatch.c:153 +#: lib/argmatch.c:154 #, fuzzy msgid "Valid arguments are:" msgstr "neispravan %s%s argument „%sâ€" -#: lib/c-stack.c:204 lib/c-stack.c:297 +#: lib/c-stack.c:203 lib/c-stack.c:296 msgid "program error" msgstr "programska greÅ¡ka" -#: lib/c-stack.c:205 lib/c-stack.c:298 +#: lib/c-stack.c:204 lib/c-stack.c:297 msgid "stack overflow" msgstr "preljev stoga" -#: lib/error.c:191 +#: lib/error.c:195 msgid "Unknown system error" msgstr "Nepoznata greÅ¡ka sustava" @@ -146,66 +147,41 @@ msgstr "" msgid "weird file" msgstr "Äudna datoteka" -#: lib/getopt.c:575 lib/getopt.c:604 -#, c-format -msgid "%s: option '%s' is ambiguous; possibilities:" -msgstr "%s: opcija „%s†je viÅ¡eznaÄna, mogućnosti:" - -#: lib/getopt.c:619 +#: lib/getopt.c:278 #, fuzzy, c-format -msgid "%s: option '%s' is ambiguous\n" +msgid "%s: option '%s%s' is ambiguous\n" msgstr "%s: opcija „-W %s†je viÅ¡eznaÄna\n" -#: lib/getopt.c:654 lib/getopt.c:658 -#, c-format -msgid "%s: option '--%s' doesn't allow an argument\n" -msgstr "%s: opcija „--%s†ne dozvoljava argument\n" +#: lib/getopt.c:284 +#, fuzzy, c-format +msgid "%s: option '%s%s' is ambiguous; possibilities:" +msgstr "%s: opcija „%s†je viÅ¡eznaÄna, mogućnosti:" -#: lib/getopt.c:667 lib/getopt.c:672 -#, c-format -msgid "%s: option '%c%s' doesn't allow an argument\n" +#: lib/getopt.c:319 +#, fuzzy, c-format +msgid "%s: unrecognized option '%s%s'\n" +msgstr "%s: neprepoznata opcija „%c%sâ€\n" + +#: lib/getopt.c:345 +#, fuzzy, c-format +msgid "%s: option '%s%s' doesn't allow an argument\n" msgstr "%s: opcija „%c%s†ne dozvoljava argument\n" -#: lib/getopt.c:715 lib/getopt.c:734 -#, c-format -msgid "%s: option '--%s' requires an argument\n" +#: lib/getopt.c:360 +#, fuzzy, c-format +msgid "%s: option '%s%s' requires an argument\n" msgstr "%s: opcija „--%s†zahtijeva argument\n" -#: lib/getopt.c:772 lib/getopt.c:775 -#, c-format -msgid "%s: unrecognized option '--%s'\n" -msgstr "%s: neprepoznata opcija „--%sâ€\n" - -#: lib/getopt.c:783 lib/getopt.c:786 -#, c-format -msgid "%s: unrecognized option '%c%s'\n" -msgstr "%s: neprepoznata opcija „%c%sâ€\n" - -#: lib/getopt.c:835 lib/getopt.c:838 +#: lib/getopt.c:621 #, c-format msgid "%s: invalid option -- '%c'\n" msgstr "%s: neispravna opcija -- „%câ€\n" -#: lib/getopt.c:891 lib/getopt.c:908 lib/getopt.c:1118 lib/getopt.c:1136 +#: lib/getopt.c:636 lib/getopt.c:682 #, c-format msgid "%s: option requires an argument -- '%c'\n" msgstr "%s: opcija zahtijeva argument -- „%câ€\n" -#: lib/getopt.c:964 lib/getopt.c:980 -#, c-format -msgid "%s: option '-W %s' is ambiguous\n" -msgstr "%s: opcija „-W %s†je viÅ¡eznaÄna\n" - -#: lib/getopt.c:1004 lib/getopt.c:1022 -#, c-format -msgid "%s: option '-W %s' doesn't allow an argument\n" -msgstr "%s: opcija „-W %s†ne dozvoljava argument\n" - -#: lib/getopt.c:1043 lib/getopt.c:1061 -#, c-format -msgid "%s: option '-W %s' requires an argument\n" -msgstr "%s: opcija „-W %s†zahtijeva argument\n" - #. TRANSLATORS: #. Get translations for open and closing quotation marks. #. The message catalog should translate "`" to a left @@ -227,11 +203,11 @@ msgstr "%s: opcija „-W %s†zahtijeva argument\n" #. If you don't know what to put here, please see #. <http://en.wikipedia.org/wiki/Quotation_marks_in_other_languages> #. and use glyphs suitable for your language. -#: lib/quotearg.c:347 +#: lib/quotearg.c:362 msgid "`" msgstr "„" -#: lib/quotearg.c:348 +#: lib/quotearg.c:363 msgid "'" msgstr "â€" @@ -523,7 +499,7 @@ msgid "General help using GNU software: <http://www.gnu.org/gethelp/>\n" msgstr "" "Općenita pomoć za koriÅ¡tenje GNU softvera: <http://www.gnu.org/gethelp/>\n" -#: src/analyze.c:454 src/diff.c:1400 +#: src/analyze.c:454 src/diff.c:1401 #, c-format msgid "Files %s and %s differ\n" msgstr "Datoteke %s i %s se razlikuju\n" @@ -533,21 +509,21 @@ msgstr "Datoteke %s i %s se razlikuju\n" msgid "Binary files %s and %s differ\n" msgstr "Binarne datoteke %s i %s se razlikuju\n" -#: src/analyze.c:697 src/diff3.c:1463 src/util.c:1255 +#: src/analyze.c:706 src/diff3.c:1465 src/util.c:1254 msgid "No newline at end of file" msgstr "Nema novog retka na kraju datoteke" #. This is a proper name. See the gettext manual, section Names. -#: src/cmp.c:43 +#: src/cmp.c:44 msgid "Torbjorn Granlund" msgstr "Torbjorn Granlund" #. This is a proper name. See the gettext manual, section Names. -#: src/cmp.c:44 +#: src/cmp.c:45 msgid "David MacKenzie" msgstr "David MacKenzie" -#: src/cmp.c:118 src/diff.c:875 src/diff3.c:459 src/sdiff.c:158 +#: src/cmp.c:119 src/diff.c:877 src/diff3.c:462 src/sdiff.c:159 #, c-format msgid "Try '%s --help' for more information." msgstr "PokuÅ¡ajte „%s --help†za viÅ¡e informacija." @@ -562,12 +538,12 @@ msgstr "neispravna --ignore-initial vrijednost „%sâ€" msgid "options -l and -s are incompatible" msgstr "opcije -l i -s nisu kompatibilne" -#: src/cmp.c:155 src/diff.c:884 src/diff3.c:467 src/sdiff.c:167 src/sdiff.c:315 -#: src/sdiff.c:322 src/sdiff.c:874 src/util.c:853 src/util.c:953 src/util.c:960 +#: src/cmp.c:155 src/diff.c:885 src/diff3.c:469 src/sdiff.c:167 src/sdiff.c:315 +#: src/sdiff.c:322 src/sdiff.c:874 src/util.c:852 src/util.c:952 src/util.c:959 msgid "write failed" msgstr "pisanje nije uspjelo" -#: src/cmp.c:157 src/diff.c:886 src/diff.c:1465 src/diff3.c:469 src/sdiff.c:169 +#: src/cmp.c:157 src/diff.c:887 src/diff.c:1466 src/diff3.c:471 src/sdiff.c:169 msgid "standard output" msgstr "standardni izlaz" @@ -626,7 +602,7 @@ msgid "" "at the beginning of each file (zero by default)." msgstr "" -#: src/cmp.c:185 src/diff.c:996 src/diff3.c:507 src/sdiff.c:210 +#: src/cmp.c:185 src/diff.c:997 src/diff3.c:509 src/sdiff.c:210 msgid "" "Mandatory arguments to long options are mandatory for short options too.\n" msgstr "" @@ -643,7 +619,7 @@ msgstr "" msgid "If a FILE is '-' or missing, read standard input." msgstr "Ako DATOTEKA nije navedena ili je „-â€, Äitaj standardni ulaz." -#: src/cmp.c:195 src/diff.c:984 src/sdiff.c:220 +#: src/cmp.c:195 src/diff.c:985 src/sdiff.c:220 msgid "Exit status is 0 if inputs are the same, 1 if different, 2 if trouble." msgstr "" "Izlazno stanje je 0 ako su ulazi jednaki, 1 ako se razlikuju, 2 u sluÄaju " @@ -654,310 +630,325 @@ msgstr "" msgid "invalid --bytes value '%s'" msgstr "neispravna --bytes vrijednost „%sâ€" -#: src/cmp.c:266 src/diff.c:793 src/diff3.c:353 src/sdiff.c:565 +#: src/cmp.c:266 src/diff.c:795 src/diff3.c:356 src/sdiff.c:565 #, c-format msgid "missing operand after '%s'" msgstr "nedostaje operand nakon „%sâ€" -#: src/cmp.c:278 src/diff.c:795 src/diff3.c:355 src/sdiff.c:567 +#: src/cmp.c:278 src/diff.c:797 src/diff3.c:358 src/sdiff.c:567 #, c-format msgid "extra operand '%s'" msgstr "operand viÅ¡ka „%sâ€" -#: src/cmp.c:494 +#: src/cmp.c:498 #, c-format msgid "%s %s differ: byte %s, line %s\n" msgstr "" -#: src/cmp.c:510 +#: src/cmp.c:514 #, c-format msgid "%s %s differ: byte %s, line %s is %3o %s %3o %s\n" msgstr "" -#: src/cmp.c:562 +#: src/cmp.c:571 #, c-format -msgid "cmp: EOF on %s\n" +msgid "cmp: EOF on %s which is empty\n" +msgstr "" + +#: src/cmp.c:585 +#, c-format +msgid "cmp: EOF on %s after byte %s, line %s\n" +msgstr "" + +#: src/cmp.c:586 +#, c-format +msgid "cmp: EOF on %s after byte %s, in line %s\n" +msgstr "" + +#: src/cmp.c:592 +#, c-format +msgid "cmp: EOF on %s after byte %s\n" msgstr "" #. This is a proper name. See the gettext manual, section Names. -#: src/diff.c:49 +#: src/diff.c:50 msgid "Paul Eggert" msgstr "Paul Eggert" #. This is a proper name. See the gettext manual, section Names. -#: src/diff.c:50 +#: src/diff.c:51 msgid "Mike Haertel" msgstr "Mike Haertel" #. This is a proper name. See the gettext manual, section Names. -#: src/diff.c:51 +#: src/diff.c:52 msgid "David Hayes" msgstr "David Hayes" #. This is a proper name. See the gettext manual, section Names. -#: src/diff.c:52 +#: src/diff.c:53 msgid "Richard Stallman" msgstr "Richard Stallman" #. This is a proper name. See the gettext manual, section Names. -#: src/diff.c:53 +#: src/diff.c:54 msgid "Len Tower" msgstr "Len Tower" -#: src/diff.c:351 +#: src/diff.c:353 #, c-format msgid "invalid context length '%s'" msgstr "neispravna duljina sadržaja „%sâ€" -#: src/diff.c:434 +#: src/diff.c:436 #, c-format msgid "pagination not supported on this host" msgstr "straniÄenje nije podržano na ovom raÄunalu" -#: src/diff.c:449 src/diff3.c:335 +#: src/diff.c:451 src/diff3.c:336 #, c-format msgid "too many file label options" msgstr "previÅ¡e opcija oznaka datoteka" -#: src/diff.c:526 +#: src/diff.c:528 #, c-format msgid "invalid width '%s'" msgstr "neispravna Å¡irina „%sâ€" -#: src/diff.c:530 +#: src/diff.c:532 msgid "conflicting width options" msgstr "konfliktne opcije Å¡irine" -#: src/diff.c:555 +#: src/diff.c:557 #, c-format msgid "invalid horizon length '%s'" msgstr "neispravna duljina sadržaja „%sâ€" -#: src/diff.c:611 +#: src/diff.c:613 #, c-format msgid "invalid tabsize '%s'" msgstr "neispravna Å¡irina „%sâ€" -#: src/diff.c:615 +#: src/diff.c:617 msgid "conflicting tabsize options" msgstr "konfliktne opcije Å¡irine" -#: src/diff.c:770 +#: src/diff.c:772 msgid "--from-file and --to-file both specified" msgstr "" -#: src/diff.c:890 +#: src/diff.c:891 msgid " --normal output a normal diff (the default)" msgstr " --normal ispiÅ¡i normalnu razliku (zadano)" -#: src/diff.c:891 +#: src/diff.c:892 msgid "-q, --brief report only when files differ" msgstr "-q, --brief izvjeÅ¡taj samo kad se datoteke razlikuju" -#: src/diff.c:892 +#: src/diff.c:893 msgid "-s, --report-identical-files report when two files are the same" msgstr "-s, --report-identical-files izvjeÅ¡taj samo kad su datoteke jednake" -#: src/diff.c:893 +#: src/diff.c:894 msgid "" "-c, -C NUM, --context[=NUM] output NUM (default 3) lines of copied context" msgstr "" -#: src/diff.c:894 +#: src/diff.c:895 msgid "" "-u, -U NUM, --unified[=NUM] output NUM (default 3) lines of unified context" msgstr "" -#: src/diff.c:895 +#: src/diff.c:896 msgid "-e, --ed output an ed script" msgstr "-e, --ed ispiÅ¡i ed skriptu" -#: src/diff.c:896 +#: src/diff.c:897 msgid "-n, --rcs output an RCS format diff" msgstr "-n, --rcs ispiÅ¡i razliku u RCS obliku" -#: src/diff.c:897 +#: src/diff.c:898 msgid "-y, --side-by-side output in two columns" msgstr "-y, --side-by-side ispiÅ¡i u dva stupca" -#: src/diff.c:898 +#: src/diff.c:899 msgid "" "-W, --width=NUM output at most NUM (default 130) print columns" msgstr "" -#: src/diff.c:899 +#: src/diff.c:900 msgid "" " --left-column output only the left column of common lines" msgstr "" -#: src/diff.c:900 +#: src/diff.c:901 msgid " --suppress-common-lines do not output common lines" msgstr "" -#: src/diff.c:902 +#: src/diff.c:903 msgid "-p, --show-c-function show which C function each change is in" msgstr "" -#: src/diff.c:903 +#: src/diff.c:904 msgid "-F, --show-function-line=RE show the most recent line matching RE" msgstr "" -#: src/diff.c:904 +#: src/diff.c:905 msgid "" " --label LABEL use LABEL instead of file name and timestamp\n" " (can be repeated)" msgstr "" -#: src/diff.c:907 +#: src/diff.c:908 msgid "-t, --expand-tabs expand tabs to spaces in output" msgstr "-t, --expand-tabs pretvori tabulatore u praznine u izlazu" -#: src/diff.c:908 +#: src/diff.c:909 msgid "-T, --initial-tab make tabs line up by prepending a tab" msgstr "" -#: src/diff.c:909 +#: src/diff.c:910 msgid "" " --tabsize=NUM tab stops every NUM (default 8) print columns" msgstr "" -#: src/diff.c:910 +#: src/diff.c:911 msgid "" " --suppress-blank-empty suppress space or tab before empty output lines" msgstr "" -#: src/diff.c:911 +#: src/diff.c:912 msgid "-l, --paginate pass output through 'pr' to paginate it" msgstr "" -#: src/diff.c:913 +#: src/diff.c:914 msgid "" "-r, --recursive recursively compare any subdirectories found" msgstr "" -#: src/diff.c:914 +#: src/diff.c:915 msgid " --no-dereference don't follow symbolic links" msgstr " --no-dereference ne slijedi simboliÄke veze" -#: src/diff.c:915 +#: src/diff.c:916 msgid "-N, --new-file treat absent files as empty" msgstr "" "-N, --new-file postupaj s odsutnim datotekama kao s praznim" -#: src/diff.c:916 +#: src/diff.c:917 msgid " --unidirectional-new-file treat absent first files as empty" msgstr "" -#: src/diff.c:917 +#: src/diff.c:918 msgid " --ignore-file-name-case ignore case when comparing file names" msgstr "" " --ignore-file-name-case zanemari veliÄinu slova pri usporeÄ‘ivanju " "imena datoteka" -#: src/diff.c:918 +#: src/diff.c:919 msgid " --no-ignore-file-name-case consider case when comparing file names" msgstr "" " --no-ignore-file-name-case ne zanemaruj veliÄinu slova pri " "usporeÄ‘ivanju imena datoteka" -#: src/diff.c:919 +#: src/diff.c:920 msgid "-x, --exclude=PAT exclude files that match PAT" msgstr "" -#: src/diff.c:920 +#: src/diff.c:921 msgid "" "-X, --exclude-from=FILE exclude files that match any pattern in FILE" msgstr "" -#: src/diff.c:921 +#: src/diff.c:922 msgid "" "-S, --starting-file=FILE start with FILE when comparing directories" msgstr "" -#: src/diff.c:922 +#: src/diff.c:923 msgid "" " --from-file=FILE1 compare FILE1 to all operands;\n" " FILE1 can be a directory" msgstr "" -#: src/diff.c:924 +#: src/diff.c:925 msgid "" " --to-file=FILE2 compare all operands to FILE2;\n" " FILE2 can be a directory" msgstr "" -#: src/diff.c:927 +#: src/diff.c:928 msgid "" "-i, --ignore-case ignore case differences in file contents" msgstr "" -#: src/diff.c:928 +#: src/diff.c:929 msgid "-E, --ignore-tab-expansion ignore changes due to tab expansion" msgstr "" -#: src/diff.c:929 +#: src/diff.c:930 msgid "-Z, --ignore-trailing-space ignore white space at line end" msgstr "" -#: src/diff.c:930 +#: src/diff.c:931 msgid "" "-b, --ignore-space-change ignore changes in the amount of white space" msgstr "" -#: src/diff.c:931 +#: src/diff.c:932 msgid "-w, --ignore-all-space ignore all white space" msgstr "" -#: src/diff.c:932 +#: src/diff.c:933 msgid "" "-B, --ignore-blank-lines ignore changes where lines are all blank" msgstr "" -#: src/diff.c:933 +#: src/diff.c:934 msgid "-I, --ignore-matching-lines=RE ignore changes where all lines match RE" msgstr "" -#: src/diff.c:935 +#: src/diff.c:936 msgid "-a, --text treat all files as text" msgstr "" "-a, --text postupaj sa svim datotekama kao s tekstualnim" -#: src/diff.c:936 +#: src/diff.c:937 msgid " --strip-trailing-cr strip trailing carriage return on input" msgstr "" -#: src/diff.c:938 +#: src/diff.c:939 msgid " --binary read and write data in binary mode" msgstr " --binary Äitaj i piÅ¡i podatke u binarnom naÄinu" -#: src/diff.c:941 +#: src/diff.c:942 msgid "" "-D, --ifdef=NAME output merged file with '#ifdef NAME' diffs" msgstr "" -#: src/diff.c:942 +#: src/diff.c:943 msgid " --GTYPE-group-format=GFMT format GTYPE input groups with GFMT" msgstr "" -#: src/diff.c:943 +#: src/diff.c:944 msgid " --line-format=LFMT format all input lines with LFMT" msgstr "" -#: src/diff.c:944 +#: src/diff.c:945 msgid " --LTYPE-line-format=LFMT format LTYPE input lines with LFMT" msgstr "" -#: src/diff.c:945 +#: src/diff.c:946 msgid "" " These format options provide fine-grained control over the output\n" " of diff, generalizing -D/--ifdef." msgstr "" -#: src/diff.c:947 +#: src/diff.c:948 msgid " LTYPE is 'old', 'new', or 'unchanged'. GTYPE is LTYPE or 'changed'." msgstr "" -#: src/diff.c:948 +#: src/diff.c:949 msgid "" " GFMT (only) may contain:\n" " %< lines from FILE1\n" @@ -973,7 +964,7 @@ msgid "" " %(A=B?T:E) if A equals B then T else E" msgstr "" -#: src/diff.c:960 +#: src/diff.c:961 msgid "" " LFMT (only) may contain:\n" " %L contents of line\n" @@ -981,7 +972,7 @@ msgid "" " %[-][WIDTH][.[PREC]]{doxX}n printf-style spec for input line number" msgstr "" -#: src/diff.c:964 +#: src/diff.c:965 msgid "" " Both GFMT and LFMT may contain:\n" " %% %\n" @@ -990,75 +981,68 @@ msgid "" " C the character C (other characters represent themselves)" msgstr "" -#: src/diff.c:970 -msgid "-d, --minimal try hard to find a smaller set of changes" -msgstr "" - #: src/diff.c:971 -msgid " --horizon-lines=NUM keep NUM lines of the common prefix and suffix" +msgid "-d, --minimal try hard to find a smaller set of changes" msgstr "" #: src/diff.c:972 -msgid "" -" --speed-large-files assume large files and many scattered small changes" +msgid " --horizon-lines=NUM keep NUM lines of the common prefix and suffix" msgstr "" #: src/diff.c:973 msgid "" -" --color[=WHEN] colorize the output; WHEN can be 'never', 'always'," +" --speed-large-files assume large files and many scattered small changes" msgstr "" #: src/diff.c:974 -#, fuzzy -msgid " or 'auto' (the default)" -msgstr " --normal ispiÅ¡i normalnu razliku (zadano)" - -#: src/diff.c:975 msgid "" -" --palette=PALETTE specify the colors to use when --color is active" +" --color[=WHEN] colorize the output; WHEN can be 'never', " +"'always',\n" +" or 'auto' (the default)" msgstr "" #: src/diff.c:976 msgid "" -" PALETTE is a colon-separated list terminfo " -"capabilities" +" --palette=PALETTE the colors to use when --color is active; PALETTE " +"is\n" +" a colon-separated list of terminfo capabilities" msgstr "" -#: src/diff.c:978 +#: src/diff.c:979 msgid " --help display this help and exit" msgstr " --help prikaži ovu pomoć i izaÄ‘i" -#: src/diff.c:979 +#: src/diff.c:980 msgid "-v, --version output version information and exit" msgstr "-v, --version ispiÅ¡i informacije o inaÄici i izaÄ‘i" -#: src/diff.c:981 +#: src/diff.c:982 #, fuzzy msgid "FILES are 'FILE1 FILE2' or 'DIR1 DIR2' or 'DIR FILE' or 'FILE DIR'." msgstr "" "DATOTEKE su „DATOTEKA1 DATOTEKA2â€, „DIR1 DIR2â€, „DIR DATOTEKA...†ili " "„DATOTEKA... DIRâ€." -#: src/diff.c:982 +#: src/diff.c:983 msgid "" "If --from-file or --to-file is given, there are no restrictions on FILE(s)." msgstr "" -#: src/diff.c:983 src/diff3.c:526 src/sdiff.c:219 +#: src/diff.c:984 src/diff3.c:528 src/sdiff.c:219 msgid "If a FILE is '-', read standard input." msgstr "Ako je DATOTEKA „-â€, Äitaj standardni ulaz." -#: src/diff.c:993 +#: src/diff.c:994 #, c-format msgid "Usage: %s [OPTION]... FILES\n" msgstr "Uporaba: %s [OPCIJA]... DATOTEKE\n" -#: src/diff.c:994 +#: src/diff.c:995 msgid "Compare FILES line by line." msgstr "Usporedi DATOTEKE redak po redak." # Ovdje trebam zamijeniti poredak... Pogledati kako se to radi. -#: src/diff.c:1028 +#: src/diff.c:1029 #, fuzzy, c-format msgid "conflicting %s option value '%s'" msgstr "konfliktna vrijednost „%s†opcije „%sâ€" @@ -1068,148 +1052,148 @@ msgstr "konfliktna vrijednost „%s†opcije „%sâ€" # # Format: # C -#: src/diff.c:1041 +#: src/diff.c:1042 #, c-format msgid "conflicting output style options" msgstr "konfliktne opcije izlaznog stila" -#: src/diff.c:1057 +#: src/diff.c:1058 #, fuzzy, c-format msgid "invalid color '%s'" msgstr "neispravna Å¡irina „%sâ€" -#: src/diff.c:1113 src/diff.c:1323 +#: src/diff.c:1114 src/diff.c:1324 #, c-format msgid "Only in %s: %s\n" msgstr "Samo u %s: %s\n" -#: src/diff.c:1247 +#: src/diff.c:1248 msgid "cannot compare '-' to a directory" msgstr "ne mogu usporediti „-†s direktorijem" -#: src/diff.c:1282 +#: src/diff.c:1283 msgid "-D option not supported with directories" msgstr "opcija -D nije podržana s direktorijima" -#: src/diff.c:1291 +#: src/diff.c:1292 #, c-format msgid "Common subdirectories: %s and %s\n" msgstr "UobiÄajeni poddirektoriji: %s i %s\n" -#: src/diff.c:1333 src/diff.c:1383 +#: src/diff.c:1334 src/diff.c:1384 #, c-format msgid "File %s is a %s while file %s is a %s\n" msgstr "Datoteka %s je %s, a datoteka %s je %s\n" -#: src/diff.c:1369 +#: src/diff.c:1370 #, c-format msgid "Symbolic links %s and %s differ\n" msgstr "SimboliÄke veze %s i %s se razlikuju\n" -#: src/diff.c:1456 +#: src/diff.c:1457 #, c-format msgid "Files %s and %s are identical\n" msgstr "Datoteke %s i %s su identiÄne\n" #. This is a proper name. See the gettext manual, section Names. -#: src/diff3.c:41 +#: src/diff3.c:42 msgid "Randy Smith" msgstr "Randy Smith" -#: src/diff3.c:348 +#: src/diff3.c:351 #, c-format msgid "incompatible options" msgstr "nekompatibilne opcije" -#: src/diff3.c:388 +#: src/diff3.c:391 msgid "'-' specified for more than one input file" msgstr "„-†je navedeno za viÅ¡e od jedne ulazne datoteke" -#: src/diff3.c:439 src/diff3.c:1288 src/diff3.c:1692 src/diff3.c:1747 +#: src/diff3.c:442 src/diff3.c:1290 src/diff3.c:1693 src/diff3.c:1748 #: src/sdiff.c:307 src/sdiff.c:844 src/sdiff.c:855 msgid "read failed" msgstr "Äitanje nije uspjelo" -#: src/diff3.c:473 +#: src/diff3.c:475 msgid "-A, --show-all output all changes, bracketing conflicts" msgstr "" -#: src/diff3.c:475 +#: src/diff3.c:477 msgid "" "-e, --ed output ed script incorporating changes\n" " from OLDFILE to YOURFILE into MYFILE" msgstr "" -#: src/diff3.c:477 +#: src/diff3.c:479 msgid "-E, --show-overlap like -e, but bracket conflicts" msgstr "" -#: src/diff3.c:478 +#: src/diff3.c:480 msgid "" "-3, --easy-only like -e, but incorporate only nonoverlapping " "changes" msgstr "" -#: src/diff3.c:479 +#: src/diff3.c:481 msgid "" "-x, --overlap-only like -e, but incorporate only overlapping changes" msgstr "" -#: src/diff3.c:480 +#: src/diff3.c:482 msgid "-X like -x, but bracket conflicts" msgstr "" -#: src/diff3.c:481 +#: src/diff3.c:483 msgid "-i append 'w' and 'q' commands to ed scripts" msgstr "" -#: src/diff3.c:483 +#: src/diff3.c:485 msgid "" "-m, --merge output actual merged file, according to\n" " -A if no other options are given" msgstr "" -#: src/diff3.c:486 +#: src/diff3.c:488 msgid "-a, --text treat all files as text" msgstr "" "-a, --text postupaj sa svim datotekama kao s tekstualnim" -#: src/diff3.c:487 +#: src/diff3.c:489 msgid " --strip-trailing-cr strip trailing carriage return on input" msgstr "" -#: src/diff3.c:488 +#: src/diff3.c:490 msgid "-T, --initial-tab make tabs line up by prepending a tab" msgstr "" -#: src/diff3.c:489 +#: src/diff3.c:491 msgid " --diff-program=PROGRAM use PROGRAM to compare files" msgstr "" -#: src/diff3.c:490 +#: src/diff3.c:492 msgid "" "-L, --label=LABEL use LABEL instead of file name\n" " (can be repeated up to three times)" msgstr "" -#: src/diff3.c:493 +#: src/diff3.c:495 msgid " --help display this help and exit" msgstr " --help prikaži ovu pomoć i izaÄ‘i" -#: src/diff3.c:494 +#: src/diff3.c:496 msgid "-v, --version output version information and exit" msgstr "-v, --version ispiÅ¡i informacije o inaÄici i izaÄ‘i" -#: src/diff3.c:503 +#: src/diff3.c:505 #, c-format msgid "Usage: %s [OPTION]... MYFILE OLDFILE YOURFILE\n" msgstr "" -#: src/diff3.c:505 +#: src/diff3.c:507 msgid "Compare three files line by line." msgstr "Usporedi tri datoteke redak po redak." -#: src/diff3.c:515 +#: src/diff3.c:517 msgid "" "\n" "The default output format is a somewhat human-readable representation of\n" @@ -1223,45 +1207,45 @@ msgid "" "robust than using ed.\n" msgstr "" -#: src/diff3.c:527 +#: src/diff3.c:529 msgid "Exit status is 0 if successful, 1 if conflicts, 2 if trouble." msgstr "Izlazno stanje je 0 za uspjeh, 1 za neuspjeh, 2 u sluÄaju greÅ¡ke." -#: src/diff3.c:720 +#: src/diff3.c:722 msgid "internal error: screwup in format of diff blocks" msgstr "" -#: src/diff3.c:1015 +#: src/diff3.c:1017 #, c-format msgid "%s: diff failed: " msgstr "%s: diff nije uspio: " -#: src/diff3.c:1037 +#: src/diff3.c:1039 msgid "internal error: invalid diff type in process_diff" msgstr "interna greÅ¡ka: neispravna diff vrsta u process_diff" -#: src/diff3.c:1062 +#: src/diff3.c:1064 msgid "invalid diff format; invalid change separator" msgstr "" -#: src/diff3.c:1298 +#: src/diff3.c:1300 msgid "invalid diff format; incomplete last line" msgstr "neispravan diff oblik, nepotpun posljednji redak" -#: src/diff3.c:1322 src/sdiff.c:275 src/util.c:970 +#: src/diff3.c:1324 src/sdiff.c:275 src/util.c:969 #, c-format msgid "subsidiary program '%s' could not be invoked" msgstr "podreÄ‘eni program „%s†se ne može pozvati" -#: src/diff3.c:1347 +#: src/diff3.c:1349 msgid "invalid diff format; incorrect leading line chars" msgstr "" -#: src/diff3.c:1420 +#: src/diff3.c:1422 msgid "internal error: invalid diff type passed to output" msgstr "" -#: src/diff3.c:1694 src/diff3.c:1751 +#: src/diff3.c:1695 src/diff3.c:1752 msgid "input file shrank" msgstr "ulazna datoteka se smanjila" @@ -1276,7 +1260,7 @@ msgid "%s: recursive directory loop" msgstr "%s: rekurzivna petlja direktorija" #. This is a proper name. See the gettext manual, section Names. -#: src/sdiff.c:42 +#: src/sdiff.c:43 msgid "Thomas Lord" msgstr "Thomas Lord" @@ -1399,12 +1383,31 @@ msgid "" "q:\tQuit.\n" msgstr "" -#: src/util.c:663 +#: src/util.c:662 #, fuzzy, c-format msgid "unrecognized prefix: %s" msgstr "%s: neprepoznata opcija „--%sâ€\n" -#: src/util.c:693 +#: src/util.c:692 #, c-format msgid "unparsable value for --palette" msgstr "" + +#, fuzzy +#~ msgid " or 'auto' (the default)" +#~ msgstr " --normal ispiÅ¡i normalnu razliku (zadano)" + +#~ msgid "%s: option '--%s' doesn't allow an argument\n" +#~ msgstr "%s: opcija „--%s†ne dozvoljava argument\n" + +#~ msgid "%s: unrecognized option '--%s'\n" +#~ msgstr "%s: neprepoznata opcija „--%sâ€\n" + +#~ msgid "%s: option '-W %s' is ambiguous\n" +#~ msgstr "%s: opcija „-W %s†je viÅ¡eznaÄna\n" + +#~ msgid "%s: option '-W %s' doesn't allow an argument\n" +#~ msgstr "%s: opcija „-W %s†ne dozvoljava argument\n" + +#~ msgid "%s: option '-W %s' requires an argument\n" +#~ msgstr "%s: opcija „-W %s†zahtijeva argument\n" Binary files differ@@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: diffutils 3.3-pre1\n" "Report-Msgid-Bugs-To: bug-diffutils@gnu.org\n" -"POT-Creation-Date: 2016-08-20 22:22-0700\n" +"POT-Creation-Date: 2017-05-21 13:26-0700\n" "PO-Revision-Date: 2014-07-13 22:01+0200\n" "Last-Translator: Balázs Úr <urbalazs@gmail.com>\n" "Language-Team: Hungarian <translation-team-hu@lists.sourceforge.net>\n" @@ -18,33 +18,34 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"X-Bugs: Report translation errors to the Language-Team address.\n" "X-Generator: Lokalize 1.5\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: lib/argmatch.c:133 +#: lib/argmatch.c:134 #, fuzzy, c-format msgid "invalid argument %s for %s" msgstr "érvénytelen %s%s argumentum: „%sâ€" -#: lib/argmatch.c:134 +#: lib/argmatch.c:135 #, c-format msgid "ambiguous argument %s for %s" msgstr "" -#: lib/argmatch.c:153 +#: lib/argmatch.c:154 #, fuzzy msgid "Valid arguments are:" msgstr "érvénytelen %s%s argumentum: „%sâ€" -#: lib/c-stack.c:204 lib/c-stack.c:297 +#: lib/c-stack.c:203 lib/c-stack.c:296 msgid "program error" msgstr "programhiba" -#: lib/c-stack.c:205 lib/c-stack.c:298 +#: lib/c-stack.c:204 lib/c-stack.c:297 msgid "stack overflow" msgstr "veremtúlcsordulás" -#: lib/error.c:191 +#: lib/error.c:195 msgid "Unknown system error" msgstr "Ismeretlen rendszerhiba" @@ -148,66 +149,41 @@ msgstr "" msgid "weird file" msgstr "szokatlan fájl" -#: lib/getopt.c:575 lib/getopt.c:604 -#, c-format -msgid "%s: option '%s' is ambiguous; possibilities:" -msgstr "%s: a(z) „%s†kapcsoló nem egyértelmű; lehetÅ‘ségek:" - -#: lib/getopt.c:619 +#: lib/getopt.c:278 #, fuzzy, c-format -msgid "%s: option '%s' is ambiguous\n" +msgid "%s: option '%s%s' is ambiguous\n" msgstr "%s: a „-W %s†kapcsoló nem egyértelmű\n" -#: lib/getopt.c:654 lib/getopt.c:658 -#, c-format -msgid "%s: option '--%s' doesn't allow an argument\n" -msgstr "%s: a(z) „--%s†kapcsoló nem enged meg argumentumot\n" +#: lib/getopt.c:284 +#, fuzzy, c-format +msgid "%s: option '%s%s' is ambiguous; possibilities:" +msgstr "%s: a(z) „%s†kapcsoló nem egyértelmű; lehetÅ‘ségek:" -#: lib/getopt.c:667 lib/getopt.c:672 -#, c-format -msgid "%s: option '%c%s' doesn't allow an argument\n" +#: lib/getopt.c:319 +#, fuzzy, c-format +msgid "%s: unrecognized option '%s%s'\n" +msgstr "%s: ismeretlen „%c%s†kapcsoló\n" + +#: lib/getopt.c:345 +#, fuzzy, c-format +msgid "%s: option '%s%s' doesn't allow an argument\n" msgstr "%s: a(z) „%c%s†kapcsoló nem enged meg argumentumot\n" -#: lib/getopt.c:715 lib/getopt.c:734 -#, c-format -msgid "%s: option '--%s' requires an argument\n" +#: lib/getopt.c:360 +#, fuzzy, c-format +msgid "%s: option '%s%s' requires an argument\n" msgstr "%s: a(z) „--%s†kapcsolóhoz egy argumentum szükséges\n" -#: lib/getopt.c:772 lib/getopt.c:775 -#, c-format -msgid "%s: unrecognized option '--%s'\n" -msgstr "%s: ismeretlen „--%s†kapcsoló\n" - -#: lib/getopt.c:783 lib/getopt.c:786 -#, c-format -msgid "%s: unrecognized option '%c%s'\n" -msgstr "%s: ismeretlen „%c%s†kapcsoló\n" - -#: lib/getopt.c:835 lib/getopt.c:838 +#: lib/getopt.c:621 #, c-format msgid "%s: invalid option -- '%c'\n" msgstr "%s: érvénytelen kapcsoló -- „%câ€\n" -#: lib/getopt.c:891 lib/getopt.c:908 lib/getopt.c:1118 lib/getopt.c:1136 +#: lib/getopt.c:636 lib/getopt.c:682 #, c-format msgid "%s: option requires an argument -- '%c'\n" msgstr "%s: a kapcsoló egy argumentumot igényel -- „%câ€\n" -#: lib/getopt.c:964 lib/getopt.c:980 -#, c-format -msgid "%s: option '-W %s' is ambiguous\n" -msgstr "%s: a „-W %s†kapcsoló nem egyértelmű\n" - -#: lib/getopt.c:1004 lib/getopt.c:1022 -#, c-format -msgid "%s: option '-W %s' doesn't allow an argument\n" -msgstr "%s: a „-W %s†kapcsoló nem enged meg argumentumot\n" - -#: lib/getopt.c:1043 lib/getopt.c:1061 -#, c-format -msgid "%s: option '-W %s' requires an argument\n" -msgstr "%s: a „-W %s†kapcsolóhoz egy argumentum szükséges\n" - #. TRANSLATORS: #. Get translations for open and closing quotation marks. #. The message catalog should translate "`" to a left @@ -229,11 +205,11 @@ msgstr "%s: a „-W %s†kapcsolóhoz egy argumentum szükséges\n" #. If you don't know what to put here, please see #. <http://en.wikipedia.org/wiki/Quotation_marks_in_other_languages> #. and use glyphs suitable for your language. -#: lib/quotearg.c:347 +#: lib/quotearg.c:362 msgid "`" msgstr "„" -#: lib/quotearg.c:348 +#: lib/quotearg.c:363 msgid "'" msgstr "â€" @@ -525,7 +501,7 @@ msgstr "" "Ãltalános segÃtség a GNU szoftverek használatához: <http://www.gnu.org/" "gethelp/>\n" -#: src/analyze.c:454 src/diff.c:1400 +#: src/analyze.c:454 src/diff.c:1401 #, c-format msgid "Files %s and %s differ\n" msgstr "A(z) %s és a(z) %s fájlok különböznek\n" @@ -535,21 +511,21 @@ msgstr "A(z) %s és a(z) %s fájlok különböznek\n" msgid "Binary files %s and %s differ\n" msgstr "A(z) %s és a(z) %s bináris fájlok különböznek\n" -#: src/analyze.c:697 src/diff3.c:1463 src/util.c:1255 +#: src/analyze.c:706 src/diff3.c:1465 src/util.c:1254 msgid "No newline at end of file" msgstr "Nincs új sor a fájl végén" #. This is a proper name. See the gettext manual, section Names. -#: src/cmp.c:43 +#: src/cmp.c:44 msgid "Torbjorn Granlund" msgstr "Torbjorn Granlund" #. This is a proper name. See the gettext manual, section Names. -#: src/cmp.c:44 +#: src/cmp.c:45 msgid "David MacKenzie" msgstr "David MacKenzie" -#: src/cmp.c:118 src/diff.c:875 src/diff3.c:459 src/sdiff.c:158 +#: src/cmp.c:119 src/diff.c:877 src/diff3.c:462 src/sdiff.c:159 #, c-format msgid "Try '%s --help' for more information." msgstr "További információkért próbálja a(z) „%s --help†parancsot." @@ -564,12 +540,12 @@ msgstr "érvénytelen --ignore-initial érték: „%sâ€" msgid "options -l and -s are incompatible" msgstr "a -l és a -s kapcsolók összeférhetetlenek" -#: src/cmp.c:155 src/diff.c:884 src/diff3.c:467 src/sdiff.c:167 src/sdiff.c:315 -#: src/sdiff.c:322 src/sdiff.c:874 src/util.c:853 src/util.c:953 src/util.c:960 +#: src/cmp.c:155 src/diff.c:885 src/diff3.c:469 src/sdiff.c:167 src/sdiff.c:315 +#: src/sdiff.c:322 src/sdiff.c:874 src/util.c:852 src/util.c:952 src/util.c:959 msgid "write failed" msgstr "az Ãrás sikertelen" -#: src/cmp.c:157 src/diff.c:886 src/diff.c:1465 src/diff3.c:469 src/sdiff.c:169 +#: src/cmp.c:157 src/diff.c:887 src/diff.c:1466 src/diff3.c:471 src/sdiff.c:169 msgid "standard output" msgstr "szabványos kimenet" @@ -631,7 +607,7 @@ msgstr "" "Az opcionális UGRÃS1 és UGRÃS2 megadja a minden egyes fájl elejérÅ‘l " "kihagyandó bájtok számát (alapértelmezetten nulla)." -#: src/cmp.c:185 src/diff.c:996 src/diff3.c:507 src/sdiff.c:210 +#: src/cmp.c:185 src/diff.c:997 src/diff3.c:509 src/sdiff.c:210 msgid "" "Mandatory arguments to long options are mandatory for short options too.\n" msgstr "" @@ -652,7 +628,7 @@ msgstr "" msgid "If a FILE is '-' or missing, read standard input." msgstr "Ha a FÃJL a „-†vagy hiányzik, akkor a szabványos bemenetrÅ‘l olvas." -#: src/cmp.c:195 src/diff.c:984 src/sdiff.c:220 +#: src/cmp.c:195 src/diff.c:985 src/sdiff.c:220 msgid "Exit status is 0 if inputs are the same, 1 if different, 2 if trouble." msgstr "" "A kilépési állapotkód 0, ha a bemenetek azonosak; 1, ha különbözÅ‘k; 2, ha\n" @@ -663,112 +639,127 @@ msgstr "" msgid "invalid --bytes value '%s'" msgstr "érvénytelen --bytes érték: „%sâ€" -#: src/cmp.c:266 src/diff.c:793 src/diff3.c:353 src/sdiff.c:565 +#: src/cmp.c:266 src/diff.c:795 src/diff3.c:356 src/sdiff.c:565 #, c-format msgid "missing operand after '%s'" msgstr "hiányzó operandus a(z) „%s†után" -#: src/cmp.c:278 src/diff.c:795 src/diff3.c:355 src/sdiff.c:567 +#: src/cmp.c:278 src/diff.c:797 src/diff3.c:358 src/sdiff.c:567 #, c-format msgid "extra operand '%s'" msgstr "extra operandus: „%sâ€" -#: src/cmp.c:494 +#: src/cmp.c:498 #, c-format msgid "%s %s differ: byte %s, line %s\n" msgstr "%s %s eltér: byte: %s, sor: %s\n" -#: src/cmp.c:510 +#: src/cmp.c:514 #, c-format msgid "%s %s differ: byte %s, line %s is %3o %s %3o %s\n" msgstr "%s %s eltér: byte %s, sor %s %3o %s %3o %s\n" -#: src/cmp.c:562 -#, c-format -msgid "cmp: EOF on %s\n" +#: src/cmp.c:571 +#, fuzzy, c-format +msgid "cmp: EOF on %s which is empty\n" +msgstr "cmp: EOF ennél: %s\n" + +#: src/cmp.c:585 +#, fuzzy, c-format +msgid "cmp: EOF on %s after byte %s, line %s\n" +msgstr "%s %s eltér: byte: %s, sor: %s\n" + +#: src/cmp.c:586 +#, fuzzy, c-format +msgid "cmp: EOF on %s after byte %s, in line %s\n" +msgstr "%s %s eltér: byte: %s, sor: %s\n" + +#: src/cmp.c:592 +#, fuzzy, c-format +msgid "cmp: EOF on %s after byte %s\n" msgstr "cmp: EOF ennél: %s\n" #. This is a proper name. See the gettext manual, section Names. -#: src/diff.c:49 +#: src/diff.c:50 msgid "Paul Eggert" msgstr "Paul Eggert" #. This is a proper name. See the gettext manual, section Names. -#: src/diff.c:50 +#: src/diff.c:51 msgid "Mike Haertel" msgstr "Mike Haertel" #. This is a proper name. See the gettext manual, section Names. -#: src/diff.c:51 +#: src/diff.c:52 msgid "David Hayes" msgstr "David Hayes" #. This is a proper name. See the gettext manual, section Names. -#: src/diff.c:52 +#: src/diff.c:53 msgid "Richard Stallman" msgstr "Richard Stallman" #. This is a proper name. See the gettext manual, section Names. -#: src/diff.c:53 +#: src/diff.c:54 msgid "Len Tower" msgstr "Len Tower" -#: src/diff.c:351 +#: src/diff.c:353 #, c-format msgid "invalid context length '%s'" msgstr "érvénytelen környezethossz: „%sâ€" -#: src/diff.c:434 +#: src/diff.c:436 #, c-format msgid "pagination not supported on this host" msgstr "a tördelés nem támogatott ezen a gépen" -#: src/diff.c:449 src/diff3.c:335 +#: src/diff.c:451 src/diff3.c:336 #, c-format msgid "too many file label options" msgstr "túl sok fájlcÃmke-beállÃtás" -#: src/diff.c:526 +#: src/diff.c:528 #, c-format msgid "invalid width '%s'" msgstr "érvénytelen szélesség: „%sâ€" -#: src/diff.c:530 +#: src/diff.c:532 msgid "conflicting width options" msgstr "ütközÅ‘ szélességbeállÃtások" -#: src/diff.c:555 +#: src/diff.c:557 #, c-format msgid "invalid horizon length '%s'" msgstr "érvénytelen munkaszinthossz: „%sâ€" -#: src/diff.c:611 +#: src/diff.c:613 #, c-format msgid "invalid tabsize '%s'" msgstr "érvénytelen tabulátorméret: „%sâ€" -#: src/diff.c:615 +#: src/diff.c:617 msgid "conflicting tabsize options" msgstr "ütközÅ‘ tabulátorméret beállÃtások" -#: src/diff.c:770 +#: src/diff.c:772 msgid "--from-file and --to-file both specified" msgstr "a --from-file és a --to-file is meg van adva" -#: src/diff.c:890 +#: src/diff.c:891 msgid " --normal output a normal diff (the default)" msgstr "" " --normal egy normál diff kimenet (az alapértelmezett)" -#: src/diff.c:891 +#: src/diff.c:892 msgid "-q, --brief report only when files differ" msgstr "-q, --brief csak akkor jelent, ha a fájlok eltérnek" -#: src/diff.c:892 +#: src/diff.c:893 msgid "-s, --report-identical-files report when two files are the same" msgstr "-s, --report-identical-files jelentés, ha a két fájl ugyanaz" -#: src/diff.c:893 +#: src/diff.c:894 msgid "" "-c, -C NUM, --context[=NUM] output NUM (default 3) lines of copied context" msgstr "" @@ -776,53 +767,53 @@ msgstr "" "3)\n" " sorának kiÃrása" -#: src/diff.c:894 +#: src/diff.c:895 msgid "" "-u, -U NUM, --unified[=NUM] output NUM (default 3) lines of unified context" msgstr "" "-u, -U SZÃM, --unified[=SZÃM] a egységesÃtett környezet SZÃM\n" " (alapértelmezetten 3) sorának kiÃrása" -#: src/diff.c:895 +#: src/diff.c:896 msgid "-e, --ed output an ed script" msgstr "-e, --ed egy ed parancsfájl kiÃrása" -#: src/diff.c:896 +#: src/diff.c:897 msgid "-n, --rcs output an RCS format diff" msgstr "-n, --rcs egy RCS formátumú diff kiÃrása" -#: src/diff.c:897 +#: src/diff.c:898 msgid "-y, --side-by-side output in two columns" msgstr "-y, --side-by-side kimenet két oszlopban" -#: src/diff.c:898 +#: src/diff.c:899 msgid "" "-W, --width=NUM output at most NUM (default 130) print columns" msgstr "" "-W, --width=SZÃM legfeljebb SZÃM (alapértelmezetten 130)\n" " nyomtatási oszlop kiÃrása" -#: src/diff.c:899 +#: src/diff.c:900 msgid "" " --left-column output only the left column of common lines" msgstr "" " --left-column a közös soroknak csak a bal oszlopának kiÃrása" -#: src/diff.c:900 +#: src/diff.c:901 msgid " --suppress-common-lines do not output common lines" msgstr " --suppress-common-lines ne Ãrja ki a közös sorokat" -#: src/diff.c:902 +#: src/diff.c:903 msgid "-p, --show-c-function show which C function each change is in" msgstr "" "-p, --show-c-function jelenÃtse meg, mely C függvényben van változás" -#: src/diff.c:903 +#: src/diff.c:904 msgid "-F, --show-function-line=RE show the most recent line matching RE" msgstr "" "-F, --show-function-line=RK a legutóbbi RK-ra illeszkedÅ‘ sor megjelenÃtése" -#: src/diff.c:904 +#: src/diff.c:905 #, fuzzy msgid "" " --label LABEL use LABEL instead of file name and timestamp\n" @@ -830,25 +821,25 @@ msgid "" msgstr "" " --label CÃMKE CÃMKE használata fájlnév helyett (ismételhetÅ‘)" -#: src/diff.c:907 +#: src/diff.c:908 msgid "-t, --expand-tabs expand tabs to spaces in output" msgstr "" "-t, --expand-tabs tabulátorok bÅ‘vÃtése szóközökké a kimeneten" -#: src/diff.c:908 +#: src/diff.c:909 msgid "-T, --initial-tab make tabs line up by prepending a tab" msgstr "" "-T, --initial-tab beigazÃtja a tabulátorokat egy tabulátor\n" " hozzáfűzésével" -#: src/diff.c:909 +#: src/diff.c:910 msgid "" " --tabsize=NUM tab stops every NUM (default 8) print columns" msgstr "" " --tabsize=SZÃM a tabulátor megáll minden SZÃMADIK\n" " (alapértelmezetten 8) nyomtatási oszlopnál" -#: src/diff.c:910 +#: src/diff.c:911 msgid "" " --suppress-blank-empty suppress space or tab before empty output lines" msgstr "" @@ -856,62 +847,62 @@ msgstr "" "kimeneti\n" " sorok elÅ‘tt" -#: src/diff.c:911 +#: src/diff.c:912 msgid "-l, --paginate pass output through 'pr' to paginate it" msgstr "" "-l, --paginate kimenet átadása a „pr†parancsnak " "lapszámozáshoz" -#: src/diff.c:913 +#: src/diff.c:914 msgid "" "-r, --recursive recursively compare any subdirectories found" msgstr "" "-r, --recursive a talált alkönyvtár rekurzÃv összehasonlÃtása" -#: src/diff.c:914 +#: src/diff.c:915 msgid " --no-dereference don't follow symbolic links" msgstr " --no-dereference ne kövesse a szimbolikus linkeket" -#: src/diff.c:915 +#: src/diff.c:916 msgid "-N, --new-file treat absent files as empty" msgstr "-N, --new-file a hiányzó fájlokat üresként kezelje" -#: src/diff.c:916 +#: src/diff.c:917 msgid " --unidirectional-new-file treat absent first files as empty" msgstr "" " --unidirectional-new-file a hiányzó elsÅ‘ fájlokat üresként kezelje" -#: src/diff.c:917 +#: src/diff.c:918 msgid " --ignore-file-name-case ignore case when comparing file names" msgstr "" " --ignore-file-name-case kis- és nagybetűk figyelmen kÃvül hagyása\n" " fájlnevek összehasonlÃtásakor" -#: src/diff.c:918 +#: src/diff.c:919 msgid " --no-ignore-file-name-case consider case when comparing file names" msgstr "" " --no-ignore-file-name-case kis- és nagybetűk figyelembe vétele\n" " fájlnevek összehasonlÃtásakor" -#: src/diff.c:919 +#: src/diff.c:920 msgid "-x, --exclude=PAT exclude files that match PAT" msgstr "-x, --exclude=MINTA a MINTÃRA illeszkedÅ‘ fájlok kizárása" -#: src/diff.c:920 +#: src/diff.c:921 msgid "" "-X, --exclude-from=FILE exclude files that match any pattern in FILE" msgstr "" "-X, --exclude-from=FÃJL a FÃJLBAN lévÅ‘ bármely mintára illeszkedÅ‘\n" " fájlok kizárása" -#: src/diff.c:921 +#: src/diff.c:922 msgid "" "-S, --starting-file=FILE start with FILE when comparing directories" msgstr "" "-S, --starting-file=FÃJL a FÃJLLAL kezdjen könyvtárak " "összehasonlÃtását" -#: src/diff.c:922 +#: src/diff.c:923 msgid "" " --from-file=FILE1 compare FILE1 to all operands;\n" " FILE1 can be a directory" @@ -919,7 +910,7 @@ msgstr "" " --from-file=FÃJL1 FÃJL1 összehasonlÃtása minden operandussal;\n" " FÃJL1 lehet könyvtár is" -#: src/diff.c:924 +#: src/diff.c:925 msgid "" " --to-file=FILE2 compare all operands to FILE2;\n" " FILE2 can be a directory" @@ -928,81 +919,81 @@ msgstr "" "vel;\n" " FÃJL2 lehet könyvtár is" -#: src/diff.c:927 +#: src/diff.c:928 msgid "" "-i, --ignore-case ignore case differences in file contents" msgstr "" "-i, --ignore-case kis- és nagybetű eltérések figyelmen kÃvül\n" " hagyása a fájlok tartalmában" -#: src/diff.c:928 +#: src/diff.c:929 msgid "-E, --ignore-tab-expansion ignore changes due to tab expansion" msgstr "" "-E, --ignore-tab-expansion a tabulátorbÅ‘vÃtés miatti változások " "mellÅ‘zése" -#: src/diff.c:929 +#: src/diff.c:930 msgid "-Z, --ignore-trailing-space ignore white space at line end" msgstr "-Z, --ignore-trailing-space a sorvégi üres helyek mellÅ‘zése" -#: src/diff.c:930 +#: src/diff.c:931 msgid "" "-b, --ignore-space-change ignore changes in the amount of white space" msgstr "" "-b, --ignore-space-change üres helyek számában lévÅ‘ változások " "mellÅ‘zése" -#: src/diff.c:931 +#: src/diff.c:932 msgid "-w, --ignore-all-space ignore all white space" msgstr "-w, --ignore-all-space minden üres hely mellÅ‘zése" -#: src/diff.c:932 +#: src/diff.c:933 msgid "" "-B, --ignore-blank-lines ignore changes where lines are all blank" msgstr "" "-B, --ignore-blank-lines változások mellÅ‘zése, ahol a sorok üresek" -#: src/diff.c:933 +#: src/diff.c:934 msgid "-I, --ignore-matching-lines=RE ignore changes where all lines match RE" msgstr "" "-I, --ignore-matching-lines=RK változások mellÅ‘zése, ahol minden sor\n" " illeszkedik az RK-ra" -#: src/diff.c:935 +#: src/diff.c:936 msgid "-a, --text treat all files as text" msgstr "-a, --text az összes fájl szövegként kezelése" -#: src/diff.c:936 +#: src/diff.c:937 msgid " --strip-trailing-cr strip trailing carriage return on input" msgstr "" " --strip-trailing-cr a záró kocsi vissza levágása a bemenetrÅ‘l" -#: src/diff.c:938 +#: src/diff.c:939 msgid " --binary read and write data in binary mode" msgstr " --binary adatok olvasása és Ãrása bináris módon" -#: src/diff.c:941 +#: src/diff.c:942 msgid "" "-D, --ifdef=NAME output merged file with '#ifdef NAME' diffs" msgstr "" "-D, --ifdef=NÉV egyesÃtett fájlkiÃrás a „#ifdef NÉV†diffs\n" " használatával" -#: src/diff.c:942 +#: src/diff.c:943 msgid " --GTYPE-group-format=GFMT format GTYPE input groups with GFMT" msgstr "" " --GTYPE-group-format=GFMT a GTYPE bemeneti csoportok formázása GFMT-vel" -#: src/diff.c:943 +#: src/diff.c:944 msgid " --line-format=LFMT format all input lines with LFMT" msgstr " --line-format=LFMT minden bemeneti sor formázása LFMT-vel" -#: src/diff.c:944 +#: src/diff.c:945 msgid " --LTYPE-line-format=LFMT format LTYPE input lines with LFMT" msgstr "" " --LTYPE-line-format=LFMT az LTYPE bemeneti sorok formázása LFMT-vel" -#: src/diff.c:945 +#: src/diff.c:946 msgid "" " These format options provide fine-grained control over the output\n" " of diff, generalizing -D/--ifdef." @@ -1010,13 +1001,13 @@ msgstr "" " Ezek a formázási lehetÅ‘ségek részletes vezérlést biztosÃtanak a diff\n" " kimenetén, általánosÃtva: -D/--ifdef." -#: src/diff.c:947 +#: src/diff.c:948 msgid " LTYPE is 'old', 'new', or 'unchanged'. GTYPE is LTYPE or 'changed'." msgstr "" " Az LTYPE „oldâ€, „new†vagy „unchangedâ€. A GTYPE értéke LTYPE vagy " "„changedâ€." -#: src/diff.c:948 +#: src/diff.c:949 msgid "" " GFMT (only) may contain:\n" " %< lines from FILE1\n" @@ -1045,7 +1036,7 @@ msgstr "" " M L+1\n" " %(A=B?T:E) ha A egyenlÅ‘ B, akkor T, egyébként E" -#: src/diff.c:960 +#: src/diff.c:961 msgid "" " LFMT (only) may contain:\n" " %L contents of line\n" @@ -1058,7 +1049,7 @@ msgstr "" " %[-][SZÉLESSÉG][.[PONTOSSÃG]]{doxX}n printf-stÃlusú megadás a bemeneti\n" " sor számához" -#: src/diff.c:964 +#: src/diff.c:965 msgid "" " Both GFMT and LFMT may contain:\n" " %% %\n" @@ -1072,60 +1063,52 @@ msgstr "" " %c'\\OOO' a OOO oktális kódú karakter\n" " C a C karakter (más karakterek saját magukat ábrázolják)" -#: src/diff.c:970 +#: src/diff.c:971 msgid "-d, --minimal try hard to find a smaller set of changes" msgstr "" "-d, --minimal igyekszik egy kisebb változási halmazt megtalálni" -#: src/diff.c:971 +#: src/diff.c:972 msgid " --horizon-lines=NUM keep NUM lines of the common prefix and suffix" msgstr "" " --horizon-lines=SZÃM a közös elÅ‘tag és utótag SZÃM sorának megtartása" -#: src/diff.c:972 +#: src/diff.c:973 msgid "" " --speed-large-files assume large files and many scattered small changes" msgstr "" " --speed-large-files nagy fájlokat és sok apró kis változást tételez fel" -#: src/diff.c:973 -msgid "" -" --color[=WHEN] colorize the output; WHEN can be 'never', 'always'," -msgstr "" - #: src/diff.c:974 -#, fuzzy -msgid " or 'auto' (the default)" -msgstr "" -" --normal egy normál diff kimenet (az alapértelmezett)" - -#: src/diff.c:975 msgid "" -" --palette=PALETTE specify the colors to use when --color is active" +" --color[=WHEN] colorize the output; WHEN can be 'never', " +"'always',\n" +" or 'auto' (the default)" msgstr "" #: src/diff.c:976 msgid "" -" PALETTE is a colon-separated list terminfo " -"capabilities" +" --palette=PALETTE the colors to use when --color is active; PALETTE " +"is\n" +" a colon-separated list of terminfo capabilities" msgstr "" -#: src/diff.c:978 +#: src/diff.c:979 msgid " --help display this help and exit" msgstr " --help ezen súgó megjelenÃtése és kilépés" -#: src/diff.c:979 +#: src/diff.c:980 msgid "-v, --version output version information and exit" msgstr "-v, --version verzióinformációk kiÃrása és kilépés" -#: src/diff.c:981 +#: src/diff.c:982 #, fuzzy msgid "FILES are 'FILE1 FILE2' or 'DIR1 DIR2' or 'DIR FILE' or 'FILE DIR'." msgstr "" "A FÃJLOK az alábbiak lehetnek „FÃJL1 FÃJL2†vagy „KÖNYVTÃR1 KÖNYVTÃR2†vagy\n" "„KÖNYVTÃR FÃJL…†vagy „FÃJL… KÖNYVTÃRâ€." -#: src/diff.c:982 +#: src/diff.c:983 msgid "" "If --from-file or --to-file is given, there are no restrictions on FILE(s)." msgstr "" @@ -1133,93 +1116,93 @@ msgstr "" "megszorÃtások\n" "a FÃJLOKRA." -#: src/diff.c:983 src/diff3.c:526 src/sdiff.c:219 +#: src/diff.c:984 src/diff3.c:528 src/sdiff.c:219 msgid "If a FILE is '-', read standard input." msgstr "Ha a FÃJL a „-â€, akkor a szabványos bemenetrÅ‘l olvas." -#: src/diff.c:993 +#: src/diff.c:994 #, c-format msgid "Usage: %s [OPTION]... FILES\n" msgstr "Használat: %s [KAPCSOLÓ]… FÃJLOK\n" -#: src/diff.c:994 +#: src/diff.c:995 msgid "Compare FILES line by line." msgstr "FÃJLOK összehasonlÃtása sorról sorra." -#: src/diff.c:1028 +#: src/diff.c:1029 #, c-format msgid "conflicting %s option value '%s'" msgstr "ütközÅ‘ %s kapcsoló érték: „%sâ€" -#: src/diff.c:1041 +#: src/diff.c:1042 #, c-format msgid "conflicting output style options" msgstr "ütközÅ‘ kimeneti stÃlus kapcsolók" -#: src/diff.c:1057 +#: src/diff.c:1058 #, fuzzy, c-format msgid "invalid color '%s'" msgstr "érvénytelen szélesség: „%sâ€" -#: src/diff.c:1113 src/diff.c:1323 +#: src/diff.c:1114 src/diff.c:1324 #, c-format msgid "Only in %s: %s\n" msgstr "Csak ebben: %s: %s\n" -#: src/diff.c:1247 +#: src/diff.c:1248 msgid "cannot compare '-' to a directory" msgstr "a „-†nem hasonlÃtható össze egy könyvtárral" -#: src/diff.c:1282 +#: src/diff.c:1283 msgid "-D option not supported with directories" msgstr "A -D kapcsoló könyvtáraknál nem támogatott" -#: src/diff.c:1291 +#: src/diff.c:1292 #, c-format msgid "Common subdirectories: %s and %s\n" msgstr "Közös alkönyvtárak: %s és %s\n" -#: src/diff.c:1333 src/diff.c:1383 +#: src/diff.c:1334 src/diff.c:1384 #, c-format msgid "File %s is a %s while file %s is a %s\n" msgstr "A(z) %s fájl egy %s, viszont a(z) %s fájl egy %s\n" -#: src/diff.c:1369 +#: src/diff.c:1370 #, c-format msgid "Symbolic links %s and %s differ\n" msgstr "A(z) %s és a(z) %s szimbolikus linkek különböznek\n" -#: src/diff.c:1456 +#: src/diff.c:1457 #, c-format msgid "Files %s and %s are identical\n" msgstr "A(z) %s és a(z) %s fájlok azonosak\n" #. This is a proper name. See the gettext manual, section Names. -#: src/diff3.c:41 +#: src/diff3.c:42 msgid "Randy Smith" msgstr "Randy Smith" -#: src/diff3.c:348 +#: src/diff3.c:351 #, c-format msgid "incompatible options" msgstr "összeférhetetlen kapcsolók" -#: src/diff3.c:388 +#: src/diff3.c:391 msgid "'-' specified for more than one input file" msgstr "a „-†több mint egy bemeneti fájlhoz lett megadva" -#: src/diff3.c:439 src/diff3.c:1288 src/diff3.c:1692 src/diff3.c:1747 +#: src/diff3.c:442 src/diff3.c:1290 src/diff3.c:1693 src/diff3.c:1748 #: src/sdiff.c:307 src/sdiff.c:844 src/sdiff.c:855 msgid "read failed" msgstr "olvasás sikertelen" -#: src/diff3.c:473 +#: src/diff3.c:475 msgid "-A, --show-all output all changes, bracketing conflicts" msgstr "" "-A, --show-all minden változás kiÃrása, zárójelbe téve az\n" " ütközéseket" -#: src/diff3.c:475 +#: src/diff3.c:477 msgid "" "-e, --ed output ed script incorporating changes\n" " from OLDFILE to YOURFILE into MYFILE" @@ -1228,12 +1211,12 @@ msgstr "" " tartalmazza a RÉGIFÃJL és ÖNFÃJLJA " "változásait" -#: src/diff3.c:477 +#: src/diff3.c:479 msgid "-E, --show-overlap like -e, but bracket conflicts" msgstr "" "-E, --show-overlap mint a -e, de zárójelbe teszi az ütközéseket" -#: src/diff3.c:478 +#: src/diff3.c:480 msgid "" "-3, --easy-only like -e, but incorporate only nonoverlapping " "changes" @@ -1241,25 +1224,25 @@ msgstr "" "-3, --easy-only mint a -e, de csak a nem átfedÅ‘ változásokat\n" " tartalmazza" -#: src/diff3.c:479 +#: src/diff3.c:481 msgid "" "-x, --overlap-only like -e, but incorporate only overlapping changes" msgstr "" "-x, --overlap-only mint a -e, de csak az átfedÅ‘ változásokat\n" " tartalmazza" -#: src/diff3.c:480 +#: src/diff3.c:482 msgid "-X like -x, but bracket conflicts" msgstr "" "-X mint a -x, de zárójelbe teszi az ütközéseket" -#: src/diff3.c:481 +#: src/diff3.c:483 msgid "-i append 'w' and 'q' commands to ed scripts" msgstr "" "-i „w†és „q†parancsok hozzáfűzése az ed\n" " parancsfájlokhoz" -#: src/diff3.c:483 +#: src/diff3.c:485 msgid "" "-m, --merge output actual merged file, according to\n" " -A if no other options are given" @@ -1268,26 +1251,26 @@ msgstr "" "szerint,\n" " ha más kapcsoló nincs megadva" -#: src/diff3.c:486 +#: src/diff3.c:488 msgid "-a, --text treat all files as text" msgstr "-a, --text az összes fájl szövegként kezelése" -#: src/diff3.c:487 +#: src/diff3.c:489 msgid " --strip-trailing-cr strip trailing carriage return on input" msgstr " --strip-trailing-cr a záró kocsi vissza levágása a bemenetrÅ‘l" -#: src/diff3.c:488 +#: src/diff3.c:490 msgid "-T, --initial-tab make tabs line up by prepending a tab" msgstr "" "-T, --initial-tab beigazÃtja a tabulátorokat egy tabulátor\n" " hozzáfűzésével" -#: src/diff3.c:489 +#: src/diff3.c:491 msgid " --diff-program=PROGRAM use PROGRAM to compare files" msgstr "" " --diff-program=PROGRAM a PROGRAM használata fájlok összehasonlÃtásához" -#: src/diff3.c:490 +#: src/diff3.c:492 msgid "" "-L, --label=LABEL use LABEL instead of file name\n" " (can be repeated up to three times)" @@ -1295,24 +1278,24 @@ msgstr "" "-L, --label=CÃMKE CÃMKE használata fájlnév helyett\n" " (legfeljebb háromszor ismételhetÅ‘)" -#: src/diff3.c:493 +#: src/diff3.c:495 msgid " --help display this help and exit" msgstr " --help ezen súgó megjelenÃtése és kilépés" -#: src/diff3.c:494 +#: src/diff3.c:496 msgid "-v, --version output version information and exit" msgstr "-v, --version verzióinformációk kiÃrása és kilépés" -#: src/diff3.c:503 +#: src/diff3.c:505 #, c-format msgid "Usage: %s [OPTION]... MYFILE OLDFILE YOURFILE\n" msgstr "Használat: %s [KAPCSOLÓ]… SAJÃTFÃJL RÉGIFÃJL ÖNFÃJLJA\n" -#: src/diff3.c:505 +#: src/diff3.c:507 msgid "Compare three files line by line." msgstr "Három fájl összehasonlÃtása sorról sorra." -#: src/diff3.c:515 +#: src/diff3.c:517 msgid "" "\n" "The default output format is a somewhat human-readable representation of\n" @@ -1337,47 +1320,47 @@ msgstr "" "belsÅ‘leg történÅ‘ elvégzéséhez, és az aktuális egyesÃtett fájlt Ãrja ki.\n" "Szokatlan bemenethez ez sokkal erÅ‘teljesebb az ed használatánál.\n" -#: src/diff3.c:527 +#: src/diff3.c:529 msgid "Exit status is 0 if successful, 1 if conflicts, 2 if trouble." msgstr "" "A kilépési állapotkód 0, ha sikeres; 1, ha ütközés van; 2, ha hiba történt." -#: src/diff3.c:720 +#: src/diff3.c:722 msgid "internal error: screwup in format of diff blocks" msgstr "belsÅ‘ hiba: zűrzavar az összehasonlÃtási blokkok formátumában" -#: src/diff3.c:1015 +#: src/diff3.c:1017 #, c-format msgid "%s: diff failed: " msgstr "%s: összehasonlÃtás sikertelen: " -#: src/diff3.c:1037 +#: src/diff3.c:1039 msgid "internal error: invalid diff type in process_diff" msgstr "" "belsÅ‘ hiba: érvénytelen összehasonlÃtási tÃpus a process_diff függvényben" -#: src/diff3.c:1062 +#: src/diff3.c:1064 msgid "invalid diff format; invalid change separator" msgstr "érvénytelen összehasonlÃtási formátum; érvénytelen változáselválasztó" -#: src/diff3.c:1298 +#: src/diff3.c:1300 msgid "invalid diff format; incomplete last line" msgstr "érvénytelen összehasonlÃtási formátum; befejezetlen utolsó sor" -#: src/diff3.c:1322 src/sdiff.c:275 src/util.c:970 +#: src/diff3.c:1324 src/sdiff.c:275 src/util.c:969 #, c-format msgid "subsidiary program '%s' could not be invoked" msgstr "a(z) „%s†kisegÃtÅ‘ programot nem sikerült meghÃvni" -#: src/diff3.c:1347 +#: src/diff3.c:1349 msgid "invalid diff format; incorrect leading line chars" msgstr "érvénytelen összehasonlÃtási formátum; helytelen sor eleji karakterek" -#: src/diff3.c:1420 +#: src/diff3.c:1422 msgid "internal error: invalid diff type passed to output" msgstr "belsÅ‘ hiba: érvénytelen összehasonlÃtási tÃpus lett átadva kimenetnek" -#: src/diff3.c:1694 src/diff3.c:1751 +#: src/diff3.c:1695 src/diff3.c:1752 msgid "input file shrank" msgstr "a bementi fájl összement" @@ -1392,7 +1375,7 @@ msgid "%s: recursive directory loop" msgstr "%s: rekurzÃv könyvtárhurok" #. This is a proper name. See the gettext manual, section Names. -#: src/sdiff.c:42 +#: src/sdiff.c:43 msgid "Thomas Lord" msgstr "Thomas Lord" @@ -1540,12 +1523,32 @@ msgstr "" "v:\tA közös sorok felvétele bÅ‘beszédűen.\n" "q:\tKilépés.\n" -#: src/util.c:663 +#: src/util.c:662 #, fuzzy, c-format msgid "unrecognized prefix: %s" msgstr "%s: ismeretlen „--%s†kapcsoló\n" -#: src/util.c:693 +#: src/util.c:692 #, c-format msgid "unparsable value for --palette" msgstr "" + +#, fuzzy +#~ msgid " or 'auto' (the default)" +#~ msgstr "" +#~ " --normal egy normál diff kimenet (az alapértelmezett)" + +#~ msgid "%s: option '--%s' doesn't allow an argument\n" +#~ msgstr "%s: a(z) „--%s†kapcsoló nem enged meg argumentumot\n" + +#~ msgid "%s: unrecognized option '--%s'\n" +#~ msgstr "%s: ismeretlen „--%s†kapcsoló\n" + +#~ msgid "%s: option '-W %s' is ambiguous\n" +#~ msgstr "%s: a „-W %s†kapcsoló nem egyértelmű\n" + +#~ msgid "%s: option '-W %s' doesn't allow an argument\n" +#~ msgstr "%s: a „-W %s†kapcsoló nem enged meg argumentumot\n" + +#~ msgid "%s: option '-W %s' requires an argument\n" +#~ msgstr "%s: a „-W %s†kapcsolóhoz egy argumentum szükséges\n" Binary files differ@@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: diffutils 3.3-pre1\n" "Report-Msgid-Bugs-To: bug-diffutils@gnu.org\n" -"POT-Creation-Date: 2016-08-20 22:22-0700\n" +"POT-Creation-Date: 2017-05-21 13:26-0700\n" "PO-Revision-Date: 2014-08-03 08:00+0700\n" "Last-Translator: Arif E. Nugroho <arif_endro@yahoo.com>\n" "Language-Team: Indonesian <translation-team-id@lists.sourceforge.net>\n" @@ -16,31 +16,32 @@ msgstr "" "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" -#: lib/argmatch.c:133 +#: lib/argmatch.c:134 #, fuzzy, c-format msgid "invalid argument %s for %s" msgstr "argumen %s%s tidak valid '%s'" -#: lib/argmatch.c:134 +#: lib/argmatch.c:135 #, c-format msgid "ambiguous argument %s for %s" msgstr "" -#: lib/argmatch.c:153 +#: lib/argmatch.c:154 #, fuzzy msgid "Valid arguments are:" msgstr "argumen %s%s tidak valid '%s'" -#: lib/c-stack.c:204 lib/c-stack.c:297 +#: lib/c-stack.c:203 lib/c-stack.c:296 msgid "program error" msgstr "kesalahan program" -#: lib/c-stack.c:205 lib/c-stack.c:298 +#: lib/c-stack.c:204 lib/c-stack.c:297 msgid "stack overflow" msgstr "overflow stack" -#: lib/error.c:191 +#: lib/error.c:195 msgid "Unknown system error" msgstr "Kesalahan sistem tidak dikenal" @@ -144,66 +145,41 @@ msgstr "" msgid "weird file" msgstr "berkas aneh" -#: lib/getopt.c:575 lib/getopt.c:604 -#, c-format -msgid "%s: option '%s' is ambiguous; possibilities:" -msgstr "%s: pilihan '%s' ambigu" - -#: lib/getopt.c:619 +#: lib/getopt.c:278 #, fuzzy, c-format -msgid "%s: option '%s' is ambiguous\n" +msgid "%s: option '%s%s' is ambiguous\n" msgstr "%s: pilihan '-W %s' ambigu\n" -#: lib/getopt.c:654 lib/getopt.c:658 -#, c-format -msgid "%s: option '--%s' doesn't allow an argument\n" -msgstr "%s: pilihan '--%s' tidak mengijinkan sebuah argumen\n" +#: lib/getopt.c:284 +#, fuzzy, c-format +msgid "%s: option '%s%s' is ambiguous; possibilities:" +msgstr "%s: pilihan '%s' ambigu" -#: lib/getopt.c:667 lib/getopt.c:672 -#, c-format -msgid "%s: option '%c%s' doesn't allow an argument\n" +#: lib/getopt.c:319 +#, fuzzy, c-format +msgid "%s: unrecognized option '%s%s'\n" +msgstr "%s: pilihan '%c%s' tidak dikenal\n" + +#: lib/getopt.c:345 +#, fuzzy, c-format +msgid "%s: option '%s%s' doesn't allow an argument\n" msgstr "%s: pilihan '%c%s' tidak mengijinkan sebuah argumen\n" -#: lib/getopt.c:715 lib/getopt.c:734 -#, c-format -msgid "%s: option '--%s' requires an argument\n" +#: lib/getopt.c:360 +#, fuzzy, c-format +msgid "%s: option '%s%s' requires an argument\n" msgstr "%s: pilihan '--%s' membutuhkan sebuah argumen\n" -#: lib/getopt.c:772 lib/getopt.c:775 -#, c-format -msgid "%s: unrecognized option '--%s'\n" -msgstr "%s: pilihan '--%s' tidak dikenal\n" - -#: lib/getopt.c:783 lib/getopt.c:786 -#, c-format -msgid "%s: unrecognized option '%c%s'\n" -msgstr "%s: pilihan '%c%s' tidak dikenal\n" - -#: lib/getopt.c:835 lib/getopt.c:838 +#: lib/getopt.c:621 #, c-format msgid "%s: invalid option -- '%c'\n" msgstr "%s: pilihan -- '%c' tidak valid\n" -#: lib/getopt.c:891 lib/getopt.c:908 lib/getopt.c:1118 lib/getopt.c:1136 +#: lib/getopt.c:636 lib/getopt.c:682 #, c-format msgid "%s: option requires an argument -- '%c'\n" msgstr "%s: pilihan -- '%c' membutuhkan sebuah argumen\n" -#: lib/getopt.c:964 lib/getopt.c:980 -#, c-format -msgid "%s: option '-W %s' is ambiguous\n" -msgstr "%s: pilihan '-W %s' ambigu\n" - -#: lib/getopt.c:1004 lib/getopt.c:1022 -#, c-format -msgid "%s: option '-W %s' doesn't allow an argument\n" -msgstr "%s: pilihan '-W %s' tidak mengijinkan sebuah argumen\n" - -#: lib/getopt.c:1043 lib/getopt.c:1061 -#, c-format -msgid "%s: option '-W %s' requires an argument\n" -msgstr "%s: pilihan '-W %s' membutuhkan sebuah argumen\n" - #. TRANSLATORS: #. Get translations for open and closing quotation marks. #. The message catalog should translate "`" to a left @@ -225,11 +201,11 @@ msgstr "%s: pilihan '-W %s' membutuhkan sebuah argumen\n" #. If you don't know what to put here, please see #. <http://en.wikipedia.org/wiki/Quotation_marks_in_other_languages> #. and use glyphs suitable for your language. -#: lib/quotearg.c:347 +#: lib/quotearg.c:362 msgid "`" msgstr "`" -#: lib/quotearg.c:348 +#: lib/quotearg.c:363 msgid "'" msgstr "'" @@ -521,7 +497,7 @@ msgid "General help using GNU software: <http://www.gnu.org/gethelp/>\n" msgstr "" "Bantuan umum menggunakan perangkat lunak GNU: <http://www.gnu.org/gethelp>\n" -#: src/analyze.c:454 src/diff.c:1400 +#: src/analyze.c:454 src/diff.c:1401 #, c-format msgid "Files %s and %s differ\n" msgstr "Berkas %s dan %s berbeda\n" @@ -531,21 +507,21 @@ msgstr "Berkas %s dan %s berbeda\n" msgid "Binary files %s and %s differ\n" msgstr "File biner %s dan %s berbeda\n" -#: src/analyze.c:697 src/diff3.c:1463 src/util.c:1255 +#: src/analyze.c:706 src/diff3.c:1465 src/util.c:1254 msgid "No newline at end of file" msgstr "Tidak ada baris-baru di akhir dari berkas" #. This is a proper name. See the gettext manual, section Names. -#: src/cmp.c:43 +#: src/cmp.c:44 msgid "Torbjorn Granlund" msgstr "Torbjorn Granlund" #. This is a proper name. See the gettext manual, section Names. -#: src/cmp.c:44 +#: src/cmp.c:45 msgid "David MacKenzie" msgstr "David MacKenzie" -#: src/cmp.c:118 src/diff.c:875 src/diff3.c:459 src/sdiff.c:158 +#: src/cmp.c:119 src/diff.c:877 src/diff3.c:462 src/sdiff.c:159 #, c-format msgid "Try '%s --help' for more information." msgstr "Coba '%s --help' untuk informasi lebih lanjut." @@ -560,12 +536,12 @@ msgstr "tidak valid --ignore-initial nilai '%s'" msgid "options -l and -s are incompatible" msgstr "pilihan -l dan -s tidak kompatibel" -#: src/cmp.c:155 src/diff.c:884 src/diff3.c:467 src/sdiff.c:167 src/sdiff.c:315 -#: src/sdiff.c:322 src/sdiff.c:874 src/util.c:853 src/util.c:953 src/util.c:960 +#: src/cmp.c:155 src/diff.c:885 src/diff3.c:469 src/sdiff.c:167 src/sdiff.c:315 +#: src/sdiff.c:322 src/sdiff.c:874 src/util.c:852 src/util.c:952 src/util.c:959 msgid "write failed" msgstr "gagal menulis" -#: src/cmp.c:157 src/diff.c:886 src/diff.c:1465 src/diff3.c:469 src/sdiff.c:169 +#: src/cmp.c:157 src/diff.c:887 src/diff.c:1466 src/diff3.c:471 src/sdiff.c:169 msgid "standard output" msgstr "standar keluaran" @@ -625,7 +601,7 @@ msgstr "" "SKIP1 dan SKIP2 adalah jumlah byte yang harus dilewati di tiap file.\n" "at the beginning of each file (zero by default)." -#: src/cmp.c:185 src/diff.c:996 src/diff3.c:507 src/sdiff.c:210 +#: src/cmp.c:185 src/diff.c:997 src/diff3.c:509 src/sdiff.c:210 msgid "" "Mandatory arguments to long options are mandatory for short options too.\n" msgstr "" @@ -645,7 +621,7 @@ msgstr "" msgid "If a FILE is '-' or missing, read standard input." msgstr "Jika sebuah FILE adalah '-' atau tidak ada, baca input standar" -#: src/cmp.c:195 src/diff.c:984 src/sdiff.c:220 +#: src/cmp.c:195 src/diff.c:985 src/sdiff.c:220 msgid "Exit status is 0 if inputs are the same, 1 if different, 2 if trouble." msgstr "" "Status keluar adalah 0 jika masukan sama, 1 jika berbeda, 2 jika bermasalah." @@ -655,157 +631,172 @@ msgstr "" msgid "invalid --bytes value '%s'" msgstr "nilai --byte tidak valid '%s'" -#: src/cmp.c:266 src/diff.c:793 src/diff3.c:353 src/sdiff.c:565 +#: src/cmp.c:266 src/diff.c:795 src/diff3.c:356 src/sdiff.c:565 #, c-format msgid "missing operand after '%s'" msgstr "tidak ada operand setelah '%s'" -#: src/cmp.c:278 src/diff.c:795 src/diff3.c:355 src/sdiff.c:567 +#: src/cmp.c:278 src/diff.c:797 src/diff3.c:358 src/sdiff.c:567 #, c-format msgid "extra operand '%s'" msgstr "operand ekstra '%s'" -#: src/cmp.c:494 +#: src/cmp.c:498 #, c-format msgid "%s %s differ: byte %s, line %s\n" msgstr "%s %s berbeda: byte %s, baris %s\n" -#: src/cmp.c:510 +#: src/cmp.c:514 #, c-format msgid "%s %s differ: byte %s, line %s is %3o %s %3o %s\n" msgstr "%s %s berbeda: byte %s, baris %s adalah %3o %s %3o %s\n" -#: src/cmp.c:562 -#, c-format -msgid "cmp: EOF on %s\n" +#: src/cmp.c:571 +#, fuzzy, c-format +msgid "cmp: EOF on %s which is empty\n" +msgstr "cmp: EOF pada %s\n" + +#: src/cmp.c:585 +#, fuzzy, c-format +msgid "cmp: EOF on %s after byte %s, line %s\n" +msgstr "%s %s berbeda: byte %s, baris %s\n" + +#: src/cmp.c:586 +#, fuzzy, c-format +msgid "cmp: EOF on %s after byte %s, in line %s\n" +msgstr "%s %s berbeda: byte %s, baris %s\n" + +#: src/cmp.c:592 +#, fuzzy, c-format +msgid "cmp: EOF on %s after byte %s\n" msgstr "cmp: EOF pada %s\n" #. This is a proper name. See the gettext manual, section Names. -#: src/diff.c:49 +#: src/diff.c:50 msgid "Paul Eggert" msgstr "Paul Eggert" #. This is a proper name. See the gettext manual, section Names. -#: src/diff.c:50 +#: src/diff.c:51 msgid "Mike Haertel" msgstr "Mike Haertel" #. This is a proper name. See the gettext manual, section Names. -#: src/diff.c:51 +#: src/diff.c:52 msgid "David Hayes" msgstr "David Hayes" #. This is a proper name. See the gettext manual, section Names. -#: src/diff.c:52 +#: src/diff.c:53 msgid "Richard Stallman" msgstr "Richard Stallman" #. This is a proper name. See the gettext manual, section Names. -#: src/diff.c:53 +#: src/diff.c:54 msgid "Len Tower" msgstr "Len Tower" -#: src/diff.c:351 +#: src/diff.c:353 #, c-format msgid "invalid context length '%s'" msgstr "panjang context tidak valid '%s'" -#: src/diff.c:434 +#: src/diff.c:436 #, c-format msgid "pagination not supported on this host" msgstr "paginasi tidak didukung pada host ini" -#: src/diff.c:449 src/diff3.c:335 +#: src/diff.c:451 src/diff3.c:336 #, c-format msgid "too many file label options" msgstr "terlalu banyak option label file" -#: src/diff.c:526 +#: src/diff.c:528 #, c-format msgid "invalid width '%s'" msgstr "lebar tidak valid '%s'" -#: src/diff.c:530 +#: src/diff.c:532 msgid "conflicting width options" msgstr "option lebar konflik" -#: src/diff.c:555 +#: src/diff.c:557 #, c-format msgid "invalid horizon length '%s'" msgstr "panjang horizon tidak valid '%s'" -#: src/diff.c:611 +#: src/diff.c:613 #, c-format msgid "invalid tabsize '%s'" msgstr "tabsize tidak valid '%s'" -#: src/diff.c:615 +#: src/diff.c:617 msgid "conflicting tabsize options" msgstr "option tabsize konflik" -#: src/diff.c:770 +#: src/diff.c:772 msgid "--from-file and --to-file both specified" msgstr "--from-file dan --to-file keduanya disebutkan" -#: src/diff.c:890 +#: src/diff.c:891 msgid " --normal output a normal diff (the default)" msgstr "--normal Output normal diff." -#: src/diff.c:891 +#: src/diff.c:892 msgid "-q, --brief report only when files differ" msgstr "-q, --brief Tampilkan hanya apakah file berbeda." -#: src/diff.c:892 +#: src/diff.c:893 msgid "-s, --report-identical-files report when two files are the same" msgstr "-s, --report-identical-files Laporkan ketika dua file sama." -#: src/diff.c:893 +#: src/diff.c:894 msgid "" "-c, -C NUM, --context[=NUM] output NUM (default 3) lines of copied context" msgstr "" "-c, -C NUM, --context[=NUM] output NUM (default 3) lines of copied context" -#: src/diff.c:894 +#: src/diff.c:895 msgid "" "-u, -U NUM, --unified[=NUM] output NUM (default 3) lines of unified context" msgstr "" "-w, NUM --width=NUM Output paling banyak NUM (baku 130) kolom cetakan." -#: src/diff.c:895 +#: src/diff.c:896 msgid "-e, --ed output an ed script" msgstr "-e, --ed Output adalah script ed." -#: src/diff.c:896 +#: src/diff.c:897 msgid "-n, --rcs output an RCS format diff" msgstr "-n, --rcs Output dalam format RCS diff." -#: src/diff.c:897 +#: src/diff.c:898 msgid "-y, --side-by-side output in two columns" msgstr "-y, --side-by-side output in two columns" -#: src/diff.c:898 +#: src/diff.c:899 msgid "" "-W, --width=NUM output at most NUM (default 130) print columns" msgstr "-W, --width=NUM Output paling banyak NUM (baku 130) kolom cetakan." -#: src/diff.c:899 +#: src/diff.c:900 msgid "" " --left-column output only the left column of common lines" msgstr " --left-column Hanya tampilkan kolom kiri baris yang sama." -#: src/diff.c:900 +#: src/diff.c:901 msgid " --suppress-common-lines do not output common lines" msgstr " --suppress-common-lines Jangan tampilkan baris yang sama." -#: src/diff.c:902 +#: src/diff.c:903 msgid "-p, --show-c-function show which C function each change is in" msgstr "-p, --show-c-function show which C function each change is in" -#: src/diff.c:903 +#: src/diff.c:904 msgid "-F, --show-function-line=RE show the most recent line matching RE" msgstr "-F, --show-function-line=RE show the most recent line matching RE" -#: src/diff.c:904 +#: src/diff.c:905 #, fuzzy msgid "" " --label LABEL use LABEL instead of file name and timestamp\n" @@ -814,74 +805,74 @@ msgstr "" " --label LABEL use LABEL instead of file name\n" " (can be repeated)" -#: src/diff.c:907 +#: src/diff.c:908 msgid "-t, --expand-tabs expand tabs to spaces in output" msgstr "-t, --expand-tabs Ekspansi tab ke spasi dalam output." -#: src/diff.c:908 +#: src/diff.c:909 msgid "-T, --initial-tab make tabs line up by prepending a tab" msgstr "-T, --initial-tab Buat tab beraturan dg menambahkan sebuah tab." -#: src/diff.c:909 +#: src/diff.c:910 msgid "" " --tabsize=NUM tab stops every NUM (default 8) print columns" msgstr "--tabsize=NUM Tab stop adalah setiap NUM (default 8) kolom cetakan." -#: src/diff.c:910 +#: src/diff.c:911 msgid "" " --suppress-blank-empty suppress space or tab before empty output lines" msgstr "" "--suppress-blank-empty Tekan spasi atau tab sebelum mengeluarkan baris " "kosong." -#: src/diff.c:911 +#: src/diff.c:912 msgid "-l, --paginate pass output through 'pr' to paginate it" msgstr "-l, --paginate Berikan output ke `pr' untuk di-paginate." -#: src/diff.c:913 +#: src/diff.c:914 msgid "" "-r, --recursive recursively compare any subdirectories found" msgstr "-r, --recursive Membandingkan subdirektori secara rekursif." -#: src/diff.c:914 +#: src/diff.c:915 msgid " --no-dereference don't follow symbolic links" msgstr " --no-dereference don't follow symbolic links" -#: src/diff.c:915 +#: src/diff.c:916 msgid "-N, --new-file treat absent files as empty" msgstr "-N, --new-file Perlakukan tiada file sebagai kosong." -#: src/diff.c:916 +#: src/diff.c:917 msgid " --unidirectional-new-file treat absent first files as empty" msgstr "" "--unidirectional-new-file Anggap file tidak ada pertama sebagai kosong." -#: src/diff.c:917 +#: src/diff.c:918 msgid " --ignore-file-name-case ignore case when comparing file names" msgstr "--ignore-file-name-case Abaikan case saat membandingkan nama file." -#: src/diff.c:918 +#: src/diff.c:919 msgid " --no-ignore-file-name-case consider case when comparing file names" msgstr "" "--no-ignore-file-name-case Pertimbangkan case saat membandingkan nama file." -#: src/diff.c:919 +#: src/diff.c:920 msgid "-x, --exclude=PAT exclude files that match PAT" msgstr "-x, --exclude=PAT Tanpa file yang cocok dengan PAT." -#: src/diff.c:920 +#: src/diff.c:921 msgid "" "-X, --exclude-from=FILE exclude files that match any pattern in FILE" msgstr "" "-X, --exclude-from=FILE Abaikan file yang cocok dengan pola dalam FILE" -#: src/diff.c:921 +#: src/diff.c:922 msgid "" "-S, --starting-file=FILE start with FILE when comparing directories" msgstr "" "-S, --starting-file=FILE Mulai dengan FILE ketika membandingkan direktori." -#: src/diff.c:922 +#: src/diff.c:923 msgid "" " --from-file=FILE1 compare FILE1 to all operands;\n" " FILE1 can be a directory" @@ -890,7 +881,7 @@ msgstr "" "direktori.\n" " FILE1 can be a directory" -#: src/diff.c:924 +#: src/diff.c:925 msgid "" " --to-file=FILE2 compare all operands to FILE2;\n" " FILE2 can be a directory" @@ -899,71 +890,71 @@ msgstr "" "direktori.\n" " FILE2 can be a directory" -#: src/diff.c:927 +#: src/diff.c:928 msgid "" "-i, --ignore-case ignore case differences in file contents" msgstr "-i, --ignore-case Abaikan beda case dalam isi file." -#: src/diff.c:928 +#: src/diff.c:929 msgid "-E, --ignore-tab-expansion ignore changes due to tab expansion" msgstr "-E, --ignore-tab-expansion Abaikan perubahan akibat ekspansi tab." -#: src/diff.c:929 +#: src/diff.c:930 msgid "-Z, --ignore-trailing-space ignore white space at line end" msgstr "-Z, --ignore-all-space Abaikan seluruh white space." -#: src/diff.c:930 +#: src/diff.c:931 msgid "" "-b, --ignore-space-change ignore changes in the amount of white space" msgstr "-b, --ignore-space-change Abaikan perubahan sejumlah white space." -#: src/diff.c:931 +#: src/diff.c:932 msgid "-w, --ignore-all-space ignore all white space" msgstr "-w, --ignore-all-space Abaikan seluruh white space." -#: src/diff.c:932 +#: src/diff.c:933 msgid "" "-B, --ignore-blank-lines ignore changes where lines are all blank" msgstr "-B, --ignore-blank-lines Abaikan perubahan baris kosong." -#: src/diff.c:933 +#: src/diff.c:934 msgid "-I, --ignore-matching-lines=RE ignore changes where all lines match RE" msgstr "" "-I, --ignore-matching-lines=RE Abaikan perubahan baris yang cocok dg RE." -#: src/diff.c:935 +#: src/diff.c:936 msgid "-a, --text treat all files as text" msgstr "-a, --text Perlakukan seluruh file sebagai teks." -#: src/diff.c:936 +#: src/diff.c:937 msgid " --strip-trailing-cr strip trailing carriage return on input" msgstr "--strip-trailing-cr Hapus trailing carriage return pada input." -#: src/diff.c:938 +#: src/diff.c:939 msgid " --binary read and write data in binary mode" msgstr "--binary Baca dan tulis data dalam mode biner." -#: src/diff.c:941 +#: src/diff.c:942 msgid "" "-D, --ifdef=NAME output merged file with '#ifdef NAME' diffs" msgstr "" "-D, --ifdef=NAME Output file merge untuk tampilkan `#ifdef NAME' diffs." -#: src/diff.c:942 +#: src/diff.c:943 msgid " --GTYPE-group-format=GFMT format GTYPE input groups with GFMT" msgstr "" "--GTYPE-group-format=GFMT Serupa, tapi format input kelompok GTYPE dg GFMT. " -#: src/diff.c:943 +#: src/diff.c:944 msgid " --line-format=LFMT format all input lines with LFMT" msgstr "--line-format=LFMT Serupa, tapi format seluruh baris input dg LFMT." -#: src/diff.c:944 +#: src/diff.c:945 msgid " --LTYPE-line-format=LFMT format LTYPE input lines with LFMT" msgstr "" "--LTYPE-line-format=LFMT Serupa, tapi format baris input LTYPE dg LFMT." -#: src/diff.c:945 +#: src/diff.c:946 msgid "" " These format options provide fine-grained control over the output\n" " of diff, generalizing -D/--ifdef." @@ -971,13 +962,13 @@ msgstr "" " These format options provide fine-grained control over the output\n" " of diff, generalizing -D/--ifdef." -#: src/diff.c:947 +#: src/diff.c:948 msgid " LTYPE is 'old', 'new', or 'unchanged'. GTYPE is LTYPE or 'changed'." msgstr "" " LTYPE adalah 'old', 'new', atau 'unchanged'. GTYPE adalah LTYPE atau " "'changed'." -#: src/diff.c:948 +#: src/diff.c:949 msgid "" " GFMT (only) may contain:\n" " %< lines from FILE1\n" @@ -1006,7 +997,7 @@ msgstr "" " M L+1\n" " %(A=B?T:E) if A equals B then T else E" -#: src/diff.c:960 +#: src/diff.c:961 msgid "" " LFMT (only) may contain:\n" " %L contents of line\n" @@ -1018,7 +1009,7 @@ msgstr "" " %l isi baris, tanpa baris baru\n" " %[-][WIDTH][.[PREC]]{doxX}n printf-style spec untuk nomor baris input" -#: src/diff.c:964 +#: src/diff.c:965 msgid "" " Both GFMT and LFMT may contain:\n" " %% %\n" @@ -1031,148 +1022,141 @@ msgstr "" " %c'C' karakter tunggal C\n" " %c'\\OOO' karakter dengan kode oktal OOO" -#: src/diff.c:970 +#: src/diff.c:971 msgid "-d, --minimal try hard to find a smaller set of changes" msgstr "-d, --minimal Usahakan mencari perubahan terkecil." -#: src/diff.c:971 +#: src/diff.c:972 msgid " --horizon-lines=NUM keep NUM lines of the common prefix and suffix" msgstr "--horizon-lines=NUM Pertahankan NUM baris prefiks dan suffiks umum." -#: src/diff.c:972 +#: src/diff.c:973 msgid "" " --speed-large-files assume large files and many scattered small changes" msgstr "" " --speed-large-files Asumsikan file besar dan banyak sebaran perubahan " "kecil." -#: src/diff.c:973 -msgid "" -" --color[=WHEN] colorize the output; WHEN can be 'never', 'always'," -msgstr "" - #: src/diff.c:974 -#, fuzzy -msgid " or 'auto' (the default)" -msgstr "--normal Output normal diff." - -#: src/diff.c:975 msgid "" -" --palette=PALETTE specify the colors to use when --color is active" +" --color[=WHEN] colorize the output; WHEN can be 'never', " +"'always',\n" +" or 'auto' (the default)" msgstr "" #: src/diff.c:976 msgid "" -" PALETTE is a colon-separated list terminfo " -"capabilities" +" --palette=PALETTE the colors to use when --color is active; PALETTE " +"is\n" +" a colon-separated list of terminfo capabilities" msgstr "" -#: src/diff.c:978 +#: src/diff.c:979 msgid " --help display this help and exit" msgstr " --help display this help and exit" -#: src/diff.c:979 +#: src/diff.c:980 msgid "-v, --version output version information and exit" msgstr "-v, --version Tampilkan informasi versi." -#: src/diff.c:981 +#: src/diff.c:982 #, fuzzy msgid "FILES are 'FILE1 FILE2' or 'DIR1 DIR2' or 'DIR FILE' or 'FILE DIR'." msgstr "" "FILES adalah 'FILE1 FILE2' atau 'DIR1 DIR2' atau 'DIR FILE...' atau 'FILE... " "DIR'." -#: src/diff.c:982 +#: src/diff.c:983 msgid "" "If --from-file or --to-file is given, there are no restrictions on FILE(s)." msgstr "" "Bila --from-file atau --to-file diberikan, tidak ada batasan untuk FILES." -#: src/diff.c:983 src/diff3.c:526 src/sdiff.c:219 +#: src/diff.c:984 src/diff3.c:528 src/sdiff.c:219 msgid "If a FILE is '-', read standard input." msgstr "Jika sebuah file FILE adalah '-', baca standard input." -#: src/diff.c:993 +#: src/diff.c:994 #, c-format msgid "Usage: %s [OPTION]... FILES\n" msgstr "Penggunaan: %s [OPTION]... FILES\n" -#: src/diff.c:994 +#: src/diff.c:995 msgid "Compare FILES line by line." msgstr "Bandingkan file baris per baris" -#: src/diff.c:1028 +#: src/diff.c:1029 #, c-format msgid "conflicting %s option value '%s'" msgstr "Nilai option %s konflik dengan '%s'" -#: src/diff.c:1041 +#: src/diff.c:1042 #, c-format msgid "conflicting output style options" msgstr "option gaya output konflik" -#: src/diff.c:1057 +#: src/diff.c:1058 #, fuzzy, c-format msgid "invalid color '%s'" msgstr "lebar tidak valid '%s'" -#: src/diff.c:1113 src/diff.c:1323 +#: src/diff.c:1114 src/diff.c:1324 #, c-format msgid "Only in %s: %s\n" msgstr "Hanya dalam %s: %s\n" -#: src/diff.c:1247 +#: src/diff.c:1248 msgid "cannot compare '-' to a directory" msgstr "tidak dapat membandingkan '-' dg direktori" -#: src/diff.c:1282 +#: src/diff.c:1283 msgid "-D option not supported with directories" msgstr "-D option tidak didukung dg direktori" -#: src/diff.c:1291 +#: src/diff.c:1292 #, c-format msgid "Common subdirectories: %s and %s\n" msgstr "Subdirektori sama: %s dan %s\n" -#: src/diff.c:1333 src/diff.c:1383 +#: src/diff.c:1334 src/diff.c:1384 #, c-format msgid "File %s is a %s while file %s is a %s\n" msgstr "File %s adalah %s sementara file %s adalah %s\n" -#: src/diff.c:1369 +#: src/diff.c:1370 #, c-format msgid "Symbolic links %s and %s differ\n" msgstr "Berkas %s dan %s berbeda\n" -#: src/diff.c:1456 +#: src/diff.c:1457 #, c-format msgid "Files %s and %s are identical\n" msgstr "File %s dan %s identik\n" #. This is a proper name. See the gettext manual, section Names. -#: src/diff3.c:41 +#: src/diff3.c:42 msgid "Randy Smith" msgstr "Randy Smith" -#: src/diff3.c:348 +#: src/diff3.c:351 #, c-format msgid "incompatible options" msgstr "option tidak kompatibel" -#: src/diff3.c:388 +#: src/diff3.c:391 msgid "'-' specified for more than one input file" msgstr "'-' dispesifikasikan lebih dari satu file input" -#: src/diff3.c:439 src/diff3.c:1288 src/diff3.c:1692 src/diff3.c:1747 +#: src/diff3.c:442 src/diff3.c:1290 src/diff3.c:1693 src/diff3.c:1748 #: src/sdiff.c:307 src/sdiff.c:844 src/sdiff.c:855 msgid "read failed" msgstr "gagal membaca" -#: src/diff3.c:473 +#: src/diff3.c:475 msgid "-A, --show-all output all changes, bracketing conflicts" msgstr "-A, --show-all Output seluruh perubahan, konflik dalam tanda kurung." -#: src/diff3.c:475 +#: src/diff3.c:477 msgid "" "-e, --ed output ed script incorporating changes\n" " from OLDFILE to YOURFILE into MYFILE" @@ -1180,31 +1164,31 @@ msgstr "" "-e --ed Output perubahan tanpa dimerge dari OLDFILE ke YOURFILE ke dl " "MYFILE." -#: src/diff3.c:477 +#: src/diff3.c:479 msgid "-E, --show-overlap like -e, but bracket conflicts" msgstr "" "-E, --show-overlap Output perubahan unmerge, konflik dl tanda kurung." -#: src/diff3.c:478 +#: src/diff3.c:480 msgid "" "-3, --easy-only like -e, but incorporate only nonoverlapping " "changes" msgstr "-3, --easy-only Output unmerged perubahan nonoverlap." -#: src/diff3.c:479 +#: src/diff3.c:481 msgid "" "-x, --overlap-only like -e, but incorporate only overlapping changes" msgstr "-x, --overlap-only Tampilkan perubahan yang overlap." -#: src/diff3.c:480 +#: src/diff3.c:482 msgid "-X like -x, but bracket conflicts" msgstr "-X like -x, but bracket conflicts" -#: src/diff3.c:481 +#: src/diff3.c:483 msgid "-i append 'w' and 'q' commands to ed scripts" msgstr "-i Tambah perintah 'w' dan 'q' ke script ed." -#: src/diff3.c:483 +#: src/diff3.c:485 msgid "" "-m, --merge output actual merged file, according to\n" " -A if no other options are given" @@ -1212,23 +1196,23 @@ msgstr "" "-m, --merge output actual merged file, according to\n" " -A if no other options are given" -#: src/diff3.c:486 +#: src/diff3.c:488 msgid "-a, --text treat all files as text" msgstr "-a, --text Perlakukan seluruh file sebagai teks." -#: src/diff3.c:487 +#: src/diff3.c:489 msgid " --strip-trailing-cr strip trailing carriage return on input" msgstr "--strip-trailing-cr Hapus trailing carriage return pada input." -#: src/diff3.c:488 +#: src/diff3.c:490 msgid "-T, --initial-tab make tabs line up by prepending a tab" msgstr "-T, --initial-tab Buat tab beraturan dg menambahkan sebuah tab." -#: src/diff3.c:489 +#: src/diff3.c:491 msgid " --diff-program=PROGRAM use PROGRAM to compare files" msgstr "--diff-program=PROGRAM Gunakan PROGRAM untuk membandingkan file." -#: src/diff3.c:490 +#: src/diff3.c:492 msgid "" "-L, --label=LABEL use LABEL instead of file name\n" " (can be repeated up to three times)" @@ -1236,24 +1220,24 @@ msgstr "" "-L, --label=LABEL use LABEL instead of file name\n" " (can be repeated up to three times)" -#: src/diff3.c:493 +#: src/diff3.c:495 msgid " --help display this help and exit" msgstr " --help display this help and exit" -#: src/diff3.c:494 +#: src/diff3.c:496 msgid "-v, --version output version information and exit" msgstr "-v, --version Tampilkan informasi versi." -#: src/diff3.c:503 +#: src/diff3.c:505 #, c-format msgid "Usage: %s [OPTION]... MYFILE OLDFILE YOURFILE\n" msgstr "Pemakaian: %s [OPTION]... MYFILE OLDFILE YOURFILE\n" -#: src/diff3.c:505 +#: src/diff3.c:507 msgid "Compare three files line by line." msgstr "Bandingkan tiga file baris per baris." -#: src/diff3.c:515 +#: src/diff3.c:517 msgid "" "\n" "The default output format is a somewhat human-readable representation of\n" @@ -1277,46 +1261,46 @@ msgstr "" "and output the actual merged file. For unusual input, this is more\n" "robust than using ed.\n" -#: src/diff3.c:527 +#: src/diff3.c:529 msgid "Exit status is 0 if successful, 1 if conflicts, 2 if trouble." msgstr "" "Status keluaran adalah 0 jika sukses, 1 jika konflik, 2 jika bermasalah." -#: src/diff3.c:720 +#: src/diff3.c:722 msgid "internal error: screwup in format of diff blocks" msgstr "kesalahan internal: kacau dalam format blok diff" -#: src/diff3.c:1015 +#: src/diff3.c:1017 #, c-format msgid "%s: diff failed: " msgstr "%s: diff gagal: " -#: src/diff3.c:1037 +#: src/diff3.c:1039 msgid "internal error: invalid diff type in process_diff" msgstr "kesalahan internal: tipe diff tidak valid dalam process_diff" -#: src/diff3.c:1062 +#: src/diff3.c:1064 msgid "invalid diff format; invalid change separator" msgstr "format diff tidak valid; separator perubahan tidak valid" -#: src/diff3.c:1298 +#: src/diff3.c:1300 msgid "invalid diff format; incomplete last line" msgstr "format diff tidak valid; baris akhir tidak lengkap" -#: src/diff3.c:1322 src/sdiff.c:275 src/util.c:970 +#: src/diff3.c:1324 src/sdiff.c:275 src/util.c:969 #, c-format msgid "subsidiary program '%s' could not be invoked" msgstr "program subsider '%s' tidak dipanggil" -#: src/diff3.c:1347 +#: src/diff3.c:1349 msgid "invalid diff format; incorrect leading line chars" msgstr "format diff tidak valid; karakter leading line tidak tepat" -#: src/diff3.c:1420 +#: src/diff3.c:1422 msgid "internal error: invalid diff type passed to output" msgstr "kesalahan internal: tipe diff tidak valid dimasukkan ke output" -#: src/diff3.c:1694 src/diff3.c:1751 +#: src/diff3.c:1695 src/diff3.c:1752 msgid "input file shrank" msgstr "file input mengecil" @@ -1331,7 +1315,7 @@ msgid "%s: recursive directory loop" msgstr "%s: rekursif loop direktori" #. This is a proper name. See the gettext manual, section Names. -#: src/sdiff.c:42 +#: src/sdiff.c:43 msgid "Thomas Lord" msgstr "Thomas Lord" @@ -1466,16 +1450,35 @@ msgstr "" "v:\tSertakan baris bersama secara verbose.\n" "q:\tKeluar.\n" -#: src/util.c:663 +#: src/util.c:662 #, fuzzy, c-format msgid "unrecognized prefix: %s" msgstr "%s: pilihan '--%s' tidak dikenal\n" -#: src/util.c:693 +#: src/util.c:692 #, c-format msgid "unparsable value for --palette" msgstr "" +#, fuzzy +#~ msgid " or 'auto' (the default)" +#~ msgstr "--normal Output normal diff." + +#~ msgid "%s: option '--%s' doesn't allow an argument\n" +#~ msgstr "%s: pilihan '--%s' tidak mengijinkan sebuah argumen\n" + +#~ msgid "%s: unrecognized option '--%s'\n" +#~ msgstr "%s: pilihan '--%s' tidak dikenal\n" + +#~ msgid "%s: option '-W %s' is ambiguous\n" +#~ msgstr "%s: pilihan '-W %s' ambigu\n" + +#~ msgid "%s: option '-W %s' doesn't allow an argument\n" +#~ msgstr "%s: pilihan '-W %s' tidak mengijinkan sebuah argumen\n" + +#~ msgid "%s: option '-W %s' requires an argument\n" +#~ msgstr "%s: pilihan '-W %s' membutuhkan sebuah argumen\n" + #~ msgid "-i SKIP1:SKIP2 --ignore-initial=SKIP1:SKIP2" #~ msgstr "-i SKIP1:SKIP2 --ignore-initial=SKIP1:SKIP2" @@ -1,45 +1,45 @@ # Italian messages for diffutils. # Copyright (C) 2004, 2005, 2010 Free Software Foundation, Inc. # This file is distributed under the same license as the diffutils package. -# Marco Colombo <m.colombo@ed.ac.uk>, 2004, 2005, 2010, 2011, 2015. +# Marco Colombo <m.colombo@ed.ac.uk>, 2004, 2005, 2010, 2011, 2015, 2017. # msgid "" msgstr "" -"Project-Id-Version: diffutils 3.3-pre1\n" +"Project-Id-Version: diffutils 3.5.14\n" "Report-Msgid-Bugs-To: bug-diffutils@gnu.org\n" -"POT-Creation-Date: 2016-08-20 22:22-0700\n" -"PO-Revision-Date: 2015-08-05 14:57+0100\n" +"POT-Creation-Date: 2017-05-21 13:26-0700\n" +"PO-Revision-Date: 2017-02-28 09:33+0000\n" "Last-Translator: Marco Colombo <m.colombo@ed.ac.uk>\n" "Language-Team: Italian <tp@lists.linux.it>\n" "Language: it\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" -#: lib/argmatch.c:133 -#, fuzzy, c-format +#: lib/argmatch.c:134 +#, c-format msgid "invalid argument %s for %s" -msgstr "argomento '%3$s' di %1$s%2$s non valido" +msgstr "argomento \"%s\" di %s non valido" -#: lib/argmatch.c:134 +#: lib/argmatch.c:135 #, c-format msgid "ambiguous argument %s for %s" -msgstr "" +msgstr "argomento \"%s\" di %s ambiguo" -#: lib/argmatch.c:153 -#, fuzzy +#: lib/argmatch.c:154 msgid "Valid arguments are:" -msgstr "argomento '%3$s' di %1$s%2$s non valido" +msgstr "Argomenti validi sono:" -#: lib/c-stack.c:204 lib/c-stack.c:297 +#: lib/c-stack.c:203 lib/c-stack.c:296 msgid "program error" msgstr "errore del programma" -#: lib/c-stack.c:205 lib/c-stack.c:298 +#: lib/c-stack.c:204 lib/c-stack.c:297 msgid "stack overflow" msgstr "overflow dello stack" -#: lib/error.c:191 +#: lib/error.c:195 msgid "Unknown system error" msgstr "Errore di sistema sconosciuto" @@ -86,7 +86,7 @@ msgstr "file speciale a caratteri" #: lib/file-type.c:72 msgid "contiguous data" -msgstr "" +msgstr "dati contigui" #: lib/file-type.c:75 msgid "fifo" @@ -94,43 +94,39 @@ msgstr "fifo" #: lib/file-type.c:78 msgid "door" -msgstr "" +msgstr "porta" #: lib/file-type.c:81 -#, fuzzy msgid "multiplexed block special file" -msgstr "file speciale a blocchi" +msgstr "" #: lib/file-type.c:84 -#, fuzzy msgid "multiplexed character special file" -msgstr "file speciale a caratteri" +msgstr "" #: lib/file-type.c:87 msgid "multiplexed file" msgstr "" #: lib/file-type.c:90 -#, fuzzy msgid "named file" -msgstr "file strano" +msgstr "" #: lib/file-type.c:93 -#, fuzzy msgid "network special file" -msgstr "file speciale a blocchi" +msgstr "file speciale di rete" #: lib/file-type.c:96 msgid "migrated file with data" -msgstr "" +msgstr "file migrato con dati" #: lib/file-type.c:99 msgid "migrated file without data" -msgstr "" +msgstr "file migrato senza dati" #: lib/file-type.c:102 msgid "port" -msgstr "" +msgstr "porta" #: lib/file-type.c:105 msgid "socket" @@ -144,65 +140,40 @@ msgstr "" msgid "weird file" msgstr "file strano" -#: lib/getopt.c:575 lib/getopt.c:604 -#, c-format -msgid "%s: option '%s' is ambiguous; possibilities:" -msgstr "%s: l'opzione '%s' è ambigua; alternative:" - -#: lib/getopt.c:619 +#: lib/getopt.c:278 #, fuzzy, c-format -msgid "%s: option '%s' is ambiguous\n" -msgstr "%s: l'opzione '-W %s' è ambigua\n" - -#: lib/getopt.c:654 lib/getopt.c:658 -#, c-format -msgid "%s: option '--%s' doesn't allow an argument\n" -msgstr "%s: l'opzione '--%s' non accetta argomenti\n" +msgid "%s: option '%s%s' is ambiguous\n" +msgstr "%s: l'opzione \"%s\" è ambigua\n" -#: lib/getopt.c:667 lib/getopt.c:672 -#, c-format -msgid "%s: option '%c%s' doesn't allow an argument\n" -msgstr "%s: l'opzione '%c%s' non accetta argomenti\n" +#: lib/getopt.c:284 +#, fuzzy, c-format +msgid "%s: option '%s%s' is ambiguous; possibilities:" +msgstr "%s: l'opzione \"%s\" è ambigua; alternative:" -#: lib/getopt.c:715 lib/getopt.c:734 -#, c-format -msgid "%s: option '--%s' requires an argument\n" -msgstr "%s: l'opzione '%s' richiede un argomento\n" +#: lib/getopt.c:319 +#, fuzzy, c-format +msgid "%s: unrecognized option '%s%s'\n" +msgstr "%s: opzione \"%c%s\" non riconosciuta\n" -#: lib/getopt.c:772 lib/getopt.c:775 -#, c-format -msgid "%s: unrecognized option '--%s'\n" -msgstr "%s: opzione '--%s' non riconosciuta\n" +#: lib/getopt.c:345 +#, fuzzy, c-format +msgid "%s: option '%s%s' doesn't allow an argument\n" +msgstr "%s: l'opzione \"%c%s\" non accetta argomenti\n" -#: lib/getopt.c:783 lib/getopt.c:786 -#, c-format -msgid "%s: unrecognized option '%c%s'\n" -msgstr "%s: opzione '%c%s' non riconosciuta\n" +#: lib/getopt.c:360 +#, fuzzy, c-format +msgid "%s: option '%s%s' requires an argument\n" +msgstr "%s: l'opzione \"%s\" richiede un argomento\n" -#: lib/getopt.c:835 lib/getopt.c:838 +#: lib/getopt.c:621 #, c-format msgid "%s: invalid option -- '%c'\n" -msgstr "%s: opzione non valida -- '%c'\n" +msgstr "%s: opzione non valida -- \"%c\"\n" -#: lib/getopt.c:891 lib/getopt.c:908 lib/getopt.c:1118 lib/getopt.c:1136 +#: lib/getopt.c:636 lib/getopt.c:682 #, c-format msgid "%s: option requires an argument -- '%c'\n" -msgstr "%s: l'opzione richiede un argomento -- '%c'\n" - -#: lib/getopt.c:964 lib/getopt.c:980 -#, c-format -msgid "%s: option '-W %s' is ambiguous\n" -msgstr "%s: l'opzione '-W %s' è ambigua\n" - -#: lib/getopt.c:1004 lib/getopt.c:1022 -#, c-format -msgid "%s: option '-W %s' doesn't allow an argument\n" -msgstr "%s: l'opzione '-W %s' non accetta argomenti\n" - -#: lib/getopt.c:1043 lib/getopt.c:1061 -#, c-format -msgid "%s: option '-W %s' requires an argument\n" -msgstr "%s: l'opzione '-W %s' richiede un argomento\n" +msgstr "%s: l'opzione richiede un argomento -- \"%c\"\n" #. TRANSLATORS: #. Get translations for open and closing quotation marks. @@ -225,13 +196,13 @@ msgstr "%s: l'opzione '-W %s' richiede un argomento\n" #. If you don't know what to put here, please see #. <http://en.wikipedia.org/wiki/Quotation_marks_in_other_languages> #. and use glyphs suitable for your language. -#: lib/quotearg.c:347 +#: lib/quotearg.c:362 msgid "`" -msgstr "'" +msgstr "\"" -#: lib/quotearg.c:348 +#: lib/quotearg.c:363 msgid "'" -msgstr "'" +msgstr "\"" #: lib/regcomp.c:135 msgid "Success" @@ -262,17 +233,16 @@ msgid "Invalid back reference" msgstr "Riferimento all'indietro non valido" #: lib/regcomp.c:156 -#, fuzzy msgid "Unmatched [, [^, [:, [., or [=" -msgstr "[ o [^ non accoppiata" +msgstr "[, [^, [:, [. o [= senza corrispondenza" #: lib/regcomp.c:159 msgid "Unmatched ( or \\(" -msgstr "( o \\( non accoppiata" +msgstr "( o \\( senza corrispondenza" #: lib/regcomp.c:162 msgid "Unmatched \\{" -msgstr "\\{ non accoppiata" +msgstr "\\{ senza corrispondenza" #: lib/regcomp.c:165 msgid "Invalid content of \\{\\}" @@ -334,17 +304,17 @@ msgstr "riapertura di %s in modalità %s non riuscita" #: lib/xstrtol-error.c:63 #, c-format msgid "invalid %s%s argument '%s'" -msgstr "argomento '%3$s' di %1$s%2$s non valido" +msgstr "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 "suffisso '%3$s' non valido nell'argomento di %1$s%2$s" +msgstr "suffisso \"%3$s\" non valido nell'argomento di %1$s%2$s" #: lib/xstrtol-error.c:72 #, c-format msgid "%s%s argument '%s' too large" -msgstr "argomento '%3$s' di %1$s%2$s troppo grande" +msgstr "argomento \"%3$s\" di %1$s%2$s troppo grande" #: lib/version-etc.c:74 #, c-format @@ -520,7 +490,7 @@ msgstr "%s home page: <http://www.gnu.org/software/%s/>\n" msgid "General help using GNU software: <http://www.gnu.org/gethelp/>\n" msgstr "Aiuto sull'uso di software GNU: <http://www.gnu.org/gethelp/>\n" -#: src/analyze.c:454 src/diff.c:1400 +#: src/analyze.c:454 src/diff.c:1401 #, c-format msgid "Files %s and %s differ\n" msgstr "I file %s e %s sono diversi\n" @@ -530,41 +500,41 @@ msgstr "I file %s e %s sono diversi\n" msgid "Binary files %s and %s differ\n" msgstr "I file binari %s e %s sono diversi\n" -#: src/analyze.c:697 src/diff3.c:1463 src/util.c:1255 +#: src/analyze.c:706 src/diff3.c:1465 src/util.c:1254 msgid "No newline at end of file" msgstr "Manca newline alla fine del file" #. This is a proper name. See the gettext manual, section Names. -#: src/cmp.c:43 +#: src/cmp.c:44 msgid "Torbjorn Granlund" msgstr "Torbjorn Granlund" #. This is a proper name. See the gettext manual, section Names. -#: src/cmp.c:44 +#: src/cmp.c:45 msgid "David MacKenzie" msgstr "David MacKenzie" -#: src/cmp.c:118 src/diff.c:875 src/diff3.c:459 src/sdiff.c:158 +#: src/cmp.c:119 src/diff.c:877 src/diff3.c:462 src/sdiff.c:159 #, c-format msgid "Try '%s --help' for more information." -msgstr "Usare '%s --help' per maggiori informazioni." +msgstr "Usare \"%s --help\" per maggiori informazioni." #: src/cmp.c:137 #, c-format msgid "invalid --ignore-initial value '%s'" -msgstr "Valore '%s' non valido per --ignore-initial" +msgstr "Valore \"%s\" non valido per --ignore-initial" #: src/cmp.c:147 #, c-format msgid "options -l and -s are incompatible" msgstr "le opzioni -l e -s sono incompatibili" -#: src/cmp.c:155 src/diff.c:884 src/diff3.c:467 src/sdiff.c:167 src/sdiff.c:315 -#: src/sdiff.c:322 src/sdiff.c:874 src/util.c:853 src/util.c:953 src/util.c:960 +#: src/cmp.c:155 src/diff.c:885 src/diff3.c:469 src/sdiff.c:167 src/sdiff.c:315 +#: src/sdiff.c:322 src/sdiff.c:874 src/util.c:852 src/util.c:952 src/util.c:959 msgid "write failed" msgstr "scrittura non riuscita" -#: src/cmp.c:157 src/diff.c:886 src/diff.c:1465 src/diff3.c:469 src/sdiff.c:169 +#: src/cmp.c:157 src/diff.c:887 src/diff.c:1466 src/diff3.c:471 src/sdiff.c:169 msgid "standard output" msgstr "standard output" @@ -630,7 +600,7 @@ msgstr "" "I valori opzionali SKIP1 e SKIP2 indicano il numero di byte da saltare\n" "all'inizio di ogni file (zero se non indicato)." -#: src/cmp.c:185 src/diff.c:996 src/diff3.c:507 src/sdiff.c:210 +#: src/cmp.c:185 src/diff.c:997 src/diff3.c:509 src/sdiff.c:210 msgid "" "Mandatory arguments to long options are mandatory for short options too.\n" msgstr "" @@ -650,9 +620,9 @@ msgstr "" #: src/cmp.c:194 msgid "If a FILE is '-' or missing, read standard input." -msgstr "Se un FILE è '-' o è mancante, legge lo standard input." +msgstr "Se un FILE è \"-\" o è mancante, legge lo standard input." -#: src/cmp.c:195 src/diff.c:984 src/sdiff.c:220 +#: src/cmp.c:195 src/diff.c:985 src/sdiff.c:220 msgid "Exit status is 0 if inputs are the same, 1 if different, 2 if trouble." msgstr "" "Il codice d'uscita è 0 se gli input sono identici, 1 se sono differenti, 2 " @@ -661,146 +631,161 @@ msgstr "" #: src/cmp.c:240 #, c-format msgid "invalid --bytes value '%s'" -msgstr "valore '%s' non valido per --bytes" +msgstr "valore \"%s\" non valido per --bytes" -#: src/cmp.c:266 src/diff.c:793 src/diff3.c:353 src/sdiff.c:565 +#: src/cmp.c:266 src/diff.c:795 src/diff3.c:356 src/sdiff.c:565 #, c-format msgid "missing operand after '%s'" -msgstr "operando mancante dopo '%s'" +msgstr "operando mancante dopo \"%s\"" -#: src/cmp.c:278 src/diff.c:795 src/diff3.c:355 src/sdiff.c:567 +#: src/cmp.c:278 src/diff.c:797 src/diff3.c:358 src/sdiff.c:567 #, c-format msgid "extra operand '%s'" -msgstr "extra operando '%s'" +msgstr "extra operando \"%s\"" -#: src/cmp.c:494 +#: src/cmp.c:498 #, c-format msgid "%s %s differ: byte %s, line %s\n" msgstr "%s %s differenza: byte %s, riga %s\n" -#: src/cmp.c:510 +#: src/cmp.c:514 #, c-format msgid "%s %s differ: byte %s, line %s is %3o %s %3o %s\n" msgstr "%s %s differenza: byte %s, riga %s è %3o %s %3o %s\n" -#: src/cmp.c:562 -#, c-format -msgid "cmp: EOF on %s\n" +#: src/cmp.c:571 +#, fuzzy, c-format +msgid "cmp: EOF on %s which is empty\n" +msgstr "cmp: EOF in %s\n" + +#: src/cmp.c:585 +#, fuzzy, c-format +msgid "cmp: EOF on %s after byte %s, line %s\n" +msgstr "%s %s differenza: byte %s, riga %s\n" + +#: src/cmp.c:586 +#, fuzzy, c-format +msgid "cmp: EOF on %s after byte %s, in line %s\n" +msgstr "%s %s differenza: byte %s, riga %s\n" + +#: src/cmp.c:592 +#, fuzzy, c-format +msgid "cmp: EOF on %s after byte %s\n" msgstr "cmp: EOF in %s\n" #. This is a proper name. See the gettext manual, section Names. -#: src/diff.c:49 +#: src/diff.c:50 msgid "Paul Eggert" msgstr "Paul Eggert" #. This is a proper name. See the gettext manual, section Names. -#: src/diff.c:50 +#: src/diff.c:51 msgid "Mike Haertel" msgstr "Mike Haertel" #. This is a proper name. See the gettext manual, section Names. -#: src/diff.c:51 +#: src/diff.c:52 msgid "David Hayes" msgstr "David Hayes" #. This is a proper name. See the gettext manual, section Names. -#: src/diff.c:52 +#: src/diff.c:53 msgid "Richard Stallman" msgstr "Richard Stallman" #. This is a proper name. See the gettext manual, section Names. -#: src/diff.c:53 +#: src/diff.c:54 msgid "Len Tower" msgstr "Len Tower" -#: src/diff.c:351 +#: src/diff.c:353 #, c-format msgid "invalid context length '%s'" -msgstr "lunghezza di contesto '%s' non valida" +msgstr "lunghezza di contesto \"%s\" non valida" -#: src/diff.c:434 +#: src/diff.c:436 #, c-format msgid "pagination not supported on this host" msgstr "paginazione non supportata su questo host" -#: src/diff.c:449 src/diff3.c:335 +#: src/diff.c:451 src/diff3.c:336 #, c-format msgid "too many file label options" msgstr "troppe opzioni di etichetta" -#: src/diff.c:526 +#: src/diff.c:528 #, c-format msgid "invalid width '%s'" -msgstr "larghezza '%s' non valida" +msgstr "larghezza \"%s\" non valida" -#: src/diff.c:530 +#: src/diff.c:532 msgid "conflicting width options" msgstr "opzioni di larghezza in conflitto" -#: src/diff.c:555 +#: src/diff.c:557 #, c-format msgid "invalid horizon length '%s'" -msgstr "lunghezza di orizzonte '%s' non valida" +msgstr "lunghezza di orizzonte \"%s\" non valida" -#: src/diff.c:611 +#: src/diff.c:613 #, c-format msgid "invalid tabsize '%s'" -msgstr "lunghezza di tabulazione '%s' non valida" +msgstr "lunghezza di tabulazione \"%s\" non valida" -#: src/diff.c:615 +#: src/diff.c:617 msgid "conflicting tabsize options" msgstr "opzioni di lunghezza di tabulazione in conflitto" -#: src/diff.c:770 +#: src/diff.c:772 msgid "--from-file and --to-file both specified" msgstr "--from-file e --to-file specificati entrambi" -#: src/diff.c:890 +#: src/diff.c:891 msgid " --normal output a normal diff (the default)" msgstr " --normal Mostra una diff normale (predefinito)" -#: src/diff.c:891 +#: src/diff.c:892 msgid "-q, --brief report only when files differ" msgstr "-q, --brief Segnala solo se i file sono diversi" -#: src/diff.c:892 +#: src/diff.c:893 msgid "-s, --report-identical-files report when two files are the same" msgstr "-s, --report-identical-files Segnala quando due file sono identici" -#: src/diff.c:893 +#: src/diff.c:894 msgid "" "-c, -C NUM, --context[=NUM] output NUM (default 3) lines of copied context" msgstr "" "-c, -C NUM, --context[=NUM] Mostra NUM righe di contesto copiato\n" " (predefinito 3)" -#: src/diff.c:894 +#: src/diff.c:895 msgid "" "-u, -U NUM, --unified[=NUM] output NUM (default 3) lines of unified context" msgstr "" "-u, -U NUM, --unified[=NUM] Mostra NUM righe di contesto unificato\n" " (predefinito 3)" -#: src/diff.c:895 +#: src/diff.c:896 msgid "-e, --ed output an ed script" msgstr "-e, --ed Mostra uno script per ed" -#: src/diff.c:896 +#: src/diff.c:897 msgid "-n, --rcs output an RCS format diff" msgstr "-n, --rcs Mostra una diff in formato RCS" -#: src/diff.c:897 +#: src/diff.c:898 msgid "-y, --side-by-side output in two columns" msgstr "-y, --side-by-side Output in due colonne" -#: src/diff.c:898 +#: src/diff.c:899 msgid "" "-W, --width=NUM output at most NUM (default 130) print columns" msgstr "" "-W, --width=NUM Mostra al massimo NUM colonne (predefinito 130)" # Lo strano allineamento della seconda riga è corretto. -#: src/diff.c:899 +#: src/diff.c:900 msgid "" " --left-column output only the left column of common lines" msgstr "" @@ -808,114 +793,116 @@ msgstr "" "righe\n" " in comune" -#: src/diff.c:900 +#: src/diff.c:901 msgid " --suppress-common-lines do not output common lines" msgstr " --suppress-common-lines Non mostra le righe in comune" -#: src/diff.c:902 +#: src/diff.c:903 msgid "-p, --show-c-function show which C function each change is in" msgstr "" "-p, --show-c-function Mostra in quale funzione C si trova ogni\n" " differenza" -#: src/diff.c:903 +#: src/diff.c:904 msgid "-F, --show-function-line=RE show the most recent line matching RE" msgstr "" "-F, --show-function-line=ER Mostra la riga più recente che corrisponde\n" " all'espressione regolare ER" -#: src/diff.c:904 -#, fuzzy +# FIXME +#: src/diff.c:905 msgid "" " --label LABEL use LABEL instead of file name and timestamp\n" " (can be repeated)" msgstr "" -" --label ETICHETTA Usa ETHICHETTA invece del nome del file\n" +" --label ETICHETTA Usa ETICHETTA invece del nome e timestamp del " +"file\n" " (può essere ripetuta)" -#: src/diff.c:907 +#: src/diff.c:908 msgid "-t, --expand-tabs expand tabs to spaces in output" msgstr "" "-t, --expand-tabs Espande le tabulazioni in spazi nell'output" -#: src/diff.c:908 +#: src/diff.c:909 msgid "-T, --initial-tab make tabs line up by prepending a tab" msgstr "" "-T, --initial-tab Allinea le tabulazioni usando una tabulazione" -#: src/diff.c:909 +#: src/diff.c:910 msgid "" " --tabsize=NUM tab stops every NUM (default 8) print columns" msgstr "" " --tabsize=NUM Stop di tabulazione ogni NUM colonne\n" " (predefinito 8)" -#: src/diff.c:910 +#: src/diff.c:911 msgid "" " --suppress-blank-empty suppress space or tab before empty output lines" msgstr "" " --suppress-blank-empty Rimuove spazi e tabulazioni prima di righe\n" " di output vuote" -#: src/diff.c:911 +#: src/diff.c:912 msgid "-l, --paginate pass output through 'pr' to paginate it" msgstr "" -"-l, --paginate Passa l'output attraverso 'pr' per impaginarlo" +"-l, --paginate Passa l'output attraverso \"pr\" per " +"impaginarlo" -#: src/diff.c:913 +#: src/diff.c:914 msgid "" "-r, --recursive recursively compare any subdirectories found" msgstr "" "-r, --recursive Confronta ricorsivamente ogni sottodirectory\n" " incontrata" -#: src/diff.c:914 +#: src/diff.c:915 msgid " --no-dereference don't follow symbolic links" msgstr " --no-dereference Non segue i collegamenti simbolici" -#: src/diff.c:915 +#: src/diff.c:916 msgid "-N, --new-file treat absent files as empty" msgstr "-N, --new-file Considera i file mancanti come vuoti" -#: src/diff.c:916 +#: src/diff.c:917 msgid " --unidirectional-new-file treat absent first files as empty" msgstr "" " --unidirectional-new-file Considera i file mancanti in prima posizione\n" " come vuoti" -#: src/diff.c:917 +#: src/diff.c:918 msgid " --ignore-file-name-case ignore case when comparing file names" msgstr "" " --ignore-file-name-case Ignora differenze in maiuscole e minuscole\n" " confrontando nomi di file" -#: src/diff.c:918 +#: src/diff.c:919 msgid " --no-ignore-file-name-case consider case when comparing file names" msgstr "" " --no-ignore-file-name-case Considera differenze in maiuscole e " "minuscole\n" " confrontando nomi di file" -#: src/diff.c:919 +#: src/diff.c:920 msgid "-x, --exclude=PAT exclude files that match PAT" msgstr "" "-x, --exclude=MODELLO Esclude i file che corrispondono al MODELLO" -#: src/diff.c:920 +#: src/diff.c:921 msgid "" "-X, --exclude-from=FILE exclude files that match any pattern in FILE" msgstr "" "-X, --exclude-from=FILE Esclude i file che corrispondono a qualsiasi\n" " modello in FILE" -#: src/diff.c:921 +#: src/diff.c:922 msgid "" "-S, --starting-file=FILE start with FILE when comparing directories" msgstr "" "-S, --starting-file=FILE Comincia da FILE quando si confrontano " "directory" -#: src/diff.c:922 +#: src/diff.c:923 msgid "" " --from-file=FILE1 compare FILE1 to all operands;\n" " FILE1 can be a directory" @@ -923,7 +910,7 @@ msgstr "" " --from-file=FILE1 Confronta FILE1 con tutti gli operandi;\n" " FILE1 può essere una directory" -#: src/diff.c:924 +#: src/diff.c:925 msgid "" " --to-file=FILE2 compare all operands to FILE2;\n" " FILE2 can be a directory" @@ -931,7 +918,7 @@ msgstr "" " --to-file=FILE2 Confronta tutti gli operandi con FILE2;\n" " FILE2 può essere una directory" -#: src/diff.c:927 +#: src/diff.c:928 msgid "" "-i, --ignore-case ignore case differences in file contents" msgstr "" @@ -939,47 +926,47 @@ msgstr "" "nel\n" " contenuto del file" -#: src/diff.c:928 +#: src/diff.c:929 msgid "-E, --ignore-tab-expansion ignore changes due to tab expansion" msgstr "" "-E, --ignore-tab-expansion Ignora differenze causate dall'espansione\n" " delle tabulazioni" -#: src/diff.c:929 +#: src/diff.c:930 msgid "-Z, --ignore-trailing-space ignore white space at line end" msgstr "-Z, --ignore-trailing-space Ignora gli spazi a fine riga" -#: src/diff.c:930 +#: src/diff.c:931 msgid "" "-b, --ignore-space-change ignore changes in the amount of white space" msgstr "-b, --ignore-space-change Ignora differenze nel numero di spazi" -#: src/diff.c:931 +#: src/diff.c:932 msgid "-w, --ignore-all-space ignore all white space" msgstr "-w, --ignore-all-space Ignora tutti gli spazi" -#: src/diff.c:932 +#: src/diff.c:933 msgid "" "-B, --ignore-blank-lines ignore changes where lines are all blank" msgstr "-B, --ignore-blank-lines Ignora differenze in righe vuote" # Lo strano allineamento della seconda riga è corretto -#: src/diff.c:933 +#: src/diff.c:934 msgid "-I, --ignore-matching-lines=RE ignore changes where all lines match RE" msgstr "" "-I, --ignore-matching-lines=ER Ignora differenze che corrispondono\n" " all'espressione regolare ER" -#: src/diff.c:935 +#: src/diff.c:936 msgid "-a, --text treat all files as text" msgstr "-a, --text Considera tutti i file come testo" -#: src/diff.c:936 +#: src/diff.c:937 msgid " --strip-trailing-cr strip trailing carriage return on input" msgstr "" " --strip-trailing-cr Elimina i ritorni a capo a fine riga in input" -#: src/diff.c:938 +#: src/diff.c:939 msgid " --binary read and write data in binary mode" msgstr " --binary Legge e scrive in modalità binaria" @@ -994,30 +981,30 @@ msgstr " --binary Legge e scrive in modalità binaria" # #endif /* NOME */ # Testo comune. # -#: src/diff.c:941 +#: src/diff.c:942 msgid "" "-D, --ifdef=NAME output merged file with '#ifdef NAME' diffs" msgstr "" "-D, --ifdef=NOME Mostra le differenze in un unico file usando\n" -" '#ifdef NOME'" +" \"#ifdef NOME\"" -#: src/diff.c:942 +#: src/diff.c:943 msgid " --GTYPE-group-format=GFMT format GTYPE input groups with GFMT" msgstr "" " --GTYPE-group-format=GFMT Simile, ma formatta i gruppi di input GTYPE\n" " con GFMT" -#: src/diff.c:943 +#: src/diff.c:944 msgid " --line-format=LFMT format all input lines with LFMT" msgstr "" " --line-format=LFMT Formatta tutte le righe di input con LFMT" -#: src/diff.c:944 +#: src/diff.c:945 msgid " --LTYPE-line-format=LFMT format LTYPE input lines with LFMT" msgstr "" " --LTYPE-line-format=LFMT Formatta le righe di input LTYPE con LFMT" -#: src/diff.c:945 +#: src/diff.c:946 msgid "" " These format options provide fine-grained control over the output\n" " of diff, generalizing -D/--ifdef." @@ -1025,11 +1012,12 @@ msgstr "" " Queste opzioni di formato forniscono un controllo preciso dell'output di\n" " diff, generalizzando -D/--ifdef." -#: src/diff.c:947 +#: src/diff.c:948 msgid " LTYPE is 'old', 'new', or 'unchanged'. GTYPE is LTYPE or 'changed'." -msgstr " LTYPE è 'old', 'new', o 'unchanged'. GTYPE è LTYPE o 'changed'." +msgstr "" +" LTYPE è \"old\", \"new\", o \"unchanged\". GTYPE è LTYPE o \"changed\"." -#: src/diff.c:948 +#: src/diff.c:949 msgid "" " GFMT (only) may contain:\n" " %< lines from FILE1\n" @@ -1059,7 +1047,7 @@ msgstr "" " M L+1\n" " %(A=B?T:E) se A è uguale a B allora T, altrimenti E" -#: src/diff.c:960 +#: src/diff.c:961 msgid "" " LFMT (only) may contain:\n" " %L contents of line\n" @@ -1072,7 +1060,7 @@ msgstr "" " %[-][LARGHEZZA][.[PREC]]{doxX}n formato in stile printf del numero\n" " di riga di input" -#: src/diff.c:964 +#: src/diff.c:965 msgid "" " Both GFMT and LFMT may contain:\n" " %% %\n" @@ -1086,139 +1074,138 @@ msgstr "" " %c'\\OOO' il carattere con codice ottale OOO\n" " C il carattere C (altri caratteri rappresentano se stessi)" -#: src/diff.c:970 +#: src/diff.c:971 msgid "-d, --minimal try hard to find a smaller set of changes" msgstr "-d, --minimal Minimizza il numero di differenze" -#: src/diff.c:971 +#: src/diff.c:972 msgid " --horizon-lines=NUM keep NUM lines of the common prefix and suffix" msgstr "" " --horizon-lines=NUM Mantiene NUM righe di prefisso e suffisso comune" -#: src/diff.c:972 +#: src/diff.c:973 msgid "" " --speed-large-files assume large files and many scattered small changes" msgstr "" " --speed-large-files Assume file grandi e tante piccole differenze" -#: src/diff.c:973 -msgid "" -" --color[=WHEN] colorize the output; WHEN can be 'never', 'always'," -msgstr "" - #: src/diff.c:974 #, fuzzy -msgid " or 'auto' (the default)" -msgstr " --normal Mostra una diff normale (predefinito)" - -#: src/diff.c:975 msgid "" -" --palette=PALETTE specify the colors to use when --color is active" +" --color[=WHEN] colorize the output; WHEN can be 'never', " +"'always',\n" +" or 'auto' (the default)" msgstr "" +" --color[=QUANDO] Colora l'output; QUANDO può essere \"never\", " +"\"always\"" #: src/diff.c:976 +#, fuzzy msgid "" -" PALETTE is a colon-separated list terminfo " -"capabilities" +" --palette=PALETTE the colors to use when --color is active; PALETTE " +"is\n" +" a colon-separated list of terminfo capabilities" msgstr "" +" PALETTA è una lista di terminfo " +"capabilities\n" +" separati da \":\"" -#: src/diff.c:978 +#: src/diff.c:979 msgid " --help display this help and exit" msgstr " --help Mostra questo aiuto ed esce" -#: src/diff.c:979 +#: src/diff.c:980 msgid "-v, --version output version information and exit" msgstr "" "-v, --version Stampa le informazioni sulla versione ed esce" -#: src/diff.c:981 -#, fuzzy +#: src/diff.c:982 msgid "FILES are 'FILE1 FILE2' or 'DIR1 DIR2' or 'DIR FILE' or 'FILE DIR'." msgstr "" -"FILES sono 'FILE1 FILE2' o 'DIR1 DIR2' o 'DIR FILE...' o 'FILE... DIR'." +"FILES sono \"FILE1 FILE2\" o \"DIR1 DIR2\" o \"DIR FILE\" o \"FILE DIR\"." -#: src/diff.c:982 +#: src/diff.c:983 msgid "" "If --from-file or --to-file is given, there are no restrictions on FILE(s)." msgstr "" "Se --from-file o --to-file sono usati, non ci sono restrizioni per FILES." -#: src/diff.c:983 src/diff3.c:526 src/sdiff.c:219 +#: src/diff.c:984 src/diff3.c:528 src/sdiff.c:219 msgid "If a FILE is '-', read standard input." -msgstr "Se un FILE è '-', legge lo standard input." +msgstr "Se un FILE è \"-\", legge lo standard input." -#: src/diff.c:993 +#: src/diff.c:994 #, c-format msgid "Usage: %s [OPTION]... FILES\n" msgstr "Uso: %s [OPZIONE]... FILES\n" -#: src/diff.c:994 +#: src/diff.c:995 msgid "Compare FILES line by line." msgstr "Confronta i file riga per riga." -#: src/diff.c:1028 +#: src/diff.c:1029 #, c-format msgid "conflicting %s option value '%s'" -msgstr "conflitto nell'opzione %s: valore '%s'" +msgstr "conflitto nell'opzione %s: valore \"%s\"" -#: src/diff.c:1041 +#: src/diff.c:1042 #, c-format msgid "conflicting output style options" msgstr "opzioni di stile di output in conflitto" -#: src/diff.c:1057 -#, fuzzy, c-format +#: src/diff.c:1058 +#, c-format msgid "invalid color '%s'" -msgstr "larghezza '%s' non valida" +msgstr "colore \"%s\" non valido" -#: src/diff.c:1113 src/diff.c:1323 +#: src/diff.c:1114 src/diff.c:1324 #, c-format msgid "Only in %s: %s\n" msgstr "Solo in %s: %s\n" -#: src/diff.c:1247 +#: src/diff.c:1248 msgid "cannot compare '-' to a directory" -msgstr "impossibile confrontare '-' con una directory" +msgstr "impossibile confrontare \"-\" con una directory" -#: src/diff.c:1282 +#: src/diff.c:1283 msgid "-D option not supported with directories" msgstr "opzione -D non supportata con directory" -#: src/diff.c:1291 +#: src/diff.c:1292 #, c-format msgid "Common subdirectories: %s and %s\n" msgstr "Sottodirectory in comune: %s e %s\n" -#: src/diff.c:1333 src/diff.c:1383 +#: src/diff.c:1334 src/diff.c:1384 #, c-format msgid "File %s is a %s while file %s is a %s\n" msgstr "File %s è un %s mentre file %s è un %s\n" -#: src/diff.c:1369 +#: src/diff.c:1370 #, c-format msgid "Symbolic links %s and %s differ\n" msgstr "I collegamenti simbolici %s e %s sono diversi\n" -#: src/diff.c:1456 +#: src/diff.c:1457 #, c-format msgid "Files %s and %s are identical\n" msgstr "I file %s e %s sono identici\n" #. This is a proper name. See the gettext manual, section Names. -#: src/diff3.c:41 +#: src/diff3.c:42 msgid "Randy Smith" msgstr "Randy Smith" -#: src/diff3.c:348 +#: src/diff3.c:351 #, c-format msgid "incompatible options" msgstr "opzioni incompatibili" -#: src/diff3.c:388 +#: src/diff3.c:391 msgid "'-' specified for more than one input file" -msgstr "'-' specificato per più di un file di input" +msgstr "\"-\" specificato per più di un file di input" -#: src/diff3.c:439 src/diff3.c:1288 src/diff3.c:1692 src/diff3.c:1747 +#: src/diff3.c:442 src/diff3.c:1290 src/diff3.c:1693 src/diff3.c:1748 #: src/sdiff.c:307 src/sdiff.c:844 src/sdiff.c:855 msgid "read failed" msgstr "lettura fallita" @@ -1238,7 +1225,7 @@ msgstr "lettura fallita" # . # # Lo strano allineamento della seconda riga è corretto. -#: src/diff3.c:473 +#: src/diff3.c:475 msgid "-A, --show-all output all changes, bracketing conflicts" msgstr "" "-A, --show-all Mostra tutte le differenze, tenendo separati\n" @@ -1261,7 +1248,7 @@ msgstr "" # 'differenze'. # # Lo strano allineamento della seconda riga è corretto. -#: src/diff3.c:475 +#: src/diff3.c:477 msgid "" "-e, --ed output ed script incorporating changes\n" " from OLDFILE to YOURFILE into MYFILE" @@ -1281,13 +1268,13 @@ msgstr "" # <<<<<<< file1 # . # -#: src/diff3.c:477 +#: src/diff3.c:479 msgid "-E, --show-overlap like -e, but bracket conflicts" msgstr "-E, --show-overlap Come -e, tenendo separati i conflitti" # Questa opzione, per i 3 file considerati, non produce niente. # -#: src/diff3.c:478 +#: src/diff3.c:480 msgid "" "-3, --easy-only like -e, but incorporate only nonoverlapping " "changes" @@ -1302,23 +1289,24 @@ msgstr "" # Questo è il file 3. # . # -#: src/diff3.c:479 +#: src/diff3.c:481 msgid "" "-x, --overlap-only like -e, but incorporate only overlapping changes" msgstr "" "-x, --overlap-only Come -e, ma mostra solo i cambiamenti che si\n" " sovrappongono" -#: src/diff3.c:480 +#: src/diff3.c:482 msgid "-X like -x, but bracket conflicts" msgstr "-X Come -x, ma tiene separati i conflitti" -#: src/diff3.c:481 +#: src/diff3.c:483 msgid "-i append 'w' and 'q' commands to ed scripts" msgstr "" -"-i Aggiunge i comandi 'w' e 'q' agli script per ed" +"-i Aggiunge i comandi \"w\" e \"q\" agli script per " +"ed" -#: src/diff3.c:483 +#: src/diff3.c:485 msgid "" "-m, --merge output actual merged file, according to\n" " -A if no other options are given" @@ -1326,25 +1314,25 @@ msgstr "" "-m, --merge Mostra il file combinato risultante, secondo -A\n" " se non è indicata nessun'altra opzione" -#: src/diff3.c:486 +#: src/diff3.c:488 msgid "-a, --text treat all files as text" msgstr "-a, --text Considera tutti i file come testo" -#: src/diff3.c:487 +#: src/diff3.c:489 msgid " --strip-trailing-cr strip trailing carriage return on input" msgstr "" " --strip-trailing-cr Elimina i ritorni a capo a fine riga in input" -#: src/diff3.c:488 +#: src/diff3.c:490 msgid "-T, --initial-tab make tabs line up by prepending a tab" msgstr "" "-T, --initial-tab Allinea le tabulazioni usando una tabulazione" -#: src/diff3.c:489 +#: src/diff3.c:491 msgid " --diff-program=PROGRAM use PROGRAM to compare files" msgstr " --diff-program=PROGRAMMA Usa PROGRAMMA per confrontare i file" -#: src/diff3.c:490 +#: src/diff3.c:492 msgid "" "-L, --label=LABEL use LABEL instead of file name\n" " (can be repeated up to three times)" @@ -1352,25 +1340,25 @@ msgstr "" "-L, --label=ETICHETTA Usa ETICHETTA invece del nome del file\n" " (può essere repetuta fino a tre volte)" -#: src/diff3.c:493 +#: src/diff3.c:495 msgid " --help display this help and exit" msgstr " --help Mostra questo aiuto ed esce" -#: src/diff3.c:494 +#: src/diff3.c:496 msgid "-v, --version output version information and exit" msgstr "" "-v, --version Stampa le informazioni sulla versione ed esce" -#: src/diff3.c:503 +#: src/diff3.c:505 #, c-format msgid "Usage: %s [OPTION]... MYFILE OLDFILE YOURFILE\n" msgstr "Uso: %s [OPZIONE]... MIOFILE VECCHIOFILE TUOFILE\n" -#: src/diff3.c:505 +#: src/diff3.c:507 msgid "Compare three files line by line." msgstr "Confronta tre file riga per riga." -#: src/diff3.c:515 +#: src/diff3.c:517 msgid "" "\n" "The default output format is a somewhat human-readable representation of\n" @@ -1398,55 +1386,55 @@ msgstr "" "robusto\n" "di ed.\n" -#: src/diff3.c:527 +#: src/diff3.c:529 msgid "Exit status is 0 if successful, 1 if conflicts, 2 if trouble." msgstr "" "Il codice d'uscita è 0 in caso di successo, 1 in caso di conflitto, 2 se " "sono\n" "stati riscontrati dei problemi." -#: src/diff3.c:720 +#: src/diff3.c:722 msgid "internal error: screwup in format of diff blocks" msgstr "errore interno: problema nel formato dei blocchi di diff" -#: src/diff3.c:1015 +#: src/diff3.c:1017 #, c-format msgid "%s: diff failed: " msgstr "%s: diff fallita: " -#: src/diff3.c:1037 +#: src/diff3.c:1039 msgid "internal error: invalid diff type in process_diff" msgstr "errore interno: tipo di diff non valido in process_diff" -#: src/diff3.c:1062 +#: src/diff3.c:1064 msgid "invalid diff format; invalid change separator" msgstr "formato di diff non valido; separatore di modifica non valido" -#: src/diff3.c:1298 +#: src/diff3.c:1300 msgid "invalid diff format; incomplete last line" msgstr "formato di diff non valido; ultima riga incompleta" -#: src/diff3.c:1322 src/sdiff.c:275 src/util.c:970 +#: src/diff3.c:1324 src/sdiff.c:275 src/util.c:969 #, c-format msgid "subsidiary program '%s' could not be invoked" -msgstr "programma accessorio '%s' non può essere chiamato" +msgstr "programma accessorio \"%s\" non può essere chiamato" -#: src/diff3.c:1347 +#: src/diff3.c:1349 msgid "invalid diff format; incorrect leading line chars" msgstr "formato di diff non valido; caratteri incorretti a inizio riga" -#: src/diff3.c:1420 +#: src/diff3.c:1422 msgid "internal error: invalid diff type passed to output" msgstr "errore interno: il tipo di diff passato all'output non è valido" -#: src/diff3.c:1694 src/diff3.c:1751 +#: src/diff3.c:1695 src/diff3.c:1752 msgid "input file shrank" msgstr "il file di input è rimpicciolito" #: src/dir.c:156 #, c-format msgid "cannot compare file names '%s' and '%s'" -msgstr "impossibile confrontare i nomi dei file '%s' e '%s'" +msgstr "impossibile confrontare i nomi dei file \"%s\" e \"%s\"" #: src/dir.c:225 #, c-format @@ -1454,7 +1442,7 @@ msgid "%s: recursive directory loop" msgstr "%s: ciclo ricorsivo tra le directory" #. This is a proper name. See the gettext manual, section Names. -#: src/sdiff.c:42 +#: src/sdiff.c:43 msgid "Thomas Lord" msgstr "Thomas Lord" @@ -1606,12 +1594,36 @@ msgstr "" "v:\tInclude prolissamente le righe in comune.\n" "q:\tEsce.\n" -#: src/util.c:663 -#, fuzzy, c-format +#: src/util.c:662 +#, c-format msgid "unrecognized prefix: %s" -msgstr "%s: opzione '--%s' non riconosciuta\n" +msgstr "prefisso non riconosciuto: %s" -#: src/util.c:693 +#: src/util.c:692 #, c-format msgid "unparsable value for --palette" -msgstr "" +msgstr "valore di --palette non comprensibile" + +#~ msgid " or 'auto' (the default)" +#~ msgstr " oppure \"auto\" (predefinito)" + +#~ msgid "" +#~ " --palette=PALETTE specify the colors to use when --color is active" +#~ msgstr "" +#~ " --palette=PALETTA Indica i colori da usare quando --color è " +#~ "attivo" + +#~ msgid "%s: option '--%s' doesn't allow an argument\n" +#~ msgstr "%s: l'opzione \"--%s\" non accetta argomenti\n" + +#~ msgid "%s: unrecognized option '--%s'\n" +#~ msgstr "%s: opzione \"--%s\" non riconosciuta\n" + +#~ msgid "%s: option '-W %s' is ambiguous\n" +#~ msgstr "%s: l'opzione \"-W %s\" è ambigua\n" + +#~ msgid "%s: option '-W %s' doesn't allow an argument\n" +#~ msgstr "%s: l'opzione \"-W %s\" non accetta argomenti\n" + +#~ msgid "%s: option '-W %s' requires an argument\n" +#~ msgstr "%s: l'opzione \"-W %s\" richiede un argomento\n" Binary files differ@@ -12,7 +12,7 @@ msgid "" msgstr "" "Project-Id-Version: GNU diffutils 3.2\n" "Report-Msgid-Bugs-To: bug-diffutils@gnu.org\n" -"POT-Creation-Date: 2016-08-20 22:22-0700\n" +"POT-Creation-Date: 2017-05-21 13:26-0700\n" "PO-Revision-Date: 2011-09-08 14:13+0900\n" "Last-Translator: Yasuaki Taniguchi <yasuakit@gmail.com>\n" "Language-Team: Japanese <translation-team-ja@lists.sourceforge.net>\n" @@ -20,32 +20,33 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"X-Bugs: Report translation errors to the Language-Team address.\n" "Plural-Forms: nplurals=1; plural=0;\n" -#: lib/argmatch.c:133 +#: lib/argmatch.c:134 #, fuzzy, c-format msgid "invalid argument %s for %s" msgstr "引数 `%3$s' ã«å¯¾ã—㦠%1$s%2$s ãŒç„¡åŠ¹ã§ã™" -#: lib/argmatch.c:134 +#: lib/argmatch.c:135 #, c-format msgid "ambiguous argument %s for %s" msgstr "" -#: lib/argmatch.c:153 +#: lib/argmatch.c:154 #, fuzzy msgid "Valid arguments are:" msgstr "引数 `%3$s' ã«å¯¾ã—㦠%1$s%2$s ãŒç„¡åŠ¹ã§ã™" -#: lib/c-stack.c:204 lib/c-stack.c:297 +#: lib/c-stack.c:203 lib/c-stack.c:296 msgid "program error" msgstr "プãƒã‚°ãƒ©ãƒ エラー" -#: lib/c-stack.c:205 lib/c-stack.c:298 +#: lib/c-stack.c:204 lib/c-stack.c:297 msgid "stack overflow" msgstr "スタックオーãƒãƒ¼ãƒ•ãƒãƒ¼" -#: lib/error.c:191 +#: lib/error.c:195 msgid "Unknown system error" msgstr "ä¸æ˜Žãªã‚·ã‚¹ãƒ†ãƒ エラー" @@ -149,66 +150,41 @@ msgstr "" msgid "weird file" msgstr "ä¸æ˜Žãªãƒ•ã‚¡ã‚¤ãƒ«" -#: lib/getopt.c:575 lib/getopt.c:604 -#, c-format -msgid "%s: option '%s' is ambiguous; possibilities:" -msgstr "%s: オプション '%s' ã¯æ›–昧ã§ã™ã€‚次ã®ã‚‚ã®ãŒå¯èƒ½ã§ã™:" - -#: lib/getopt.c:619 +#: lib/getopt.c:278 #, fuzzy, c-format -msgid "%s: option '%s' is ambiguous\n" +msgid "%s: option '%s%s' is ambiguous\n" msgstr "%s: オプション '-W %s' ã¯æ›–昧ã§ã™\n" -#: lib/getopt.c:654 lib/getopt.c:658 -#, c-format -msgid "%s: option '--%s' doesn't allow an argument\n" -msgstr "%s: オプション '--%s' ã¯å¼•æ•°ã‚’å–ã‚‹ã“ã¨ãŒã§ãã¾ã›ã‚“\n" +#: lib/getopt.c:284 +#, fuzzy, c-format +msgid "%s: option '%s%s' is ambiguous; possibilities:" +msgstr "%s: オプション '%s' ã¯æ›–昧ã§ã™ã€‚次ã®ã‚‚ã®ãŒå¯èƒ½ã§ã™:" -#: lib/getopt.c:667 lib/getopt.c:672 -#, c-format -msgid "%s: option '%c%s' doesn't allow an argument\n" +#: lib/getopt.c:319 +#, fuzzy, c-format +msgid "%s: unrecognized option '%s%s'\n" +msgstr "%s: オプション '%c%s' ã‚’èªè˜ã§ãã¾ã›ã‚“\n" + +#: lib/getopt.c:345 +#, fuzzy, c-format +msgid "%s: option '%s%s' doesn't allow an argument\n" msgstr "%s: オプション '%c%s' ã¯å¼•æ•°ã‚’å–ã‚‹ã“ã¨ãŒã§ãã¾ã›ã‚“\n" -#: lib/getopt.c:715 lib/getopt.c:734 -#, c-format -msgid "%s: option '--%s' requires an argument\n" +#: lib/getopt.c:360 +#, fuzzy, c-format +msgid "%s: option '%s%s' requires an argument\n" msgstr "%s: オプション '--%s' ã¯å¼•æ•°ãŒå¿…è¦ã§ã™\n" -#: lib/getopt.c:772 lib/getopt.c:775 -#, c-format -msgid "%s: unrecognized option '--%s'\n" -msgstr "%s: オプション '--%s' ã‚’èªè˜ã§ãã¾ã›ã‚“\n" - -#: lib/getopt.c:783 lib/getopt.c:786 -#, c-format -msgid "%s: unrecognized option '%c%s'\n" -msgstr "%s: オプション '%c%s' ã‚’èªè˜ã§ãã¾ã›ã‚“\n" - -#: lib/getopt.c:835 lib/getopt.c:838 +#: lib/getopt.c:621 #, c-format msgid "%s: invalid option -- '%c'\n" msgstr "%s: 無効ãªã‚ªãƒ—ション -- '%c'\n" -#: lib/getopt.c:891 lib/getopt.c:908 lib/getopt.c:1118 lib/getopt.c:1136 +#: lib/getopt.c:636 lib/getopt.c:682 #, c-format msgid "%s: option requires an argument -- '%c'\n" msgstr "%s: オプションã«ã¯å¼•æ•°ãŒå¿…è¦ã§ã™ -- '%c'\n" -#: lib/getopt.c:964 lib/getopt.c:980 -#, c-format -msgid "%s: option '-W %s' is ambiguous\n" -msgstr "%s: オプション '-W %s' ã¯æ›–昧ã§ã™\n" - -#: lib/getopt.c:1004 lib/getopt.c:1022 -#, c-format -msgid "%s: option '-W %s' doesn't allow an argument\n" -msgstr "%s: オプション '-W %s' ã¯å¼•æ•°ã‚’å–ã‚‹ã“ã¨ãŒã§ãã¾ã›ã‚“\n" - -#: lib/getopt.c:1043 lib/getopt.c:1061 -#, c-format -msgid "%s: option '-W %s' requires an argument\n" -msgstr "%s: オプション '-W %s' ã¯å¼•æ•°ãŒå¿…è¦ã§ã™\n" - #. TRANSLATORS: #. Get translations for open and closing quotation marks. #. The message catalog should translate "`" to a left @@ -230,11 +206,11 @@ msgstr "%s: オプション '-W %s' ã¯å¼•æ•°ãŒå¿…è¦ã§ã™\n" #. If you don't know what to put here, please see #. <http://en.wikipedia.org/wiki/Quotation_marks_in_other_languages> #. and use glyphs suitable for your language. -#: lib/quotearg.c:347 +#: lib/quotearg.c:362 msgid "`" msgstr "`" -#: lib/quotearg.c:348 +#: lib/quotearg.c:363 msgid "'" msgstr "'" @@ -527,7 +503,7 @@ msgid "General help using GNU software: <http://www.gnu.org/gethelp/>\n" msgstr "" "GNU ソフトウェアを使用ã™ã‚‹éš›ã®ä¸€èˆ¬çš„ãªãƒ˜ãƒ«ãƒ—: <http://www.gnu.org/gethelp/>\n" -#: src/analyze.c:454 src/diff.c:1400 +#: src/analyze.c:454 src/diff.c:1401 #, c-format msgid "Files %s and %s differ\n" msgstr "ファイル %s 㨠%s ã¯ç•°ãªã‚Šã¾ã™\n" @@ -537,21 +513,21 @@ msgstr "ファイル %s 㨠%s ã¯ç•°ãªã‚Šã¾ã™\n" msgid "Binary files %s and %s differ\n" msgstr "ãƒã‚¤ãƒŠãƒªãƒ¼ãƒ•ã‚¡ã‚¤ãƒ« %s ã¨%s ã¯ç•°ãªã‚Šã¾ã™\n" -#: src/analyze.c:697 src/diff3.c:1463 src/util.c:1255 +#: src/analyze.c:706 src/diff3.c:1465 src/util.c:1254 msgid "No newline at end of file" msgstr "ファイル末尾ã«æ”¹è¡ŒãŒã‚ã‚Šã¾ã›ã‚“" #. This is a proper name. See the gettext manual, section Names. -#: src/cmp.c:43 +#: src/cmp.c:44 msgid "Torbjorn Granlund" msgstr "Torbjorn Granlund" #. This is a proper name. See the gettext manual, section Names. -#: src/cmp.c:44 +#: src/cmp.c:45 msgid "David MacKenzie" msgstr "David MacKenzie" -#: src/cmp.c:118 src/diff.c:875 src/diff3.c:459 src/sdiff.c:158 +#: src/cmp.c:119 src/diff.c:877 src/diff3.c:462 src/sdiff.c:159 #, fuzzy, c-format msgid "Try '%s --help' for more information." msgstr "詳ã—ãã¯`%s --help'を実行ã—ã¦ãã ã•ã„。" @@ -566,12 +542,12 @@ msgstr "無効㪠--ignore-initial ã®å€¤ `%s' ã§ã™" msgid "options -l and -s are incompatible" msgstr "オプション -l 㨠-s ã¯åŒæ™‚ã«æŒ‡å®šã§ãã¾ã›ã‚“" -#: src/cmp.c:155 src/diff.c:884 src/diff3.c:467 src/sdiff.c:167 src/sdiff.c:315 -#: src/sdiff.c:322 src/sdiff.c:874 src/util.c:853 src/util.c:953 src/util.c:960 +#: src/cmp.c:155 src/diff.c:885 src/diff3.c:469 src/sdiff.c:167 src/sdiff.c:315 +#: src/sdiff.c:322 src/sdiff.c:874 src/util.c:852 src/util.c:952 src/util.c:959 msgid "write failed" msgstr "書ãè¾¼ã¿ã«å¤±æ•—ã—ã¾ã—ãŸ" -#: src/cmp.c:157 src/diff.c:886 src/diff.c:1465 src/diff3.c:469 src/sdiff.c:169 +#: src/cmp.c:157 src/diff.c:887 src/diff.c:1466 src/diff3.c:471 src/sdiff.c:169 msgid "standard output" msgstr "標準出力" @@ -630,7 +606,7 @@ msgstr "" "オプション㮠SKIP1 㨠SKIP2 ã¯ãã‚Œãžã‚Œã®ãƒ•ã‚¡ã‚¤ãƒ«ã®å…ˆé ã‹ã‚‰ã‚¹ã‚ップã™ã‚‹\n" "ãƒã‚¤ãƒˆæ•°ã‚’指定ã—ã¾ã™(デフォルト㯠0)。" -#: src/cmp.c:185 src/diff.c:996 src/diff3.c:507 src/sdiff.c:210 +#: src/cmp.c:185 src/diff.c:997 src/diff3.c:509 src/sdiff.c:210 msgid "" "Mandatory arguments to long options are mandatory for short options too.\n" msgstr "" @@ -652,7 +628,7 @@ msgstr "" msgid "If a FILE is '-' or missing, read standard input." msgstr "FILE ㌠`-' ã¾ãŸã¯æŒ‡å®šã—ãªã„å ´åˆã€æ¨™æº–入力ã‹ã‚‰èªã¿è¾¼ã¿ã¾ã™ã€‚" -#: src/cmp.c:195 src/diff.c:984 src/sdiff.c:220 +#: src/cmp.c:195 src/diff.c:985 src/sdiff.c:220 msgid "Exit status is 0 if inputs are the same, 1 if different, 2 if trouble." msgstr "" "終了コードã¯ã€å…¥åŠ›ãƒ•ã‚¡ã‚¤ãƒ«ãŒåŒã˜å ´åˆã¯ 0ã€å…¥åŠ›ãƒ•ã‚¡ã‚¤ãƒ«ãŒç•°ãªã‚‹å ´åˆã¯ 1ã€\n" @@ -663,161 +639,176 @@ msgstr "" msgid "invalid --bytes value '%s'" msgstr "無効㪠--bytes ã®å€¤ `%s' ã§ã™ã€‚" -#: src/cmp.c:266 src/diff.c:793 src/diff3.c:353 src/sdiff.c:565 +#: src/cmp.c:266 src/diff.c:795 src/diff3.c:356 src/sdiff.c:565 #, fuzzy, c-format msgid "missing operand after '%s'" msgstr "`%s' ã®å¾Œã«è¢«æ¼”ç®—åãŒã‚ã‚Šã¾ã›ã‚“" -#: src/cmp.c:278 src/diff.c:795 src/diff3.c:355 src/sdiff.c:567 +#: src/cmp.c:278 src/diff.c:797 src/diff3.c:358 src/sdiff.c:567 #, fuzzy, c-format msgid "extra operand '%s'" msgstr "余分ãªè¢«æ¼”ç®—å `%s' ã§ã™ã€‚" -#: src/cmp.c:494 +#: src/cmp.c:498 #, c-format msgid "%s %s differ: byte %s, line %s\n" msgstr "%s %s ç•°ãªã‚Šã¾ã™: ãƒã‚¤ãƒˆ %sã€è¡Œ %s\n" -#: src/cmp.c:510 +#: src/cmp.c:514 #, c-format msgid "%s %s differ: byte %s, line %s is %3o %s %3o %s\n" msgstr "%s %s ç•°ãªã‚Šã¾ã™: ãƒã‚¤ãƒˆ %sã€è¡Œ %s %3o %s %3o %s\n" -#: src/cmp.c:562 -#, c-format -msgid "cmp: EOF on %s\n" +#: src/cmp.c:571 +#, fuzzy, c-format +msgid "cmp: EOF on %s which is empty\n" +msgstr "cmp: %s ã§ãƒ•ã‚¡ã‚¤ãƒ«çµ‚端 (EOF) ã«é”ã—ã¾ã—ãŸ\n" + +#: src/cmp.c:585 +#, fuzzy, c-format +msgid "cmp: EOF on %s after byte %s, line %s\n" +msgstr "%s %s ç•°ãªã‚Šã¾ã™: ãƒã‚¤ãƒˆ %sã€è¡Œ %s\n" + +#: src/cmp.c:586 +#, fuzzy, c-format +msgid "cmp: EOF on %s after byte %s, in line %s\n" +msgstr "%s %s ç•°ãªã‚Šã¾ã™: ãƒã‚¤ãƒˆ %sã€è¡Œ %s\n" + +#: src/cmp.c:592 +#, fuzzy, c-format +msgid "cmp: EOF on %s after byte %s\n" msgstr "cmp: %s ã§ãƒ•ã‚¡ã‚¤ãƒ«çµ‚端 (EOF) ã«é”ã—ã¾ã—ãŸ\n" #. This is a proper name. See the gettext manual, section Names. -#: src/diff.c:49 +#: src/diff.c:50 msgid "Paul Eggert" msgstr "Paul Eggert" #. This is a proper name. See the gettext manual, section Names. -#: src/diff.c:50 +#: src/diff.c:51 msgid "Mike Haertel" msgstr "Mike Haertel" #. This is a proper name. See the gettext manual, section Names. -#: src/diff.c:51 +#: src/diff.c:52 msgid "David Hayes" msgstr "David Hayes" #. This is a proper name. See the gettext manual, section Names. -#: src/diff.c:52 +#: src/diff.c:53 msgid "Richard Stallman" msgstr "Richard Stallman" #. This is a proper name. See the gettext manual, section Names. -#: src/diff.c:53 +#: src/diff.c:54 msgid "Len Tower" msgstr "Len Tower" -#: src/diff.c:351 +#: src/diff.c:353 #, fuzzy, c-format msgid "invalid context length '%s'" msgstr "無効ãªå‰å¾Œã®è¡Œæ•° `%s' ã§ã™" -#: src/diff.c:434 +#: src/diff.c:436 #, c-format msgid "pagination not supported on this host" msgstr "ã“ã®ãƒ›ã‚¹ãƒˆã§ã¯ãƒšãƒ¼ã‚¸å‰²ä»˜ã‘をサãƒãƒ¼ãƒˆã—ã¾ã›ã‚“" -#: src/diff.c:449 src/diff3.c:335 +#: src/diff.c:451 src/diff3.c:336 #, c-format msgid "too many file label options" msgstr "ファイル・ラベル・オプションãŒå¤šã™ãŽã¾ã™" -#: src/diff.c:526 +#: src/diff.c:528 #, fuzzy, c-format msgid "invalid width '%s'" msgstr "無効ãªå¹… `%s' ã§ã™" -#: src/diff.c:530 +#: src/diff.c:532 msgid "conflicting width options" msgstr "å¹…ã®ã‚ªãƒ—ションãŒç«¶åˆã—ã¦ã„ã¾ã™" -#: src/diff.c:555 +#: src/diff.c:557 #, fuzzy, c-format msgid "invalid horizon length '%s'" msgstr "無効ãªæ¨ªå¹… `%s' ã§ã™" -#: src/diff.c:611 +#: src/diff.c:613 #, fuzzy, c-format msgid "invalid tabsize '%s'" msgstr "無効ãªã‚¿ãƒ–å¹… `%s' ã§ã™" -#: src/diff.c:615 +#: src/diff.c:617 msgid "conflicting tabsize options" msgstr "タブ幅ã®ã‚ªãƒ—ションãŒç«¶åˆã—ã¦ã„ã¾ã™" -#: src/diff.c:770 +#: src/diff.c:772 msgid "--from-file and --to-file both specified" msgstr "--from-file ãŠã‚ˆã³ --to-file ã®ä¸¡æ–¹ãŒæŒ‡å®šã•ã‚Œã¦ã„ã¾ã™" -#: src/diff.c:890 +#: src/diff.c:891 msgid " --normal output a normal diff (the default)" msgstr " --normal 通常㮠diff を出力ã™ã‚‹ (デフォルト)" -#: src/diff.c:891 +#: src/diff.c:892 msgid "-q, --brief report only when files differ" msgstr "-q, --brief ファイルãŒç•°ãªã‚‹ã‹ã©ã†ã‹ã®ã¿è¡¨ç¤ºã™ã‚‹" -#: src/diff.c:892 +#: src/diff.c:893 msgid "-s, --report-identical-files report when two files are the same" msgstr "" "-s, --report-identical-files 両方ã®ãƒ•ã‚¡ã‚¤ãƒ«ãŒåŒä¸€ã§ã‚ã‚‹ã‹ã©ã†ã‹ã®ã¿è¡¨ç¤ºã™ã‚‹" -#: src/diff.c:893 +#: src/diff.c:894 msgid "" "-c, -C NUM, --context[=NUM] output NUM (default 3) lines of copied context" msgstr "" "-c, -C NUM, --context[=NUM] コンテã‚スト diff å½¢å¼ã§å‰å¾Œ NUM (デフォルト: " "3) 行を表示ã™ã‚‹" -#: src/diff.c:894 +#: src/diff.c:895 msgid "" "-u, -U NUM, --unified[=NUM] output NUM (default 3) lines of unified context" msgstr "" "-u, -U NUM, --unified[=NUM] ユニファイド diff å½¢å¼ã§å‰å¾Œ NUM (デフォルト: " "3) 行を表示ã™ã‚‹" -#: src/diff.c:895 +#: src/diff.c:896 msgid "-e, --ed output an ed script" msgstr "-e, --ed ed スクリプトを出力ã™ã‚‹" -#: src/diff.c:896 +#: src/diff.c:897 msgid "-n, --rcs output an RCS format diff" msgstr "-n, --rcs RCS å½¢å¼ã® diff を出力ã™ã‚‹" -#: src/diff.c:897 +#: src/diff.c:898 msgid "-y, --side-by-side output in two columns" msgstr "-y, --side-by-side 出力を2列ã«ã™ã‚‹" -#: src/diff.c:898 +#: src/diff.c:899 msgid "" "-W, --width=NUM output at most NUM (default 130) print columns" msgstr "" "-W, --width=NUM 表示ã™ã‚‹åˆ—を最大 NUM (デフォルト: 130) 列ã«ã™ã‚‹" -#: src/diff.c:899 +#: src/diff.c:900 msgid "" " --left-column output only the left column of common lines" msgstr " --left-column 共通行ã¯å·¦å´ã®åˆ—ã®ã¿è¡¨ç¤ºã™ã‚‹" -#: src/diff.c:900 +#: src/diff.c:901 msgid " --suppress-common-lines do not output common lines" msgstr " --suppress-common-lines 共通行ã®å‡ºåŠ›ã‚’抑æ¢ã™ã‚‹" -#: src/diff.c:902 +#: src/diff.c:903 msgid "-p, --show-c-function show which C function each change is in" msgstr "-p, --show-c-function 変更ãŒã‚ã‚‹ C 関数を表示ã™ã‚‹" -#: src/diff.c:903 +#: src/diff.c:904 msgid "-F, --show-function-line=RE show the most recent line matching RE" msgstr "-F, --show-function-line=RE RE ã«ä¸€è‡´ã™ã‚‹æœ€ã‚‚è¿‘ã„行を表示ã™ã‚‹" -#: src/diff.c:904 +#: src/diff.c:905 #, fuzzy msgid "" " --label LABEL use LABEL instead of file name and timestamp\n" @@ -826,80 +817,80 @@ msgstr "" " --label LABEL ファイルåã®ä»£ã‚ã‚Šã« LABEL を使用ã™ã‚‹\n" " (ç¹°ã‚Šè¿”ã—指定ã§ãã¾ã™)" -#: src/diff.c:907 +#: src/diff.c:908 msgid "-t, --expand-tabs expand tabs to spaces in output" msgstr "-t, --expand-tabs 出力時ã«ã‚¿ãƒ–をスペースã«å±•é–‹ã™ã‚‹" -#: src/diff.c:908 +#: src/diff.c:909 msgid "-T, --initial-tab make tabs line up by prepending a tab" msgstr "" "-T, --initial-tab タブã§å§‹ã¾ã‚‹è¡Œã¯ã€å‰ã«ã‚¿ãƒ–ã‚’ç½®ã„ã¦ãã‚ãˆã‚‹" -#: src/diff.c:909 +#: src/diff.c:910 msgid "" " --tabsize=NUM tab stops every NUM (default 8) print columns" msgstr "" " --tabsize=NUM タブ幅を NUM (デフォルト: 8) 列ã«è¨å®šã™ã‚‹" -#: src/diff.c:910 +#: src/diff.c:911 msgid "" " --suppress-blank-empty suppress space or tab before empty output lines" msgstr "" " --suppress-blank-empty 空ã®å‡ºåŠ›è¡Œã®å‰å¾Œã§ã¯ã‚¹ãƒšãƒ¼ã‚¹ã¾ãŸã¯ã‚¿ãƒ–を抑æ¢ã™" "ã‚‹" -#: src/diff.c:911 +#: src/diff.c:912 #, fuzzy msgid "-l, --paginate pass output through 'pr' to paginate it" msgstr "" "-l, --paginate ページ割り付ã‘ã‚’è¡Œã†ãŸã‚ã« `pr' を通ã—ã¦å‡ºåŠ›ã™" "ã‚‹" -#: src/diff.c:913 +#: src/diff.c:914 msgid "" "-r, --recursive recursively compare any subdirectories found" msgstr "-r, --recursive サブディレクトリーをå†å¸°çš„ã«æ¯”較ã™ã‚‹" -#: src/diff.c:914 +#: src/diff.c:915 msgid " --no-dereference don't follow symbolic links" msgstr "" -#: src/diff.c:915 +#: src/diff.c:916 msgid "-N, --new-file treat absent files as empty" msgstr "" "-N, --new-file å˜åœ¨ã—ãªã„ファイルを空ファイルã¨ã—ã¦æ‰±ã†" -#: src/diff.c:916 +#: src/diff.c:917 msgid " --unidirectional-new-file treat absent first files as empty" msgstr "" " --unidirectional-new-file å˜åœ¨ã—ãªã„最åˆã®ãƒ•ã‚¡ã‚¤ãƒ«ã‚’空ファイルã¨ã—ã¦æ‰±" "ã†" -#: src/diff.c:917 +#: src/diff.c:918 msgid " --ignore-file-name-case ignore case when comparing file names" msgstr " --ignore-file-name-case ファイルåã®å¤§æ–‡å—ã¨å°æ–‡å—を区別ã—ãªã„" -#: src/diff.c:918 +#: src/diff.c:919 msgid " --no-ignore-file-name-case consider case when comparing file names" msgstr " --no-ignore-file-name-case ファイルåã®å¤§æ–‡å—ã¨å°æ–‡å—を区別ã™ã‚‹" -#: src/diff.c:919 +#: src/diff.c:920 msgid "-x, --exclude=PAT exclude files that match PAT" msgstr "-x, --exclude=PAT PAT ã«ä¸€è‡´ã™ã‚‹ãƒ•ã‚¡ã‚¤ãƒ«ã‚’除外ã™ã‚‹" -#: src/diff.c:920 +#: src/diff.c:921 msgid "" "-X, --exclude-from=FILE exclude files that match any pattern in FILE" msgstr "" "-X, --exclude-from=FILE FILE 内ã®ãƒ‘ターンã«ä¸€è‡´ã™ã‚‹ãƒ•ã‚¡ã‚¤ãƒ«ã‚’除外ã™ã‚‹" -#: src/diff.c:921 +#: src/diff.c:922 msgid "" "-S, --starting-file=FILE start with FILE when comparing directories" msgstr "" "-S, --starting-file=FILE ディレクトリーを比較ã™ã‚‹æ™‚ã« FILE ã‹ã‚‰å§‹ã‚ã‚‹" -#: src/diff.c:922 +#: src/diff.c:923 msgid "" " --from-file=FILE1 compare FILE1 to all operands;\n" " FILE1 can be a directory" @@ -907,7 +898,7 @@ msgstr "" " --from-file=FILE1 ã™ã¹ã¦ã®è¢«æ¼”ç®—å㨠FILE1 を比較ã™ã‚‹\n" " FILE1 ã¯ãƒ‡ã‚£ãƒ¬ã‚¯ãƒˆãƒªãƒ¼ã§ã‚‚よã„" -#: src/diff.c:924 +#: src/diff.c:925 msgid "" " --to-file=FILE2 compare all operands to FILE2;\n" " FILE2 can be a directory" @@ -915,57 +906,57 @@ msgstr "" " --to-file=FILE2 ã™ã¹ã¦ã®è¢«æ¼”ç®—åã‚’ FILE2 を比較ã™ã‚‹\n" " FILE2 ã¯ãƒ‡ã‚£ãƒ¬ã‚¯ãƒˆãƒªãƒ¼ã§ã‚‚よã„" -#: src/diff.c:927 +#: src/diff.c:928 msgid "" "-i, --ignore-case ignore case differences in file contents" msgstr "" "-i, --ignore-case ファイル内容ã®æ¯”較時ã«å¤§æ–‡å—ã¨å°æ–‡å—を区別ã—" "ãªã„" -#: src/diff.c:928 +#: src/diff.c:929 msgid "-E, --ignore-tab-expansion ignore changes due to tab expansion" msgstr "-E, --ignore-tab-expansion タブ展開ã«ã‚ˆã£ã¦ç™ºç”Ÿã™ã‚‹é•ã„を無視ã™ã‚‹" -#: src/diff.c:929 +#: src/diff.c:930 msgid "-Z, --ignore-trailing-space ignore white space at line end" msgstr "-Z, --ignore-trailing-space 行末ã«ã‚るスペースを無視ã™ã‚‹" -#: src/diff.c:930 +#: src/diff.c:931 msgid "" "-b, --ignore-space-change ignore changes in the amount of white space" msgstr "-b, --ignore-space-change スペース数ã«ã‚ˆã‚Šç”Ÿã˜ã‚‹é•ã„を無視ã™ã‚‹" -#: src/diff.c:931 +#: src/diff.c:932 msgid "-w, --ignore-all-space ignore all white space" msgstr "-w, --ignore-all-space ã™ã¹ã¦ã®ã‚¹ãƒšãƒ¼ã‚¹ã‚’無視ã™ã‚‹" -#: src/diff.c:932 +#: src/diff.c:933 #, fuzzy msgid "" "-B, --ignore-blank-lines ignore changes where lines are all blank" msgstr "" "-B, --ignore-blank-lines 空白類文å—ã ã‘ã®è¡Œã«ã‚ˆã‚Šç”Ÿã˜ã‚‹é•ã„を無視ã™ã‚‹" -#: src/diff.c:933 +#: src/diff.c:934 #, fuzzy msgid "-I, --ignore-matching-lines=RE ignore changes where all lines match RE" msgstr "" "-I, --ignore-matching-lines=RE RE ã¨ä¸€è‡´ã™ã‚‹ã™ã¹ã¦ã®è¡Œã®é•ã„を無視ã™ã‚‹" -#: src/diff.c:935 +#: src/diff.c:936 msgid "-a, --text treat all files as text" msgstr "-a, --text ã™ã¹ã¦ã®ãƒ•ã‚¡ã‚¤ãƒ«ã‚’テã‚ストã¨ã—ã¦æ‰±ã†" -#: src/diff.c:936 +#: src/diff.c:937 msgid " --strip-trailing-cr strip trailing carriage return on input" msgstr "" " --strip-trailing-cr 入力ã‹ã‚‰ CR (ã‚ャリッジリターン) を除去ã™ã‚‹" -#: src/diff.c:938 +#: src/diff.c:939 msgid " --binary read and write data in binary mode" msgstr " --binary ãƒã‚¤ãƒŠãƒªãƒ¼ãƒ¢ãƒ¼ãƒ‰ã§ãƒ‡ãƒ¼ã‚¿ã‚’èªã¿æ›¸ãã™ã‚‹" -#: src/diff.c:941 +#: src/diff.c:942 #, fuzzy msgid "" "-D, --ifdef=NAME output merged file with '#ifdef NAME' diffs" @@ -973,19 +964,19 @@ msgstr "" "-D, --ifdef=NAME パッãƒé©ç”¨æ™‚ã« `#ifdef NAME' ã§ä½µåˆã•ã‚Œã‚‹ã‚ˆã†" "ã«å·®åˆ†ã‚’出力ã™ã‚‹" -#: src/diff.c:942 +#: src/diff.c:943 msgid " --GTYPE-group-format=GFMT format GTYPE input groups with GFMT" msgstr " --GTYPE-group-format=GFMT GTYPE ã®å…¥åŠ›ã‚°ãƒ«ãƒ¼ãƒ—ã‚’ GFMT ã§æ•´å½¢ã™ã‚‹" -#: src/diff.c:943 +#: src/diff.c:944 msgid " --line-format=LFMT format all input lines with LFMT" msgstr " --line-format=LFMT ã™ã¹ã¦ã®å…¥åŠ›è¡Œã‚’ LFMT ã§æ•´å½¢ã™ã‚‹" -#: src/diff.c:944 +#: src/diff.c:945 msgid " --LTYPE-line-format=LFMT format LTYPE input lines with LFMT" msgstr " --LTYPE-line-format=LFMT LTYPE 入力行を LFMT ã§æ•´å½¢ã™ã‚‹" -#: src/diff.c:945 +#: src/diff.c:946 msgid "" " These format options provide fine-grained control over the output\n" " of diff, generalizing -D/--ifdef." @@ -994,14 +985,14 @@ msgstr "" "ã«\n" " 見ãˆã‚‹ã‚ˆã†ã«åˆ¶å¾¡ã™ã‚‹ãŸã‚ã«æä¾›ã•ã‚Œã¾ã™ã€‚" -#: src/diff.c:947 +#: src/diff.c:948 #, fuzzy msgid " LTYPE is 'old', 'new', or 'unchanged'. GTYPE is LTYPE or 'changed'." msgstr "" " LTYPE 㯠`old'ã€`new'ã€ã¾ãŸã¯`unchanged'ã§ã™ã€‚GTYPE 㯠LTYPE ã¾ãŸã¯ " "`changed' ã§ã™ã€‚" -#: src/diff.c:948 +#: src/diff.c:949 msgid "" " GFMT (only) may contain:\n" " %< lines from FILE1\n" @@ -1029,7 +1020,7 @@ msgstr "" " M L+1\n" " %(A=B?T:E) A 㨠B ãŒç‰ã—ã„å ´åˆã¯ Tã€ç‰ã—ããªã„å ´åˆã¯ E" -#: src/diff.c:960 +#: src/diff.c:961 msgid "" " LFMT (only) may contain:\n" " %L contents of line\n" @@ -1041,7 +1032,7 @@ msgstr "" " %l 行末ã«ã‚ã‚‹ã™ã¹ã¦ã®ç¨®é¡žã®æ”¹è¡Œæ–‡å—を除ã„ãŸè¡Œã®å†…容\n" " %[-][WIDTH][.[PREC]]{doxX}n printf 書å¼ã®å…¥åŠ›è¡Œ" -#: src/diff.c:964 +#: src/diff.c:965 msgid "" " Both GFMT and LFMT may contain:\n" " %% %\n" @@ -1055,151 +1046,144 @@ msgstr "" " %c'\\OOO' 八進数コード OOO\n" " C æ–‡å— C (ä»–ã®æ–‡å—ã‚‚åŒæ§˜ã«è¡¨ã™)" -#: src/diff.c:970 +#: src/diff.c:971 msgid "-d, --minimal try hard to find a smaller set of changes" msgstr "-d, --minimal 差分ã®å¤§ãã•ãŒæœ€å°ã¨ãªã‚‹ã‚ˆã†ã«é•ã„を検出ã™ã‚‹" -#: src/diff.c:971 +#: src/diff.c:972 msgid " --horizon-lines=NUM keep NUM lines of the common prefix and suffix" msgstr " --horizon-lines=NUM 差分ã®å‰å¾Œã«ã‚る共通部分を NUM è¡Œä¿æŒã™ã‚‹" -#: src/diff.c:972 +#: src/diff.c:973 msgid "" " --speed-large-files assume large files and many scattered small changes" msgstr "" " --speed-large-files 巨大ãªãƒ•ã‚¡ã‚¤ãƒ«ã«å°ã•ãªå·®åˆ†ãŒåˆ†æ•£ã—ã¦ã„ã‚‹ã¨ä»®å®šã™ã‚‹" -#: src/diff.c:973 -msgid "" -" --color[=WHEN] colorize the output; WHEN can be 'never', 'always'," -msgstr "" - #: src/diff.c:974 -#, fuzzy -msgid " or 'auto' (the default)" -msgstr " --normal 通常㮠diff を出力ã™ã‚‹ (デフォルト)" - -#: src/diff.c:975 msgid "" -" --palette=PALETTE specify the colors to use when --color is active" +" --color[=WHEN] colorize the output; WHEN can be 'never', " +"'always',\n" +" or 'auto' (the default)" msgstr "" #: src/diff.c:976 msgid "" -" PALETTE is a colon-separated list terminfo " -"capabilities" +" --palette=PALETTE the colors to use when --color is active; PALETTE " +"is\n" +" a colon-separated list of terminfo capabilities" msgstr "" -#: src/diff.c:978 +#: src/diff.c:979 msgid " --help display this help and exit" msgstr " --help ã“ã®ãƒ˜ãƒ«ãƒ—を表示ã—ã¦çµ‚了ã™ã‚‹" -#: src/diff.c:979 +#: src/diff.c:980 msgid "-v, --version output version information and exit" msgstr "-v, --version ãƒãƒ¼ã‚¸ãƒ§ãƒ³æƒ…å ±ã‚’è¡¨ç¤ºã—ã¦çµ‚了ã™ã‚‹" -#: src/diff.c:981 +#: src/diff.c:982 #, fuzzy msgid "FILES are 'FILE1 FILE2' or 'DIR1 DIR2' or 'DIR FILE' or 'FILE DIR'." msgstr "" "FILES 㯠`FILE1 FILE2'ã€`DIR1 DIR2' ã€`DIR FILE...'ã€ã¾ãŸã¯ `FILE... DIR' ã§" "ã™ã€‚" -#: src/diff.c:982 +#: src/diff.c:983 msgid "" "If --from-file or --to-file is given, there are no restrictions on FILE(s)." msgstr "" "--from-file ã¾ãŸã¯ --to-file ãŒä¸Žãˆã‚‰ã‚ŒãŸå ´åˆã€FILE ã«åˆ¶é™ã¯ã‚ã‚Šã¾ã›ã‚“。" -#: src/diff.c:983 src/diff3.c:526 src/sdiff.c:219 +#: src/diff.c:984 src/diff3.c:528 src/sdiff.c:219 #, fuzzy msgid "If a FILE is '-', read standard input." msgstr "FILE ㌠`-' ã®å ´åˆã€æ¨™æº–入力ã‹ã‚‰èªã¿è¾¼ã¿ã¾ã™ã€‚" -#: src/diff.c:993 +#: src/diff.c:994 #, c-format msgid "Usage: %s [OPTION]... FILES\n" msgstr "使用法: %s [OPTION]... FILES\n" -#: src/diff.c:994 +#: src/diff.c:995 msgid "Compare FILES line by line." msgstr "FILES ã‚’è¡Œã”ã¨ã«æ¯”較ã—ã¾ã™ã€‚" -#: src/diff.c:1028 +#: src/diff.c:1029 #, fuzzy, c-format msgid "conflicting %s option value '%s'" msgstr "%s オプションã®å€¤ `%s' ãŒç«¶åˆã—ã¦ã„ã¾ã™" -#: src/diff.c:1041 +#: src/diff.c:1042 #, c-format msgid "conflicting output style options" msgstr "出力形å¼ã‚ªãƒ—ションãŒç«¶åˆã—ã¦ã„ã¾ã™" -#: src/diff.c:1057 +#: src/diff.c:1058 #, fuzzy, c-format msgid "invalid color '%s'" -msgstr "無効ãªå¹… `%s' ã§ã™" +msgstr "無効ãªå‰å¾Œã®è¡Œæ•° `%s' ã§ã™" -#: src/diff.c:1113 src/diff.c:1323 +#: src/diff.c:1114 src/diff.c:1324 #, c-format msgid "Only in %s: %s\n" msgstr "%s ã®ã¿ã«å˜åœ¨: %s\n" -#: src/diff.c:1247 +#: src/diff.c:1248 #, fuzzy msgid "cannot compare '-' to a directory" msgstr "`-' ã¨ãƒ‡ã‚£ãƒ¬ã‚¯ãƒˆãƒªãƒ¼ã¯æ¯”較ã§ãã¾ã›ã‚“" -#: src/diff.c:1282 +#: src/diff.c:1283 msgid "-D option not supported with directories" msgstr "-D オプションã¯ãƒ‡ã‚£ãƒ¬ã‚¯ãƒˆãƒªãƒ¼ã«ã¯ã‚µãƒãƒ¼ãƒˆã•ã‚Œã¾ã›ã‚“" -#: src/diff.c:1291 +#: src/diff.c:1292 #, c-format msgid "Common subdirectories: %s and %s\n" msgstr "共通ã®ã‚µãƒ–ディレクトリー: %s 㨠%s\n" -#: src/diff.c:1333 src/diff.c:1383 +#: src/diff.c:1334 src/diff.c:1384 #, c-format msgid "File %s is a %s while file %s is a %s\n" msgstr "ファイル %s 㯠%s ã§ã™ã€‚一方ã€ãƒ•ã‚¡ã‚¤ãƒ« %s 㯠%s ã§ã™\n" -#: src/diff.c:1369 +#: src/diff.c:1370 #, fuzzy, c-format msgid "Symbolic links %s and %s differ\n" msgstr "ファイル %s 㨠%s ã¯ç•°ãªã‚Šã¾ã™\n" -#: src/diff.c:1456 +#: src/diff.c:1457 #, c-format msgid "Files %s and %s are identical\n" msgstr "ファイル %s 㨠%s ã¯åŒä¸€ã§ã™\n" #. This is a proper name. See the gettext manual, section Names. -#: src/diff3.c:41 +#: src/diff3.c:42 msgid "Randy Smith" msgstr "Randy Smith" -#: src/diff3.c:348 +#: src/diff3.c:351 #, c-format msgid "incompatible options" msgstr "åŒæ™‚ã«æŒ‡å®šã§ããªã„オプションã§ã™" -#: src/diff3.c:388 +#: src/diff3.c:391 #, fuzzy msgid "'-' specified for more than one input file" msgstr "入力ファイルã¨ã—㦠`-' ãŒè¤‡æ•°å›žæŒ‡å®šã•ã‚Œã¦ã„ã¾ã™" -#: src/diff3.c:439 src/diff3.c:1288 src/diff3.c:1692 src/diff3.c:1747 +#: src/diff3.c:442 src/diff3.c:1290 src/diff3.c:1693 src/diff3.c:1748 #: src/sdiff.c:307 src/sdiff.c:844 src/sdiff.c:855 msgid "read failed" msgstr "èªã¿è¾¼ã¿ã«å¤±æ•—ã—ã¾ã—ãŸ" -#: src/diff3.c:473 +#: src/diff3.c:475 msgid "-A, --show-all output all changes, bracketing conflicts" msgstr "" "-A, --show-all 競åˆã‚’ã™ã¹ã¦æ‹¬å¼§ã§ããã‚Šã€å¤‰æ›´ã‚’ã™ã¹ã¦å‡ºåŠ›ã™ã‚‹" -#: src/diff3.c:475 +#: src/diff3.c:477 msgid "" "-e, --ed output ed script incorporating changes\n" " from OLDFILE to YOURFILE into MYFILE" @@ -1208,11 +1192,11 @@ msgstr "" " スクリプトã¨ã—ã¦å‡ºåŠ›ã™ã‚‹\n" " " -#: src/diff3.c:477 +#: src/diff3.c:479 msgid "-E, --show-overlap like -e, but bracket conflicts" msgstr "-E, --show-overlap -e ã¨åŒæ§˜ã ãŒã€ç«¶åˆã‚’括弧ã§ããã‚‹" -#: src/diff3.c:478 +#: src/diff3.c:480 msgid "" "-3, --easy-only like -e, but incorporate only nonoverlapping " "changes" @@ -1220,23 +1204,23 @@ msgstr "" "-3, --easy-only -e ã¨åŒæ§˜ã ãŒã€3ファイル競åˆã§ç„¡ã„部分ã®ã¿å‡ºåŠ›ã™" "ã‚‹" -#: src/diff3.c:479 +#: src/diff3.c:481 msgid "" "-x, --overlap-only like -e, but incorporate only overlapping changes" msgstr "" "-x, --overlap-only -e ã¨åŒæ§˜ã ãŒã€3ファイル競åˆã®éƒ¨åˆ†ã®ã¿å‡ºåŠ›ã™ã‚‹" -#: src/diff3.c:480 +#: src/diff3.c:482 msgid "-X like -x, but bracket conflicts" msgstr "-X -x ã¨åŒæ§˜ã ãŒã€ç«¶åˆã‚’括弧ã§ããã‚‹" -#: src/diff3.c:481 +#: src/diff3.c:483 #, fuzzy msgid "-i append 'w' and 'q' commands to ed scripts" msgstr "" "-i ed スクリプトã®å¾Œã« `w' 㨠`q' ã‚³ãƒžãƒ³ãƒ‰ã‚’è¿½åŠ ã™ã‚‹" -#: src/diff3.c:483 +#: src/diff3.c:485 msgid "" "-m, --merge output actual merged file, according to\n" " -A if no other options are given" @@ -1244,23 +1228,23 @@ msgstr "" "-m, --merge ä»–ã®ã‚ªãƒ—ションを指定ã—ã¦ã„ãªã„å ´åˆã€-A 従ã£ã¦\n" " 実際ã«ä½µåˆã•ã‚ŒãŸãƒ•ã‚¡ã‚¤ãƒ«ã‚’出力ã™ã‚‹" -#: src/diff3.c:486 +#: src/diff3.c:488 msgid "-a, --text treat all files as text" msgstr "-a, --text ã™ã¹ã¦ã®ãƒ•ã‚¡ã‚¤ãƒ«ã‚’テã‚ストã¨ã—ã¦æ‰±ã†" -#: src/diff3.c:487 +#: src/diff3.c:489 msgid " --strip-trailing-cr strip trailing carriage return on input" msgstr " --strip-trailing-cr 入力ã‹ã‚‰æœ«å°¾ã®ã‚ャリッジリターンを除去ã™ã‚‹" -#: src/diff3.c:488 +#: src/diff3.c:490 msgid "-T, --initial-tab make tabs line up by prepending a tab" msgstr "-T, --initial-tab タブã§å§‹ã¾ã‚‹è¡Œã¯ã€å‰ã«ã‚¿ãƒ–ã‚’ç½®ã„ã¦ãã‚ãˆã‚‹" -#: src/diff3.c:489 +#: src/diff3.c:491 msgid " --diff-program=PROGRAM use PROGRAM to compare files" msgstr " --diff-program=PROGRAM ファイル比較㫠PROGRAM を使用ã™ã‚‹" -#: src/diff3.c:490 +#: src/diff3.c:492 msgid "" "-L, --label=LABEL use LABEL instead of file name\n" " (can be repeated up to three times)" @@ -1268,24 +1252,24 @@ msgstr "" "-L, --label=LABEL ファイルåã®ä»£ã‚ã‚Šã« LABEL を使用ã™ã‚‹\n" " (3回ã¾ã§ç¹°ã‚Šè¿”ã—指定ã§ãã‚‹)" -#: src/diff3.c:493 +#: src/diff3.c:495 msgid " --help display this help and exit" msgstr " --help ã“ã®ãƒ˜ãƒ«ãƒ—を表示ã—ã¦çµ‚了ã™ã‚‹" -#: src/diff3.c:494 +#: src/diff3.c:496 msgid "-v, --version output version information and exit" msgstr "-v, --version ãƒãƒ¼ã‚¸ãƒ§ãƒ³æƒ…å ±ã‚’è¡¨ç¤ºã—ã¦çµ‚了ã™ã‚‹" -#: src/diff3.c:503 +#: src/diff3.c:505 #, c-format msgid "Usage: %s [OPTION]... MYFILE OLDFILE YOURFILE\n" msgstr "Usage: %s [OPTION]... MYFILE OLDFILE YOURFILE\n" -#: src/diff3.c:505 +#: src/diff3.c:507 msgid "Compare three files line by line." msgstr "3ã¤ã®ãƒ•ã‚¡ã‚¤ãƒ«ã‚’è¡Œã”ã¨ã«æ¯”較ã—ã¾ã™ã€‚" -#: src/diff3.c:515 +#: src/diff3.c:517 msgid "" "\n" "The default output format is a somewhat human-readable representation of\n" @@ -1308,47 +1292,47 @@ msgstr "" "ä½µåˆã•ã‚ŒãŸãƒ•ã‚¡ã‚¤ãƒ«ã‚’出力ã—ã¾ã™ã€‚通常ã®å…¥åŠ›ã¨ã—ã¦ã¯ã€ã“れ㯠ed を使用ã™\n" "るより強固ã§ã™ã€‚\n" -#: src/diff3.c:527 +#: src/diff3.c:529 msgid "Exit status is 0 if successful, 1 if conflicts, 2 if trouble." msgstr "" "終了コードã¯ã€æˆåŠŸã—ãŸå ´åˆã¯ 0ã€ç«¶åˆãŒã‚ã‚‹å ´åˆã¯ 1ã€\n" "å•é¡ŒãŒç™ºç”Ÿã—ãŸã¨ã㯠2 ã«ãªã‚Šã¾ã™ã€‚" -#: src/diff3.c:720 +#: src/diff3.c:722 msgid "internal error: screwup in format of diff blocks" msgstr "内部エラー: 差分ブãƒãƒƒã‚¯ã®å½¢å¼ã‚’ã†ã¾ã処ç†ã§ãã¾ã›ã‚“ã§ã—ãŸ" -#: src/diff3.c:1015 +#: src/diff3.c:1017 #, c-format msgid "%s: diff failed: " msgstr "%s: diff ã«å¤±æ•—ã—ã¾ã—ãŸ: " -#: src/diff3.c:1037 +#: src/diff3.c:1039 msgid "internal error: invalid diff type in process_diff" msgstr "内部エラー: process_diff 内ã«ç„¡åŠ¹ãªå·®åˆ†åž‹ãŒã‚ã‚Šã¾ã™" -#: src/diff3.c:1062 +#: src/diff3.c:1064 msgid "invalid diff format; invalid change separator" msgstr "無効ãªå·®åˆ†å½¢å¼ã§ã™ã€‚無効ãªå¤‰æ›´åŒºåˆ‡ã‚Šã§ã™" -#: src/diff3.c:1298 +#: src/diff3.c:1300 msgid "invalid diff format; incomplete last line" msgstr "無効ãªå·®åˆ†å½¢å¼ã§ã™ã€‚最後ã®è¡ŒãŒä¸å®Œå…¨ã§ã™" -#: src/diff3.c:1322 src/sdiff.c:275 src/util.c:970 +#: src/diff3.c:1324 src/sdiff.c:275 src/util.c:969 #, fuzzy, c-format msgid "subsidiary program '%s' could not be invoked" msgstr "下ä½ãƒ—ãƒã‚°ãƒ©ãƒ `%s' ãŒèµ·å‹•ã§ãã¾ã›ã‚“" -#: src/diff3.c:1347 +#: src/diff3.c:1349 msgid "invalid diff format; incorrect leading line chars" msgstr "無効ãªå·®åˆ†å½¢å¼ã§ã™ã€‚è¡Œã®å…ˆé æ–‡å—ãŒèª¤ã£ã¦ã„ã¾ã™" -#: src/diff3.c:1420 +#: src/diff3.c:1422 msgid "internal error: invalid diff type passed to output" msgstr "内部エラー: 無効ãªå·®åˆ†åž‹ãŒå‡ºåŠ›ã«æ¸¡ã•ã‚Œã¾ã—ãŸ" -#: src/diff3.c:1694 src/diff3.c:1751 +#: src/diff3.c:1695 src/diff3.c:1752 msgid "input file shrank" msgstr "入力ファイルãŒå°ã•ããªã‚Šã¾ã—ãŸ" @@ -1363,7 +1347,7 @@ msgid "%s: recursive directory loop" msgstr "%s: ディレクトリーãŒå†å¸°çš„ã«ãƒ«ãƒ¼ãƒ—ã—ã¦ã„ã¾ã™" #. This is a proper name. See the gettext manual, section Names. -#: src/sdiff.c:42 +#: src/sdiff.c:43 msgid "Thomas Lord" msgstr "Thomas Lord" @@ -1503,16 +1487,35 @@ msgstr "" "v: 共通行を明示ã—ã¦å«ã‚る。\n" "q: 終了ã™ã‚‹ã€‚\n" -#: src/util.c:663 +#: src/util.c:662 #, fuzzy, c-format msgid "unrecognized prefix: %s" msgstr "%s: オプション '--%s' ã‚’èªè˜ã§ãã¾ã›ã‚“\n" -#: src/util.c:693 +#: src/util.c:692 #, c-format msgid "unparsable value for --palette" msgstr "" +#, fuzzy +#~ msgid " or 'auto' (the default)" +#~ msgstr " --normal 通常㮠diff を出力ã™ã‚‹ (デフォルト)" + +#~ 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' is ambiguous\n" +#~ msgstr "%s: オプション '-W %s' ã¯æ›–昧ã§ã™\n" + +#~ msgid "%s: option '-W %s' doesn't allow an argument\n" +#~ msgstr "%s: オプション '-W %s' ã¯å¼•æ•°ã‚’å–ã‚‹ã“ã¨ãŒã§ãã¾ã›ã‚“\n" + +#~ msgid "%s: option '-W %s' requires an argument\n" +#~ msgstr "%s: オプション '-W %s' ã¯å¼•æ•°ãŒå¿…è¦ã§ã™\n" + #~ msgid "-i SKIP1:SKIP2 --ignore-initial=SKIP1:SKIP2" #~ msgstr "-i SKIP1:SKIP2 --ignore-initial=SKIP1:SKIP2" @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: diffutils-3.3-pre1\n" "Report-Msgid-Bugs-To: bug-diffutils@gnu.org\n" -"POT-Creation-Date: 2016-08-20 22:22-0700\n" +"POT-Creation-Date: 2017-05-21 13:26-0700\n" "PO-Revision-Date: 2014-04-20 15:28+0300\n" "Last-Translator: Rihards Prieditis <rprieditis@gmail.com>\n" "Language-Team: Latvian <translation-team-lv@lists.sourceforge.net>\n" @@ -16,34 +16,35 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"X-Bugs: Report translation errors to the Language-Team address.\n" "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : " "2);\n" "X-Generator: Lokalize 1.5\n" -#: lib/argmatch.c:133 +#: lib/argmatch.c:134 #, fuzzy, c-format msgid "invalid argument %s for %s" msgstr "nederÄ«gs %s%s arguments “%sâ€" -#: lib/argmatch.c:134 +#: lib/argmatch.c:135 #, c-format msgid "ambiguous argument %s for %s" msgstr "" -#: lib/argmatch.c:153 +#: lib/argmatch.c:154 #, fuzzy msgid "Valid arguments are:" msgstr "nederÄ«gs %s%s arguments “%sâ€" -#: lib/c-stack.c:204 lib/c-stack.c:297 +#: lib/c-stack.c:203 lib/c-stack.c:296 msgid "program error" msgstr "programmas kļūda" -#: lib/c-stack.c:205 lib/c-stack.c:298 +#: lib/c-stack.c:204 lib/c-stack.c:297 msgid "stack overflow" msgstr "steka pÄrplÅ«Å¡ana" -#: lib/error.c:191 +#: lib/error.c:195 msgid "Unknown system error" msgstr "NezinÄma sistÄ“mas kļūda" @@ -147,66 +148,41 @@ msgstr "" msgid "weird file" msgstr "dÄ«vaina datne" -#: lib/getopt.c:575 lib/getopt.c:604 -#, c-format -msgid "%s: option '%s' is ambiguous; possibilities:" -msgstr "%s: opcija “%s†nav viennozÄ«mÄ«ga, iespÄ“jas:" - -#: lib/getopt.c:619 +#: lib/getopt.c:278 #, fuzzy, c-format -msgid "%s: option '%s' is ambiguous\n" +msgid "%s: option '%s%s' is ambiguous\n" msgstr "%s: opcija “-W %s†ir divdomÄ«ga\n" -#: lib/getopt.c:654 lib/getopt.c:658 -#, c-format -msgid "%s: option '--%s' doesn't allow an argument\n" -msgstr "%s: opcija “--%s†neatļauj argumentu\n" +#: lib/getopt.c:284 +#, fuzzy, c-format +msgid "%s: option '%s%s' is ambiguous; possibilities:" +msgstr "%s: opcija “%s†nav viennozÄ«mÄ«ga, iespÄ“jas:" -#: lib/getopt.c:667 lib/getopt.c:672 -#, c-format -msgid "%s: option '%c%s' doesn't allow an argument\n" +#: lib/getopt.c:319 +#, fuzzy, c-format +msgid "%s: unrecognized option '%s%s'\n" +msgstr "%s: neatpazÄ«ta opcija “%c%sâ€\n" + +#: lib/getopt.c:345 +#, fuzzy, c-format +msgid "%s: option '%s%s' doesn't allow an argument\n" msgstr "%s: opcija “%c%s†neatļauj argumentu\n" -#: lib/getopt.c:715 lib/getopt.c:734 -#, c-format -msgid "%s: option '--%s' requires an argument\n" +#: lib/getopt.c:360 +#, fuzzy, c-format +msgid "%s: option '%s%s' requires an argument\n" msgstr "%s: opcijai “--%s†nepiecieÅ¡ams arguments\n" -#: lib/getopt.c:772 lib/getopt.c:775 -#, c-format -msgid "%s: unrecognized option '--%s'\n" -msgstr "%s: neatpazÄ«ta opcija “--%sâ€\n" - -#: lib/getopt.c:783 lib/getopt.c:786 -#, c-format -msgid "%s: unrecognized option '%c%s'\n" -msgstr "%s: neatpazÄ«ta opcija “%c%sâ€\n" - -#: lib/getopt.c:835 lib/getopt.c:838 +#: lib/getopt.c:621 #, c-format msgid "%s: invalid option -- '%c'\n" msgstr "%s: nederÄ«ga opcija -- “%câ€\n" -#: lib/getopt.c:891 lib/getopt.c:908 lib/getopt.c:1118 lib/getopt.c:1136 +#: lib/getopt.c:636 lib/getopt.c:682 #, c-format msgid "%s: option requires an argument -- '%c'\n" msgstr "%s: opcijai nepiecieÅ¡ams arguments -- “%câ€\n" -#: lib/getopt.c:964 lib/getopt.c:980 -#, c-format -msgid "%s: option '-W %s' is ambiguous\n" -msgstr "%s: opcija “-W %s†ir divdomÄ«ga\n" - -#: lib/getopt.c:1004 lib/getopt.c:1022 -#, c-format -msgid "%s: option '-W %s' doesn't allow an argument\n" -msgstr "%s: opcija “-W %s†neatļauj argumentu\n" - -#: lib/getopt.c:1043 lib/getopt.c:1061 -#, c-format -msgid "%s: option '-W %s' requires an argument\n" -msgstr "%s: opcijai “-W %s†nepiecieÅ¡ams arguments\n" - #. TRANSLATORS: #. Get translations for open and closing quotation marks. #. The message catalog should translate "`" to a left @@ -228,11 +204,11 @@ msgstr "%s: opcijai “-W %s†nepiecieÅ¡ams arguments\n" #. If you don't know what to put here, please see #. <http://en.wikipedia.org/wiki/Quotation_marks_in_other_languages> #. and use glyphs suitable for your language. -#: lib/quotearg.c:347 +#: lib/quotearg.c:362 msgid "`" msgstr "“" -#: lib/quotearg.c:348 +#: lib/quotearg.c:363 msgid "'" msgstr "â€" @@ -524,7 +500,7 @@ msgstr "" "VispÄrÄ“ja palÄ«dzÄ«ba, izmantojot GNU programmatÅ«ru: <http://www.gnu.org/" "gethelp/>\n" -#: src/analyze.c:454 src/diff.c:1400 +#: src/analyze.c:454 src/diff.c:1401 #, c-format msgid "Files %s and %s differ\n" msgstr "Datnes %s un %s atÅ¡Ä·iras\n" @@ -534,21 +510,21 @@ msgstr "Datnes %s un %s atÅ¡Ä·iras\n" msgid "Binary files %s and %s differ\n" msgstr "BinÄrÄs datnes %s un %s atÅ¡Ä·iras\n" -#: src/analyze.c:697 src/diff3.c:1463 src/util.c:1255 +#: src/analyze.c:706 src/diff3.c:1465 src/util.c:1254 msgid "No newline at end of file" msgstr "Nav jaunu rindu datnes beigÄs" #. This is a proper name. See the gettext manual, section Names. -#: src/cmp.c:43 +#: src/cmp.c:44 msgid "Torbjorn Granlund" msgstr "Torbjorn Granlund" #. This is a proper name. See the gettext manual, section Names. -#: src/cmp.c:44 +#: src/cmp.c:45 msgid "David MacKenzie" msgstr "David MacKenzie" -#: src/cmp.c:118 src/diff.c:875 src/diff3.c:459 src/sdiff.c:158 +#: src/cmp.c:119 src/diff.c:877 src/diff3.c:462 src/sdiff.c:159 #, c-format msgid "Try '%s --help' for more information." msgstr "Lietojiet “%s --helpâ€, lai uzzinÄtu vairÄk." @@ -563,12 +539,12 @@ msgstr "nederÄ«ga --ignore-initial vÄ“rtÄ«ba “%sâ€" msgid "options -l and -s are incompatible" msgstr "opcijas -l un -s nav savstarpÄ“ji saderÄ«gas" -#: src/cmp.c:155 src/diff.c:884 src/diff3.c:467 src/sdiff.c:167 src/sdiff.c:315 -#: src/sdiff.c:322 src/sdiff.c:874 src/util.c:853 src/util.c:953 src/util.c:960 +#: src/cmp.c:155 src/diff.c:885 src/diff3.c:469 src/sdiff.c:167 src/sdiff.c:315 +#: src/sdiff.c:322 src/sdiff.c:874 src/util.c:852 src/util.c:952 src/util.c:959 msgid "write failed" msgstr "rakstÄ«Å¡ana neizdevÄs" -#: src/cmp.c:157 src/diff.c:886 src/diff.c:1465 src/diff3.c:469 src/sdiff.c:169 +#: src/cmp.c:157 src/diff.c:887 src/diff.c:1466 src/diff3.c:471 src/sdiff.c:169 msgid "standard output" msgstr "standarta izvade" @@ -629,7 +605,7 @@ msgstr "" "NeobligÄtie IZLAIST1 un IZLAIST2 norÄda, cik baitus izlaist\n" "katras datnes sÄkumÄ (pÄ“c noklusÄ“juma nulle)." -#: src/cmp.c:185 src/diff.c:996 src/diff3.c:507 src/sdiff.c:210 +#: src/cmp.c:185 src/diff.c:997 src/diff3.c:509 src/sdiff.c:210 msgid "" "Mandatory arguments to long options are mandatory for short options too.\n" msgstr "" @@ -649,7 +625,7 @@ msgstr "" msgid "If a FILE is '-' or missing, read standard input." msgstr "Ja DATNEI ir “-†vai tÄ nav, tad lasÄ«t standarta ievadi." -#: src/cmp.c:195 src/diff.c:984 src/sdiff.c:220 +#: src/cmp.c:195 src/diff.c:985 src/sdiff.c:220 msgid "Exit status is 0 if inputs are the same, 1 if different, 2 if trouble." msgstr "" "Izejas status ir 0, ja ievads ir tÄds pats, 1, ja tas ir atÅ¡Ä·irÄ«gs, 2, ja ir " @@ -660,161 +636,176 @@ msgstr "" msgid "invalid --bytes value '%s'" msgstr "nederÄ«ga --bytes vÄ“rtÄ«ba “%sâ€" -#: src/cmp.c:266 src/diff.c:793 src/diff3.c:353 src/sdiff.c:565 +#: src/cmp.c:266 src/diff.c:795 src/diff3.c:356 src/sdiff.c:565 #, c-format msgid "missing operand after '%s'" msgstr "trÅ«kst operands pÄ“c “%sâ€" -#: src/cmp.c:278 src/diff.c:795 src/diff3.c:355 src/sdiff.c:567 +#: src/cmp.c:278 src/diff.c:797 src/diff3.c:358 src/sdiff.c:567 #, c-format msgid "extra operand '%s'" msgstr "papildu operands “%sâ€" -#: src/cmp.c:494 +#: src/cmp.c:498 #, c-format msgid "%s %s differ: byte %s, line %s\n" msgstr "%s %s atÅ¡Ä·iras: baits %s, rinda %s\n" -#: src/cmp.c:510 +#: src/cmp.c:514 #, c-format msgid "%s %s differ: byte %s, line %s is %3o %s %3o %s\n" msgstr "%s %s atÅ¡Ä·iras: baits %s, rinda %s ir %3o %s %3o %s\n" -#: src/cmp.c:562 -#, c-format -msgid "cmp: EOF on %s\n" +#: src/cmp.c:571 +#, fuzzy, c-format +msgid "cmp: EOF on %s which is empty\n" +msgstr "cmp: EOF uz %s\n" + +#: src/cmp.c:585 +#, fuzzy, c-format +msgid "cmp: EOF on %s after byte %s, line %s\n" +msgstr "%s %s atÅ¡Ä·iras: baits %s, rinda %s\n" + +#: src/cmp.c:586 +#, fuzzy, c-format +msgid "cmp: EOF on %s after byte %s, in line %s\n" +msgstr "%s %s atÅ¡Ä·iras: baits %s, rinda %s\n" + +#: src/cmp.c:592 +#, fuzzy, c-format +msgid "cmp: EOF on %s after byte %s\n" msgstr "cmp: EOF uz %s\n" #. This is a proper name. See the gettext manual, section Names. -#: src/diff.c:49 +#: src/diff.c:50 msgid "Paul Eggert" msgstr "Paul Eggert" #. This is a proper name. See the gettext manual, section Names. -#: src/diff.c:50 +#: src/diff.c:51 msgid "Mike Haertel" msgstr "Mike Haertel" #. This is a proper name. See the gettext manual, section Names. -#: src/diff.c:51 +#: src/diff.c:52 msgid "David Hayes" msgstr "David Hayes" #. This is a proper name. See the gettext manual, section Names. -#: src/diff.c:52 +#: src/diff.c:53 msgid "Richard Stallman" msgstr "Richard Stallman" #. This is a proper name. See the gettext manual, section Names. -#: src/diff.c:53 +#: src/diff.c:54 msgid "Len Tower" msgstr "Len Tower" -#: src/diff.c:351 +#: src/diff.c:353 #, c-format msgid "invalid context length '%s'" msgstr "nederÄ«gs konteksta garums “%sâ€" -#: src/diff.c:434 +#: src/diff.c:436 #, c-format msgid "pagination not supported on this host" msgstr "lapoÅ¡ana netiek atbalstÄ«ta uz Å¡Ä« resursdatora" -#: src/diff.c:449 src/diff3.c:335 +#: src/diff.c:451 src/diff3.c:336 #, c-format msgid "too many file label options" msgstr "pÄrÄk daudz datnes etiÄ·eÅ¡u opciju" -#: src/diff.c:526 +#: src/diff.c:528 #, c-format msgid "invalid width '%s'" msgstr "nederÄ«gs platums “%sâ€" -#: src/diff.c:530 +#: src/diff.c:532 msgid "conflicting width options" msgstr "konfliktÄ“joÅ¡as platuma opcijas" -#: src/diff.c:555 +#: src/diff.c:557 #, c-format msgid "invalid horizon length '%s'" msgstr "nederÄ«gs horizontÄlais garums “%sâ€" -#: src/diff.c:611 +#: src/diff.c:613 #, c-format msgid "invalid tabsize '%s'" msgstr "nederÄ«gs tabulÄcijas izmÄ“rs “%sâ€" -#: src/diff.c:615 +#: src/diff.c:617 msgid "conflicting tabsize options" msgstr "konfliktÄ“joÅ¡as tabulÄcijas izmÄ“ru opcijas" -#: src/diff.c:770 +#: src/diff.c:772 msgid "--from-file and --to-file both specified" msgstr "--from-file un --to-file abi norÄdÄ«ti" -#: src/diff.c:890 +#: src/diff.c:891 msgid " --normal output a normal diff (the default)" msgstr " --normal izvada parastu diff (noklusÄ“juma)" -#: src/diff.c:891 +#: src/diff.c:892 msgid "-q, --brief report only when files differ" msgstr "-q, --brief ziņot tikai, ja datnes atÅ¡Ä·iras" -#: src/diff.c:892 +#: src/diff.c:893 msgid "-s, --report-identical-files report when two files are the same" msgstr "-s, --report-identical-files ziņot, ja divas datnes ir vienÄdas" -#: src/diff.c:893 +#: src/diff.c:894 msgid "" "-c, -C NUM, --context[=NUM] output NUM (default 3) lines of copied context" msgstr "" "-c, -C NUM, --context[=NUM] izvadÄ«t NUM (noklus. 3) kopÄ“tÄ konteksta rindas" -#: src/diff.c:894 +#: src/diff.c:895 msgid "" "-u, -U NUM, --unified[=NUM] output NUM (default 3) lines of unified context" msgstr "" "-u, -U NUM, --unified[=NUM] izvadÄ«t NUM (noklus. 3) vienotÄ konteksta " "rindas" -#: src/diff.c:895 +#: src/diff.c:896 msgid "-e, --ed output an ed script" msgstr "-e, --ed izvada ed skriptu" -#: src/diff.c:896 +#: src/diff.c:897 msgid "-n, --rcs output an RCS format diff" msgstr "-n, --rcs izvada RCS formÄta diff" -#: src/diff.c:897 +#: src/diff.c:898 msgid "-y, --side-by-side output in two columns" msgstr "-y, --side-by-side izvade divÄs kolonnÄs" -#: src/diff.c:898 +#: src/diff.c:899 msgid "" "-W, --width=NUM output at most NUM (default 130) print columns" msgstr "" "-W, --width=NUM izvada lÄ«dz NUM (noklusÄ“juma 130) drukas " "kolonas" -#: src/diff.c:899 +#: src/diff.c:900 msgid "" " --left-column output only the left column of common lines" msgstr "" " --left-column izvadÄ«t tikai kreiso kolonu no kopÄ“jÄm rindÄm" -#: src/diff.c:900 +#: src/diff.c:901 msgid " --suppress-common-lines do not output common lines" msgstr " --suppress-common-lines neizvadÄ«t kopÄ“jÄs rindas" -#: src/diff.c:902 +#: src/diff.c:903 msgid "-p, --show-c-function show which C function each change is in" msgstr "-p, --show-c-function rÄdÄ«t, kurÄs C funkcijÄs ir izmaiņas" -#: src/diff.c:903 +#: src/diff.c:904 msgid "-F, --show-function-line=RE show the most recent line matching RE" msgstr "-F, --show-function-line=RE rÄdÄ«t visnesenÄko rindu, kas atbilst RE" -#: src/diff.c:904 +#: src/diff.c:905 #, fuzzy msgid "" " --label LABEL use LABEL instead of file name and timestamp\n" @@ -823,24 +814,24 @@ msgstr "" " --label ETIĶETE izmantot ETIĶETI nevis datnes nosaukumu\n" " (var atkÄrtot)" -#: src/diff.c:907 +#: src/diff.c:908 msgid "-t, --expand-tabs expand tabs to spaces in output" msgstr "" "-t, --expand-tabs pÄrveidot tabulÄcijas par atstarpÄ“m izvadÄ“" -#: src/diff.c:908 +#: src/diff.c:909 msgid "-T, --initial-tab make tabs line up by prepending a tab" msgstr "" "-T, --initial-tab pacelt tabulÄcijas rindu pirms tabulÄcijas" -#: src/diff.c:909 +#: src/diff.c:910 msgid "" " --tabsize=NUM tab stops every NUM (default 8) print columns" msgstr "" " --tabsize=NUM tabulÄciju pietura ik NUM drukas " "kolonas (noklusÄ“juma ir 8)" -#: src/diff.c:910 +#: src/diff.c:911 msgid "" " --suppress-blank-empty suppress space or tab before empty output lines" msgstr "" @@ -848,59 +839,59 @@ msgstr "" "tukÅ¡Äm\n" " izvades rindÄm." -#: src/diff.c:911 +#: src/diff.c:912 msgid "-l, --paginate pass output through 'pr' to paginate it" msgstr "-l, --paginate izlaist izvadi caur “prâ€, lai to lapotu" -#: src/diff.c:913 +#: src/diff.c:914 msgid "" "-r, --recursive recursively compare any subdirectories found" msgstr "" "-r, --recursive rekursÄ«vi salÄ«dzina atrastÄs " "apakÅ¡direktorijas" -#: src/diff.c:914 +#: src/diff.c:915 msgid " --no-dereference don't follow symbolic links" msgstr " --no-dereference nerÄdÄ«t simboliskÄs saites" -#: src/diff.c:915 +#: src/diff.c:916 msgid "-N, --new-file treat absent files as empty" msgstr "-N, --new-file trÅ«kstoÅ¡as datnes uzskatÄ«t par tukÅ¡Äm" -#: src/diff.c:916 +#: src/diff.c:917 msgid " --unidirectional-new-file treat absent first files as empty" msgstr "" " --unidirectional-new-file trÅ«kstoÅ¡as pirmÄs datnes uzskatÄ«t par tukÅ¡Äm" -#: src/diff.c:917 +#: src/diff.c:918 msgid " --ignore-file-name-case ignore case when comparing file names" msgstr "" " --ignore-file-name-case ignorÄ“t reÄ£istru, salÄ«dzinot datņu nosaukumus" -#: src/diff.c:918 +#: src/diff.c:919 msgid " --no-ignore-file-name-case consider case when comparing file names" msgstr "" " --no-ignore-file-name-case neignorÄ“t reÄ£istru, salÄ«dzinot datņu " "nosaukumus" -#: src/diff.c:919 +#: src/diff.c:920 msgid "-x, --exclude=PAT exclude files that match PAT" msgstr "-x, --exclude=Å ABLONS izslÄ“gt datnes, kuras atbilst Å ABLONAM" -#: src/diff.c:920 +#: src/diff.c:921 msgid "" "-X, --exclude-from=FILE exclude files that match any pattern in FILE" msgstr "" "-X, --exclude-from=DATNE izslÄ“gt datnes, kuras atbilst jebkuram\n" " Å¡ablonam DATNÄ’" -#: src/diff.c:921 +#: src/diff.c:922 msgid "" "-S, --starting-file=FILE start with FILE when comparing directories" msgstr "" "-S, --starting-file=DATNE sÄkt ar DATNI, kad salÄ«dzina direktorijas" -#: src/diff.c:922 +#: src/diff.c:923 msgid "" " --from-file=FILE1 compare FILE1 to all operands;\n" " FILE1 can be a directory" @@ -908,7 +899,7 @@ msgstr "" " --from-file=DATNE1 salÄ«dzina DANTE1 ar visiem operandiem;\n" " DATNE1 var bÅ«t direktorija" -#: src/diff.c:924 +#: src/diff.c:925 msgid "" " --to-file=FILE2 compare all operands to FILE2;\n" " FILE2 can be a directory" @@ -916,73 +907,73 @@ msgstr "" " --to-file=FILE2 salÄ«dzina visus operandus ar DANTE2;\n" " DATNE2 var bÅ«t direktorija" -#: src/diff.c:927 +#: src/diff.c:928 msgid "" "-i, --ignore-case ignore case differences in file contents" msgstr "" "-i, --ignore-case ignorÄ“ reÄ£istra atÅ¡Ä·irÄ«bas datnes saturÄ" -#: src/diff.c:928 +#: src/diff.c:929 msgid "-E, --ignore-tab-expansion ignore changes due to tab expansion" msgstr "" "-E, --ignore-tab-expansion ignorÄ“t izmaiņas dēļ tabulÄcijas izpleÅ¡anÄs" -#: src/diff.c:929 +#: src/diff.c:930 msgid "-Z, --ignore-trailing-space ignore white space at line end" msgstr "-Z, --ignore-trailing-space ignorÄ“t visas atstarpes rindu beigÄs" -#: src/diff.c:930 +#: src/diff.c:931 msgid "" "-b, --ignore-space-change ignore changes in the amount of white space" msgstr "-b, --ignore-space-change ignorÄ“t izmaiņas dēļ atstarpÄ“m" -#: src/diff.c:931 +#: src/diff.c:932 msgid "-w, --ignore-all-space ignore all white space" msgstr "-w, --ignore-all-space ignorÄ“t visas atstarpes" -#: src/diff.c:932 +#: src/diff.c:933 msgid "" "-B, --ignore-blank-lines ignore changes where lines are all blank" msgstr "-B, --ignore-blank-lines ignorÄ“t izmaiņas tukÅ¡ajÄs rindÄs" -#: src/diff.c:933 +#: src/diff.c:934 msgid "-I, --ignore-matching-lines=RE ignore changes where all lines match RE" msgstr "" "-I, --ignore-matching-lines=RE ignorÄ“t izmaiņas rindÄs, kuras sakrÄ«t ar RE" -#: src/diff.c:935 +#: src/diff.c:936 msgid "-a, --text treat all files as text" msgstr "-a, --text uztvert visas datnes kÄ teksta datnes" -#: src/diff.c:936 +#: src/diff.c:937 msgid " --strip-trailing-cr strip trailing carriage return on input" msgstr "" " --strip-trailing-cr noņemt atkÄrtojoÅ¡os rakstatgriezi ievadÄ“" -#: src/diff.c:938 +#: src/diff.c:939 msgid " --binary read and write data in binary mode" msgstr " --binary lasÄ«t un rakstÄ«t datus binÄrajÄ režīmÄ" -#: src/diff.c:941 +#: src/diff.c:942 msgid "" "-D, --ifdef=NAME output merged file with '#ifdef NAME' diffs" msgstr "" "-D, --ifdef=NOSAUKUMS izvadÄ«t sapludinÄto datni ar\n" " “#ifdef NOSAUKUMS†diff" -#: src/diff.c:942 +#: src/diff.c:943 msgid " --GTYPE-group-format=GFMT format GTYPE input groups with GFMT" msgstr " --GTYPE-group-format=GFMT formatÄ“t GTYPE ievades grupas ar GFMT" -#: src/diff.c:943 +#: src/diff.c:944 msgid " --line-format=LFMT format all input lines with LFMT" msgstr " --line-format=LFMT formatÄ“t visas ievades rindas ar LFMT" -#: src/diff.c:944 +#: src/diff.c:945 msgid " --LTYPE-line-format=LFMT format LTYPE input lines with LFMT" msgstr " --LTYPE-line-format=LFMT formatÄ“t LTYPE ievades rindÄm ar LFMT" -#: src/diff.c:945 +#: src/diff.c:946 msgid "" " These format options provide fine-grained control over the output\n" " of diff, generalizing -D/--ifdef." @@ -990,12 +981,12 @@ msgstr "" " Å Ä«s formÄta opcijas sniedz detalizÄ“tu kontroli pÄr diff izvadi,\n" " vispÄrinot -D/--ifdef." -#: src/diff.c:947 +#: src/diff.c:948 msgid " LTYPE is 'old', 'new', or 'unchanged'. GTYPE is LTYPE or 'changed'." msgstr "" " LTYPE ir “oldâ€, “new†vai “unchangedâ€. GTYPE ir LTYPE vai “changedâ€." -#: src/diff.c:948 +#: src/diff.c:949 msgid "" " GFMT (only) may contain:\n" " %< lines from FILE1\n" @@ -1022,7 +1013,7 @@ msgstr "" " E F-1\n" " M L+1 %(A=B?T:E) ja A vienÄds ar B tad T citÄdi E" -#: src/diff.c:960 +#: src/diff.c:961 msgid "" " LFMT (only) may contain:\n" " %L contents of line\n" @@ -1035,7 +1026,7 @@ msgstr "" " %[-][PLATUMS][.[PREC]]{doxX}n printf-style specifikÄcija ievades rindu\n" " numuriem" -#: src/diff.c:964 +#: src/diff.c:965 msgid "" " Both GFMT and LFMT may contain:\n" " %% %\n" @@ -1049,149 +1040,142 @@ msgstr "" " %c'\\OOO' rakstzÄ«mi ar oktÄlo kodu OOO\n" " C rakstzÄ«me C (vai citas rakstzÄ«mes, kas attÄ“lo paÅ¡as sevi)" -#: src/diff.c:970 +#: src/diff.c:971 msgid "-d, --minimal try hard to find a smaller set of changes" msgstr "-d, --minimal ļoti censties atrast mazÄku izmaiņu kopu" -#: src/diff.c:971 +#: src/diff.c:972 msgid " --horizon-lines=NUM keep NUM lines of the common prefix and suffix" msgstr "" " --horizon-lines=NUM uzturÄ“t NUM rindas kopÄ“jiem prefiksiem un sufiksiem" -#: src/diff.c:972 +#: src/diff.c:973 msgid "" " --speed-large-files assume large files and many scattered small changes" msgstr "" " --speed-large-files pieņemt, ka datnes ir lielas ar daudz mazÄm izmaiņÄm" -#: src/diff.c:973 -msgid "" -" --color[=WHEN] colorize the output; WHEN can be 'never', 'always'," -msgstr "" - #: src/diff.c:974 -#, fuzzy -msgid " or 'auto' (the default)" -msgstr " --normal izvada parastu diff (noklusÄ“juma)" - -#: src/diff.c:975 msgid "" -" --palette=PALETTE specify the colors to use when --color is active" +" --color[=WHEN] colorize the output; WHEN can be 'never', " +"'always',\n" +" or 'auto' (the default)" msgstr "" #: src/diff.c:976 msgid "" -" PALETTE is a colon-separated list terminfo " -"capabilities" +" --palette=PALETTE the colors to use when --color is active; PALETTE " +"is\n" +" a colon-separated list of terminfo capabilities" msgstr "" -#: src/diff.c:978 +#: src/diff.c:979 msgid " --help display this help and exit" msgstr " --help parÄdÄ«t Å¡o palÄ«dzÄ«bu un iziet" -#: src/diff.c:979 +#: src/diff.c:980 msgid "-v, --version output version information and exit" msgstr "-v, --version izvada informÄciju par versiju un iziet" -#: src/diff.c:981 +#: src/diff.c:982 #, fuzzy msgid "FILES are 'FILE1 FILE2' or 'DIR1 DIR2' or 'DIR FILE' or 'FILE DIR'." msgstr "" "DATNES ir “DATNE1 DATNE2†vai “DIREKTORIJA1 DIREKTORIJA2†vai\n" "“DIREKTORIJA DATNE...†vai “DATNE... DIREKTORIJAâ€" -#: src/diff.c:982 +#: src/diff.c:983 msgid "" "If --from-file or --to-file is given, there are no restrictions on FILE(s)." msgstr "" "Ja ir doti --from-file vai --to-file, nav nekÄdu ierobežojumu uz DATNÄ’M." -#: src/diff.c:983 src/diff3.c:526 src/sdiff.c:219 +#: src/diff.c:984 src/diff3.c:528 src/sdiff.c:219 msgid "If a FILE is '-', read standard input." msgstr "Ja DATNE ir “-â€, lasÄ«t standarta ievadi." -#: src/diff.c:993 +#: src/diff.c:994 #, c-format msgid "Usage: %s [OPTION]... FILES\n" msgstr "LietoÅ¡ana: %s [OPCIJAS]... DATNES\n" -#: src/diff.c:994 +#: src/diff.c:995 msgid "Compare FILES line by line." msgstr "SalÄ«dzina DATNES rindu pa rindai." -#: src/diff.c:1028 +#: src/diff.c:1029 #, c-format msgid "conflicting %s option value '%s'" msgstr "konfliktÄ“joÅ¡a %s opcijas vÄ“rtÄ«ba “%sâ€" -#: src/diff.c:1041 +#: src/diff.c:1042 #, c-format msgid "conflicting output style options" msgstr "konfliktÄ“joÅ¡a izvades stila opcijas" -#: src/diff.c:1057 +#: src/diff.c:1058 #, fuzzy, c-format msgid "invalid color '%s'" msgstr "nederÄ«gs platums “%sâ€" -#: src/diff.c:1113 src/diff.c:1323 +#: src/diff.c:1114 src/diff.c:1324 #, c-format msgid "Only in %s: %s\n" msgstr "Tikai iekÅ¡ %s: %s\n" -#: src/diff.c:1247 +#: src/diff.c:1248 msgid "cannot compare '-' to a directory" msgstr "nevar salÄ«dzinÄt “-†ar direktoriju" -#: src/diff.c:1282 +#: src/diff.c:1283 msgid "-D option not supported with directories" msgstr "-D opcija nav atbalstÄ«ta ar direktorijÄm" -#: src/diff.c:1291 +#: src/diff.c:1292 #, c-format msgid "Common subdirectories: %s and %s\n" msgstr "KopÄ“jÄs apakÅ¡direktorijas: %s un %s\n" -#: src/diff.c:1333 src/diff.c:1383 +#: src/diff.c:1334 src/diff.c:1384 #, c-format msgid "File %s is a %s while file %s is a %s\n" msgstr "Datne %s ir %s kamÄ“r datne %s ir %s\n" -#: src/diff.c:1369 +#: src/diff.c:1370 #, c-format msgid "Symbolic links %s and %s differ\n" msgstr "SimboliskÄs saites %s un %s atÅ¡Ä·iras\n" -#: src/diff.c:1456 +#: src/diff.c:1457 #, c-format msgid "Files %s and %s are identical\n" msgstr "Datnes %s un %s ir identiskas\n" #. This is a proper name. See the gettext manual, section Names. -#: src/diff3.c:41 +#: src/diff3.c:42 msgid "Randy Smith" msgstr "Randy Smith" -#: src/diff3.c:348 +#: src/diff3.c:351 #, c-format msgid "incompatible options" msgstr "savstarpÄ“ji nesaderÄ«gas opcijas" -#: src/diff3.c:388 +#: src/diff3.c:391 msgid "'-' specified for more than one input file" msgstr "“-†norÄdÄ«ts vairÄk par vienu ievades datni" -#: src/diff3.c:439 src/diff3.c:1288 src/diff3.c:1692 src/diff3.c:1747 +#: src/diff3.c:442 src/diff3.c:1290 src/diff3.c:1693 src/diff3.c:1748 #: src/sdiff.c:307 src/sdiff.c:844 src/sdiff.c:855 msgid "read failed" msgstr "lasÄ«Å¡ana neizdevÄs" -#: src/diff3.c:473 +#: src/diff3.c:475 msgid "-A, --show-all output all changes, bracketing conflicts" msgstr "" "-A, --show-all izvada visas izmaņas, ieliekot iekavÄs konfliktus" -#: src/diff3.c:475 +#: src/diff3.c:477 msgid "" "-e, --ed output ed script incorporating changes\n" " from OLDFILE to YOURFILE into MYFILE" @@ -1199,12 +1183,12 @@ msgstr "" "-e, --ed izvada ed skirpta iekļautÄs izmaiņas\n" " no VECÄ€SDATNES uz JŪSUDATNI iekÅ¡ MANUDATNI." -#: src/diff3.c:477 +#: src/diff3.c:479 msgid "-E, --show-overlap like -e, but bracket conflicts" msgstr "" "-E, --show-overlap tÄpat kÄ -e, bet ieliekot iekavÄs konfliktus" -#: src/diff3.c:478 +#: src/diff3.c:480 msgid "" "-3, --easy-only like -e, but incorporate only nonoverlapping " "changes" @@ -1212,23 +1196,23 @@ msgstr "" "-3, --easy-only lÄ«dzÄ«gs -e, bet iekļauj tikai nepÄrklÄjoÅ¡Äs " "izmaiņas" -#: src/diff3.c:479 +#: src/diff3.c:481 msgid "" "-x, --overlap-only like -e, but incorporate only overlapping changes" msgstr "" "-x, --overlap-only lÄ«dzÄ«gs -e, bet iekļauj tikai pÄrklÄjoÅ¡Äs " "izmaiņas" -#: src/diff3.c:480 +#: src/diff3.c:482 msgid "-X like -x, but bracket conflicts" msgstr "" "-X lÄ«dzÄ«gs -x, bet ieliekot iekavÄs konfliktus" -#: src/diff3.c:481 +#: src/diff3.c:483 msgid "-i append 'w' and 'q' commands to ed scripts" msgstr "-i pievieno “w†un “q†komandas ed skriptÄ" -#: src/diff3.c:483 +#: src/diff3.c:485 msgid "" "-m, --merge output actual merged file, according to\n" " -A if no other options are given" @@ -1236,24 +1220,24 @@ msgstr "" "-m, --merge izvada paÅ¡u sapludinÄto datni, vadoties pÄ“c -A,\n" " ja nav dotu citu opciju" -#: src/diff3.c:486 +#: src/diff3.c:488 msgid "-a, --text treat all files as text" msgstr "-a, --text uztvert visas datnes kÄ teksta datnes" -#: src/diff3.c:487 +#: src/diff3.c:489 msgid " --strip-trailing-cr strip trailing carriage return on input" msgstr " --strip-trailing-cr noņemt atkÄrtojoÅ¡os rakstatgriezi ievadÄ“" -#: src/diff3.c:488 +#: src/diff3.c:490 msgid "-T, --initial-tab make tabs line up by prepending a tab" msgstr "-T, --initial-tab pacelt tabulÄcijas rindu pirms tabulÄcijas" -#: src/diff3.c:489 +#: src/diff3.c:491 msgid " --diff-program=PROGRAM use PROGRAM to compare files" msgstr "" " --diff-program=PROGRAMMA izmantot PROGRAMMU, lai salÄ«dzinÄtu divas datnes" -#: src/diff3.c:490 +#: src/diff3.c:492 msgid "" "-L, --label=LABEL use LABEL instead of file name\n" " (can be repeated up to three times)" @@ -1261,24 +1245,24 @@ msgstr "" "-L, --label=ETIĶETE izmantot ETIĶETI nevis datnes nosaukumu\n" " (var atkÄrtot)" -#: src/diff3.c:493 +#: src/diff3.c:495 msgid " --help display this help and exit" msgstr " --help parÄdÄ«t Å¡o palÄ«dzÄ«bu un iziet" -#: src/diff3.c:494 +#: src/diff3.c:496 msgid "-v, --version output version information and exit" msgstr "-v, --version izvada informÄciju par versiju un iziet" -#: src/diff3.c:503 +#: src/diff3.c:505 #, c-format msgid "Usage: %s [OPTION]... MYFILE OLDFILE YOURFILE\n" msgstr "IzmantoÅ¡ana: %s [OPCIJAS]... MANADATNE VECÄ€DATNE JŪSUDATNE\n" -#: src/diff3.c:505 +#: src/diff3.c:507 msgid "Compare three files line by line." msgstr "SalÄ«dzinÄt trÄ«s datnes rindiņu pa rindiņai." -#: src/diff3.c:515 +#: src/diff3.c:517 msgid "" "\n" "The default output format is a somewhat human-readable representation of\n" @@ -1304,47 +1288,47 @@ msgstr "" "sapludinÄto datni. NetipiskÄm ievadÄ“m, Å¡is ir vÄ“l spÄ“cÄ«gÄks paņēmiens, nekÄ\n" "ed izmantoÅ¡ana.\n" -#: src/diff3.c:527 +#: src/diff3.c:529 msgid "Exit status is 0 if successful, 1 if conflicts, 2 if trouble." msgstr "" "Izejas statuss ir 0, ja tas ir veiksmÄ«gs, 1, ja ir konflikts, 2, ja ir " "nepatikÅ¡anas." -#: src/diff3.c:720 +#: src/diff3.c:722 msgid "internal error: screwup in format of diff blocks" msgstr "iekÅ¡Ä“jÄ kļūda: sagÄja grÄ«stÄ“ diff bloku formÄts" -#: src/diff3.c:1015 +#: src/diff3.c:1017 #, c-format msgid "%s: diff failed: " msgstr "%s: diff neizdevÄs:" -#: src/diff3.c:1037 +#: src/diff3.c:1039 msgid "internal error: invalid diff type in process_diff" msgstr "iekÅ¡Ä“jÄ kļūda: nederÄ«gs diff veids iekÅ¡ process_diff" -#: src/diff3.c:1062 +#: src/diff3.c:1064 msgid "invalid diff format; invalid change separator" msgstr "nederÄ«gs diff formÄts; nederÄ«gs izmaiņu atdalÄ«tÄjs" -#: src/diff3.c:1298 +#: src/diff3.c:1300 msgid "invalid diff format; incomplete last line" msgstr "nederÄ«gs diff formÄts; nepilnÄ«ga pÄ“dÄ“jÄ rinda" -#: src/diff3.c:1322 src/sdiff.c:275 src/util.c:970 +#: src/diff3.c:1324 src/sdiff.c:275 src/util.c:969 #, c-format msgid "subsidiary program '%s' could not be invoked" msgstr "nevarÄ“ja izsaukt palÄ«gprogrammu “%sâ€" -#: src/diff3.c:1347 +#: src/diff3.c:1349 msgid "invalid diff format; incorrect leading line chars" msgstr "nederÄ«gs diff formÄts; nederÄ«gas rindas ievades rakstzÄ«mes" -#: src/diff3.c:1420 +#: src/diff3.c:1422 msgid "internal error: invalid diff type passed to output" msgstr "iekÅ¡Ä“jÄ kļūda: nederÄ«gs uz izvadi padotais diff veids" -#: src/diff3.c:1694 src/diff3.c:1751 +#: src/diff3.c:1695 src/diff3.c:1752 msgid "input file shrank" msgstr "ievades datne saruka" @@ -1359,7 +1343,7 @@ msgid "%s: recursive directory loop" msgstr "%s: rekursÄ«vs direktorijas cikls" #. This is a proper name. See the gettext manual, section Names. -#: src/sdiff.c:42 +#: src/sdiff.c:43 msgid "Thomas Lord" msgstr "Thomas Lord" @@ -1504,16 +1488,35 @@ msgstr "" "v:\tDetalizÄ“ti iekļaut kopÄ“jÄs rindas.\n" "q:\tIziet.\n" -#: src/util.c:663 +#: src/util.c:662 #, fuzzy, c-format msgid "unrecognized prefix: %s" msgstr "%s: neatpazÄ«ta opcija “--%sâ€\n" -#: src/util.c:693 +#: src/util.c:692 #, c-format msgid "unparsable value for --palette" msgstr "" +#, fuzzy +#~ msgid " or 'auto' (the default)" +#~ msgstr " --normal izvada parastu diff (noklusÄ“juma)" + +#~ msgid "%s: option '--%s' doesn't allow an argument\n" +#~ msgstr "%s: opcija “--%s†neatļauj argumentu\n" + +#~ msgid "%s: unrecognized option '--%s'\n" +#~ msgstr "%s: neatpazÄ«ta opcija “--%sâ€\n" + +#~ msgid "%s: option '-W %s' is ambiguous\n" +#~ msgstr "%s: opcija “-W %s†ir divdomÄ«ga\n" + +#~ msgid "%s: option '-W %s' doesn't allow an argument\n" +#~ msgstr "%s: opcija “-W %s†neatļauj argumentu\n" + +#~ msgid "%s: option '-W %s' requires an argument\n" +#~ msgstr "%s: opcijai “-W %s†nepiecieÅ¡ams arguments\n" + #~ msgid "-i SKIP1:SKIP2 --ignore-initial=SKIP1:SKIP2" #~ msgstr "-i IZLAIST1:IZLAIST2 --ignore-initial=IZLAIST1:IZLAIST2" @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: diffutils 3.3-pre1\n" "Report-Msgid-Bugs-To: bug-diffutils@gnu.org\n" -"POT-Creation-Date: 2016-08-20 22:22-0700\n" +"POT-Creation-Date: 2017-05-21 13:26-0700\n" "PO-Revision-Date: 2015-09-24 17:50+0800\n" "Last-Translator: Sharuzzaman Ahmat Raslan <sharuzzaman@gmail.com>\n" "Language-Team: Malay <translation-team-ms@lists.sourceforge.net>\n" @@ -15,32 +15,33 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"X-Bugs: Report translation errors to the Language-Team address.\n" "X-Generator: Poedit 1.8.5\n" -#: lib/argmatch.c:133 +#: lib/argmatch.c:134 #, fuzzy, c-format msgid "invalid argument %s for %s" msgstr "hujah tidak sah %s untuk %s" -#: lib/argmatch.c:134 +#: lib/argmatch.c:135 #, c-format msgid "ambiguous argument %s for %s" msgstr "" -#: lib/argmatch.c:153 +#: lib/argmatch.c:154 #, fuzzy msgid "Valid arguments are:" msgstr "hujah tidak sah %s untuk %s" -#: lib/c-stack.c:204 lib/c-stack.c:297 +#: lib/c-stack.c:203 lib/c-stack.c:296 msgid "program error" msgstr "ralat program" -#: lib/c-stack.c:205 lib/c-stack.c:298 +#: lib/c-stack.c:204 lib/c-stack.c:297 msgid "stack overflow" msgstr "stack melimpah" -#: lib/error.c:191 +#: lib/error.c:195 msgid "Unknown system error" msgstr "Ralat sistem tidak diketahui" @@ -144,66 +145,41 @@ msgstr "" msgid "weird file" msgstr "fail pelik" -#: lib/getopt.c:575 lib/getopt.c:604 +#: lib/getopt.c:278 #, fuzzy, c-format -msgid "%s: option '%s' is ambiguous; possibilities:" +msgid "%s: option '%s%s' is ambiguous\n" msgstr "%s: pilihan '%s' adalah kabur; kemungkinan:" -#: lib/getopt.c:619 +#: lib/getopt.c:284 #, fuzzy, c-format -msgid "%s: option '%s' is ambiguous\n" +msgid "%s: option '%s%s' is ambiguous; possibilities:" msgstr "%s: pilihan '%s' adalah kabur; kemungkinan:" -#: lib/getopt.c:654 lib/getopt.c:658 +#: lib/getopt.c:319 #, fuzzy, c-format -msgid "%s: option '--%s' doesn't allow an argument\n" -msgstr "%s: pilihan `-W %s' tidak mengizinkan hujah\n" +msgid "%s: unrecognized option '%s%s'\n" +msgstr "%s: -c tidak disokong pada rekabentuk %s\n" -#: lib/getopt.c:667 lib/getopt.c:672 +#: lib/getopt.c:345 #, fuzzy, c-format -msgid "%s: option '%c%s' doesn't allow an argument\n" +msgid "%s: option '%s%s' doesn't allow an argument\n" msgstr "%s: pilihan `-W %s' tidak mengizinkan hujah\n" -#: lib/getopt.c:715 lib/getopt.c:734 +#: lib/getopt.c:360 #, fuzzy, c-format -msgid "%s: option '--%s' requires an argument\n" +msgid "%s: option '%s%s' requires an argument\n" msgstr "Pilihan \"%s\" memerlukan hujah" -#: lib/getopt.c:772 lib/getopt.c:775 -#, fuzzy, c-format -msgid "%s: unrecognized option '--%s'\n" -msgstr "%s: pilihan '%s' adalah kabur; kemungkinan:" - -#: lib/getopt.c:783 lib/getopt.c:786 -#, fuzzy, c-format -msgid "%s: unrecognized option '%c%s'\n" -msgstr "%s: -c tidak disokong pada rekabentuk %s\n" - -#: lib/getopt.c:835 lib/getopt.c:838 +#: lib/getopt.c:621 #, fuzzy, c-format msgid "%s: invalid option -- '%c'\n" msgstr "Tetapan pilihan lekapan tidak sah: %s\n" -#: lib/getopt.c:891 lib/getopt.c:908 lib/getopt.c:1118 lib/getopt.c:1136 +#: lib/getopt.c:636 lib/getopt.c:682 #, fuzzy, c-format msgid "%s: option requires an argument -- '%c'\n" msgstr "Pilihan \"%s\" memerlukan hujah" -#: lib/getopt.c:964 lib/getopt.c:980 -#, fuzzy, c-format -msgid "%s: option '-W %s' is ambiguous\n" -msgstr "%s: pilihan '%s' adalah kabur; kemungkinan:" - -#: lib/getopt.c:1004 lib/getopt.c:1022 -#, fuzzy, c-format -msgid "%s: option '-W %s' doesn't allow an argument\n" -msgstr "%s: pilihan `-W %s' tidak mengizinkan hujah\n" - -#: lib/getopt.c:1043 lib/getopt.c:1061 -#, fuzzy, c-format -msgid "%s: option '-W %s' requires an argument\n" -msgstr "Pilihan \"%s\" memerlukan hujah" - #. TRANSLATORS: #. Get translations for open and closing quotation marks. #. The message catalog should translate "`" to a left @@ -225,11 +201,11 @@ msgstr "Pilihan \"%s\" memerlukan hujah" #. If you don't know what to put here, please see #. <http://en.wikipedia.org/wiki/Quotation_marks_in_other_languages> #. and use glyphs suitable for your language. -#: lib/quotearg.c:347 +#: lib/quotearg.c:362 msgid "`" msgstr "`" -#: lib/quotearg.c:348 +#: lib/quotearg.c:363 msgid "'" msgstr "'" @@ -528,7 +504,7 @@ msgid "General help using GNU software: <http://www.gnu.org/gethelp/>\n" msgstr "" "Bantuan umum menggunakan perisian GNU: <http://www.gnu.org/gethelp/>.\n" -#: src/analyze.c:454 src/diff.c:1400 +#: src/analyze.c:454 src/diff.c:1401 #, c-format msgid "Files %s and %s differ\n" msgstr "Fail %s dan %s berbeza\n" @@ -538,21 +514,21 @@ msgstr "Fail %s dan %s berbeza\n" msgid "Binary files %s and %s differ\n" msgstr "Fail %s dan %s berbeza\n" -#: src/analyze.c:697 src/diff3.c:1463 src/util.c:1255 +#: src/analyze.c:706 src/diff3.c:1465 src/util.c:1254 msgid "No newline at end of file" msgstr "Tiada baris baru pada penghujung fail" #. This is a proper name. See the gettext manual, section Names. -#: src/cmp.c:43 +#: src/cmp.c:44 msgid "Torbjorn Granlund" msgstr "Torbjorn Granlund" #. This is a proper name. See the gettext manual, section Names. -#: src/cmp.c:44 +#: src/cmp.c:45 msgid "David MacKenzie" msgstr "David MacKenzie" -#: src/cmp.c:118 src/diff.c:875 src/diff3.c:459 src/sdiff.c:158 +#: src/cmp.c:119 src/diff.c:877 src/diff3.c:462 src/sdiff.c:159 #, fuzzy, c-format msgid "Try '%s --help' for more information." msgstr "Cuba `%s --help' untuk maklumat lanjut." @@ -567,12 +543,12 @@ msgstr "nilai `%s' --ignore-initial tidak sah" msgid "options -l and -s are incompatible" msgstr "pilihan -l dan -s tidak sepadan" -#: src/cmp.c:155 src/diff.c:884 src/diff3.c:467 src/sdiff.c:167 src/sdiff.c:315 -#: src/sdiff.c:322 src/sdiff.c:874 src/util.c:853 src/util.c:953 src/util.c:960 +#: src/cmp.c:155 src/diff.c:885 src/diff3.c:469 src/sdiff.c:167 src/sdiff.c:315 +#: src/sdiff.c:322 src/sdiff.c:874 src/util.c:852 src/util.c:952 src/util.c:959 msgid "write failed" msgstr "gagal menulis" -#: src/cmp.c:157 src/diff.c:886 src/diff.c:1465 src/diff3.c:469 src/sdiff.c:169 +#: src/cmp.c:157 src/diff.c:887 src/diff.c:1466 src/diff3.c:471 src/sdiff.c:169 msgid "standard output" msgstr "keluaran piawai" @@ -638,7 +614,7 @@ msgid "" msgstr "" "LANGKAU1 dan LANGKAU2 adalah jumlah byte untuk dilangkau dalam setiap fail." -#: src/cmp.c:185 src/diff.c:996 src/diff3.c:507 src/sdiff.c:210 +#: src/cmp.c:185 src/diff.c:997 src/diff3.c:509 src/sdiff.c:210 #, fuzzy msgid "" "Mandatory arguments to long options are mandatory for short options too.\n" @@ -660,7 +636,7 @@ msgstr "" msgid "If a FILE is '-' or missing, read standard input." msgstr "Jika FAIL adalah `-' atau tiada, baca masukan piawai." -#: src/cmp.c:195 src/diff.c:984 src/sdiff.c:220 +#: src/cmp.c:195 src/diff.c:985 src/sdiff.c:220 msgid "Exit status is 0 if inputs are the same, 1 if different, 2 if trouble." msgstr "" "Status keluar adalah 0 jika masukan adalah sama, 1 jika berbeza, 2 jika " @@ -671,114 +647,129 @@ msgstr "" msgid "invalid --bytes value '%s'" msgstr "nilai --bytes `%s' tidak sah" -#: src/cmp.c:266 src/diff.c:793 src/diff3.c:353 src/sdiff.c:565 +#: src/cmp.c:266 src/diff.c:795 src/diff3.c:356 src/sdiff.c:565 #, fuzzy, c-format msgid "missing operand after '%s'" msgstr "operan hilang selepas `%s'" -#: src/cmp.c:278 src/diff.c:795 src/diff3.c:355 src/sdiff.c:567 +#: src/cmp.c:278 src/diff.c:797 src/diff3.c:358 src/sdiff.c:567 #, fuzzy, c-format msgid "extra operand '%s'" msgstr "operan tambahan `%s'" -#: src/cmp.c:494 +#: src/cmp.c:498 #, c-format msgid "%s %s differ: byte %s, line %s\n" msgstr "%s %s berbeza: byte %s, baris %s\n" -#: src/cmp.c:510 +#: src/cmp.c:514 #, c-format msgid "%s %s differ: byte %s, line %s is %3o %s %3o %s\n" msgstr "%s %s berbeza: byte %s, baris %s adalah %3o %s %3o %s\n" -#: src/cmp.c:562 -#, c-format -msgid "cmp: EOF on %s\n" +#: src/cmp.c:571 +#, fuzzy, c-format +msgid "cmp: EOF on %s which is empty\n" +msgstr "cmp: EOF pada %s\n" + +#: src/cmp.c:585 +#, fuzzy, c-format +msgid "cmp: EOF on %s after byte %s, line %s\n" +msgstr "%s %s berbeza: byte %s, baris %s\n" + +#: src/cmp.c:586 +#, fuzzy, c-format +msgid "cmp: EOF on %s after byte %s, in line %s\n" +msgstr "%s %s berbeza: byte %s, baris %s\n" + +#: src/cmp.c:592 +#, fuzzy, c-format +msgid "cmp: EOF on %s after byte %s\n" msgstr "cmp: EOF pada %s\n" #. This is a proper name. See the gettext manual, section Names. -#: src/diff.c:49 +#: src/diff.c:50 msgid "Paul Eggert" msgstr "Paul Eggert" #. This is a proper name. See the gettext manual, section Names. -#: src/diff.c:50 +#: src/diff.c:51 msgid "Mike Haertel" msgstr "Mike Haertel" #. This is a proper name. See the gettext manual, section Names. -#: src/diff.c:51 +#: src/diff.c:52 msgid "David Hayes" msgstr "David Hayes" #. This is a proper name. See the gettext manual, section Names. -#: src/diff.c:52 +#: src/diff.c:53 msgid "Richard Stallman" msgstr "Richard Stallman" #. This is a proper name. See the gettext manual, section Names. -#: src/diff.c:53 +#: src/diff.c:54 msgid "Len Tower" msgstr "Len Tower" -#: src/diff.c:351 +#: src/diff.c:353 #, fuzzy, c-format msgid "invalid context length '%s'" msgstr "panjang konteks `%s' tidak sah" -#: src/diff.c:434 +#: src/diff.c:436 #, c-format msgid "pagination not supported on this host" msgstr "pagination tidak disokong pada hos ini" -#: src/diff.c:449 src/diff3.c:335 +#: src/diff.c:451 src/diff3.c:336 #, c-format msgid "too many file label options" msgstr "terlalu banyak pilihan label fail" -#: src/diff.c:526 +#: src/diff.c:528 #, fuzzy, c-format msgid "invalid width '%s'" msgstr "lebar `%s' tidak sah" -#: src/diff.c:530 +#: src/diff.c:532 msgid "conflicting width options" msgstr "pilihan lebar berkonflik" -#: src/diff.c:555 +#: src/diff.c:557 #, fuzzy, c-format msgid "invalid horizon length '%s'" msgstr "panjang horizon `%s' tidak sah" -#: src/diff.c:611 +#: src/diff.c:613 #, fuzzy, c-format msgid "invalid tabsize '%s'" msgstr "saiz tab `%s' tidak sah" -#: src/diff.c:615 +#: src/diff.c:617 msgid "conflicting tabsize options" msgstr "pilihan saiz tab berkonflik" -#: src/diff.c:770 +#: src/diff.c:772 msgid "--from-file and --to-file both specified" msgstr "--from-file dan --to-file kedua-duanya dinyatakan" -#: src/diff.c:890 +#: src/diff.c:891 #, fuzzy msgid " --normal output a normal diff (the default)" msgstr "--normal Keluarkan diff normal." -#: src/diff.c:891 +#: src/diff.c:892 #, fuzzy msgid "-q, --brief report only when files differ" msgstr "-q --brief Keluaran hanya jika fail berbeza." -#: src/diff.c:892 +#: src/diff.c:893 #, fuzzy msgid "-s, --report-identical-files report when two files are the same" msgstr "-s --report-identical-files Lapor apabila dua fail adalah sama." -#: src/diff.c:893 +#: src/diff.c:894 #, fuzzy msgid "" "-c, -C NUM, --context[=NUM] output NUM (default 3) lines of copied context" @@ -791,7 +782,7 @@ msgstr "" " -p --show-c-function Papar fungsi C yang mana dalam setiap perubahan.\n" " -F RE --show-function-line=RE Papar baris terbaru sepadan RE." -#: src/diff.c:894 +#: src/diff.c:895 #, fuzzy msgid "" "-u, -U NUM, --unified[=NUM] output NUM (default 3) lines of unified context" @@ -804,39 +795,39 @@ msgstr "" " -p --show-c-function Papar fungsi C yang mana dalam setiap perubahan.\n" " -F RE --show-function-line=RE Papar baris terbaru sepadan RE." -#: src/diff.c:895 +#: src/diff.c:896 #, fuzzy msgid "-e, --ed output an ed script" msgstr "-e --ed Keluarkan skrip ed." -#: src/diff.c:896 +#: src/diff.c:897 #, fuzzy msgid "-n, --rcs output an RCS format diff" msgstr "-n --rcs Keluarkan diff format RCS." -#: src/diff.c:897 +#: src/diff.c:898 msgid "-y, --side-by-side output in two columns" msgstr "-y, --side-by-side keluaran dalam dua lajur" -#: src/diff.c:898 +#: src/diff.c:899 #, fuzzy msgid "" "-W, --width=NUM output at most NUM (default 130) print columns" msgstr "" "-w NOM --width=NOM Keluarkan paling banyak NOM (default 130) lajur cetakan." -#: src/diff.c:899 +#: src/diff.c:900 #, fuzzy msgid "" " --left-column output only the left column of common lines" msgstr "-l --left-column Keluarkan hanya lajur kiri baris yang sama." -#: src/diff.c:900 +#: src/diff.c:901 #, fuzzy msgid " --suppress-common-lines do not output common lines" msgstr "-s --suppress-common-lines Jangan keluarkan baris sama." -#: src/diff.c:902 +#: src/diff.c:903 #, fuzzy msgid "-p, --show-c-function show which C function each change is in" msgstr "" @@ -848,84 +839,84 @@ msgstr "" " -p --show-c-function Papar fungsi C yang mana dalam setiap perubahan.\n" " -F RE --show-function-line=RE Papar baris terbaru sepadan RE." -#: src/diff.c:903 +#: src/diff.c:904 msgid "-F, --show-function-line=RE show the most recent line matching RE" msgstr "-F, --show-function-line=RE papar baris paling terkini sepadan RE" -#: src/diff.c:904 +#: src/diff.c:905 #, fuzzy msgid "" " --label LABEL use LABEL instead of file name and timestamp\n" " (can be repeated)" msgstr "-L LABEL --label=LABEL Guna LABEL selain daripada nama fail." -#: src/diff.c:907 +#: src/diff.c:908 #, fuzzy msgid "-t, --expand-tabs expand tabs to spaces in output" msgstr "-t --expand-tabs Kembang tab kepada ruang dalam keluaran." -#: src/diff.c:908 +#: src/diff.c:909 #, fuzzy msgid "-T, --initial-tab make tabs line up by prepending a tab" msgstr "-T --initial-tab Jadikan tab sebaris dengan menambah awalan tab." -#: src/diff.c:909 +#: src/diff.c:910 #, fuzzy msgid "" " --tabsize=NUM tab stops every NUM (default 8) print columns" msgstr "--tabsize=NOM Hentian tab setial NOM (default 8) lajur cetakan." -#: src/diff.c:910 +#: src/diff.c:911 msgid "" " --suppress-blank-empty suppress space or tab before empty output lines" msgstr "" " --suppress-blank-empty sekat ruang atau tab sebelum baris keluaran " "kosong" -#: src/diff.c:911 +#: src/diff.c:912 #, fuzzy msgid "-l, --paginate pass output through 'pr' to paginate it" msgstr "-l --paginate Salur keluaran menerusi `pr' untuk paginate." -#: src/diff.c:913 +#: src/diff.c:914 #, fuzzy msgid "" "-r, --recursive recursively compare any subdirectories found" msgstr "" "-r --recursive Banding berulang-ulang sebarang subdirektori yang dijumpai." -#: src/diff.c:914 +#: src/diff.c:915 #, fuzzy msgid " --no-dereference don't follow symbolic links" msgstr "Jangan ikut pautan simbolik, tulisemula" -#: src/diff.c:915 +#: src/diff.c:916 #, fuzzy msgid "-N, --new-file treat absent files as empty" msgstr "-N --new-file Anggap fail tidak wujud sebagai kosong." -#: src/diff.c:916 +#: src/diff.c:917 #, fuzzy msgid " --unidirectional-new-file treat absent first files as empty" msgstr "--unidirectional-new-file Anggap fail tidak wujud sebagai kosong." -#: src/diff.c:917 +#: src/diff.c:918 #, fuzzy msgid " --ignore-file-name-case ignore case when comparing file names" msgstr "--ignore-file-name-case Abai case apabila membanding nama fail." -#: src/diff.c:918 +#: src/diff.c:919 #, fuzzy msgid " --no-ignore-file-name-case consider case when comparing file names" msgstr "" "--no-ignore-file-name-case Ambil kira case ketika membanding nama fail." -#: src/diff.c:919 +#: src/diff.c:920 #, fuzzy msgid "-x, --exclude=PAT exclude files that match PAT" msgstr "-x PAT --exclude=PAT Asing fail yang sepadan PAT." -#: src/diff.c:920 +#: src/diff.c:921 #, fuzzy msgid "" "-X, --exclude-from=FILE exclude files that match any pattern in FILE" @@ -933,14 +924,14 @@ msgstr "" "-X FAIL --exclude-from=FAIL Asing fail yang sepadan sebarang corak dalam " "FAIL." -#: src/diff.c:921 +#: src/diff.c:922 #, fuzzy msgid "" "-S, --starting-file=FILE start with FILE when comparing directories" msgstr "" "-S FAIL --starting-file=FAIL Mula dengan FAIL apabila membanding direktori." -#: src/diff.c:922 +#: src/diff.c:923 #, fuzzy msgid "" " --from-file=FILE1 compare FILE1 to all operands;\n" @@ -949,7 +940,7 @@ msgstr "" "--from-file=FAIL1 Banding FAIL1 kepada semua operan. FAIL1 boleh jadi " "direktori." -#: src/diff.c:924 +#: src/diff.c:925 #, fuzzy msgid "" " --to-file=FILE2 compare all operands to FILE2;\n" @@ -958,35 +949,35 @@ msgstr "" "--to-file=FAIL2 Banding semua operan kepada FAIL2. FAIL2 boleh jadi " "direktori." -#: src/diff.c:927 +#: src/diff.c:928 #, fuzzy msgid "" "-i, --ignore-case ignore case differences in file contents" msgstr "-i --ignore-case Abai perbezaan case dalam kandungan fail." -#: src/diff.c:928 +#: src/diff.c:929 #, fuzzy msgid "-E, --ignore-tab-expansion ignore changes due to tab expansion" msgstr "" "-E --ignore-tab-expansion Abai perubahan diakibatkan oleh pengembangan tab." -#: src/diff.c:929 +#: src/diff.c:930 #, fuzzy msgid "-Z, --ignore-trailing-space ignore white space at line end" msgstr "-w --ignore-all-space Abai semua ruang putih." -#: src/diff.c:930 +#: src/diff.c:931 #, fuzzy msgid "" "-b, --ignore-space-change ignore changes in the amount of white space" msgstr "-b --ignore-space-change Abai perubahan dalam jumlah ruang putih." -#: src/diff.c:931 +#: src/diff.c:932 #, fuzzy msgid "-w, --ignore-all-space ignore all white space" msgstr "-w --ignore-all-space Abai semua ruang putih." -#: src/diff.c:932 +#: src/diff.c:933 #, fuzzy msgid "" "-B, --ignore-blank-lines ignore changes where lines are all blank" @@ -994,29 +985,29 @@ msgstr "" "-B --ignore-blank-lines Abai perubahan dimana baris adalah kesemuanya " "kosong." -#: src/diff.c:933 +#: src/diff.c:934 #, fuzzy msgid "-I, --ignore-matching-lines=RE ignore changes where all lines match RE" msgstr "" "-I RE --ignore-matching-lines=RE Abai perubahan dimana baris semua sepadan " "RE." -#: src/diff.c:935 +#: src/diff.c:936 #, fuzzy msgid "-a, --text treat all files as text" msgstr "-a --text Layan semua fail sebagai teks." -#: src/diff.c:936 +#: src/diff.c:937 #, fuzzy msgid " --strip-trailing-cr strip trailing carriage return on input" msgstr "--strip-trailing-cr Buang enter penghujung pada masukan." -#: src/diff.c:938 +#: src/diff.c:939 #, fuzzy msgid " --binary read and write data in binary mode" msgstr "--binary Baca dan tulis data dalam mod binari." -#: src/diff.c:941 +#: src/diff.c:942 #, fuzzy msgid "" "-D, --ifdef=NAME output merged file with '#ifdef NAME' diffs" @@ -1024,41 +1015,41 @@ msgstr "" "-D NAMA --ifdef=NAMA Keluarkan fail tergabung untuk menunjukkan perbezaa " "`#ifdef NAMA'." -#: src/diff.c:942 +#: src/diff.c:943 #, fuzzy msgid " --GTYPE-group-format=GFMT format GTYPE input groups with GFMT" msgstr "" "--GTYPE-group-format=GFMT Hampir sama, tetapi format masukan GTYPE " "dikumpulkan dengan GFMT." -#: src/diff.c:943 +#: src/diff.c:944 #, fuzzy msgid " --line-format=LFMT format all input lines with LFMT" msgstr "" "--line-format=LFMT Hampir sama, tetapi format semua baris masukan dengan " "LFMT." -#: src/diff.c:944 +#: src/diff.c:945 #, fuzzy msgid " --LTYPE-line-format=LFMT format LTYPE input lines with LFMT" msgstr "" "--LTYPE-line-format=LFMT Hampir sama, tetapi format baris masukan LTYPE " "dengan LFMT." -#: src/diff.c:945 +#: src/diff.c:946 msgid "" " These format options provide fine-grained control over the output\n" " of diff, generalizing -D/--ifdef." msgstr "" -#: src/diff.c:947 +#: src/diff.c:948 #, fuzzy msgid " LTYPE is 'old', 'new', or 'unchanged'. GTYPE is LTYPE or 'changed'." msgstr "" " LTYPE adalah `old', `new', atau `unchanged'. GTYPE adalah LTYPE atau " "`changed'." -#: src/diff.c:948 +#: src/diff.c:949 #, fuzzy msgid "" " GFMT (only) may contain:\n" @@ -1087,7 +1078,7 @@ msgstr "" " E F-1\n" " M L+1" -#: src/diff.c:960 +#: src/diff.c:961 #, fuzzy msgid "" " LFMT (only) may contain:\n" @@ -1100,7 +1091,7 @@ msgstr "" " %l kandungan baris, tidak termasuk baris baru dipenghujung\n" " %[-][WIDTH][.[PREC]]{doxX}n spec gaya-printf untuk nombor baris masukan" -#: src/diff.c:964 +#: src/diff.c:965 #, fuzzy msgid "" " Both GFMT and LFMT may contain:\n" @@ -1114,157 +1105,150 @@ msgstr "" " %c'C' satu aksara C\n" " %c'\\OOO' aksara dengan kod oktal OOO" -#: src/diff.c:970 +#: src/diff.c:971 #, fuzzy msgid "-d, --minimal try hard to find a smaller set of changes" msgstr "-d --minimal Cuba cari dengan tekun set perbezaan yang kecil." -#: src/diff.c:971 +#: src/diff.c:972 #, fuzzy msgid " --horizon-lines=NUM keep NUM lines of the common prefix and suffix" msgstr "--horizon-lines=NOM Pastikan NOM baris prefix dan suffix sama." -#: src/diff.c:972 +#: src/diff.c:973 #, fuzzy msgid "" " --speed-large-files assume large files and many scattered small changes" msgstr "" "--speed-large-files Anggap fail besar dan banyak perubahan kecil tersebar." -#: src/diff.c:973 -msgid "" -" --color[=WHEN] colorize the output; WHEN can be 'never', 'always'," -msgstr "" - #: src/diff.c:974 -#, fuzzy -msgid " or 'auto' (the default)" -msgstr "--normal Keluarkan diff normal." - -#: src/diff.c:975 msgid "" -" --palette=PALETTE specify the colors to use when --color is active" +" --color[=WHEN] colorize the output; WHEN can be 'never', " +"'always',\n" +" or 'auto' (the default)" msgstr "" #: src/diff.c:976 msgid "" -" PALETTE is a colon-separated list terminfo " -"capabilities" +" --palette=PALETTE the colors to use when --color is active; PALETTE " +"is\n" +" a colon-separated list of terminfo capabilities" msgstr "" -#: src/diff.c:978 +#: src/diff.c:979 #, fuzzy msgid " --help display this help and exit" msgstr "Papar teks bantuan ini" -#: src/diff.c:979 +#: src/diff.c:980 #, fuzzy msgid "-v, --version output version information and exit" msgstr "Papar maklumat versi dan keluar" -#: src/diff.c:981 +#: src/diff.c:982 #, fuzzy msgid "FILES are 'FILE1 FILE2' or 'DIR1 DIR2' or 'DIR FILE' or 'FILE DIR'." msgstr "" "FAIL-FAIL adalah `FAIL1 FAIL2' atau `DIR1 DIR2' atau `DIR FAIL...' atau " "`FAIL... DIR'." -#: src/diff.c:982 +#: src/diff.c:983 #, fuzzy msgid "" "If --from-file or --to-file is given, there are no restrictions on FILE(s)." msgstr "Jika --from-file atau --to-file diberi, tiada sekatan pada FAIL." -#: src/diff.c:983 src/diff3.c:526 src/sdiff.c:219 +#: src/diff.c:984 src/diff3.c:528 src/sdiff.c:219 #, fuzzy msgid "If a FILE is '-', read standard input." msgstr "Jika FAIL adalah `-', baca masukan piawai." -#: src/diff.c:993 +#: src/diff.c:994 #, c-format msgid "Usage: %s [OPTION]... FILES\n" msgstr "Penggunaan: %s [PILIHAN]... FAIL\n" -#: src/diff.c:994 +#: src/diff.c:995 #, fuzzy msgid "Compare FILES line by line." msgstr "Banding fail setiap baris." -#: src/diff.c:1028 +#: src/diff.c:1029 #, fuzzy, c-format msgid "conflicting %s option value '%s'" msgstr "nilai pilihan %s berkonflik `%s'" -#: src/diff.c:1041 +#: src/diff.c:1042 #, c-format msgid "conflicting output style options" msgstr "pilihan gaya keluaran berkonflik" -#: src/diff.c:1057 +#: src/diff.c:1058 #, fuzzy, c-format msgid "invalid color '%s'" msgstr "lebar `%s' tidak sah" -#: src/diff.c:1113 src/diff.c:1323 +#: src/diff.c:1114 src/diff.c:1324 #, c-format msgid "Only in %s: %s\n" msgstr "Hanya dalam %s: %s\n" -#: src/diff.c:1247 +#: src/diff.c:1248 #, fuzzy msgid "cannot compare '-' to a directory" msgstr "tidak dapat membandingkan `-' kepada direktori" -#: src/diff.c:1282 +#: src/diff.c:1283 msgid "-D option not supported with directories" msgstr "pilihan -D tidak disokong dengan direktori" -#: src/diff.c:1291 +#: src/diff.c:1292 #, c-format msgid "Common subdirectories: %s and %s\n" msgstr "Subdirektori umum: %s dan %s\n" -#: src/diff.c:1333 src/diff.c:1383 +#: src/diff.c:1334 src/diff.c:1384 #, c-format msgid "File %s is a %s while file %s is a %s\n" msgstr "Fail %s adalah %s manakala fail %s adalah %s\n" -#: src/diff.c:1369 +#: src/diff.c:1370 #, fuzzy, c-format msgid "Symbolic links %s and %s differ\n" msgstr "%s bukan fail biasa atau pautan simbolik." -#: src/diff.c:1456 +#: src/diff.c:1457 #, c-format msgid "Files %s and %s are identical\n" msgstr "Fail %s dan %s adalah serupa\n" #. This is a proper name. See the gettext manual, section Names. -#: src/diff3.c:41 +#: src/diff3.c:42 msgid "Randy Smith" msgstr "Randy Smith" -#: src/diff3.c:348 +#: src/diff3.c:351 #, c-format msgid "incompatible options" msgstr "pilihan tidak sepadan" -#: src/diff3.c:388 +#: src/diff3.c:391 #, fuzzy msgid "'-' specified for more than one input file" msgstr "`-' dinyatakan untuk lebih daripada satu fail masukan" -#: src/diff3.c:439 src/diff3.c:1288 src/diff3.c:1692 src/diff3.c:1747 +#: src/diff3.c:442 src/diff3.c:1290 src/diff3.c:1693 src/diff3.c:1748 #: src/sdiff.c:307 src/sdiff.c:844 src/sdiff.c:855 msgid "read failed" msgstr "gagal membaca" -#: src/diff3.c:473 +#: src/diff3.c:475 #, fuzzy msgid "-A, --show-all output all changes, bracketing conflicts" msgstr "-A --show-all Keluarkan semua perubahan, kurungkan konflik." -#: src/diff3.c:475 +#: src/diff3.c:477 #, fuzzy msgid "" "-e, --ed output ed script incorporating changes\n" @@ -1273,13 +1257,13 @@ msgstr "" "-e --ed Keluarkan perubahan tidak digabung daripada OLDFILE ke YOURFILE " "kedalam MYFILE." -#: src/diff3.c:477 +#: src/diff3.c:479 #, fuzzy msgid "-E, --show-overlap like -e, but bracket conflicts" msgstr "" "-E --show-overlap Keluarkan perubahan tidak digabung, kurungkan konflik." -#: src/diff3.c:478 +#: src/diff3.c:480 #, fuzzy msgid "" "-3, --easy-only like -e, but incorporate only nonoverlapping " @@ -1287,73 +1271,73 @@ msgid "" msgstr "" "-3 --easy-only Keluarkan perubahan tidak digabung dan tidak bertindih." -#: src/diff3.c:479 +#: src/diff3.c:481 #, fuzzy msgid "" "-x, --overlap-only like -e, but incorporate only overlapping changes" msgstr "-x --overlap-only Keluarkan perubahan bertindih." -#: src/diff3.c:480 +#: src/diff3.c:482 msgid "-X like -x, but bracket conflicts" msgstr "" -#: src/diff3.c:481 +#: src/diff3.c:483 #, fuzzy msgid "-i append 'w' and 'q' commands to ed scripts" msgstr "-i Tambah arahan `w' dan `q' kepada skrip ed." -#: src/diff3.c:483 +#: src/diff3.c:485 msgid "" "-m, --merge output actual merged file, according to\n" " -A if no other options are given" msgstr "" -#: src/diff3.c:486 +#: src/diff3.c:488 #, fuzzy msgid "-a, --text treat all files as text" msgstr "-a --text Layan semua fail sebagai teks." -#: src/diff3.c:487 +#: src/diff3.c:489 #, fuzzy msgid " --strip-trailing-cr strip trailing carriage return on input" msgstr "--strip-trailing-cr Buang enter penghujung pada masukan." -#: src/diff3.c:488 +#: src/diff3.c:490 #, fuzzy msgid "-T, --initial-tab make tabs line up by prepending a tab" msgstr "-T --initial-tab Jadikan tab sebaris dengan menambah awalan tab." -#: src/diff3.c:489 +#: src/diff3.c:491 #, fuzzy msgid " --diff-program=PROGRAM use PROGRAM to compare files" msgstr "--diff-program=PROGRAM Guna PROGRAM untuk membanding fail." -#: src/diff3.c:490 +#: src/diff3.c:492 msgid "" "-L, --label=LABEL use LABEL instead of file name\n" " (can be repeated up to three times)" msgstr "" -#: src/diff3.c:493 +#: src/diff3.c:495 #, fuzzy msgid " --help display this help and exit" msgstr "Papar teks bantuan ini" -#: src/diff3.c:494 +#: src/diff3.c:496 #, fuzzy msgid "-v, --version output version information and exit" msgstr "Papar maklumat versi dan keluar" -#: src/diff3.c:503 +#: src/diff3.c:505 #, c-format msgid "Usage: %s [OPTION]... MYFILE OLDFILE YOURFILE\n" msgstr "Penggunaan: %s [PILIHAN]... MYFILE OLDFILE YOURFILE\n" -#: src/diff3.c:505 +#: src/diff3.c:507 msgid "Compare three files line by line." msgstr "Banding tiga fail tiap-tiap baris." -#: src/diff3.c:515 +#: src/diff3.c:517 msgid "" "\n" "The default output format is a somewhat human-readable representation of\n" @@ -1367,46 +1351,46 @@ msgid "" "robust than using ed.\n" msgstr "" -#: src/diff3.c:527 +#: src/diff3.c:529 msgid "Exit status is 0 if successful, 1 if conflicts, 2 if trouble." msgstr "" "Status keluar adalah 0 jika berjaya, 1 jika konflik, 2 jika bermasalah." -#: src/diff3.c:720 +#: src/diff3.c:722 msgid "internal error: screwup in format of diff blocks" msgstr "ralat dalaman: kerosakan dalam format blok diff" -#: src/diff3.c:1015 +#: src/diff3.c:1017 #, c-format msgid "%s: diff failed: " msgstr "%s: diff gagal: " -#: src/diff3.c:1037 +#: src/diff3.c:1039 msgid "internal error: invalid diff type in process_diff" msgstr "ralat dalaman: jenis diff tidak sah dalam process_diff" -#: src/diff3.c:1062 +#: src/diff3.c:1064 msgid "invalid diff format; invalid change separator" msgstr "format diff tidak sah; pengasing perbezaan tidak sah" -#: src/diff3.c:1298 +#: src/diff3.c:1300 msgid "invalid diff format; incomplete last line" msgstr "format diff tidak sah; baris akhir tidak lengkap" -#: src/diff3.c:1322 src/sdiff.c:275 src/util.c:970 +#: src/diff3.c:1324 src/sdiff.c:275 src/util.c:969 #, fuzzy, c-format msgid "subsidiary program '%s' could not be invoked" msgstr "program subsidiari `%s' tidak dapat dilaksanakan" -#: src/diff3.c:1347 +#: src/diff3.c:1349 msgid "invalid diff format; incorrect leading line chars" msgstr "format diff tidak sah; aksara awal baris tidak betul" -#: src/diff3.c:1420 +#: src/diff3.c:1422 msgid "internal error: invalid diff type passed to output" msgstr "ralat dalaman: jenis diff tidak sah diberikan kepada keluaran" -#: src/diff3.c:1694 src/diff3.c:1751 +#: src/diff3.c:1695 src/diff3.c:1752 msgid "input file shrank" msgstr "fail masukan mengecil" @@ -1421,7 +1405,7 @@ msgid "%s: recursive directory loop" msgstr "\"%s\" adalah sebuah direktori" #. This is a proper name. See the gettext manual, section Names. -#: src/sdiff.c:42 +#: src/sdiff.c:43 msgid "Thomas Lord" msgstr "Thomas Lord" @@ -1585,12 +1569,36 @@ msgstr "" "v:\tSertakan baris sama dengan berjela.\n" "q:\tKeluar.\n" -#: src/util.c:663 +#: src/util.c:662 #, fuzzy, c-format msgid "unrecognized prefix: %s" msgstr "%s: pilihan '%s' adalah kabur; kemungkinan:" -#: src/util.c:693 +#: src/util.c:692 #, c-format msgid "unparsable value for --palette" msgstr "" + +#, fuzzy +#~ msgid " or 'auto' (the default)" +#~ msgstr "--normal Keluarkan diff normal." + +#, fuzzy +#~ msgid "%s: option '--%s' doesn't allow an argument\n" +#~ msgstr "%s: pilihan `-W %s' tidak mengizinkan hujah\n" + +#, fuzzy +#~ msgid "%s: unrecognized option '--%s'\n" +#~ msgstr "%s: pilihan '%s' adalah kabur; kemungkinan:" + +#, fuzzy +#~ msgid "%s: option '-W %s' is ambiguous\n" +#~ msgstr "%s: pilihan '%s' adalah kabur; kemungkinan:" + +#, fuzzy +#~ msgid "%s: option '-W %s' doesn't allow an argument\n" +#~ msgstr "%s: pilihan `-W %s' tidak mengizinkan hujah\n" + +#, fuzzy +#~ msgid "%s: option '-W %s' requires an argument\n" +#~ msgstr "Pilihan \"%s\" memerlukan hujah" Binary files differ@@ -1,47 +1,47 @@ # Norwegian bokmÃ¥l translation of GNU diffutils -# Copyright (C) 2000, 2012 Free Software Foundation, Inc. +# Copyright (C) 2016 Free Software Foundation, Inc. # This file is distributed under the same license as the diffutils package. -# Ã…ka Sikrom <a4@hush.com>, 2015. +# Ã…ka Sikrom <a4@hush.com>, 2017. # msgid "" msgstr "" -"Project-Id-Version: diffutils-3.3-pre1\n" +"Project-Id-Version: diffutils-3.5.25\n" "Report-Msgid-Bugs-To: bug-diffutils@gnu.org\n" -"POT-Creation-Date: 2016-08-20 22:22-0700\n" -"PO-Revision-Date: 2015-01-23 18:51+0100\n" +"POT-Creation-Date: 2017-05-21 13:26-0700\n" +"PO-Revision-Date: 2017-05-21 15:11+0200\n" "Last-Translator: Ã…ka Sikrom <a4@hush.com>\n" "Language-Team: Norwegian Bokmaal <i18n-nb@lister.ping.uio.no>\n" "Language: nb\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"X-Bugs: Report translation errors to the Language-Team address.\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-Generator: Poedit 1.5.4\n" +"X-Generator: Poedit 1.8.7.1\n" -#: lib/argmatch.c:133 -#, fuzzy, c-format +#: lib/argmatch.c:134 +#, c-format msgid "invalid argument %s for %s" -msgstr "%s%s-argumentet «%s» er ugyldig" +msgstr "argumentet %s er ugyldig for %s" -#: lib/argmatch.c:134 +#: lib/argmatch.c:135 #, c-format msgid "ambiguous argument %s for %s" -msgstr "" +msgstr "argumentet %s er flertydig for %s" -#: lib/argmatch.c:153 -#, fuzzy +#: lib/argmatch.c:154 msgid "Valid arguments are:" -msgstr "%s%s-argumentet «%s» er ugyldig" +msgstr "Følgende argumenter kan brukes:" -#: lib/c-stack.c:204 lib/c-stack.c:297 +#: lib/c-stack.c:203 lib/c-stack.c:296 msgid "program error" msgstr "programfeil" -#: lib/c-stack.c:205 lib/c-stack.c:298 +#: lib/c-stack.c:204 lib/c-stack.c:297 msgid "stack overflow" msgstr "stabel er full" -#: lib/error.c:191 +#: lib/error.c:195 msgid "Unknown system error" msgstr "Ukjent systemfeil" @@ -87,7 +87,7 @@ msgstr "tegn-spesialfil" #: lib/file-type.c:72 msgid "contiguous data" -msgstr "" +msgstr "tilstøtende data" #: lib/file-type.c:75 msgid "fifo" @@ -95,43 +95,39 @@ msgstr "fifo" #: lib/file-type.c:78 msgid "door" -msgstr "" +msgstr "dør" #: lib/file-type.c:81 -#, fuzzy msgid "multiplexed block special file" -msgstr "blokk-spesialfil" +msgstr "oppstykket blokk-spesialfil" #: lib/file-type.c:84 -#, fuzzy msgid "multiplexed character special file" -msgstr "tegn-spesialfil" +msgstr "oppstykket tegn-spesialfil" #: lib/file-type.c:87 msgid "multiplexed file" -msgstr "" +msgstr "oppstykket fil" #: lib/file-type.c:90 -#, fuzzy msgid "named file" -msgstr "rar fil" +msgstr "navngitt fil" #: lib/file-type.c:93 -#, fuzzy msgid "network special file" -msgstr "blokk-spesialfil" +msgstr "nettverk-spesialfil" #: lib/file-type.c:96 msgid "migrated file with data" -msgstr "" +msgstr "flyttet fil med innhold" #: lib/file-type.c:99 msgid "migrated file without data" -msgstr "" +msgstr "flyttet fil uten innhold" #: lib/file-type.c:102 msgid "port" -msgstr "" +msgstr "port" #: lib/file-type.c:105 msgid "socket" @@ -139,72 +135,47 @@ msgstr "sokkel" #: lib/file-type.c:108 msgid "whiteout" -msgstr "" +msgstr "whiteout" #: lib/file-type.c:110 msgid "weird file" msgstr "rar fil" -#: lib/getopt.c:575 lib/getopt.c:604 -#, c-format -msgid "%s: option '%s' is ambiguous; possibilities:" -msgstr "%s: valget «%s» er flertydig, og kan bety følgende:" - -#: lib/getopt.c:619 -#, fuzzy, c-format -msgid "%s: option '%s' is ambiguous\n" -msgstr "%s: valget «-W %s» er flertydig\n" - -#: lib/getopt.c:654 lib/getopt.c:658 +#: lib/getopt.c:278 #, c-format -msgid "%s: option '--%s' doesn't allow an argument\n" -msgstr "%s: valget «--%s» tillater ikke argumenter\n" +msgid "%s: option '%s%s' is ambiguous\n" +msgstr "%s: valget «%s%s» er flertydig\n" -#: lib/getopt.c:667 lib/getopt.c:672 +#: lib/getopt.c:284 #, c-format -msgid "%s: option '%c%s' doesn't allow an argument\n" -msgstr "%s: valget «%c%s» tillater ikke argumenter\n" +msgid "%s: option '%s%s' is ambiguous; possibilities:" +msgstr "%s: valget «%s%s» er flertydig, og kan bety følgende:" -#: lib/getopt.c:715 lib/getopt.c:734 +#: lib/getopt.c:319 #, c-format -msgid "%s: option '--%s' requires an argument\n" -msgstr "%s: krever «--%s» krever et argument\n" +msgid "%s: unrecognized option '%s%s'\n" +msgstr "%s: «%s%s» er et ukjent valg\n" -#: lib/getopt.c:772 lib/getopt.c:775 +#: lib/getopt.c:345 #, c-format -msgid "%s: unrecognized option '--%s'\n" -msgstr "%s: «--%s» er et ukjent valg\n" +msgid "%s: option '%s%s' doesn't allow an argument\n" +msgstr "%s: valget «%s%s» tillater ikke argumenter\n" -#: lib/getopt.c:783 lib/getopt.c:786 +#: lib/getopt.c:360 #, c-format -msgid "%s: unrecognized option '%c%s'\n" -msgstr "%s: «%c%s» er et ukjent valg\n" +msgid "%s: option '%s%s' requires an argument\n" +msgstr "%s: valget «%s%s» krever et argument\n" -#: lib/getopt.c:835 lib/getopt.c:838 +#: lib/getopt.c:621 #, c-format msgid "%s: invalid option -- '%c'\n" msgstr "%s: «%c» er et ugyldig valg\n" -#: lib/getopt.c:891 lib/getopt.c:908 lib/getopt.c:1118 lib/getopt.c:1136 +#: lib/getopt.c:636 lib/getopt.c:682 #, c-format msgid "%s: option requires an argument -- '%c'\n" msgstr "%s: valget -- «%c» krever et argument\n" -#: lib/getopt.c:964 lib/getopt.c:980 -#, c-format -msgid "%s: option '-W %s' is ambiguous\n" -msgstr "%s: valget «-W %s» er flertydig\n" - -#: lib/getopt.c:1004 lib/getopt.c:1022 -#, c-format -msgid "%s: option '-W %s' doesn't allow an argument\n" -msgstr "%s: valget «-W %s» tillater ikke argumenter\n" - -#: lib/getopt.c:1043 lib/getopt.c:1061 -#, c-format -msgid "%s: option '-W %s' requires an argument\n" -msgstr "%s: valget «-W %s» krever et argument\n" - #. TRANSLATORS: #. Get translations for open and closing quotation marks. #. The message catalog should translate "`" to a left @@ -226,11 +197,11 @@ msgstr "%s: valget «-W %s» krever et argument\n" #. If you don't know what to put here, please see #. <http://en.wikipedia.org/wiki/Quotation_marks_in_other_languages> #. and use glyphs suitable for your language. -#: lib/quotearg.c:347 +#: lib/quotearg.c:362 msgid "`" msgstr "«" -#: lib/quotearg.c:348 +#: lib/quotearg.c:363 msgid "'" msgstr "»" @@ -263,9 +234,8 @@ msgid "Invalid back reference" msgstr "Ugyldig tilbakereferanse" #: lib/regcomp.c:156 -#, fuzzy msgid "Unmatched [, [^, [:, [., or [=" -msgstr "Ingen treff pÃ¥ «[» eller «[^»" +msgstr "Ingen treff pÃ¥ «[», «[^», «[:», «[.» eller «[=»" #: lib/regcomp.c:159 msgid "Unmatched ( or \\(" @@ -522,7 +492,7 @@ msgid "General help using GNU software: <http://www.gnu.org/gethelp/>\n" msgstr "" "Generell hjelp til Ã¥ bruke GNU-programmer: <http://www.gnu.org/gethelp/>\n" -#: src/analyze.c:454 src/diff.c:1400 +#: src/analyze.c:454 src/diff.c:1401 #, c-format msgid "Files %s and %s differ\n" msgstr "Filene %s og %s er ulike\n" @@ -532,21 +502,21 @@ msgstr "Filene %s og %s er ulike\n" msgid "Binary files %s and %s differ\n" msgstr "Binærfilene %s og %s er ulike\n" -#: src/analyze.c:697 src/diff3.c:1463 src/util.c:1255 +#: src/analyze.c:706 src/diff3.c:1465 src/util.c:1254 msgid "No newline at end of file" msgstr "Intet linjeskift i slutten av fila" #. This is a proper name. See the gettext manual, section Names. -#: src/cmp.c:43 +#: src/cmp.c:44 msgid "Torbjorn Granlund" msgstr "Torbjörn Granlund" #. This is a proper name. See the gettext manual, section Names. -#: src/cmp.c:44 +#: src/cmp.c:45 msgid "David MacKenzie" msgstr "David MacKenzie" -#: src/cmp.c:118 src/diff.c:875 src/diff3.c:459 src/sdiff.c:158 +#: src/cmp.c:119 src/diff.c:877 src/diff3.c:462 src/sdiff.c:159 #, c-format msgid "Try '%s --help' for more information." msgstr "Prøv «%s --help» for ytterligere informasjon." @@ -561,12 +531,12 @@ msgstr "«%s» er en ugyldig verdi for «--ignore-initial»" msgid "options -l and -s are incompatible" msgstr "valgene «-l» og «-s» kan ikke brukes samtidig" -#: src/cmp.c:155 src/diff.c:884 src/diff3.c:467 src/sdiff.c:167 src/sdiff.c:315 -#: src/sdiff.c:322 src/sdiff.c:874 src/util.c:853 src/util.c:953 src/util.c:960 +#: src/cmp.c:155 src/diff.c:885 src/diff3.c:469 src/sdiff.c:167 src/sdiff.c:315 +#: src/sdiff.c:322 src/sdiff.c:874 src/util.c:852 src/util.c:952 src/util.c:959 msgid "write failed" msgstr "skriving mislyktes" -#: src/cmp.c:157 src/diff.c:886 src/diff.c:1465 src/diff3.c:469 src/sdiff.c:169 +#: src/cmp.c:157 src/diff.c:887 src/diff.c:1466 src/diff3.c:471 src/sdiff.c:169 msgid "standard output" msgstr "standardutdata" @@ -627,7 +597,7 @@ msgstr "" "Du kan hoppe over valgfritt ANT1 og ANT2 byte i begynnelsen\n" "av henholdsvis første og andre fil (standard er null)." -#: src/cmp.c:185 src/diff.c:996 src/diff3.c:507 src/sdiff.c:210 +#: src/cmp.c:185 src/diff.c:997 src/diff3.c:509 src/sdiff.c:210 msgid "" "Mandatory arguments to long options are mandatory for short options too.\n" msgstr "" @@ -648,7 +618,7 @@ msgstr "" msgid "If a FILE is '-' or missing, read standard input." msgstr "Hvis FIL er tom eller «-», leser programmet standard inndata." -#: src/cmp.c:195 src/diff.c:984 src/sdiff.c:220 +#: src/cmp.c:195 src/diff.c:985 src/sdiff.c:220 msgid "Exit status is 0 if inputs are the same, 1 if different, 2 if trouble." msgstr "" "Avsluttende status er 0 hvis inndata er like, 1 hvis ulike og 2 hvis det " @@ -659,251 +629,265 @@ msgstr "" msgid "invalid --bytes value '%s'" msgstr "«%s» er en ugyldig verdi for «--bytes»" -#: src/cmp.c:266 src/diff.c:793 src/diff3.c:353 src/sdiff.c:565 +#: src/cmp.c:266 src/diff.c:795 src/diff3.c:356 src/sdiff.c:565 #, c-format msgid "missing operand after '%s'" msgstr "operand mangler etter «%s»" -#: src/cmp.c:278 src/diff.c:795 src/diff3.c:355 src/sdiff.c:567 +#: src/cmp.c:278 src/diff.c:797 src/diff3.c:358 src/sdiff.c:567 #, c-format msgid "extra operand '%s'" msgstr "ekstra operand «%s»" -#: src/cmp.c:494 +#: src/cmp.c:498 #, c-format msgid "%s %s differ: byte %s, line %s\n" msgstr "%s %s er ulike: byte %s, linje %s\n" -#: src/cmp.c:510 +#: src/cmp.c:514 #, c-format msgid "%s %s differ: byte %s, line %s is %3o %s %3o %s\n" msgstr "%s %s er ulike: byte %s, linje %s er %3o %s %3o %s\n" -#: src/cmp.c:562 +#: src/cmp.c:571 +#, c-format +msgid "cmp: EOF on %s which is empty\n" +msgstr "cmp: EOF pÃ¥ %s, som er tom\n" + +#: src/cmp.c:585 #, c-format -msgid "cmp: EOF on %s\n" -msgstr "cmp: EOF ved %s\n" +msgid "cmp: EOF on %s after byte %s, line %s\n" +msgstr "cmp: EOF pÃ¥ %s etter byte %s, linje %s\n" + +#: src/cmp.c:586 +#, c-format +msgid "cmp: EOF on %s after byte %s, in line %s\n" +msgstr "cmp: EOF pÃ¥ %s etter byte %s, pÃ¥ linje %s\n" + +#: src/cmp.c:592 +#, c-format +msgid "cmp: EOF on %s after byte %s\n" +msgstr "cmp: EOF pÃ¥ %s etter byte %s\n" #. This is a proper name. See the gettext manual, section Names. -#: src/diff.c:49 +#: src/diff.c:50 msgid "Paul Eggert" msgstr "Paul Eggert" #. This is a proper name. See the gettext manual, section Names. -#: src/diff.c:50 +#: src/diff.c:51 msgid "Mike Haertel" msgstr "Mike Haertel" #. This is a proper name. See the gettext manual, section Names. -#: src/diff.c:51 +#: src/diff.c:52 msgid "David Hayes" msgstr "David Hayes" #. This is a proper name. See the gettext manual, section Names. -#: src/diff.c:52 +#: src/diff.c:53 msgid "Richard Stallman" msgstr "Richard Stallman" #. This is a proper name. See the gettext manual, section Names. -#: src/diff.c:53 +#: src/diff.c:54 msgid "Len Tower" msgstr "Len Tower" -#: src/diff.c:351 +#: src/diff.c:353 #, c-format msgid "invalid context length '%s'" msgstr "«%s» er en ugyldig kontekstlengde" -#: src/diff.c:434 +#: src/diff.c:436 #, c-format msgid "pagination not supported on this host" msgstr "sidedeling støttes ikke pÃ¥ denne verten" -#: src/diff.c:449 src/diff3.c:335 +#: src/diff.c:451 src/diff3.c:336 #, c-format msgid "too many file label options" msgstr "for mange filetikett-valg" -#: src/diff.c:526 +#: src/diff.c:528 #, c-format msgid "invalid width '%s'" msgstr "«%s» er en ugyldig bredde" -#: src/diff.c:530 +#: src/diff.c:532 msgid "conflicting width options" msgstr "breddevalg i konflikt" -#: src/diff.c:555 +#: src/diff.c:557 #, c-format msgid "invalid horizon length '%s'" msgstr "«%s» er en ugyldig horisontlengde" -#: src/diff.c:611 +#: src/diff.c:613 #, c-format msgid "invalid tabsize '%s'" msgstr "«%s» er en ugyldig tabulatorstørrelse" -#: src/diff.c:615 +#: src/diff.c:617 msgid "conflicting tabsize options" msgstr "tabulatorvalg i konflikt" -#: src/diff.c:770 +#: src/diff.c:772 msgid "--from-file and --to-file both specified" msgstr "du har valgt bÃ¥de «--from-file» og «--to-file»" -#: src/diff.c:890 +#: src/diff.c:891 msgid " --normal output a normal diff (the default)" msgstr "" " --normal skriv ut en normal diff (dette er standard)" -#: src/diff.c:891 +#: src/diff.c:892 msgid "-q, --brief report only when files differ" msgstr "-q, --brief bare rapporter nÃ¥r filer er ulike" -#: src/diff.c:892 +#: src/diff.c:893 msgid "-s, --report-identical-files report when two files are the same" msgstr "-s, --report-identical-files rapporter nÃ¥r to filer er like" -#: src/diff.c:893 +#: src/diff.c:894 msgid "" "-c, -C NUM, --context[=NUM] output NUM (default 3) lines of copied context" msgstr "" "-c, -C ANT, --context[=ANT] skriv ut valgt ANTall linjer med kopiert " "kontekst (standard: 3)" -#: src/diff.c:894 +#: src/diff.c:895 msgid "" "-u, -U NUM, --unified[=NUM] output NUM (default 3) lines of unified context" msgstr "" "-u, -U ANT, --unified[=ANT] skriv ut valgt ANTall linjer med sammenslÃ¥tt " "kontekst (standard: 3)" -#: src/diff.c:895 +#: src/diff.c:896 msgid "-e, --ed output an ed script" msgstr "-e, --ed skriv ut et ed-skript" -#: src/diff.c:896 +#: src/diff.c:897 msgid "-n, --rcs output an RCS format diff" msgstr "-n, --rcs skriv ut diff i RCS-format" -#: src/diff.c:897 +#: src/diff.c:898 msgid "-y, --side-by-side output in two columns" msgstr "-y, --side-by-side skriv ut i to kolonner" -#: src/diff.c:898 +#: src/diff.c:899 msgid "" "-W, --width=NUM output at most NUM (default 130) print columns" msgstr "" "-W, --width=ANT skriv ut maks valgt ANTall kolonner (standard: " "130)" -#: src/diff.c:899 +#: src/diff.c:900 msgid "" " --left-column output only the left column of common lines" msgstr "" -" --left-column bare skriv ut venstre kolonne med vanlige " -"linjer" +" --left-column bare skriv ut venstre kolonne med felles linjer" -#: src/diff.c:900 +#: src/diff.c:901 msgid " --suppress-common-lines do not output common lines" -msgstr " --suppress-common-lines ikke skriv ut vanlige linjer" +msgstr " --suppress-common-lines ikke skriv ut felles linjer" -#: src/diff.c:902 +#: src/diff.c:903 msgid "-p, --show-c-function show which C function each change is in" msgstr "" "-p, --show-c-function vis hvilken C-funksjon hver endring ligger i" -#: src/diff.c:903 +#: src/diff.c:904 msgid "-F, --show-function-line=RE show the most recent line matching RE" msgstr "-F, --show-function-line=RE vis nyeste linje som samsvarer med RE" -#: src/diff.c:904 -#, fuzzy +#: src/diff.c:905 msgid "" " --label LABEL use LABEL instead of file name and timestamp\n" " (can be repeated)" msgstr "" -" --label ETIK bruk valgt ETIKett i stedet for filnavn\n" +" --label ETIK bruk valgt ETIKett i stedet for filnavn og " +"tidsstempel\n" " (dette kan gjentas)" -#: src/diff.c:907 +#: src/diff.c:908 msgid "-t, --expand-tabs expand tabs to spaces in output" msgstr "" "-t, --expand-tabs utvid tabulatorer til mellomrom pÃ¥ utskrift" -#: src/diff.c:908 +#: src/diff.c:909 msgid "-T, --initial-tab make tabs line up by prepending a tab" msgstr "" "-T, --initial-tab still opp tabulatorer ved Ã¥ legge til en " "tabulator først" -#: src/diff.c:909 +#: src/diff.c:910 msgid "" " --tabsize=NUM tab stops every NUM (default 8) print columns" msgstr "" " --tabsize=NUM tabulatorer stopper for hvert valgte " "utskriftskolonne-NUMmer (standard: 8)" -#: src/diff.c:910 +#: src/diff.c:911 msgid "" " --suppress-blank-empty suppress space or tab before empty output lines" msgstr "" " --suppress-blank-empty ikke skriv ut mellomrom eller tabulator før " "tomme linjer" -#: src/diff.c:911 +#: src/diff.c:912 msgid "-l, --paginate pass output through 'pr' to paginate it" msgstr "-l, --paginate del utdata i sider via «pr»" -#: src/diff.c:913 +#: src/diff.c:914 msgid "" "-r, --recursive recursively compare any subdirectories found" msgstr "-r, --recursive sammenlikn evt. undermapper rekursivt" -#: src/diff.c:914 +#: src/diff.c:915 msgid " --no-dereference don't follow symbolic links" msgstr " --no-dereference ikke følg symbolske lenker" -#: src/diff.c:915 +#: src/diff.c:916 msgid "-N, --new-file treat absent files as empty" msgstr "-N, --new-file behandle fraværende filer som tomme" -#: src/diff.c:916 +#: src/diff.c:917 msgid " --unidirectional-new-file treat absent first files as empty" msgstr " --unidirectional-new-file behandle fraværende førstefil som tom" -#: src/diff.c:917 +#: src/diff.c:918 msgid " --ignore-file-name-case ignore case when comparing file names" msgstr "" " --ignore-file-name-case skill mellom store og smÃ¥ bokstaver ved " "sammenlikning av filnavn" -#: src/diff.c:918 +#: src/diff.c:919 msgid " --no-ignore-file-name-case consider case when comparing file names" msgstr "" " --no-ignore-file-name-case skill mellom store og smÃ¥ bokstaver ved " "sammenlikning av filnavn" -#: src/diff.c:919 +#: src/diff.c:920 msgid "-x, --exclude=PAT exclude files that match PAT" msgstr "" "-x, --exclude=MØN utelat filer som samsvarer med valgt MØNster" -#: src/diff.c:920 +#: src/diff.c:921 msgid "" "-X, --exclude-from=FILE exclude files that match any pattern in FILE" msgstr "" "-X, --exclude-from=FIL utelat filer som samsvarer med mønster(e) i " "valgt FIL" -#: src/diff.c:921 +#: src/diff.c:922 msgid "" "-S, --starting-file=FILE start with FILE when comparing directories" msgstr "" "-S, --starting-file=FIL begynn med valgt FIL ved sammenlikning av " "mapper" -#: src/diff.c:922 +#: src/diff.c:923 msgid "" " --from-file=FILE1 compare FILE1 to all operands;\n" " FILE1 can be a directory" @@ -911,7 +895,7 @@ msgstr "" " --from-file=FIL1 sammenlikn FIL1 med alle operand-er\n" " (FIL1 kan være en mappe)" -#: src/diff.c:924 +#: src/diff.c:925 msgid "" " --to-file=FILE2 compare all operands to FILE2;\n" " FILE2 can be a directory" @@ -919,78 +903,78 @@ msgstr "" " --to-file=FIL2 sammenlikn alle operand-er med FIL2\n" " (FIL2 kan være en mappe)" -#: src/diff.c:927 +#: src/diff.c:928 msgid "" "-i, --ignore-case ignore case differences in file contents" msgstr "" "-i, --ignore-case ikke skill mellom smÃ¥ og store bokstaver i " "fil-innhold" -#: src/diff.c:928 +#: src/diff.c:929 msgid "-E, --ignore-tab-expansion ignore changes due to tab expansion" msgstr "" "-E, --ignore-tab-expansion ignorer endringer som skyldes tabulator-" "utvidelse" -#: src/diff.c:929 +#: src/diff.c:930 msgid "-Z, --ignore-trailing-space ignore white space at line end" msgstr "-Z, --ignore-trailing-space ignorer blanktegn i slutten av linjer" -#: src/diff.c:930 +#: src/diff.c:931 msgid "" "-b, --ignore-space-change ignore changes in the amount of white space" msgstr "-b, --ignore-space-change ignorer endringer i antall blanktegn" -#: src/diff.c:931 +#: src/diff.c:932 msgid "-w, --ignore-all-space ignore all white space" msgstr "-w, --ignore-all-space ignorer alle blanktegn" -#: src/diff.c:932 +#: src/diff.c:933 msgid "" "-B, --ignore-blank-lines ignore changes where lines are all blank" msgstr "" "-B, --ignore-blank-lines ignorer endringer nÃ¥r alle linjer er tomme" -#: src/diff.c:933 +#: src/diff.c:934 msgid "-I, --ignore-matching-lines=RE ignore changes where all lines match RE" msgstr "" "-I, --ignore-matching-lines=RE ignorer endringer nÃ¥r alle linjer samsvarer " "med RE" -#: src/diff.c:935 +#: src/diff.c:936 msgid "-a, --text treat all files as text" msgstr "-a, --text behandle filer som tekst" -#: src/diff.c:936 +#: src/diff.c:937 msgid " --strip-trailing-cr strip trailing carriage return on input" msgstr "" " --strip-trailing-cr fjern etterfølgende linjeskift-tegn fra " "inndata" -#: src/diff.c:938 +#: src/diff.c:939 msgid " --binary read and write data in binary mode" msgstr " --binary les og skriv data i binærmodus" -#: src/diff.c:941 +#: src/diff.c:942 msgid "" "-D, --ifdef=NAME output merged file with '#ifdef NAME' diffs" msgstr "" "-D, --ifdef=NAVN skriv ut sammenslÃ¥tt fil med ulikheter i " "«#ifdef NAVN»" -#: src/diff.c:942 +#: src/diff.c:943 msgid " --GTYPE-group-format=GFMT format GTYPE input groups with GFMT" msgstr " --GTYPE-group-format=GFMT formater GTYPE-inndatagrupper med GFMT" -#: src/diff.c:943 +#: src/diff.c:944 msgid " --line-format=LFMT format all input lines with LFMT" msgstr " --line-format=LFMT formater inndatalinjer med LFMT" -#: src/diff.c:944 +#: src/diff.c:945 msgid " --LTYPE-line-format=LFMT format LTYPE input lines with LFMT" msgstr " --LTYPE-line-format=LFMT formater LTYPE-inndatalinjer med LFMT" -#: src/diff.c:945 +#: src/diff.c:946 msgid "" " These format options provide fine-grained control over the output\n" " of diff, generalizing -D/--ifdef." @@ -998,13 +982,13 @@ msgstr "" " Disse formatvalgene gjør det mulig Ã¥ detaljstyre utdata\n" " fra diff, og generaliserer -D/--ifdef." -#: src/diff.c:947 +#: src/diff.c:948 msgid " LTYPE is 'old', 'new', or 'unchanged'. GTYPE is LTYPE or 'changed'." msgstr "" " LTYPE er enten «old», «new» eller «unchanged». GTYPE er enten LTYPE eller " "«changed»." -#: src/diff.c:948 +#: src/diff.c:949 msgid "" " GFMT (only) may contain:\n" " %< lines from FILE1\n" @@ -1034,7 +1018,7 @@ msgstr "" " M L+1\n" " %(A=B?T:E) hvis A er lik B, sÃ¥ T eller E" -#: src/diff.c:960 +#: src/diff.c:961 msgid "" " LFMT (only) may contain:\n" " %L contents of line\n" @@ -1047,7 +1031,7 @@ msgstr "" " %[-][BREDDE][.[PREC]]{doxX}n spesifikasjon av inndata-linjenummer i " "printf-stil" -#: src/diff.c:964 +#: src/diff.c:965 msgid "" " Both GFMT and LFMT may contain:\n" " %% %\n" @@ -1061,150 +1045,145 @@ msgstr "" " %c'\\OOO' tegnet med oktalkode OOO\n" " C tegnet C (andre tegn representerer seg selv)" -#: src/diff.c:970 +#: src/diff.c:971 msgid "-d, --minimal try hard to find a smaller set of changes" msgstr "-d, --minimal prøv hardt Ã¥ finne en mindre rekke endringer" -#: src/diff.c:971 +#: src/diff.c:972 msgid " --horizon-lines=NUM keep NUM lines of the common prefix and suffix" msgstr "" -" --horizon-lines=ANT behold valgt ANTall linjer av vanlig pre- og suffiks" +" --horizon-lines=ANT behold valgt ANTall linjer av felles pre- og suffiks" -#: src/diff.c:972 +#: src/diff.c:973 msgid "" " --speed-large-files assume large files and many scattered small changes" msgstr " --speed-large-files forvent store filer og smÃ¥, spredte endringer" -#: src/diff.c:973 -msgid "" -" --color[=WHEN] colorize the output; WHEN can be 'never', 'always'," -msgstr "" - #: src/diff.c:974 -#, fuzzy -msgid " or 'auto' (the default)" -msgstr "" -" --normal skriv ut en normal diff (dette er standard)" - -#: src/diff.c:975 msgid "" -" --palette=PALETTE specify the colors to use when --color is active" +" --color[=WHEN] colorize the output; WHEN can be 'never', " +"'always',\n" +" or 'auto' (the default)" msgstr "" +" --color[=NÃ…R] fargelegg utdata. NÃ…R kan være «never» (aldri),\n" +" «always» eller «auto» (standard)" #: src/diff.c:976 msgid "" -" PALETTE is a colon-separated list terminfo " -"capabilities" +" --palette=PALETTE the colors to use when --color is active; PALETTE " +"is\n" +" a colon-separated list of terminfo capabilities" msgstr "" +" --palette=PALETT farger som skal brukes nÃ¥r «--color» er valgt.\n" +" PALETT er en kolon-delt liste over terminfo-" +"muligheter" -#: src/diff.c:978 +#: src/diff.c:979 msgid " --help display this help and exit" msgstr " --help vis denne hjelpeteksten og avslutt" -#: src/diff.c:979 +#: src/diff.c:980 msgid "-v, --version output version information and exit" msgstr "-v, --version vis versjonsinformasjon og avslutt" -#: src/diff.c:981 -#, fuzzy +#: src/diff.c:982 msgid "FILES are 'FILE1 FILE2' or 'DIR1 DIR2' or 'DIR FILE' or 'FILE DIR'." -msgstr "" -"FILER er «FIL1 FIL2», «MAPPE1 MAPPE2», «MAPPE FIL …» eller «FIL… MAPPE»." +msgstr "FILER er «FIL1 FIL2», «MAPPE1 MAPPE2», «MAPPE FIL» eller «FIL MAPPE»." -#: src/diff.c:982 +#: src/diff.c:983 msgid "" "If --from-file or --to-file is given, there are no restrictions on FILE(s)." msgstr "" "Programmet bruker ingen restriksjoner pÃ¥ FIL(er) hvis «--from-file» eller «--" "to-file» er valgt." -#: src/diff.c:983 src/diff3.c:526 src/sdiff.c:219 +#: src/diff.c:984 src/diff3.c:528 src/sdiff.c:219 msgid "If a FILE is '-', read standard input." msgstr "Programmet leser fra standard inndata hvis FIL er «-»." -#: src/diff.c:993 +#: src/diff.c:994 #, c-format msgid "Usage: %s [OPTION]... FILES\n" msgstr "Bruk: %s [VALG] … FILER\n" -#: src/diff.c:994 +#: src/diff.c:995 msgid "Compare FILES line by line." msgstr "Sammenlikn FILER linje for linje." -#: src/diff.c:1028 +#: src/diff.c:1029 #, c-format msgid "conflicting %s option value '%s'" msgstr "valget %s er i konflikt med verdien «%s»" -#: src/diff.c:1041 +#: src/diff.c:1042 #, c-format msgid "conflicting output style options" msgstr "utdata-stilvalg er i konflikt med hverandre" -#: src/diff.c:1057 -#, fuzzy, c-format +#: src/diff.c:1058 +#, c-format msgid "invalid color '%s'" -msgstr "«%s» er en ugyldig bredde" +msgstr "«%s» er en ugyldig farge" -#: src/diff.c:1113 src/diff.c:1323 +#: src/diff.c:1114 src/diff.c:1324 #, c-format msgid "Only in %s: %s\n" msgstr "Bare i %s: %s\n" -#: src/diff.c:1247 +#: src/diff.c:1248 msgid "cannot compare '-' to a directory" msgstr "du kan ikke sammenlikne «-» med en mappe" -#: src/diff.c:1282 +#: src/diff.c:1283 msgid "-D option not supported with directories" msgstr "valget «-D» støttes ikke for mapper" -#: src/diff.c:1291 +#: src/diff.c:1292 #, c-format msgid "Common subdirectories: %s and %s\n" -msgstr "Vanlige undermapper: %s og %s\n" +msgstr "Felles undermapper: %s og %s\n" -#: src/diff.c:1333 src/diff.c:1383 +#: src/diff.c:1334 src/diff.c:1384 #, c-format msgid "File %s is a %s while file %s is a %s\n" msgstr "Fila %s er en %s, og fila %s er en %s\n" -#: src/diff.c:1369 +#: src/diff.c:1370 #, c-format msgid "Symbolic links %s and %s differ\n" msgstr "De symbolske lenkene %s og %s er ulike\n" -#: src/diff.c:1456 +#: src/diff.c:1457 #, c-format msgid "Files %s and %s are identical\n" msgstr "Filene %s og %s er identiske\n" #. This is a proper name. See the gettext manual, section Names. -#: src/diff3.c:41 +#: src/diff3.c:42 msgid "Randy Smith" msgstr "Randy Smith" -#: src/diff3.c:348 +#: src/diff3.c:351 #, c-format msgid "incompatible options" msgstr "gjeldende valg kan ikke brukes samtidig" -#: src/diff3.c:388 +#: src/diff3.c:391 msgid "'-' specified for more than one input file" msgstr "«-» er valgt for flere enn én inndatafil" -#: src/diff3.c:439 src/diff3.c:1288 src/diff3.c:1692 src/diff3.c:1747 +#: src/diff3.c:442 src/diff3.c:1290 src/diff3.c:1693 src/diff3.c:1748 #: src/sdiff.c:307 src/sdiff.c:844 src/sdiff.c:855 msgid "read failed" msgstr "lesing mislyktes" -#: src/diff3.c:473 +#: src/diff3.c:475 msgid "-A, --show-all output all changes, bracketing conflicts" msgstr "" "-A, --show-all skriv ut alle endringer, med konflikter i " "parentes" -#: src/diff3.c:475 +#: src/diff3.c:477 msgid "" "-e, --ed output ed script incorporating changes\n" " from OLDFILE to YOURFILE into MYFILE" @@ -1212,12 +1191,12 @@ msgstr "" "-e, --ed skriv ut ed-skript med endringer\n" " mellom GAMMELFIL og NYFIL til FIL" -#: src/diff3.c:477 +#: src/diff3.c:479 msgid "-E, --show-overlap like -e, but bracket conflicts" msgstr "" "-E, --show-overlap likner «-e», men viser konflikter i parentes" -#: src/diff3.c:478 +#: src/diff3.c:480 msgid "" "-3, --easy-only like -e, but incorporate only nonoverlapping " "changes" @@ -1225,24 +1204,24 @@ msgstr "" "-3, --easy-only likner «-e», men tar ikke med endringer som " "overlapper hverandre" -#: src/diff3.c:479 +#: src/diff3.c:481 msgid "" "-x, --overlap-only like -e, but incorporate only overlapping changes" msgstr "" "-x, --overlap-only likner «-e», men tar bare med endringer som " "overlapper hverandre" -#: src/diff3.c:480 +#: src/diff3.c:482 msgid "-X like -x, but bracket conflicts" msgstr "" "-X likner «-x», men viser ogsÃ¥ konflikter i parentes" -#: src/diff3.c:481 +#: src/diff3.c:483 msgid "-i append 'w' and 'q' commands to ed scripts" msgstr "" "-i legg til kommandoene «w» og «q» i ed-skript" -#: src/diff3.c:483 +#: src/diff3.c:485 msgid "" "-m, --merge output actual merged file, according to\n" " -A if no other options are given" @@ -1250,26 +1229,26 @@ msgstr "" "-m, --merge skriv ut sammenslÃ¥tt fil ihht. «-A»,\n" " med mindre noe annet er valgt" -#: src/diff3.c:486 +#: src/diff3.c:488 msgid "-a, --text treat all files as text" msgstr "-a, --text behandle filer som tekst" -#: src/diff3.c:487 +#: src/diff3.c:489 msgid " --strip-trailing-cr strip trailing carriage return on input" msgstr "" " --strip-trailing-cr fjern etterfølgende linjeskift-tegn fra inndata" -#: src/diff3.c:488 +#: src/diff3.c:490 msgid "-T, --initial-tab make tabs line up by prepending a tab" msgstr "" "-T, --initial-tab still opp tabulatorer pÃ¥ rekke ved Ã¥ legge til " "en ekstra tab foran" -#: src/diff3.c:489 +#: src/diff3.c:491 msgid " --diff-program=PROGRAM use PROGRAM to compare files" msgstr " --diff-program=PROGRAM bruk valgt PROGRAM til Ã¥ sammenlikne filer" -#: src/diff3.c:490 +#: src/diff3.c:492 msgid "" "-L, --label=LABEL use LABEL instead of file name\n" " (can be repeated up to three times)" @@ -1277,24 +1256,24 @@ msgstr "" "-L, --label=ETIKETT bruk valgt ETIKETT i stedet for filnavn\n" " (dette kan gjentas opptil tre ganger)" -#: src/diff3.c:493 +#: src/diff3.c:495 msgid " --help display this help and exit" msgstr " --help vis denne hjelpeteksten og avslutt" -#: src/diff3.c:494 +#: src/diff3.c:496 msgid "-v, --version output version information and exit" msgstr "-v, --version vis versjonsinformasjon og avslutt" -#: src/diff3.c:503 +#: src/diff3.c:505 #, c-format msgid "Usage: %s [OPTION]... MYFILE OLDFILE YOURFILE\n" msgstr "Usage: %s [VALG] … FIL GAMMELFIL NYFIL\n" -#: src/diff3.c:505 +#: src/diff3.c:507 msgid "Compare three files line by line." msgstr "Sammenlikn tre filer, linje for linje." -#: src/diff3.c:515 +#: src/diff3.c:517 msgid "" "\n" "The default output format is a somewhat human-readable representation of\n" @@ -1318,47 +1297,47 @@ msgstr "" "og skrive ut sammenslÃ¥tt fil. Dette er sikrere for behandling av\n" "uvanlig inndata enn Ã¥ bruke ed.\n" -#: src/diff3.c:527 +#: src/diff3.c:529 msgid "Exit status is 0 if successful, 1 if conflicts, 2 if trouble." msgstr "" "Avsluttende status er 0 hvis alt er i orden, 1 ved konflikter og 2 ved " "problemer." -#: src/diff3.c:720 +#: src/diff3.c:722 msgid "internal error: screwup in format of diff blocks" msgstr "intern feil: rot i diff-blokkformat" -#: src/diff3.c:1015 +#: src/diff3.c:1017 #, c-format msgid "%s: diff failed: " msgstr "%s: diff mislyktes: " -#: src/diff3.c:1037 +#: src/diff3.c:1039 msgid "internal error: invalid diff type in process_diff" msgstr "intern feil: ugyldig diff-type i process_diff" -#: src/diff3.c:1062 +#: src/diff3.c:1064 msgid "invalid diff format; invalid change separator" msgstr "ugyldig diff-format. Ugyldig endringsskilletegn" -#: src/diff3.c:1298 +#: src/diff3.c:1300 msgid "invalid diff format; incomplete last line" msgstr "ugyldig diff-format. Siste linje er ufullstendig" -#: src/diff3.c:1322 src/sdiff.c:275 src/util.c:970 +#: src/diff3.c:1324 src/sdiff.c:275 src/util.c:969 #, c-format msgid "subsidiary program '%s' could not be invoked" msgstr "klarte ikke Ã¥ starte hjelpeprogrammet «%s»" -#: src/diff3.c:1347 +#: src/diff3.c:1349 msgid "invalid diff format; incorrect leading line chars" msgstr "ugyldig diff-format. Feil ledende linjetegn" -#: src/diff3.c:1420 +#: src/diff3.c:1422 msgid "internal error: invalid diff type passed to output" msgstr "intern feil: ugyldig diff-type sendt til utdata" -#: src/diff3.c:1694 src/diff3.c:1751 +#: src/diff3.c:1695 src/diff3.c:1752 msgid "input file shrank" msgstr "inndata-fila er krympet" @@ -1373,7 +1352,7 @@ msgid "%s: recursive directory loop" msgstr "%s: rekursiv mappesløyfe" #. This is a proper name. See the gettext manual, section Names. -#: src/sdiff.c:42 +#: src/sdiff.c:43 msgid "Thomas Lord" msgstr "Thomas Lord" @@ -1438,11 +1417,11 @@ msgstr "" msgid "" "-l, --left-column output only the left column of common lines" msgstr "" -"-l, --left-column bare skriv ut venstre kolonne med vanlige linjer" +"-l, --left-column bare skriv ut venstre kolonne med felles linjer" #: src/sdiff.c:187 msgid "-s, --suppress-common-lines do not output common lines" -msgstr "-s, --suppress-common-lines ikke skriv ut vanlige linjer" +msgstr "-s, --suppress-common-lines ikke skriv ut felles linjer" #: src/sdiff.c:189 msgid "-t, --expand-tabs expand tabs to spaces in output" @@ -1508,24 +1487,47 @@ msgid "" "v:\tVerbosely include common lines.\n" "q:\tQuit.\n" msgstr "" -"ed:\tRediger og bruk begge versjoner, og dekorer hver av dem med " -"overskrift.\n" +"ed:\tRediger og bruk begge versjoner, og dekorer begge med overskrift.\n" "eb:\tRediger og bruk deretter begge versjoner.\n" "el or e1:\tRediger og bruk deretter venstre versjon.\n" "er or e2:\tRediger og bruk deretter høyre versjon.\n" -"e:\tForkast begge versjon, og rediger en ny versjon.\n" +"e:\tForkast begge versjoner, og rediger ny versjon.\n" "l or 1:\tBruk venstre versjon.\n" "r or 2:\tBruk høyre versjon.\n" -"s:\tInkluder kommandolinjer uten Ã¥ nevne noe om det.\n" -"v:\tInkluder kommandolinjer i detaljert modus.\n" +"s:\tTa med felles linjer uten Ã¥ gi beskjed.\n" +"v:\tTa med felles linjer og gi beskjed.\n" "q:\tAvslutt.\n" -#: src/util.c:663 -#, fuzzy, c-format +#: src/util.c:662 +#, c-format msgid "unrecognized prefix: %s" -msgstr "%s: «--%s» er et ukjent valg\n" +msgstr "ukjent prefiks: %s" -#: src/util.c:693 +#: src/util.c:692 #, c-format msgid "unparsable value for --palette" -msgstr "" +msgstr "«--palette» har uforstÃ¥elig verdi" + +#~ msgid "%s: option '--%s' doesn't allow an argument\n" +#~ msgstr "%s: valget «--%s» tillater ikke argumenter\n" + +#~ msgid "%s: unrecognized option '--%s'\n" +#~ msgstr "%s: «--%s» er et ukjent valg\n" + +#~ msgid "%s: option '-W %s' is ambiguous\n" +#~ msgstr "%s: valget «-W %s» er flertydig\n" + +#~ msgid "%s: option '-W %s' doesn't allow an argument\n" +#~ msgstr "%s: valget «-W %s» tillater ikke argumenter\n" + +#~ msgid "%s: option '-W %s' requires an argument\n" +#~ msgstr "%s: valget «-W %s» krever et argument\n" + +#~ msgid " or 'auto' (the default)" +#~ msgstr " eller «auto» (standard)" + +#~ msgid "" +#~ " --palette=PALETTE specify the colors to use when --color is active" +#~ msgstr "" +#~ " --palette=PALETT velg farger som skal brukes nÃ¥r «--color» er " +#~ "valgt" Binary files differ@@ -1,50 +1,50 @@ # Dutch translations for GNU diffutils. -# Copyright (C) 2012 Free Software Foundation, Inc. +# Copyright (C) 2017 Free Software Foundation, Inc. # This file is distributed under the same license as the diffutils package. # -# Would she be called Adinda... +# «We know things, but when they bother us we suddenly forget we knew them.» # -# Benno Schulenberg <benno@vertaalt.nl>, 2007, 2008, 2010, 2011, 2012. +# Benno Schulenberg <benno@vertaalt.nl>, 2007, 2008, 2010, 2011, 2012, 2017. # Elros Cyriatan <cyriatan@fastmail.fm>, 2004. msgid "" msgstr "" -"Project-Id-Version: diffutils-3.3-pre1\n" +"Project-Id-Version: diffutils-3.5.25\n" "Report-Msgid-Bugs-To: bug-diffutils@gnu.org\n" -"POT-Creation-Date: 2016-08-20 22:22-0700\n" -"PO-Revision-Date: 2012-10-31 21:04+0100\n" +"POT-Creation-Date: 2017-05-21 13:26-0700\n" +"PO-Revision-Date: 2017-05-09 19:36+0200\n" "Last-Translator: Benno Schulenberg <benno@vertaalt.nl>\n" "Language-Team: Dutch <vertaling@vrijschrift.org>\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:133 -#, fuzzy, c-format +#: lib/argmatch.c:134 +#, c-format msgid "invalid argument %s for %s" -msgstr "ongeldig argument '%3$s' van %1$s%2$s" +msgstr "ongeldig argument %s van %s" -#: lib/argmatch.c:134 +#: lib/argmatch.c:135 #, c-format msgid "ambiguous argument %s for %s" -msgstr "" +msgstr "argument %s van %s is niet eenduidig" -#: lib/argmatch.c:153 -#, fuzzy +#: lib/argmatch.c:154 msgid "Valid arguments are:" -msgstr "ongeldig argument '%3$s' van %1$s%2$s" +msgstr "Geldige argumenten zijn:" -#: lib/c-stack.c:204 lib/c-stack.c:297 +#: lib/c-stack.c:203 lib/c-stack.c:296 msgid "program error" msgstr "programmafout" -#: lib/c-stack.c:205 lib/c-stack.c:298 +#: lib/c-stack.c:204 lib/c-stack.c:297 msgid "stack overflow" msgstr "stack-overloop" -#: lib/error.c:191 +#: lib/error.c:195 msgid "Unknown system error" msgstr "Onbekende systeemfout" @@ -90,7 +90,7 @@ msgstr "byte-apparaat" #: lib/file-type.c:72 msgid "contiguous data" -msgstr "" +msgstr "aaneengesloten gegevens" #: lib/file-type.c:75 msgid "fifo" @@ -98,43 +98,39 @@ msgstr "fifo" #: lib/file-type.c:78 msgid "door" -msgstr "" +msgstr "door" #: lib/file-type.c:81 -#, fuzzy msgid "multiplexed block special file" -msgstr "blok-apparaat" +msgstr "gemultiplexed blok-apparaat" #: lib/file-type.c:84 -#, fuzzy msgid "multiplexed character special file" -msgstr "byte-apparaat" +msgstr "gemultiplexed byte-apparaat" #: lib/file-type.c:87 msgid "multiplexed file" -msgstr "" +msgstr "gemultiplexed bestand" #: lib/file-type.c:90 -#, fuzzy msgid "named file" -msgstr "merkwaardig bestand" +msgstr "benoemd bestand" #: lib/file-type.c:93 -#, fuzzy msgid "network special file" -msgstr "blok-apparaat" +msgstr "netwerkapparaat" #: lib/file-type.c:96 msgid "migrated file with data" -msgstr "" +msgstr "gemigreerd bestand met gegevens" #: lib/file-type.c:99 msgid "migrated file without data" -msgstr "" +msgstr "gemigreerd bestand zonder gegevens" #: lib/file-type.c:102 msgid "port" -msgstr "" +msgstr "poort" #: lib/file-type.c:105 msgid "socket" @@ -142,72 +138,47 @@ msgstr "socket" #: lib/file-type.c:108 msgid "whiteout" -msgstr "" +msgstr "whiteout" #: lib/file-type.c:110 msgid "weird file" msgstr "merkwaardig bestand" -#: lib/getopt.c:575 lib/getopt.c:604 -#, c-format -msgid "%s: option '%s' is ambiguous; possibilities:" -msgstr "%s: optie '%s' is niet eenduidig; mogelijkheden zijn:" - -#: lib/getopt.c:619 -#, fuzzy, c-format -msgid "%s: option '%s' is ambiguous\n" -msgstr "%s: optie '-W %s' is niet eenduidig\n" - -#: lib/getopt.c:654 lib/getopt.c:658 +#: lib/getopt.c:278 #, c-format -msgid "%s: option '--%s' doesn't allow an argument\n" -msgstr "%s: optie '--%s' staat geen argument toe\n" +msgid "%s: option '%s%s' is ambiguous\n" +msgstr "%s: optie '%s%s' is niet eenduidig\n" -#: lib/getopt.c:667 lib/getopt.c:672 +#: lib/getopt.c:284 #, c-format -msgid "%s: option '%c%s' doesn't allow an argument\n" -msgstr "%s: optie '%c%s' staat geen argument toe\n" +msgid "%s: option '%s%s' is ambiguous; possibilities:" +msgstr "%s: optie '%s%s' is niet eenduidig; mogelijkheden zijn:" -#: lib/getopt.c:715 lib/getopt.c:734 +#: lib/getopt.c:319 #, c-format -msgid "%s: option '--%s' requires an argument\n" -msgstr "%s: optie '--%s' vereist een argument\n" +msgid "%s: unrecognized option '%s%s'\n" +msgstr "%s: onbekende optie '%s%s'\n" -#: lib/getopt.c:772 lib/getopt.c:775 +#: lib/getopt.c:345 #, c-format -msgid "%s: unrecognized option '--%s'\n" -msgstr "%s: onbekende optie '--%s'\n" +msgid "%s: option '%s%s' doesn't allow an argument\n" +msgstr "%s: optie '%s%s' staat geen argument toe\n" -#: lib/getopt.c:783 lib/getopt.c:786 +#: lib/getopt.c:360 #, c-format -msgid "%s: unrecognized option '%c%s'\n" -msgstr "%s: onbekende optie '%c%s'\n" +msgid "%s: option '%s%s' requires an argument\n" +msgstr "%s: optie '%s%s' vereist een argument\n" -#: lib/getopt.c:835 lib/getopt.c:838 +#: lib/getopt.c:621 #, c-format msgid "%s: invalid option -- '%c'\n" msgstr "%s: ongeldige optie -- '%c'\n" -#: lib/getopt.c:891 lib/getopt.c:908 lib/getopt.c:1118 lib/getopt.c:1136 +#: lib/getopt.c:636 lib/getopt.c:682 #, c-format msgid "%s: option requires an argument -- '%c'\n" msgstr "%s: optie vereist een argument -- '%c'\n" -#: lib/getopt.c:964 lib/getopt.c:980 -#, c-format -msgid "%s: option '-W %s' is ambiguous\n" -msgstr "%s: optie '-W %s' is niet eenduidig\n" - -#: lib/getopt.c:1004 lib/getopt.c:1022 -#, c-format -msgid "%s: option '-W %s' doesn't allow an argument\n" -msgstr "%s: optie '-W %s' staat geen argument toe\n" - -#: lib/getopt.c:1043 lib/getopt.c:1061 -#, c-format -msgid "%s: option '-W %s' requires an argument\n" -msgstr "%s: optie '-W %s' vereist een argument\n" - #. TRANSLATORS: #. Get translations for open and closing quotation marks. #. The message catalog should translate "`" to a left @@ -229,11 +200,11 @@ msgstr "%s: optie '-W %s' vereist een argument\n" #. If you don't know what to put here, please see #. <http://en.wikipedia.org/wiki/Quotation_marks_in_other_languages> #. and use glyphs suitable for your language. -#: lib/quotearg.c:347 +#: lib/quotearg.c:362 msgid "`" msgstr "‘" -#: lib/quotearg.c:348 +#: lib/quotearg.c:363 msgid "'" msgstr "’" @@ -267,9 +238,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 \\(" @@ -529,7 +499,7 @@ msgid "General help using GNU software: <http://www.gnu.org/gethelp/>\n" msgstr "" "Algemene hulp bij gebruik van GNU-software: <http://www.gnu.org/gethelp/>\n" -#: src/analyze.c:454 src/diff.c:1400 +#: src/analyze.c:454 src/diff.c:1401 #, c-format msgid "Files %s and %s differ\n" msgstr "Bestanden %s en %s zijn verschillend\n" @@ -539,21 +509,21 @@ msgstr "Bestanden %s en %s zijn verschillend\n" msgid "Binary files %s and %s differ\n" msgstr "Binaire bestanden %s en %s zijn verschillend\n" -#: src/analyze.c:697 src/diff3.c:1463 src/util.c:1255 +#: src/analyze.c:706 src/diff3.c:1465 src/util.c:1254 msgid "No newline at end of file" msgstr "Geen regeleindeteken (LF) aan einde van bestand" #. This is a proper name. See the gettext manual, section Names. -#: src/cmp.c:43 +#: src/cmp.c:44 msgid "Torbjorn Granlund" msgstr "Torbjörn Granlund" #. This is a proper name. See the gettext manual, section Names. -#: src/cmp.c:44 +#: src/cmp.c:45 msgid "David MacKenzie" msgstr "David MacKenzie" -#: src/cmp.c:118 src/diff.c:875 src/diff3.c:459 src/sdiff.c:158 +#: src/cmp.c:119 src/diff.c:877 src/diff3.c:462 src/sdiff.c:159 #, c-format msgid "Try '%s --help' for more information." msgstr "Typ '%s --help' voor meer informatie." @@ -568,12 +538,12 @@ msgstr "ongeldige waarde '%s' voor '--ignore-initial'" msgid "options -l and -s are incompatible" msgstr "opties '-l' en '-s' gaan niet samen" -#: src/cmp.c:155 src/diff.c:884 src/diff3.c:467 src/sdiff.c:167 src/sdiff.c:315 -#: src/sdiff.c:322 src/sdiff.c:874 src/util.c:853 src/util.c:953 src/util.c:960 +#: src/cmp.c:155 src/diff.c:885 src/diff3.c:469 src/sdiff.c:167 src/sdiff.c:315 +#: src/sdiff.c:322 src/sdiff.c:874 src/util.c:852 src/util.c:952 src/util.c:959 msgid "write failed" msgstr "schrijven is mislukt" -#: src/cmp.c:157 src/diff.c:886 src/diff.c:1465 src/diff3.c:469 src/sdiff.c:169 +#: src/cmp.c:157 src/diff.c:887 src/diff.c:1466 src/diff3.c:471 src/sdiff.c:169 msgid "standard output" msgstr "standaarduitvoer" @@ -638,7 +608,7 @@ msgstr "" "dat\n" "aan het begin van elk bestand moet worden overgeslagen (standaard nul)." -#: src/cmp.c:185 src/diff.c:996 src/diff3.c:507 src/sdiff.c:210 +#: src/cmp.c:185 src/diff.c:997 src/diff3.c:509 src/sdiff.c:210 msgid "" "Mandatory arguments to long options are mandatory for short options too.\n" msgstr "" @@ -661,7 +631,7 @@ msgid "If a FILE is '-' or missing, read standard input." msgstr "" "Als een BESTAND ontbreekt of '-' is, wordt er van standaardinvoer gelezen." -#: src/cmp.c:195 src/diff.c:984 src/sdiff.c:220 +#: src/cmp.c:195 src/diff.c:985 src/sdiff.c:220 msgid "Exit status is 0 if inputs are the same, 1 if different, 2 if trouble." msgstr "" "De afsluitwaarde is 0 als de invoeren gelijk zijn, 1 als ze verschillen,\n" @@ -672,252 +642,267 @@ msgstr "" msgid "invalid --bytes value '%s'" msgstr "ongeldige waarde '%s' voor '--bytes'" -#: src/cmp.c:266 src/diff.c:793 src/diff3.c:353 src/sdiff.c:565 +#: src/cmp.c:266 src/diff.c:795 src/diff3.c:356 src/sdiff.c:565 #, c-format msgid "missing operand after '%s'" msgstr "ontbrekend argument na '%s'" -#: src/cmp.c:278 src/diff.c:795 src/diff3.c:355 src/sdiff.c:567 +#: src/cmp.c:278 src/diff.c:797 src/diff3.c:358 src/sdiff.c:567 #, c-format msgid "extra operand '%s'" msgstr "overtollig argument '%s'" -#: src/cmp.c:494 +#: src/cmp.c:498 #, c-format msgid "%s %s differ: byte %s, line %s\n" msgstr "%s %s verschillen: byte %s, regel %s\n" -#: src/cmp.c:510 +#: src/cmp.c:514 #, c-format msgid "%s %s differ: byte %s, line %s is %3o %s %3o %s\n" msgstr "%s %s verschillen: byte %s, regel %s, is %3o %s %3o %s\n" -#: src/cmp.c:562 +#: src/cmp.c:571 +#, c-format +msgid "cmp: EOF on %s which is empty\n" +msgstr "cmp: einde-van-bestand in %s dat leeg is\n" + +#: src/cmp.c:585 #, c-format -msgid "cmp: EOF on %s\n" -msgstr "cmp: einde-van-bestand op %s\n" +msgid "cmp: EOF on %s after byte %s, line %s\n" +msgstr "cmp: einde-van-bestand in %s na byte %s, regel %s\n" + +#: src/cmp.c:586 +#, c-format +msgid "cmp: EOF on %s after byte %s, in line %s\n" +msgstr "cmp: einde-van-bestand in %s na byte %s, in regel %s\n" + +#: src/cmp.c:592 +#, c-format +msgid "cmp: EOF on %s after byte %s\n" +msgstr "cmp: einde-van-bestand in %s na byte %s\n" #. This is a proper name. See the gettext manual, section Names. -#: src/diff.c:49 +#: src/diff.c:50 msgid "Paul Eggert" msgstr "Paul Eggert" #. This is a proper name. See the gettext manual, section Names. -#: src/diff.c:50 +#: src/diff.c:51 msgid "Mike Haertel" msgstr "Mike Haertel" #. This is a proper name. See the gettext manual, section Names. -#: src/diff.c:51 +#: src/diff.c:52 msgid "David Hayes" msgstr "David Hayes" #. This is a proper name. See the gettext manual, section Names. -#: src/diff.c:52 +#: src/diff.c:53 msgid "Richard Stallman" msgstr "Richard Stallman" #. This is a proper name. See the gettext manual, section Names. -#: src/diff.c:53 +#: src/diff.c:54 msgid "Len Tower" msgstr "Len Tower" -#: src/diff.c:351 +#: src/diff.c:353 #, c-format msgid "invalid context length '%s'" msgstr "ongeldige contextlengte '%s'" -#: src/diff.c:434 +#: src/diff.c:436 #, c-format msgid "pagination not supported on this host" msgstr "het in pagina's indelen is op deze computer niet mogelijk" -#: src/diff.c:449 src/diff3.c:335 +#: src/diff.c:451 src/diff3.c:336 #, c-format msgid "too many file label options" msgstr "te veel bestandslabel-opties" -#: src/diff.c:526 +#: src/diff.c:528 #, c-format msgid "invalid width '%s'" msgstr "ongeldige breedte '%s'" -#: src/diff.c:530 +#: src/diff.c:532 msgid "conflicting width options" msgstr "conflicterende breedte-opties" -#: src/diff.c:555 +#: src/diff.c:557 #, c-format msgid "invalid horizon length '%s'" msgstr "ongeldige horizonlengte '%s'" -#: src/diff.c:611 +#: src/diff.c:613 #, c-format msgid "invalid tabsize '%s'" msgstr "ongeldige tabgrootte '%s'" -#: src/diff.c:615 +#: src/diff.c:617 msgid "conflicting tabsize options" msgstr "conflicterende tabgrootte-opties" -#: src/diff.c:770 +#: src/diff.c:772 msgid "--from-file and --to-file both specified" msgstr "zowel '--from-file' als '--to-file' zijn opgegeven" -#: src/diff.c:890 +#: src/diff.c:891 msgid " --normal output a normal diff (the default)" msgstr " --normal een gewone diff produceren (standaard)" -#: src/diff.c:891 +#: src/diff.c:892 msgid "-q, --brief report only when files differ" msgstr "-q, --brief alleen aangeven of bestanden verschillen" -#: src/diff.c:892 +#: src/diff.c:893 msgid "-s, --report-identical-files report when two files are the same" msgstr "" "-s, --report-identical-files vermelden of twee bestanden hetzelfde zijn" -#: src/diff.c:893 +#: src/diff.c:894 msgid "" "-c, -C NUM, --context[=NUM] output NUM (default 3) lines of copied context" msgstr "" "-c, -C AANTAL, --context[=AANTAL] dit AANTAL regels (standaard 3) van\n" " gekopieerde context tonen" -#: src/diff.c:894 +#: src/diff.c:895 msgid "" "-u, -U NUM, --unified[=NUM] output NUM (default 3) lines of unified context" msgstr "" "-u, -U AANTAL, --unified[=AANTAL] dit AANTAL regels (standaard 3) van\n" " geünificeerde context tonen" -#: src/diff.c:895 +#: src/diff.c:896 msgid "-e, --ed output an ed script" msgstr "-e, --ed een ed-script produceren" -#: src/diff.c:896 +#: src/diff.c:897 msgid "-n, --rcs output an RCS format diff" msgstr "-n, --rcs een diff in RCS-opmaak produceren" -#: src/diff.c:897 +#: src/diff.c:898 msgid "-y, --side-by-side output in two columns" msgstr "-y, --side-by-side het resultaat weergeven in twee kolommen" -#: src/diff.c:898 +#: src/diff.c:899 msgid "" "-W, --width=NUM output at most NUM (default 130) print columns" msgstr "" "-w, --width=AANTAL maximaal dit AANTAL kolommen tonen (standaard 130)" -#: src/diff.c:899 +#: src/diff.c:900 msgid "" " --left-column output only the left column of common lines" msgstr "" " --left-column bij gelijke regels alleen de linkerkolom tonen" -#: src/diff.c:900 +#: src/diff.c:901 msgid " --suppress-common-lines do not output common lines" msgstr " --suppress-common-lines de gelijke regels onderdrukken" -#: src/diff.c:902 +#: src/diff.c:903 msgid "-p, --show-c-function show which C function each change is in" msgstr "" "-p, --show-c-function vermelden in welke C-functie elke wijziging is" -#: src/diff.c:903 +#: src/diff.c:904 msgid "-F, --show-function-line=RE show the most recent line matching RE" msgstr "" "-F, --show-function-line=RE recentste regel overeenkomend met RE tonen" -#: src/diff.c:904 -#, fuzzy +#: src/diff.c:905 msgid "" " --label LABEL use LABEL instead of file name and timestamp\n" " (can be repeated)" msgstr "" -" --label LABEL dit LABEL gebruiken in plaats van bestandsnaam\n" -" (mag herhaald worden)" +" --label LABEL dit LABEL gebruiken in plaats van bestandsnaam " +"plus\n" +" tijdsstempel (mag herhaald worden)" -#: src/diff.c:907 +#: src/diff.c:908 msgid "-t, --expand-tabs expand tabs to spaces in output" msgstr "-t, --expand-tabs tabs uitschrijven naar spaties in uitvoer" -#: src/diff.c:908 +#: src/diff.c:909 msgid "-T, --initial-tab make tabs line up by prepending a tab" msgstr "" "-T, --initial-tab tabs uitlijnen door invoegen van tab aan het begin" -#: src/diff.c:909 +#: src/diff.c:910 msgid "" " --tabsize=NUM tab stops every NUM (default 8) print columns" msgstr "" " --tabsize=AANTAL tab-stops op elke AANTAL posities (standaard 8)" -#: src/diff.c:910 +#: src/diff.c:911 msgid "" " --suppress-blank-empty suppress space or tab before empty output lines" msgstr "" " --suppress-blank-empty spatie of tab onderdrukken voor lege uitregels" -#: src/diff.c:911 +#: src/diff.c:912 msgid "-l, --paginate pass output through 'pr' to paginate it" msgstr "" "-l, --paginate de uitvoer door 'pr' halen om deze in pagina's\n" " in te delen" -#: src/diff.c:913 +#: src/diff.c:914 msgid "" "-r, --recursive recursively compare any subdirectories found" msgstr "-r, --recursive recursief elke gevonden submap vergelijken" -#: src/diff.c:914 +#: src/diff.c:915 msgid " --no-dereference don't follow symbolic links" msgstr " --no-dereference symbolische koppelingen niet volgen" -#: src/diff.c:915 +#: src/diff.c:916 msgid "-N, --new-file treat absent files as empty" msgstr "-N, --new-file afwezige bestanden als leeg behandelen" -#: src/diff.c:916 +#: src/diff.c:917 msgid " --unidirectional-new-file treat absent first files as empty" msgstr "" " --unidirectional-new-file alleen bestanden die afwezig zijn in de\n" " eerste map als leeg behandelen" -#: src/diff.c:917 +#: src/diff.c:918 msgid " --ignore-file-name-case ignore case when comparing file names" msgstr "" " --ignore-file-name-case verschil tussen hoofd- en kleine letters " "negeren\n" " bij vergelijken van bestandsnamen" -#: src/diff.c:918 +#: src/diff.c:919 msgid " --no-ignore-file-name-case consider case when comparing file names" msgstr "" " --no-ignore-file-name-case onderscheid maken tussen hoofd- en kleine\n" " letters bij vergelijken van bestandsnamen" -#: src/diff.c:919 +#: src/diff.c:920 msgid "-x, --exclude=PAT exclude files that match PAT" msgstr "" "-x, --exclude=PATROON bestanden uitsluiten als ze overeenkomen met " "PATROON" -#: src/diff.c:920 +#: src/diff.c:921 msgid "" "-X, --exclude-from=FILE exclude files that match any pattern in FILE" msgstr "" "-X, --exclude-from=BESTAND bestanden uitsluiten die overeenkomen met\n" " een patroon in BESTAND" -#: src/diff.c:921 +#: src/diff.c:922 msgid "" "-S, --starting-file=FILE start with FILE when comparing directories" msgstr "" "-S, --starting-file=BESTAND beginnen met BESTAND bij vergelijken van " "mappen" -#: src/diff.c:922 +#: src/diff.c:923 msgid "" " --from-file=FILE1 compare FILE1 to all operands;\n" " FILE1 can be a directory" @@ -925,7 +910,7 @@ msgstr "" " --from-file=BESTAND1 BESTAND1 met alle argumenten vergelijken;\n" " BESTAND1 mag een map zijn" -#: src/diff.c:924 +#: src/diff.c:925 msgid "" " --to-file=FILE2 compare all operands to FILE2;\n" " FILE2 can be a directory" @@ -933,88 +918,88 @@ msgstr "" " --to-file=BESTAND2 alle argumenten met BESTAND2 vergelijken;\n" " BESTAND2 mag een map zijn" -#: src/diff.c:927 +#: src/diff.c:928 msgid "" "-i, --ignore-case ignore case differences in file contents" msgstr "" "-i, --ignore-case verschil tussen hoofd- en kleine letters\n" " negeren in bestandsinhoud" -#: src/diff.c:928 +#: src/diff.c:929 msgid "-E, --ignore-tab-expansion ignore changes due to tab expansion" msgstr "-E, --ignore-tab-expansion omzettingen van tabs in spaties negeren" -#: src/diff.c:929 +#: src/diff.c:930 msgid "-Z, --ignore-trailing-space ignore white space at line end" msgstr "-Z, --ignore-trailing-space witruimte aan einde van regel negeren" -#: src/diff.c:930 +#: src/diff.c:931 msgid "" "-b, --ignore-space-change ignore changes in the amount of white space" msgstr "" "-b, --ignore-space-change wijzigingen in hoeveelheid witruimte negeren" -#: src/diff.c:931 +#: src/diff.c:932 msgid "-w, --ignore-all-space ignore all white space" msgstr "-w, --ignore-all-space alle witruimte negeren" -#: src/diff.c:932 +#: src/diff.c:933 msgid "" "-B, --ignore-blank-lines ignore changes where lines are all blank" msgstr "" "-B, --ignore-blank-lines wijzigingen waarvan alle regels leeg zijn " "negeren" -#: src/diff.c:933 +#: src/diff.c:934 msgid "-I, --ignore-matching-lines=RE ignore changes where all lines match RE" msgstr "" "-I, --ignore-matching-lines=RE wijzigingen waarvan alle regels " "overeenkomen\n" " met reguliere expressie RE negeren" -#: src/diff.c:935 +#: src/diff.c:936 msgid "-a, --text treat all files as text" msgstr "-a, --text alle bestanden als tekst behandelen" -#: src/diff.c:936 +#: src/diff.c:937 msgid " --strip-trailing-cr strip trailing carriage return on input" msgstr "" " --strip-trailing-cr Enter-tekens (CR's) aan einde van regels weglaten" -#: src/diff.c:938 +#: src/diff.c:939 msgid " --binary read and write data in binary mode" msgstr "" " --binary gegevens in binaire modus lezen en schrijven" -#: src/diff.c:941 +#: src/diff.c:942 msgid "" "-D, --ifdef=NAME output merged file with '#ifdef NAME' diffs" msgstr "" "-D, --ifdef=NAAM samengevoegd bestand tonen om verschillen in\n" " '#ifdef NAAM' te laten zien" -#: src/diff.c:942 +#: src/diff.c:943 msgid " --GTYPE-group-format=GFMT format GTYPE input groups with GFMT" msgstr "" " --GSOORT-group-format=GOPMAAK iets dergelijks, maar dan invoergroepen " "van\n" " soort GSOORT opmaken met GOPMAAK" -#: src/diff.c:943 +#: src/diff.c:944 msgid " --line-format=LFMT format all input lines with LFMT" msgstr "" " --line-format=LOPMAAK iets dergelijks, maar dan alle invoerregels " "opmaken\n" " met LOPMAAK" -#: src/diff.c:944 +#: src/diff.c:945 msgid " --LTYPE-line-format=LFMT format LTYPE input lines with LFMT" msgstr "" " --LSOORT-line-format=LOPMAAK iets dergelijks, maar dan invoerregels " "van\n" " soort LSOORT opmaken met LOPMAAK" -#: src/diff.c:945 +#: src/diff.c:946 msgid "" " These format options provide fine-grained control over the output\n" " of diff, generalizing -D/--ifdef." @@ -1022,13 +1007,13 @@ msgstr "" " Deze opmaakopties bieden een fijnafregeling van de uitvoer aan,\n" " een generalisatie van de optie '-d/--ifdef'." -#: src/diff.c:947 +#: src/diff.c:948 msgid " LTYPE is 'old', 'new', or 'unchanged'. GTYPE is LTYPE or 'changed'." msgstr "" " LSOORT is 'old' (oud), 'new' (nieuw), of 'unchanged' (ongewijzigd);\n" " GSOORT is LSOORT of 'changed' (gewijzigd)." -#: src/diff.c:948 +#: src/diff.c:949 msgid "" " GFMT (only) may contain:\n" " %< lines from FILE1\n" @@ -1058,7 +1043,7 @@ msgstr "" " M L+1\n" " %(A=B?Z:V) als A gelijk is aan B, dan Z anders V" -#: src/diff.c:960 +#: src/diff.c:961 msgid "" " LFMT (only) may contain:\n" " %L contents of line\n" @@ -1071,7 +1056,7 @@ msgstr "" " %[-][BREEDTE][.[PREC]]{doxX}n specificatie in printf-stijl voor\n" " invoerregelnummer" -#: src/diff.c:964 +#: src/diff.c:965 msgid "" " Both GFMT and LFMT may contain:\n" " %% %\n" @@ -1085,20 +1070,20 @@ msgstr "" " %c'\\OOO' het teken met octaalcode OOO\n" " C het teken C (andere tekens representeren zichzelf)" -#: src/diff.c:970 +#: src/diff.c:971 msgid "-d, --minimal try hard to find a smaller set of changes" msgstr "" "-d, --minimal moeite doen om een kleinere verzameling " "wijzigingen\n" " te vinden" -#: src/diff.c:971 +#: src/diff.c:972 msgid " --horizon-lines=NUM keep NUM lines of the common prefix and suffix" msgstr "" " --horizon-lines=AANTAL dit AANTAL regels met identieke kop en staart\n" " bij vergelijkingsproces meenemen" -#: src/diff.c:972 +#: src/diff.c:973 msgid "" " --speed-large-files assume large files and many scattered small changes" msgstr "" @@ -1106,137 +1091,136 @@ msgstr "" "verspreide\n" " kleine wijzigingen" -#: src/diff.c:973 -msgid "" -" --color[=WHEN] colorize the output; WHEN can be 'never', 'always'," -msgstr "" - #: src/diff.c:974 -#, fuzzy -msgid " or 'auto' (the default)" -msgstr " --normal een gewone diff produceren (standaard)" - -#: src/diff.c:975 msgid "" -" --palette=PALETTE specify the colors to use when --color is active" +" --color[=WHEN] colorize the output; WHEN can be 'never', " +"'always',\n" +" or 'auto' (the default)" msgstr "" +" --color[=WANNEER] de uitvoer kleuren; WANNEER is " +"'always' (altijd),\n" +" 'never' (nooit), of 'auto' (standaard)" #: src/diff.c:976 msgid "" -" PALETTE is a colon-separated list terminfo " -"capabilities" +" --palette=PALETTE the colors to use when --color is active; PALETTE " +"is\n" +" a colon-separated list of terminfo capabilities" msgstr "" +" --palette=PALET te gebruiken kleuren bij '--color'; PALET is een\n" +" lijst van terminfo-capabilities gescheiden " +"door\n" +" dubbelepunten" -#: src/diff.c:978 +#: src/diff.c:979 msgid " --help display this help and exit" msgstr " --help deze hulptekst tonen en stoppen" -#: src/diff.c:979 +#: src/diff.c:980 msgid "-v, --version output version information and exit" msgstr "-v, --version programmaversie tonen en stoppen" -#: src/diff.c:981 -#, fuzzy +#: src/diff.c:982 msgid "FILES are 'FILE1 FILE2' or 'DIR1 DIR2' or 'DIR FILE' or 'FILE DIR'." msgstr "" "BESTANDEN is 'BESTAND1 BESTAND2' of 'MAP1 MAP2' of\n" " 'MAP BESTAND...' of 'BESTAND... MAP'." -#: src/diff.c:982 +#: src/diff.c:983 msgid "" "If --from-file or --to-file is given, there are no restrictions on FILE(s)." msgstr "" "Als '--from-file' of '--to-file' gegeven is, mag BESTANDEN van alles zijn." -#: src/diff.c:983 src/diff3.c:526 src/sdiff.c:219 +#: src/diff.c:984 src/diff3.c:528 src/sdiff.c:219 msgid "If a FILE is '-', read standard input." msgstr "Als een BESTAND '-' is, wordt er van standaardinvoer gelezen." -#: src/diff.c:993 +#: src/diff.c:994 #, c-format msgid "Usage: %s [OPTION]... FILES\n" msgstr "" "Gebruik: %s [OPTIE...] BESTANDEN\n" "\n" -#: src/diff.c:994 +#: src/diff.c:995 msgid "Compare FILES line by line." msgstr "Bestanden regel-voor-regel vergelijken." -#: src/diff.c:1028 +#: src/diff.c:1029 #, c-format msgid "conflicting %s option value '%s'" msgstr "conflicterende waarde '%2$s' van optie %1$s" -#: src/diff.c:1041 +#: src/diff.c:1042 #, c-format msgid "conflicting output style options" msgstr "conflicterende uitvoerstijl-opties" -#: src/diff.c:1057 -#, fuzzy, c-format +#: src/diff.c:1058 +#, c-format msgid "invalid color '%s'" -msgstr "ongeldige breedte '%s'" +msgstr "ongeldige kleur '%s'" -#: src/diff.c:1113 src/diff.c:1323 +#: src/diff.c:1114 src/diff.c:1324 #, c-format msgid "Only in %s: %s\n" msgstr "Alleen in %s: %s\n" -#: src/diff.c:1247 +#: src/diff.c:1248 msgid "cannot compare '-' to a directory" msgstr "kan '-' niet met een map vergelijken" -#: src/diff.c:1282 +#: src/diff.c:1283 msgid "-D option not supported with directories" msgstr "optie '-D' is niet mogelijk bij mappen" -#: src/diff.c:1291 +#: src/diff.c:1292 #, c-format msgid "Common subdirectories: %s and %s\n" msgstr "Gemeenschappelijke submappen: %s en %s\n" -#: src/diff.c:1333 src/diff.c:1383 +#: src/diff.c:1334 src/diff.c:1384 #, c-format msgid "File %s is a %s while file %s is a %s\n" msgstr "Bestand %s is een %s terwijl bestand %s een %s is\n" -#: src/diff.c:1369 +#: src/diff.c:1370 #, c-format msgid "Symbolic links %s and %s differ\n" msgstr "Symbolische koppelingen %s en %s zijn verschillend\n" -#: src/diff.c:1456 +#: src/diff.c:1457 #, c-format msgid "Files %s and %s are identical\n" msgstr "Bestanden %s en %s zijn identiek\n" #. This is a proper name. See the gettext manual, section Names. -#: src/diff3.c:41 +#: src/diff3.c:42 msgid "Randy Smith" msgstr "Randy Smith" -#: src/diff3.c:348 +#: src/diff3.c:351 #, c-format msgid "incompatible options" msgstr "niet-samengaande opties" -#: src/diff3.c:388 +#: src/diff3.c:391 msgid "'-' specified for more than one input file" msgstr "'-' opgegeven voor meer dan één invoerbestand" -#: src/diff3.c:439 src/diff3.c:1288 src/diff3.c:1692 src/diff3.c:1747 +#: src/diff3.c:442 src/diff3.c:1290 src/diff3.c:1693 src/diff3.c:1748 #: src/sdiff.c:307 src/sdiff.c:844 src/sdiff.c:855 msgid "read failed" msgstr "lezen is mislukt" -#: src/diff3.c:473 +#: src/diff3.c:475 msgid "-A, --show-all output all changes, bracketing conflicts" msgstr "" "-A, --show-all alle wijzigingen tonen, met rechte haken om de " "conflicten" -#: src/diff3.c:475 +#: src/diff3.c:477 msgid "" "-e, --ed output ed script incorporating changes\n" " from OLDFILE to YOURFILE into MYFILE" @@ -1244,12 +1228,12 @@ msgstr "" "-e, --ed een ed-script produceren die de wijzigingen van\n" " OUDBESTAND naar UWBESTAND in MIJNBESTAND maakt" -#: src/diff3.c:477 +#: src/diff3.c:479 msgid "-E, --show-overlap like -e, but bracket conflicts" msgstr "" "-E, --show-overlap als '-e' maar met rechte haken om de conflicten" -#: src/diff3.c:478 +#: src/diff3.c:480 msgid "" "-3, --easy-only like -e, but incorporate only nonoverlapping " "changes" @@ -1257,25 +1241,25 @@ msgstr "" "-3, --easy-only als '-e' maar alleen met niet-overlappende " "wijzigingen" -#: src/diff3.c:479 +#: src/diff3.c:481 msgid "" "-x, --overlap-only like -e, but incorporate only overlapping changes" msgstr "" "-x, --overlap-only als '-e' maar met alleen de overlappende " "wijzigingen" -#: src/diff3.c:480 +#: src/diff3.c:482 msgid "-X like -x, but bracket conflicts" msgstr "" "-X als '-x' maar met rechte haken om de conflicten" -#: src/diff3.c:481 +#: src/diff3.c:483 msgid "-i append 'w' and 'q' commands to ed scripts" msgstr "" "-i opdrachten 'w' en 'q' toevoegen aan einde van ed-" "scripts" -#: src/diff3.c:483 +#: src/diff3.c:485 msgid "" "-m, --merge output actual merged file, according to\n" " -A if no other options are given" @@ -1283,27 +1267,27 @@ msgstr "" "-m, --merge het feitelijk samengevoegde bestand tonen\n" " volgens '-A' zonder andere opties" -#: src/diff3.c:486 +#: src/diff3.c:488 msgid "-a, --text treat all files as text" msgstr "-a, --text alle bestanden als tekst behandelen" -#: src/diff3.c:487 +#: src/diff3.c:489 msgid " --strip-trailing-cr strip trailing carriage return on input" msgstr "" " --strip-trailing-cr Enter-tekens (CR's) aan einde van regels weglaten" -#: src/diff3.c:488 +#: src/diff3.c:490 msgid "-T, --initial-tab make tabs line up by prepending a tab" msgstr "" "-T, --initial-tab tabs uitlijnen door invoegen van tab aan het begin" -#: src/diff3.c:489 +#: src/diff3.c:491 msgid " --diff-program=PROGRAM use PROGRAM to compare files" msgstr "" " --diff-program=PROG dit programma gebruiken om bestanden te " "vergelijken" -#: src/diff3.c:490 +#: src/diff3.c:492 msgid "" "-L, --label=LABEL use LABEL instead of file name\n" " (can be repeated up to three times)" @@ -1311,26 +1295,26 @@ msgstr "" "-L, --label=LABEL dit LABEL gebruiken in plaats van bestandsnaam\n" " (mag maximaal driemaal herhaald worden)" -#: src/diff3.c:493 +#: src/diff3.c:495 msgid " --help display this help and exit" msgstr " --help deze hulptekst tonen en stoppen" -#: src/diff3.c:494 +#: src/diff3.c:496 msgid "-v, --version output version information and exit" msgstr "-v, --version programmaversie tonen en stoppen" -#: src/diff3.c:503 +#: src/diff3.c:505 #, c-format msgid "Usage: %s [OPTION]... MYFILE OLDFILE YOURFILE\n" msgstr "" "Gebruik: %s [OPTIE]... MIJNBESTAND OUDBESTAND UWBESTAND\n" "\n" -#: src/diff3.c:505 +#: src/diff3.c:507 msgid "Compare three files line by line." msgstr "Drie bestanden regel-voor-regel vergelijken." -#: src/diff3.c:515 +#: src/diff3.c:517 msgid "" "\n" "The default output format is a somewhat human-readable representation of\n" @@ -1356,46 +1340,46 @@ msgstr "" "robuuster\n" "dan het gebruik van 'ed'.\n" -#: src/diff3.c:527 +#: src/diff3.c:529 msgid "Exit status is 0 if successful, 1 if conflicts, 2 if trouble." msgstr "" "De afsluitwaarde is 0 bij succes, 1 bij conflicten, en 2 bij problemen." -#: src/diff3.c:720 +#: src/diff3.c:722 msgid "internal error: screwup in format of diff blocks" msgstr "*interne programmafout*: opmaak van diff-blokken is verhaspeld" -#: src/diff3.c:1015 +#: src/diff3.c:1017 #, c-format msgid "%s: diff failed: " msgstr "%s: diff is mislukt: " -#: src/diff3.c:1037 +#: src/diff3.c:1039 msgid "internal error: invalid diff type in process_diff" msgstr "*interne programmmafout*: ongeldig soort diff in process_diff()" -#: src/diff3.c:1062 +#: src/diff3.c:1064 msgid "invalid diff format; invalid change separator" msgstr "ongeldige diff-opmaak: ongeldig scheidingsteken voor veranderingen" -#: src/diff3.c:1298 +#: src/diff3.c:1300 msgid "invalid diff format; incomplete last line" msgstr "ongeldige diff-opmaak: incomplete laatste regel" -#: src/diff3.c:1322 src/sdiff.c:275 src/util.c:970 +#: src/diff3.c:1324 src/sdiff.c:275 src/util.c:969 #, c-format msgid "subsidiary program '%s' could not be invoked" msgstr "hulpprogramma '%s' kan niet worden aangeroepen" -#: src/diff3.c:1347 +#: src/diff3.c:1349 msgid "invalid diff format; incorrect leading line chars" msgstr "ongeldige diff-opmaak: onjuiste tekens aan begin van regel" -#: src/diff3.c:1420 +#: src/diff3.c:1422 msgid "internal error: invalid diff type passed to output" msgstr "*interne programmafout*: ongeldig soort diff naar uitvoer gestuurd" -#: src/diff3.c:1694 src/diff3.c:1751 +#: src/diff3.c:1695 src/diff3.c:1752 msgid "input file shrank" msgstr "invoerbestand is gekrompen" @@ -1410,7 +1394,7 @@ msgid "%s: recursive directory loop" msgstr "%s: oneindige lus in de mappen" #. This is a proper name. See the gettext manual, section Names. -#: src/sdiff.c:42 +#: src/sdiff.c:43 msgid "Thomas Lord" msgstr "Thomas Lord" @@ -1433,7 +1417,7 @@ msgstr "-E, --ignore-tab-expansion omzettingen van tabs in spaties negeren" #: src/sdiff.c:177 msgid "-Z, --ignore-trailing-space ignore white space at line end" -msgstr "-Z, --ignore-trailing-space witruimte aan einde van regel negeren" +msgstr "-Z, --ignore-trailing-space witruimte aan einde van regel negeren" #: src/sdiff.c:178 msgid "" @@ -1531,7 +1515,7 @@ msgstr "" #: src/sdiff.c:208 msgid "Side-by-side merge of differences between FILE1 and FILE2." -msgstr "Twee bestanden naast elkaar weergeven." +msgstr "Twee bestanden en hun verschillen naast elkaar weergeven." #: src/sdiff.c:329 msgid "cannot interactively merge standard input" @@ -1565,15 +1549,30 @@ msgstr "" "v: Overeenkomende regels invoegen en tonen.\n" "q: Afsluiten.\n" -#: src/util.c:663 -#, fuzzy, c-format +#: src/util.c:662 +#, c-format msgid "unrecognized prefix: %s" -msgstr "%s: onbekende optie '--%s'\n" +msgstr "niet-herkend voorvoegsel: %s" -#: src/util.c:693 +#: src/util.c:692 #, c-format msgid "unparsable value for --palette" -msgstr "" +msgstr "onbegrepen waarde bij '--palette'" + +#~ msgid "%s: option '--%s' doesn't allow an argument\n" +#~ msgstr "%s: optie '--%s' staat geen argument toe\n" + +#~ msgid "%s: unrecognized option '--%s'\n" +#~ msgstr "%s: onbekende optie '--%s'\n" + +#~ msgid "%s: option '-W %s' is ambiguous\n" +#~ msgstr "%s: optie '-W %s' is niet eenduidig\n" + +#~ msgid "%s: option '-W %s' doesn't allow an argument\n" +#~ msgstr "%s: optie '-W %s' staat geen argument toe\n" + +#~ msgid "%s: option '-W %s' requires an argument\n" +#~ msgstr "%s: optie '-W %s' vereist een argument\n" #~ msgid "-i SKIP1:SKIP2 --ignore-initial=SKIP1:SKIP2" #~ msgstr "-i OVERSLAAN1:OVERSLAAN2 --ignore-initial=OVERSLAAN1:OVERSLAAN2" Binary files differ@@ -1,48 +1,48 @@ # Polish translations for the GNU diffutils messages -# Copyright (C) 1996, 2002, 2004, 2009, 2010, 2011, 2012 Free Software Foundation, Inc. +# Copyright (C) 1996, 2002, 2004, 2009, 2010, 2011, 2012, 2017 Free Software Foundation, Inc. # This file is distributed under the same license as the diffutils package. -# RafaÅ‚ Maszkowski <rzm@icm.edu.pl>„ 1996, 2002, 2004, 2009-2012 +# RafaÅ‚ Maszkowski <rzm@icm.edu.pl> 1996, 2002, 2004, 2009-2012, 2017 # Contributions: # PaweÅ‚ Krawczyk <kravietz@pipeta.chemia.pk.edu.pl>, 1996. # 23 corrections - Jakub Bogusz <qboosh@pld-linux.org>, 2004. # msgid "" msgstr "" -"Project-Id-Version: GNU diffutils 3.3-pre1\n" +"Project-Id-Version: GNU diffutils 3.5.25\n" "Report-Msgid-Bugs-To: bug-diffutils@gnu.org\n" -"POT-Creation-Date: 2016-08-20 22:22-0700\n" -"PO-Revision-Date: 2012-10-31 17:30+0100\n" +"POT-Creation-Date: 2017-05-21 13:26-0700\n" +"PO-Revision-Date: 2017-05-09 14:30+0200\n" "Last-Translator: RafaÅ‚ Maszkowski <rzm@icm.edu.pl>\n" "Language-Team: Polish <translation-team-pl@lists.sourceforge.net>\n" "Language: pl\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8-bit\n" +"X-Bugs: Report translation errors to the Language-Team address.\n" -#: lib/argmatch.c:133 -#, fuzzy, c-format +#: lib/argmatch.c:134 +#, c-format msgid "invalid argument %s for %s" -msgstr "bÅ‚Ä™dny argument %s%s: '%s'" +msgstr "argument %s bÅ‚Ä™dny w kontekÅ›cie %s" -#: lib/argmatch.c:134 +#: lib/argmatch.c:135 #, c-format msgid "ambiguous argument %s for %s" -msgstr "" +msgstr "argument %s bÅ‚Ä™dny w kontekÅ›cie %s" -#: lib/argmatch.c:153 -#, fuzzy +#: lib/argmatch.c:154 msgid "Valid arguments are:" -msgstr "bÅ‚Ä™dny argument %s%s: '%s'" +msgstr "PrawidÅ‚owe argumenty to:" -#: lib/c-stack.c:204 lib/c-stack.c:297 +#: lib/c-stack.c:203 lib/c-stack.c:296 msgid "program error" msgstr "bÅ‚Ä…d programu" -#: lib/c-stack.c:205 lib/c-stack.c:298 +#: lib/c-stack.c:204 lib/c-stack.c:297 msgid "stack overflow" msgstr "przepeÅ‚nienie stosu" -#: lib/error.c:191 +#: lib/error.c:195 msgid "Unknown system error" msgstr "Nieznany bÅ‚Ä…d systemu" @@ -52,7 +52,7 @@ msgstr "zwykÅ‚y pusty plik" #: lib/file-type.c:40 msgid "regular file" -msgstr "zwykÅ‚y plik" +msgstr "plik zwykÅ‚y" #: lib/file-type.c:43 msgid "directory" @@ -80,15 +80,15 @@ msgstr "obiekt w pamiÄ™ci z okreÅ›leniem typu" #: lib/file-type.c:66 msgid "block special file" -msgstr "specjalny plik blokowy" +msgstr "blokowy plik specjalny" #: lib/file-type.c:69 msgid "character special file" -msgstr "specjalny plik znakowy" +msgstr "znakowy plik specjalny" #: lib/file-type.c:72 msgid "contiguous data" -msgstr "" +msgstr "dane ciÄ…gÅ‚e" #: lib/file-type.c:75 msgid "fifo" @@ -96,43 +96,39 @@ msgstr "fifo" #: lib/file-type.c:78 msgid "door" -msgstr "" +msgstr "drzwi" #: lib/file-type.c:81 -#, fuzzy msgid "multiplexed block special file" -msgstr "specjalny plik blokowy" +msgstr "blokowy zwielokrotniony plik specjalny" #: lib/file-type.c:84 -#, fuzzy msgid "multiplexed character special file" -msgstr "specjalny plik znakowy" +msgstr "znakowy zwielokrotniony plik specjalny" #: lib/file-type.c:87 msgid "multiplexed file" -msgstr "" +msgstr "plik zwielokrotniony" #: lib/file-type.c:90 -#, fuzzy msgid "named file" -msgstr "dziwny plik" +msgstr "nazwany plik specjalny" #: lib/file-type.c:93 -#, fuzzy msgid "network special file" -msgstr "specjalny plik blokowy" +msgstr "sieciowy plik specjalny" #: lib/file-type.c:96 msgid "migrated file with data" -msgstr "" +msgstr "przemigrowany plik z danymi" #: lib/file-type.c:99 msgid "migrated file without data" -msgstr "" +msgstr "przemigrowany plik bez danych" #: lib/file-type.c:102 msgid "port" -msgstr "" +msgstr "port" #: lib/file-type.c:105 msgid "socket" @@ -140,71 +136,46 @@ msgstr "gniazdo" #: lib/file-type.c:108 msgid "whiteout" -msgstr "" +msgstr "plik zaÅ›lepka" #: lib/file-type.c:110 msgid "weird file" -msgstr "dziwny plik" - -#: lib/getopt.c:575 lib/getopt.c:604 -#, c-format -msgid "%s: option '%s' is ambiguous; possibilities:" -msgstr "%s: opcja '%s' jest niejednoznaczna; możliwoÅ›ci:" +msgstr "plik dziwny" -#: lib/getopt.c:619 -#, fuzzy, c-format -msgid "%s: option '%s' is ambiguous\n" -msgstr "%s: opcja '-W %s' jest niejednoznaczna\n" - -#: lib/getopt.c:654 lib/getopt.c:658 +#: lib/getopt.c:278 #, c-format -msgid "%s: option '--%s' doesn't allow an argument\n" -msgstr "%s: opcja '--%s' nie może mieć argumentu\n" +msgid "%s: option '%s%s' is ambiguous\n" +msgstr "%s: opcja „%s%s†jest niejednoznaczna\n" -#: lib/getopt.c:667 lib/getopt.c:672 +#: lib/getopt.c:284 #, c-format -msgid "%s: option '%c%s' doesn't allow an argument\n" -msgstr "%s: opcja '%c%s' nie może mieć argumentu\n" +msgid "%s: option '%s%s' is ambiguous; possibilities:" +msgstr "%s: opcja „%s%s†jest niejednoznaczna; możliwoÅ›ci:" -#: lib/getopt.c:715 lib/getopt.c:734 +#: lib/getopt.c:319 #, c-format -msgid "%s: option '--%s' requires an argument\n" -msgstr "%s: opcja '--%s' wymaga argumentu\n" +msgid "%s: unrecognized option '%s%s'\n" +msgstr "%s: nierozpoznana opcja „%s%sâ€\n" -#: lib/getopt.c:772 lib/getopt.c:775 +#: lib/getopt.c:345 #, c-format -msgid "%s: unrecognized option '--%s'\n" -msgstr "%s: nierozpoznana opcja '--%s'\n" +msgid "%s: option '%s%s' doesn't allow an argument\n" +msgstr "%s: opcja „%s%s†nie może mieć argumentu\n" -#: lib/getopt.c:783 lib/getopt.c:786 +#: lib/getopt.c:360 #, c-format -msgid "%s: unrecognized option '%c%s'\n" -msgstr "%s: nierozpoznana opcja '%c%s'\n" +msgid "%s: option '%s%s' requires an argument\n" +msgstr "%s: opcja „%s%s†wymaga argumentu\n" -#: lib/getopt.c:835 lib/getopt.c:838 +#: lib/getopt.c:621 #, c-format msgid "%s: invalid option -- '%c'\n" -msgstr "%s: bÅ‚Ä™dna opcja -- '%c'\n" +msgstr "%s: bÅ‚Ä™dna opcja -- „%c'\n" -#: lib/getopt.c:891 lib/getopt.c:908 lib/getopt.c:1118 lib/getopt.c:1136 +#: lib/getopt.c:636 lib/getopt.c:682 #, c-format msgid "%s: option requires an argument -- '%c'\n" -msgstr "%s: opcja wymaga argumentu -- '%c'\n" - -#: lib/getopt.c:964 lib/getopt.c:980 -#, c-format -msgid "%s: option '-W %s' is ambiguous\n" -msgstr "%s: opcja '-W %s' jest niejednoznaczna\n" - -#: lib/getopt.c:1004 lib/getopt.c:1022 -#, c-format -msgid "%s: option '-W %s' doesn't allow an argument\n" -msgstr "%s: opcja '-W %s' nie może mieć argumentu\n" - -#: lib/getopt.c:1043 lib/getopt.c:1061 -#, c-format -msgid "%s: option '-W %s' requires an argument\n" -msgstr "%s: opcja -W '%s' wymaga argumentu\n" +msgstr "%s: opcja wymaga argumentu -- „%câ€\n" #. TRANSLATORS: #. Get translations for open and closing quotation marks. @@ -227,11 +198,11 @@ msgstr "%s: opcja -W '%s' wymaga argumentu\n" #. If you don't know what to put here, please see #. <http://en.wikipedia.org/wiki/Quotation_marks_in_other_languages> #. and use glyphs suitable for your language. -#: lib/quotearg.c:347 +#: lib/quotearg.c:362 msgid "`" msgstr "„" -#: lib/quotearg.c:348 +#: lib/quotearg.c:363 msgid "'" msgstr "â€" @@ -264,13 +235,12 @@ msgid "Invalid back reference" msgstr "BÅ‚Ä™dny odnoÅ›nik wstecz" #: lib/regcomp.c:156 -#, fuzzy msgid "Unmatched [, [^, [:, [., or [=" -msgstr "Nie sparowany [ lub [^" +msgstr "Nie sparowany [, [^, [:, [., albo [=" #: lib/regcomp.c:159 msgid "Unmatched ( or \\(" -msgstr "Nie sparowany ( lub \\(" +msgstr "Nie sparowany ( albo \\(" #: lib/regcomp.c:162 msgid "Unmatched \\{" @@ -336,17 +306,17 @@ msgstr "nie udaÅ‚o siÄ™ ponownie otworzyć %s z uprawnieniami %s" #: lib/xstrtol-error.c:63 #, c-format msgid "invalid %s%s argument '%s'" -msgstr "bÅ‚Ä™dny argument %s%s: '%s'" +msgstr "bÅ‚Ä™dny argument %s%s: „%sâ€" #: lib/xstrtol-error.c:68 #, c-format msgid "invalid suffix in %s%s argument '%s'" -msgstr "bÅ‚Ä™dny przyrostek argumentu %s%s: '%s'" +msgstr "bÅ‚Ä™dny przyrostek argumentu %s%s: „%sâ€" #: lib/xstrtol-error.c:72 #, c-format msgid "%s%s argument '%s' too large" -msgstr "argument %s%s '%s' jest za duży" +msgstr "argument %s%s „%s†jest za duży" #: lib/version-etc.c:74 #, c-format @@ -363,7 +333,7 @@ msgstr "Pakowane przez %s\n" #. locale. Otherwise, do not translate "(C)"; leave it as-is. #: lib/version-etc.c:84 msgid "(C)" -msgstr "(C)" +msgstr "©" #: lib/version-etc.c:86 msgid "" @@ -522,7 +492,7 @@ msgstr "strona domowa %s: http://www.gnu.org/software/%s/\n" msgid "General help using GNU software: <http://www.gnu.org/gethelp/>\n" msgstr "Pomoc w używaniu oprogramowania GNU: http://www.gnu.org/gethelp/\n" -#: src/analyze.c:454 src/diff.c:1400 +#: src/analyze.c:454 src/diff.c:1401 #, c-format msgid "Files %s and %s differ\n" msgstr "Pliki %s i %s różniÄ… siÄ™\n" @@ -532,41 +502,41 @@ msgstr "Pliki %s i %s różniÄ… siÄ™\n" msgid "Binary files %s and %s differ\n" msgstr "Binarne pliki %s i %s różniÄ… siÄ™\n" -#: src/analyze.c:697 src/diff3.c:1463 src/util.c:1255 +#: src/analyze.c:706 src/diff3.c:1465 src/util.c:1254 msgid "No newline at end of file" msgstr "Brak znaku nowej linii na koÅ„cu pliku" #. This is a proper name. See the gettext manual, section Names. -#: src/cmp.c:43 +#: src/cmp.c:44 msgid "Torbjorn Granlund" msgstr "Torbjörn Granlund" #. This is a proper name. See the gettext manual, section Names. -#: src/cmp.c:44 +#: src/cmp.c:45 msgid "David MacKenzie" msgstr "David MacKenzie" -#: src/cmp.c:118 src/diff.c:875 src/diff3.c:459 src/sdiff.c:158 +#: src/cmp.c:119 src/diff.c:877 src/diff3.c:462 src/sdiff.c:159 #, c-format msgid "Try '%s --help' for more information." -msgstr "Napisz '%s --help' żeby dowiedzieć siÄ™ wiÄ™cej." +msgstr "Napisz „%s --help†żeby dowiedzieć siÄ™ wiÄ™cej." #: src/cmp.c:137 #, c-format msgid "invalid --ignore-initial value '%s'" -msgstr "bÅ‚Ä™dna wartość --ignore-initial '%s'" +msgstr "bÅ‚Ä™dna wartość --ignore-initial „%sâ€" #: src/cmp.c:147 #, c-format msgid "options -l and -s are incompatible" msgstr "sprzeczne opcje -l i -s" -#: src/cmp.c:155 src/diff.c:884 src/diff3.c:467 src/sdiff.c:167 src/sdiff.c:315 -#: src/sdiff.c:322 src/sdiff.c:874 src/util.c:853 src/util.c:953 src/util.c:960 +#: src/cmp.c:155 src/diff.c:885 src/diff3.c:469 src/sdiff.c:167 src/sdiff.c:315 +#: src/sdiff.c:322 src/sdiff.c:874 src/util.c:852 src/util.c:952 src/util.c:959 msgid "write failed" msgstr "zapis nieudany" -#: src/cmp.c:157 src/diff.c:886 src/diff.c:1465 src/diff3.c:469 src/sdiff.c:169 +#: src/cmp.c:157 src/diff.c:887 src/diff.c:1466 src/diff3.c:471 src/sdiff.c:169 msgid "standard output" msgstr "standardowe wyjÅ›cie" @@ -626,7 +596,7 @@ msgstr "" "Opcjonalne argumenty OMIŃ1 i OMIŃ2 to liczby bajtów do pominiÄ™cia na\n" "poczÄ…tku każdego z plików (domyÅ›lnie zero)." -#: src/cmp.c:185 src/diff.c:996 src/diff3.c:507 src/sdiff.c:210 +#: src/cmp.c:185 src/diff.c:997 src/diff3.c:509 src/sdiff.c:210 msgid "" "Mandatory arguments to long options are mandatory for short options too.\n" msgstr "ObowiÄ…zkowe argumenty dÅ‚ugich opcji sÄ… obowiÄ…zkowe też dla krótkich.\n" @@ -643,9 +613,9 @@ msgstr "" #: src/cmp.c:194 msgid "If a FILE is '-' or missing, read standard input." -msgstr "Jeżeli PLIK to '-' lub go brak, czytane jest standardowe wejÅ›cie." +msgstr "Jeżeli PLIK to „-†lub go brak, czytane jest standardowe wejÅ›cie." -#: src/cmp.c:195 src/diff.c:984 src/sdiff.c:220 +#: src/cmp.c:195 src/diff.c:985 src/sdiff.c:220 msgid "Exit status is 0 if inputs are the same, 1 if different, 2 if trouble." msgstr "" "Status wyjÅ›ciowy ma wartość 0 gdy pliki wejÅ›ciowe sÄ… takie same, 1 - jeżeli\n" @@ -654,252 +624,267 @@ msgstr "" #: src/cmp.c:240 #, c-format msgid "invalid --bytes value '%s'" -msgstr "bÅ‚Ä™dna wartość --bytes '%s'" +msgstr "bÅ‚Ä™dna wartość --bytes „%sâ€" -#: src/cmp.c:266 src/diff.c:793 src/diff3.c:353 src/sdiff.c:565 +#: src/cmp.c:266 src/diff.c:795 src/diff3.c:356 src/sdiff.c:565 #, c-format msgid "missing operand after '%s'" -msgstr "brakujÄ…cy argument po '%s'" +msgstr "brakujÄ…cy argument po „%sâ€" -#: src/cmp.c:278 src/diff.c:795 src/diff3.c:355 src/sdiff.c:567 +#: src/cmp.c:278 src/diff.c:797 src/diff3.c:358 src/sdiff.c:567 #, c-format msgid "extra operand '%s'" -msgstr "nadmiarowy argument '%s'" +msgstr "nadmiarowy argument „%sâ€" -#: src/cmp.c:494 +#: src/cmp.c:498 #, c-format msgid "%s %s differ: byte %s, line %s\n" msgstr "%s %s różniÄ… siÄ™: bajt %s, linia %s\n" -#: src/cmp.c:510 +#: src/cmp.c:514 #, c-format msgid "%s %s differ: byte %s, line %s is %3o %s %3o %s\n" msgstr "%s %s różniÄ… siÄ™: bajt %s, linia %s zawiera %3o %s %3o %s\n" -#: src/cmp.c:562 +#: src/cmp.c:571 +#, c-format +msgid "cmp: EOF on %s which is empty\n" +msgstr "cmp: EOF w %s, który jest pusty\n" + +#: src/cmp.c:585 +#, c-format +msgid "cmp: EOF on %s after byte %s, line %s\n" +msgstr "cmp: EOF w %s, po bajcie %s, linii %s\n" + +#: src/cmp.c:586 +#, c-format +msgid "cmp: EOF on %s after byte %s, in line %s\n" +msgstr "cmp: EOF w %s, po bajcie %s, w linii %s\n" + +#: src/cmp.c:592 #, c-format -msgid "cmp: EOF on %s\n" -msgstr "cmp: EOF przy %s\n" +msgid "cmp: EOF on %s after byte %s\n" +msgstr "cmp: EOF w %s, po bajcie %s\n" #. This is a proper name. See the gettext manual, section Names. -#: src/diff.c:49 +#: src/diff.c:50 msgid "Paul Eggert" msgstr "Paul Eggert" #. This is a proper name. See the gettext manual, section Names. -#: src/diff.c:50 +#: src/diff.c:51 msgid "Mike Haertel" msgstr "Mike Haertel" #. This is a proper name. See the gettext manual, section Names. -#: src/diff.c:51 +#: src/diff.c:52 msgid "David Hayes" msgstr "David Hayes" #. This is a proper name. See the gettext manual, section Names. -#: src/diff.c:52 +#: src/diff.c:53 msgid "Richard Stallman" msgstr "Richard Stallman" #. This is a proper name. See the gettext manual, section Names. -#: src/diff.c:53 +#: src/diff.c:54 msgid "Len Tower" msgstr "Len Tower" -#: src/diff.c:351 +#: src/diff.c:353 #, c-format msgid "invalid context length '%s'" -msgstr "bÅ‚Ä™dna dÅ‚ugość kontekstu '%s'" +msgstr "bÅ‚Ä™dna dÅ‚ugość kontekstu „%sâ€" -#: src/diff.c:434 +#: src/diff.c:436 #, c-format msgid "pagination not supported on this host" msgstr "stronicowanie nie jest możliwe na tej maszynie" -#: src/diff.c:449 src/diff3.c:335 +#: src/diff.c:451 src/diff3.c:336 #, c-format msgid "too many file label options" msgstr "za dużo opcji etykietowania plików" -#: src/diff.c:526 +#: src/diff.c:528 #, c-format msgid "invalid width '%s'" -msgstr "bÅ‚Ä™dna szerokość '%s'" +msgstr "bÅ‚Ä™dna szerokość „%sâ€" -#: src/diff.c:530 +#: src/diff.c:532 msgid "conflicting width options" msgstr "sprzeczne opcje szerokoÅ›ci" -#: src/diff.c:555 +#: src/diff.c:557 #, c-format msgid "invalid horizon length '%s'" -msgstr "bÅ‚Ä™dna dÅ‚ugość horyzontu '%s'" +msgstr "bÅ‚Ä™dna dÅ‚ugość horyzontu „%sâ€" -#: src/diff.c:611 +#: src/diff.c:613 #, c-format msgid "invalid tabsize '%s'" -msgstr "bÅ‚Ä™dny rozmiar tabulacji '%s'" +msgstr "bÅ‚Ä™dny rozmiar tabulacji „%sâ€" -#: src/diff.c:615 +#: src/diff.c:617 msgid "conflicting tabsize options" msgstr "sprzeczne opcje rozmiarów TAB-a" -#: src/diff.c:770 +#: src/diff.c:772 msgid "--from-file and --to-file both specified" msgstr "równoczeÅ›nie podane --from-file i --to-file" -#: src/diff.c:890 +#: src/diff.c:891 msgid " --normal output a normal diff (the default)" msgstr "" "--normal wynik w postaci zwykÅ‚ego diff-a (domyÅ›lnie)" -#: src/diff.c:891 +#: src/diff.c:892 msgid "-q, --brief report only when files differ" msgstr "" "-q --brief wypisanie wyniku tylko gdy pliki siÄ™ różniÄ…" -#: src/diff.c:892 +#: src/diff.c:893 msgid "-s, --report-identical-files report when two files are the same" msgstr "-s --report-identical-files informowanie gdy dwa pliki sÄ… takie same" -#: src/diff.c:893 +#: src/diff.c:894 msgid "" "-c, -C NUM, --context[=NUM] output NUM (default 3) lines of copied context" msgstr "" "-c, -C NUM, --context[=ILE] wypisanie ILU (domyÅ›lnie 3) linii kontekstu" -#: src/diff.c:894 +#: src/diff.c:895 msgid "" "-u, -U NUM, --unified[=NUM] output NUM (default 3) lines of unified context" msgstr "" "--u, -U ILE, --unified=ILE wypisanie najwyżej ILE (domyÅ›lnie 3)\n" " linii kontekstu w trybie unified" -#: src/diff.c:895 +#: src/diff.c:896 msgid "-e, --ed output an ed script" msgstr "-e --ed wynik w postaci poleceÅ„ ed-a" -#: src/diff.c:896 +#: src/diff.c:897 msgid "-n, --rcs output an RCS format diff" msgstr "-n --rcs wynik w postaci diff-a z RCS" -#: src/diff.c:897 +#: src/diff.c:898 msgid "-y, --side-by-side output in two columns" msgstr "-y, --side-by-side wyniki w dwóch kolumnach" -#: src/diff.c:898 +#: src/diff.c:899 msgid "" "-W, --width=NUM output at most NUM (default 130) print columns" msgstr "" "-W, --width=ILE wypisanie najwyżej ILE (domyÅ›lnie 130) kolumn" -#: src/diff.c:899 +#: src/diff.c:900 msgid "" " --left-column output only the left column of common lines" msgstr "" " --left-column wypisanie tylko lewej kolumny dla wspólnych " "linii" -#: src/diff.c:900 +#: src/diff.c:901 msgid " --suppress-common-lines do not output common lines" msgstr " --suppress-common-lines bez wypisania wspólnych linii" -#: src/diff.c:902 +#: src/diff.c:903 msgid "-p, --show-c-function show which C function each change is in" msgstr "-p, --show-c-function podanie w jakiej funkcji C sÄ… zmiany" -#: src/diff.c:903 +#: src/diff.c:904 msgid "-F, --show-function-line=RE show the most recent line matching RE" msgstr "" "-F, --show-function-line=WYRREG wypisanie ostatniej linii pasujÄ…cej do " "WYRREG" -#: src/diff.c:904 -#, fuzzy +#: src/diff.c:905 msgid "" " --label LABEL use LABEL instead of file name and timestamp\n" " (can be repeated)" msgstr "" -" --label ETYKIETA użycie ETYKIETY zamiast nazwy pliku\n" -" (może być powtarzane)" +" --label ETYKIETA użycie ETYKIETY zamiast nazwy pliku i " +"znacznika\n" +" czasu (może być powtarzane)" -#: src/diff.c:907 +#: src/diff.c:908 msgid "-t, --expand-tabs expand tabs to spaces in output" msgstr "-t --expand-tabs rozwiniÄ™cie TAB-ów w spacje w wyniku" -#: src/diff.c:908 +#: src/diff.c:909 msgid "-T, --initial-tab make tabs line up by prepending a tab" msgstr "-T --initial-tab wyrównanie linii przez użycie TAB-ów" -#: src/diff.c:909 +#: src/diff.c:910 msgid "" " --tabsize=NUM tab stops every NUM (default 8) print columns" msgstr " --tabsize=ILE TAB-y co ILE (domyÅ›lnie 8) kolumn" -#: src/diff.c:910 +#: src/diff.c:911 msgid "" " --suppress-blank-empty suppress space or tab before empty output lines" msgstr "" " --suppress-blank-empty bez wypisywania spacji i znaków TAB przed\n" " pustymi liniami" -#: src/diff.c:911 +#: src/diff.c:912 msgid "-l, --paginate pass output through 'pr' to paginate it" msgstr "" -"-I --paginate przepuszczenie wyniku przez 'pr' żeby go " +"-I --paginate przepuszczenie wyniku przez „pr†żeby go " "stronnicować" -#: src/diff.c:913 +#: src/diff.c:914 msgid "" "-r, --recursive recursively compare any subdirectories found" msgstr "-r --recursive porównanie podkatalogów rekurencyjnie" -#: src/diff.c:914 +#: src/diff.c:915 msgid " --no-dereference don't follow symbolic links" msgstr "" " --no-dereference bez podążania za dowiÄ…zaniami symbolicznymi" -#: src/diff.c:915 +#: src/diff.c:916 msgid "-N, --new-file treat absent files as empty" msgstr "" "-N --new-file traktowanie brakujÄ…cych plików jak pustych" -#: src/diff.c:916 +#: src/diff.c:917 msgid " --unidirectional-new-file treat absent first files as empty" msgstr "" " --unidirectional-new-file traktowanie brakujÄ…cych pierwszych plików\n" " w pierwszym zestawie jako pustych" -#: src/diff.c:917 +#: src/diff.c:918 msgid " --ignore-file-name-case ignore case when comparing file names" msgstr "" " --ignore-space-change zignorowanie wielkoÅ›ci liter przy\n" " porównywaniu nazw plików" -#: src/diff.c:918 +#: src/diff.c:919 msgid " --no-ignore-file-name-case consider case when comparing file names" msgstr "" " --no-ignore-file-name-case uwzglÄ™dnianie wielkoÅ›ci liter przy\n" " porównywaniu nazw plików" -#: src/diff.c:919 +#: src/diff.c:920 msgid "-x, --exclude=PAT exclude files that match PAT" msgstr "-x, --exclude=WZÓR wykluczenie plików pasujÄ…cych do WZORU" -#: src/diff.c:920 +#: src/diff.c:921 msgid "" "-X, --exclude-from=FILE exclude files that match any pattern in FILE" msgstr "" "-X, --exclude-from=PLIK pominiÄ™cie plików pasujÄ…cych do wzorców w " "PLIKU" -#: src/diff.c:921 +#: src/diff.c:922 msgid "" "-S, --starting-file=FILE start with FILE when comparing directories" msgstr "" "-S, --starting-file=PLIK zacznij od PLIKU przy porównywaniu katalogów" -#: src/diff.c:922 +#: src/diff.c:923 msgid "" " --from-file=FILE1 compare FILE1 to all operands;\n" " FILE1 can be a directory" @@ -907,7 +892,7 @@ msgstr "" " --from-file=PLIK1 porównanie PLIKU1 z wszystkimi\n" " argumentami; PLIK1 może być katalogiem" -#: src/diff.c:924 +#: src/diff.c:925 msgid "" " --to-file=FILE2 compare all operands to FILE2;\n" " FILE2 can be a directory" @@ -915,85 +900,85 @@ msgstr "" " --to-file=PLIK2 porównanie wszystkich argumentów\n" " z PLIKIEM2; PLIK2 może być katalogiem" -#: src/diff.c:927 +#: src/diff.c:928 msgid "" "-i, --ignore-case ignore case differences in file contents" msgstr "" "-i --ignore-case ignorowanie różnic miÄ™dzy wielkimi i maÅ‚ymi " "literami" -#: src/diff.c:928 +#: src/diff.c:929 msgid "-E, --ignore-tab-expansion ignore changes due to tab expansion" msgstr "" "-E --ignore-tab-expansion zignorowanie zmian spowodowanych\n" " rozwiniÄ™ciem TAB-ów" -#: src/diff.c:929 +#: src/diff.c:930 msgid "-Z, --ignore-trailing-space ignore white space at line end" msgstr "" "-Z --ignore-trailing-space ignorowanie znaków odstÄ™pu na koÅ„cu linii" -#: src/diff.c:930 +#: src/diff.c:931 msgid "" "-b, --ignore-space-change ignore changes in the amount of white space" msgstr "" "-b --ignore-space-change Zignorowanie zmian iloÅ›ci znaków odstÄ™pu" -#: src/diff.c:931 +#: src/diff.c:932 msgid "-w, --ignore-all-space ignore all white space" msgstr "-w --ignore-all-space zignorowanie znaków odstÄ™pu" -#: src/diff.c:932 +#: src/diff.c:933 msgid "" "-B, --ignore-blank-lines ignore changes where lines are all blank" msgstr "" "-B --ignore-blank-lines zignorowanie zmian liczby pustych linii" -#: src/diff.c:933 +#: src/diff.c:934 msgid "-I, --ignore-matching-lines=RE ignore changes where all lines match RE" msgstr "" "-I, --ignore-matching-lines=RE zignorowanie zmian w liniach pasujÄ…cych\n" " do RE" -#: src/diff.c:935 +#: src/diff.c:936 msgid "-a, --text treat all files as text" msgstr "-a --text traktowanie plików jako tekstowych" -#: src/diff.c:936 +#: src/diff.c:937 msgid " --strip-trailing-cr strip trailing carriage return on input" msgstr "" "--strip-trailing-cr pominiÄ™cie znaków nowej linii na wejÅ›ciu" -#: src/diff.c:938 +#: src/diff.c:939 msgid " --binary read and write data in binary mode" msgstr "--binary czytanie i zapisywanie danych binarnie" -#: src/diff.c:941 +#: src/diff.c:942 msgid "" "-D, --ifdef=NAME output merged file with '#ifdef NAME' diffs" msgstr "" "-D, --ifdef=NAZWA wypisanie poÅ‚Ä…czonego pliku dla pokazania\n" -" różnic w '#ifdef NAZWA'" +" różnic w „#ifdef NAZWAâ€" -#: src/diff.c:942 +#: src/diff.c:943 msgid " --GTYPE-group-format=GFMT format GTYPE input groups with GFMT" msgstr "" " --GTYPE-group-format=FMTG użyciem FMTF do sformatowania grup\n" " wejÅ›ciowych typu GTYPE" -#: src/diff.c:943 +#: src/diff.c:944 msgid " --line-format=LFMT format all input lines with LFMT" msgstr "" " --line-format=LFMT podobnie, ale z użyciem LFMT do\n" " sformatowania linii wejÅ›ciowych" -#: src/diff.c:944 +#: src/diff.c:945 msgid " --LTYPE-line-format=LFMT format LTYPE input lines with LFMT" msgstr "" " --LTYPE-line-format=FMTL użycie FMTL do sformatowania linii\n" " wejÅ›ciowych typu LTYPE" -#: src/diff.c:945 +#: src/diff.c:946 msgid "" " These format options provide fine-grained control over the output\n" " of diff, generalizing -D/--ifdef." @@ -1001,11 +986,13 @@ msgstr "" " Te opcje formatowania dajÄ… dokÅ‚adnÄ… kontrolÄ™ nad wynikami diff-a,\n" " sÄ… uogólnieniem -D/--ifdef." -#: src/diff.c:947 +#: src/diff.c:948 msgid " LTYPE is 'old', 'new', or 'unchanged'. GTYPE is LTYPE or 'changed'." -msgstr "TYPL to 'old', 'new' albo 'unchanged'. TYPG to TYPL albo 'changed'." +msgstr "" +"TYPL to „old†(stary), „new†(nowy) albo „unchanged†(nie zmieniony).\n" +"TYPG to TYPL albo „changed†(zmieniony)." -#: src/diff.c:948 +#: src/diff.c:949 msgid "" " GFMT (only) may contain:\n" " %< lines from FILE1\n" @@ -1033,7 +1020,7 @@ msgstr "" " E F-1\n" " M L+1 %(A=B?T:E) jeżeli A równa siÄ™ B, to T, jeżeli nie, to E" -#: src/diff.c:960 +#: src/diff.c:961 msgid "" " LFMT (only) may contain:\n" " %L contents of line\n" @@ -1045,7 +1032,7 @@ msgstr "" " %l zawartość linii z wyÅ‚Ä…czeniem znaku nowej linii\n" " %[-][SZER][.[DOKÅ]]{doxX}n specyfikacjÄ™ numeru linii w stylu printf" -#: src/diff.c:964 +#: src/diff.c:965 msgid "" " Both GFMT and LFMT may contain:\n" " %% %\n" @@ -1056,156 +1043,153 @@ msgstr "" " Zarówno FMTG jak FMTL mogÄ… zawierać:\n" " %% %\n" " %c'Z' pojedynczy znak Z\n" -" %c'\\OOO' znak o kodzie ósemkowym OOO Z znak Z (inne znaki " -"reprezentujÄ… same siebie)" +" %c'\\OOO' znak o kodzie ósemkowym OOO\n" +" Z znak Z (inne znaki reprezentujÄ… same siebie)" -#: src/diff.c:970 +#: src/diff.c:971 msgid "-d, --minimal try hard to find a smaller set of changes" msgstr "" "-d --minimal usiÅ‚owanie znalezienia mniejszego zbioru zmian" -#: src/diff.c:971 +#: src/diff.c:972 msgid " --horizon-lines=NUM keep NUM lines of the common prefix and suffix" msgstr "" " --horizon-lines=ILE zostawienie ILE linii wspólnego przedrostka i " "przyrostka" -#: src/diff.c:972 +#: src/diff.c:973 msgid "" " --speed-large-files assume large files and many scattered small changes" msgstr "" " --speed-large-files zaÅ‚ożenie: duże pliki i rozrzucone maÅ‚e zmiany" -#: src/diff.c:973 -msgid "" -" --color[=WHEN] colorize the output; WHEN can be 'never', 'always'," -msgstr "" - #: src/diff.c:974 -#, fuzzy -msgid " or 'auto' (the default)" -msgstr "" -"--normal wynik w postaci zwykÅ‚ego diff-a (domyÅ›lnie)" - -#: src/diff.c:975 msgid "" -" --palette=PALETTE specify the colors to use when --color is active" +" --color[=WHEN] colorize the output; WHEN can be 'never', " +"'always',\n" +" or 'auto' (the default)" msgstr "" +" --color[=KIEDY] kolorowe wyniki; KIEDY to „never†(nigdy), " +"„alwaysâ€\n" +" (zawsze) albo „auto†(wartość domyÅ›lna)" #: src/diff.c:976 msgid "" -" PALETTE is a colon-separated list terminfo " -"capabilities" +" --palette=PALETTE the colors to use when --color is active; PALETTE " +"is\n" +" a colon-separated list of terminfo capabilities" msgstr "" +" --palette=PALETA kolory do użycia przy wÅ‚Ä…czonym --color;\n" +" PALETA jest listÄ… oddzielonych dwukropkami\n" +" wÅ‚aÅ›ciwoÅ›ci terminfo" -#: src/diff.c:978 +#: src/diff.c:979 msgid " --help display this help and exit" msgstr " --help wypisanie tej pomocy i zakoÅ„czenie" -#: src/diff.c:979 +#: src/diff.c:980 msgid "-v, --version output version information and exit" msgstr "-v --version wypisanie informacji o wersji i zakoÅ„czenie" -#: src/diff.c:981 -#, fuzzy +#: src/diff.c:982 msgid "FILES are 'FILE1 FILE2' or 'DIR1 DIR2' or 'DIR FILE' or 'FILE DIR'." msgstr "" -"PLIKI to 'PLIK1 PLIK2' albo 'KATALOG1 KATALOG2' albo 'KATALOG PLIK...' albo\n" -"'PLIK... KATALOG'." +"PLIKI to „PLIK1 PLIK2†albo „KATALOG1 KATALOG2†albo „KATALOG PLIK†albo\n" +"„PLIK KATALOGâ€." -#: src/diff.c:982 +#: src/diff.c:983 msgid "" "If --from-file or --to-file is given, there are no restrictions on FILE(s)." msgstr "" "Jeżeli użyta jest opcja --from-file albo --to-file, nie ma ograniczeÅ„ co do\n" "PLIKU/ÓW." -#: src/diff.c:983 src/diff3.c:526 src/sdiff.c:219 +#: src/diff.c:984 src/diff3.c:528 src/sdiff.c:219 msgid "If a FILE is '-', read standard input." -msgstr "Jeżeli PLIK to '-', czytane jest standardowe wejÅ›cie." +msgstr "Jeżeli PLIK to „-â€, czytane jest standardowe wejÅ›cie." -#: src/diff.c:993 +#: src/diff.c:994 #, c-format msgid "Usage: %s [OPTION]... FILES\n" msgstr "SkÅ‚adnia: %s [OPCJA]... PLIKI\n" -#: src/diff.c:994 +#: src/diff.c:995 msgid "Compare FILES line by line." msgstr "Porównanie PLIKÓW kolejnymi liniami." -#: src/diff.c:1028 +#: src/diff.c:1029 #, c-format msgid "conflicting %s option value '%s'" -msgstr "sprzeczna wartość opcji %s: '%s'" +msgstr "sprzeczna wartość opcji %s: „%sâ€" -#: src/diff.c:1041 +#: src/diff.c:1042 #, c-format msgid "conflicting output style options" msgstr "sprzeczne opcje stylu wyniku" -#: src/diff.c:1057 -#, fuzzy, c-format +#: src/diff.c:1058 +#, c-format msgid "invalid color '%s'" -msgstr "bÅ‚Ä™dna szerokość '%s'" +msgstr "bÅ‚Ä™dny kolor „%sâ€" -#: src/diff.c:1113 src/diff.c:1323 +#: src/diff.c:1114 src/diff.c:1324 #, c-format msgid "Only in %s: %s\n" msgstr "Tylko w %s: %s\n" -#: src/diff.c:1247 +#: src/diff.c:1248 msgid "cannot compare '-' to a directory" -msgstr "nie można porównać '-' z katalogiem" +msgstr "nie można porównać „-†z katalogiem" -#: src/diff.c:1282 +#: src/diff.c:1283 msgid "-D option not supported with directories" msgstr "opcja -D nie dziaÅ‚a dla katalogów" -#: src/diff.c:1291 +#: src/diff.c:1292 #, c-format msgid "Common subdirectories: %s and %s\n" msgstr "Wspólne podkatalogi: %s i %s\n" -#: src/diff.c:1333 src/diff.c:1383 +#: src/diff.c:1334 src/diff.c:1384 #, c-format msgid "File %s is a %s while file %s is a %s\n" msgstr "Plik %s jest %s, podczas gdy plik %s jest %s\n" -#: src/diff.c:1369 +#: src/diff.c:1370 #, c-format msgid "Symbolic links %s and %s differ\n" msgstr "DowiÄ…zania symboliczne %s i %s różniÄ… siÄ™\n" -#: src/diff.c:1456 +#: src/diff.c:1457 #, c-format msgid "Files %s and %s are identical\n" msgstr "Pliki %s i %s sÄ… identyczne\n" #. This is a proper name. See the gettext manual, section Names. -#: src/diff3.c:41 +#: src/diff3.c:42 msgid "Randy Smith" msgstr "Randy Smith" -#: src/diff3.c:348 +#: src/diff3.c:351 #, c-format msgid "incompatible options" msgstr "niezgodne opcje" -#: src/diff3.c:388 +#: src/diff3.c:391 msgid "'-' specified for more than one input file" -msgstr "'-' podany dla wiÄ™cej niż jednego pliku wejÅ›ciowego" +msgstr "„-†podany dla wiÄ™cej niż jednego pliku wejÅ›ciowego" -#: src/diff3.c:439 src/diff3.c:1288 src/diff3.c:1692 src/diff3.c:1747 +#: src/diff3.c:442 src/diff3.c:1290 src/diff3.c:1693 src/diff3.c:1748 #: src/sdiff.c:307 src/sdiff.c:844 src/sdiff.c:855 msgid "read failed" msgstr "nieudany odczyt" -#: src/diff3.c:473 +#: src/diff3.c:475 msgid "-A, --show-all output all changes, bracketing conflicts" msgstr "" "-A --show-all wypisanie wszystkich zmian, konflikty w nawiasach" -#: src/diff3.c:475 +#: src/diff3.c:477 msgid "" "-e, --ed output ed script incorporating changes\n" " from OLDFILE to YOURFILE into MYFILE" @@ -1213,31 +1197,31 @@ msgstr "" "-e --ed wypisanie niezÅ‚Ä…czonych zmian miÄ™dzy\n" " STARY_PLIK a NOWY_PLIK do MÓJ_PLIK" -#: src/diff3.c:477 +#: src/diff3.c:479 msgid "-E, --show-overlap like -e, but bracket conflicts" msgstr "-E --show-overlap jak -e, ale z konfliktami w nawiasach" -#: src/diff3.c:478 +#: src/diff3.c:480 msgid "" "-3, --easy-only like -e, but incorporate only nonoverlapping " "changes" msgstr "" "-3 --easy-only jak -e, ale z tylko z nienachodzÄ…cymi zmianami" -#: src/diff3.c:479 +#: src/diff3.c:481 msgid "" "-x, --overlap-only like -e, but incorporate only overlapping changes" msgstr "-x --overlap-only jak -e, ale tylko z nachodzÄ…cymi zmianami" -#: src/diff3.c:480 +#: src/diff3.c:482 msgid "-X like -x, but bracket conflicts" msgstr "-X jak -x, ale z konfliktami w nawiasach" -#: src/diff3.c:481 +#: src/diff3.c:483 msgid "-i append 'w' and 'q' commands to ed scripts" -msgstr "-i dodanie poleceÅ„ 'w' i 'q' do skryptu ed-a" +msgstr "-i dodanie poleceÅ„ „w†i „q†do skryptu ed-a" -#: src/diff3.c:483 +#: src/diff3.c:485 msgid "" "-m, --merge output actual merged file, according to\n" " -A if no other options are given" @@ -1245,23 +1229,23 @@ msgstr "" "-m, --merge wypisanie poÅ‚Ä…czonego pliku zgodnie z -A,\n" " jeżeli nie byÅ‚o innych opcji" -#: src/diff3.c:486 +#: src/diff3.c:488 msgid "-a, --text treat all files as text" msgstr "-a --text traktowanie plików jako tekstowych" -#: src/diff3.c:487 +#: src/diff3.c:489 msgid " --strip-trailing-cr strip trailing carriage return on input" msgstr "--strip-trailing-cr pominiÄ™cie znaków nowej linii na wejÅ›ciu" -#: src/diff3.c:488 +#: src/diff3.c:490 msgid "-T, --initial-tab make tabs line up by prepending a tab" msgstr "-T --initial-tab wyrównanie linii przez użycie TAB-ów" -#: src/diff3.c:489 +#: src/diff3.c:491 msgid " --diff-program=PROGRAM use PROGRAM to compare files" msgstr "--diff-program=PROGRAM użycie PROGRAMU do porównania plików" -#: src/diff3.c:490 +#: src/diff3.c:492 msgid "" "-L, --label=LABEL use LABEL instead of file name\n" " (can be repeated up to three times)" @@ -1269,25 +1253,25 @@ msgstr "" "-L, --label=ETYKIETA użycie ETYKIETY zamiast nazwy pliku\n" " (może być powtarzane do trzech razy)" -#: src/diff3.c:493 +#: src/diff3.c:495 msgid " --help display this help and exit" msgstr " --help wypisanie tej pomocy i zakoÅ„czenie" -#: src/diff3.c:494 +#: src/diff3.c:496 msgid "-v, --version output version information and exit" msgstr "" "-v --version wypisanie informacji o wersji i zakoÅ„czenie" -#: src/diff3.c:503 +#: src/diff3.c:505 #, c-format msgid "Usage: %s [OPTION]... MYFILE OLDFILE YOURFILE\n" msgstr "SkÅ‚adnia: %s [OPCJA]... MÓJ_PLIK STARY_PLIK TWÓJ_PLIK\n" -#: src/diff3.c:505 +#: src/diff3.c:507 msgid "Compare three files line by line." msgstr "Porównanie trzech plików linia po linii." -#: src/diff3.c:515 +#: src/diff3.c:517 msgid "" "\n" "The default output format is a somewhat human-readable representation of\n" @@ -1311,54 +1295,54 @@ msgstr "" "różnice i wypisuje poÅ‚Ä…czony plik. Przy nietypowych danych wejÅ›ciowych\n" "jest to bardziej elastyczne niż użycie ed-a.\n" -#: src/diff3.c:527 +#: src/diff3.c:529 msgid "Exit status is 0 if successful, 1 if conflicts, 2 if trouble." msgstr "" "Status wyjÅ›ciowy ma wartość 0 gdy polecenie wykonaÅ‚o siÄ™ z prawidÅ‚owym\n" "wynikiem, 1 - jeżeli sÄ… konflikty, 2 - jeżeli sÄ… problemy." -#: src/diff3.c:720 +#: src/diff3.c:722 msgid "internal error: screwup in format of diff blocks" msgstr "bÅ‚ad wewnÄ™trzny: spieprzony format bloków diff" -#: src/diff3.c:1015 +#: src/diff3.c:1017 #, c-format msgid "%s: diff failed: " msgstr "%s: diff nie zadziaÅ‚aÅ‚: " -#: src/diff3.c:1037 +#: src/diff3.c:1039 msgid "internal error: invalid diff type in process_diff" msgstr "bÅ‚Ä…d wewnÄ™trzny: bÅ‚Ä™dny typ diff w process_diff" -#: src/diff3.c:1062 +#: src/diff3.c:1064 msgid "invalid diff format; invalid change separator" msgstr "bÅ‚Ä™dny format diff; bÅ‚Ä™dny separator zmian" -#: src/diff3.c:1298 +#: src/diff3.c:1300 msgid "invalid diff format; incomplete last line" msgstr "bÅ‚Ä™dny format diff; niekompletna ostatnia linia" -#: src/diff3.c:1322 src/sdiff.c:275 src/util.c:970 +#: src/diff3.c:1324 src/sdiff.c:275 src/util.c:969 #, c-format msgid "subsidiary program '%s' could not be invoked" -msgstr "nie mógÅ‚ być wywoÅ‚any program pomocniczy '%s'" +msgstr "nie mógÅ‚ być wywoÅ‚any program pomocniczy „%sâ€" -#: src/diff3.c:1347 +#: src/diff3.c:1349 msgid "invalid diff format; incorrect leading line chars" msgstr "bÅ‚Ä™dny format diff; nieprawidÅ‚owe znaki na poczÄ…tku linii" -#: src/diff3.c:1420 +#: src/diff3.c:1422 msgid "internal error: invalid diff type passed to output" msgstr "bÅ‚Ä…d wenwÄ™trzny: bÅ‚Ä™dny typ diff-a przekazany na wyjÅ›cie" -#: src/diff3.c:1694 src/diff3.c:1751 +#: src/diff3.c:1695 src/diff3.c:1752 msgid "input file shrank" msgstr "plik wejÅ›ciowy siÄ™ zmniejszyÅ‚" #: src/dir.c:156 #, c-format msgid "cannot compare file names '%s' and '%s'" -msgstr "nie można porównać nazw plików '%s' i '%s'" +msgstr "nie można porównać nazw plików „%s†i „%sâ€" #: src/dir.c:225 #, c-format @@ -1366,7 +1350,7 @@ msgid "%s: recursive directory loop" msgstr "%s: rekurencyjne zapÄ™tlenie katalogów" #. This is a proper name. See the gettext manual, section Names. -#: src/sdiff.c:42 +#: src/sdiff.c:43 msgid "Thomas Lord" msgstr "Thomas Lord" @@ -1510,12 +1494,12 @@ msgstr "" "v:\tDoÅ‚Ä…czenie wspólnych linii z podaniem informacji.\n" "q:\tZakoÅ„czenie.\n" -#: src/util.c:663 -#, fuzzy, c-format +#: src/util.c:662 +#, c-format msgid "unrecognized prefix: %s" -msgstr "%s: nierozpoznana opcja '--%s'\n" +msgstr "nierozpoznany prefiks: %s" -#: src/util.c:693 +#: src/util.c:692 #, c-format msgid "unparsable value for --palette" -msgstr "" +msgstr "wartość --palette niemożliwa do rozbioru" diff --git a/po/pt_BR.gmo b/po/pt_BR.gmo Binary files differindex e8ae7ac..3d5b75a 100644 --- a/po/pt_BR.gmo +++ b/po/pt_BR.gmo diff --git a/po/pt_BR.po b/po/pt_BR.po index cc560a7..58c1505 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -1,14 +1,15 @@ -# Brazilian Portuguese translation for diffutis. -# Copyright © 2016 Free Software Foundation, Inc. +# Brazilian Portuguese translations for diffutis package +# Traduções em português brasileiro para o pacote diffutils +# Copyright (C) 2017 Free Software Foundation, Inc. # This file is distributed under the same license as the diffutils package. # Halley Pacheco de Oliveira <halleypo@ig.com.br>, 2002. -# Rafael Fontenelle <rffontenelle@gmail.com>, 2016. +# Rafael Fontenelle <rffontenelle@gmail.com>, 2016, 2017. msgid "" msgstr "" -"Project-Id-Version: diffutils 3.3-pre1\n" +"Project-Id-Version: diffutils 3.5.25\n" "Report-Msgid-Bugs-To: bug-diffutils@gnu.org\n" -"POT-Creation-Date: 2016-08-20 22:22-0700\n" -"PO-Revision-Date: 2016-05-06 21:25-0200\n" +"POT-Creation-Date: 2017-05-21 13:26-0700\n" +"PO-Revision-Date: 2017-05-07 15:53-0200\n" "Last-Translator: Rafael Fontenelle <rffontenelle@gmail.com>\n" "Language-Team: Brazilian Portuguese <ldpbr-translation@lists.sourceforge." "net>\n" @@ -17,42 +18,42 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" -"X-Generator: Virtaal 0.7.1\n" +"X-Generator: Virtaal 1.0.0-beta1\n" +"X-Bugs: Report translation errors to the Language-Team address.\n" -#: lib/argmatch.c:133 -#, fuzzy, c-format +#: lib/argmatch.c:134 +#, c-format msgid "invalid argument %s for %s" -msgstr "argumento inválido para %s%s: \"%s\"" +msgstr "argumento inválido para %s: %s" -#: lib/argmatch.c:134 +#: lib/argmatch.c:135 #, c-format msgid "ambiguous argument %s for %s" -msgstr "" +msgstr "argumento ambÃguo %s para %s" -#: lib/argmatch.c:153 -#, fuzzy +#: lib/argmatch.c:154 msgid "Valid arguments are:" -msgstr "argumento inválido para %s%s: \"%s\"" +msgstr "Argumentos válidos são:" -#: lib/c-stack.c:204 lib/c-stack.c:297 +#: lib/c-stack.c:203 lib/c-stack.c:296 msgid "program error" msgstr "erro do programa" -#: lib/c-stack.c:205 lib/c-stack.c:298 +#: lib/c-stack.c:204 lib/c-stack.c:297 msgid "stack overflow" -msgstr "estouro da pilha" +msgstr "estouro de pilha" -#: lib/error.c:191 +#: lib/error.c:195 msgid "Unknown system error" -msgstr "Erro de sistema desconhecido" +msgstr "Erro desconhecido de sistema" #: lib/file-type.c:40 msgid "regular empty file" -msgstr "arquivo regular vazio" +msgstr "arquivo comum vazio" #: lib/file-type.c:40 msgid "regular file" -msgstr "arquivo regular" +msgstr "arquivo comum" #: lib/file-type.c:43 msgid "directory" @@ -80,131 +81,102 @@ msgstr "objeto de memória tipificada" #: lib/file-type.c:66 msgid "block special file" -msgstr "arquivo do tipo especial de bloco" +msgstr "arquivo especial de bloco" #: lib/file-type.c:69 msgid "character special file" -msgstr "arquivo do tipo especial de caracter" +msgstr "arquivo especial de caractere" #: lib/file-type.c:72 msgid "contiguous data" -msgstr "" +msgstr "dados contÃguos" #: lib/file-type.c:75 msgid "fifo" -msgstr "fila" +msgstr "fifo" #: lib/file-type.c:78 msgid "door" -msgstr "" +msgstr "porta" #: lib/file-type.c:81 -#, fuzzy msgid "multiplexed block special file" -msgstr "arquivo do tipo especial de bloco" +msgstr "arquivo multiplexado especial de bloco" #: lib/file-type.c:84 -#, fuzzy msgid "multiplexed character special file" -msgstr "arquivo do tipo especial de caracter" +msgstr "arquivo multiplexado especial de caractere" #: lib/file-type.c:87 msgid "multiplexed file" -msgstr "" +msgstr "arquivo multiplexado" #: lib/file-type.c:90 -#, fuzzy msgid "named file" -msgstr "arquivo estranho" +msgstr "arquivo nomeado" #: lib/file-type.c:93 -#, fuzzy msgid "network special file" -msgstr "arquivo do tipo especial de bloco" +msgstr "arquivo especial de rede" #: lib/file-type.c:96 msgid "migrated file with data" -msgstr "" +msgstr "arquivo migrado com dados" #: lib/file-type.c:99 msgid "migrated file without data" -msgstr "" +msgstr "arquivo migrado sem dados" #: lib/file-type.c:102 msgid "port" -msgstr "" +msgstr "porta" #: lib/file-type.c:105 msgid "socket" -msgstr "socket" +msgstr "soquete" #: lib/file-type.c:108 msgid "whiteout" -msgstr "" +msgstr "whiteout" #: lib/file-type.c:110 msgid "weird file" msgstr "arquivo estranho" -#: lib/getopt.c:575 lib/getopt.c:604 +#: lib/getopt.c:278 #, c-format -msgid "%s: option '%s' is ambiguous; possibilities:" -msgstr "%s: a opção \"%s\" está ambÃgua; possibilidades:" +msgid "%s: option '%s%s' is ambiguous\n" +msgstr "%s: a opção \"%s%s\" é ambÃgua\n" -#: lib/getopt.c:619 -#, fuzzy, c-format -msgid "%s: option '%s' is ambiguous\n" -msgstr "%s: a opção \"-W %s\" é ambÃgua\n" - -#: lib/getopt.c:654 lib/getopt.c:658 -#, c-format -msgid "%s: option '--%s' doesn't allow an argument\n" -msgstr "%s: a opção \"--%s\" não admite argumentos\n" - -#: lib/getopt.c:667 lib/getopt.c:672 +#: lib/getopt.c:284 #, c-format -msgid "%s: option '%c%s' doesn't allow an argument\n" -msgstr "%s: a opção \"%c%s\" não admite argumentos\n" +msgid "%s: option '%s%s' is ambiguous; possibilities:" +msgstr "%s: a opção \"%s%s\" é ambÃgua; possibilidades:" -#: lib/getopt.c:715 lib/getopt.c:734 +#: lib/getopt.c:319 #, c-format -msgid "%s: option '--%s' requires an argument\n" -msgstr "%s: a opção \"--%s\" exige um argumento\n" +msgid "%s: unrecognized option '%s%s'\n" +msgstr "%s: opção desconhecida \"%s%s\"\n" -#: lib/getopt.c:772 lib/getopt.c:775 +#: lib/getopt.c:345 #, c-format -msgid "%s: unrecognized option '--%s'\n" -msgstr "%s: opção não reconhecida \"--%s\"\n" +msgid "%s: option '%s%s' doesn't allow an argument\n" +msgstr "%s: a opção \"%s%s\" não permite argumento\n" -#: lib/getopt.c:783 lib/getopt.c:786 +#: lib/getopt.c:360 #, c-format -msgid "%s: unrecognized option '%c%s'\n" -msgstr "%s: opção não reconhecida \"%c%s\"\n" +msgid "%s: option '%s%s' requires an argument\n" +msgstr "%s: a opção \"%s%s\" exige um argumento\n" -#: lib/getopt.c:835 lib/getopt.c:838 +#: lib/getopt.c:621 #, c-format msgid "%s: invalid option -- '%c'\n" msgstr "%s: opção inválida -- \"%c\"\n" -#: lib/getopt.c:891 lib/getopt.c:908 lib/getopt.c:1118 lib/getopt.c:1136 +#: lib/getopt.c:636 lib/getopt.c:682 #, c-format msgid "%s: option requires an argument -- '%c'\n" -msgstr "%s: a opção requer um argumento -- \"%c\"\n" - -#: lib/getopt.c:964 lib/getopt.c:980 -#, c-format -msgid "%s: option '-W %s' is ambiguous\n" -msgstr "%s: a opção \"-W %s\" é ambÃgua\n" - -#: lib/getopt.c:1004 lib/getopt.c:1022 -#, c-format -msgid "%s: option '-W %s' doesn't allow an argument\n" -msgstr "%s: a opção \"-W %s\" não admite argumentos\n" - -#: lib/getopt.c:1043 lib/getopt.c:1061 -#, c-format -msgid "%s: option '-W %s' requires an argument\n" -msgstr "%s: a opção \"-W %s\" requer um argumentos\n" +msgstr "%s: a opção exige um argumento -- \"%c\"\n" #. TRANSLATORS: #. Get translations for open and closing quotation marks. @@ -227,11 +199,11 @@ msgstr "%s: a opção \"-W %s\" requer um argumentos\n" #. If you don't know what to put here, please see #. <http://en.wikipedia.org/wiki/Quotation_marks_in_other_languages> #. and use glyphs suitable for your language. -#: lib/quotearg.c:347 +#: lib/quotearg.c:362 msgid "`" msgstr "“" -#: lib/quotearg.c:348 +#: lib/quotearg.c:363 msgid "'" msgstr "â€" @@ -241,7 +213,7 @@ msgstr "Sucesso" #: lib/regcomp.c:138 msgid "No match" -msgstr "Sem correspondente" +msgstr "Nenhuma ocorrência do padrão" #: lib/regcomp.c:141 msgid "Invalid regular expression" @@ -249,24 +221,23 @@ msgstr "Expressão regular inválida" #: lib/regcomp.c:144 msgid "Invalid collation character" -msgstr "caractere de classificação inválido" +msgstr "caractere de combinação inválido" #: lib/regcomp.c:147 msgid "Invalid character class name" -msgstr "Nome da classe de caracteres inválido" +msgstr "Nome inválido da classe de caracteres" #: lib/regcomp.c:150 msgid "Trailing backslash" -msgstr "Barra invertida ao final" +msgstr "Barra invertida no final" #: lib/regcomp.c:153 msgid "Invalid back reference" -msgstr "Referência retroativa inválida" +msgstr "Retrorreferência inválida" #: lib/regcomp.c:156 -#, fuzzy msgid "Unmatched [, [^, [:, [., or [=" -msgstr "[ ou [^ sem correspondente" +msgstr "[, [^, [:, [. ou [= sem correspondente" #: lib/regcomp.c:159 msgid "Unmatched ( or \\(" @@ -278,7 +249,7 @@ msgstr "\\{ sem correspondente" #: lib/regcomp.c:165 msgid "Invalid content of \\{\\}" -msgstr "Conteúdo de \\{\\} inválido" +msgstr "Conteúdo inválido de \\{\\}" #: lib/regcomp.c:168 msgid "Invalid range end" @@ -290,7 +261,7 @@ msgstr "Memória esgotada" #: lib/regcomp.c:174 msgid "Invalid preceding regular expression" -msgstr "Expressão regular precedente inválida" +msgstr "A expressão regular precedente é inválida" #: lib/regcomp.c:177 msgid "Premature end of regular expression" @@ -298,7 +269,7 @@ msgstr "Fim prematuro da expressão regular" #: lib/regcomp.c:180 msgid "Regular expression too big" -msgstr "Expressão regular muito grande" +msgstr "Expressão regular grande demais" #: lib/regcomp.c:183 msgid "Unmatched ) or \\)" @@ -306,7 +277,7 @@ msgstr ") ou \\) sem correspondente" #: lib/regcomp.c:687 msgid "No previous regular expression" -msgstr "Sem expressão regular prévia" +msgstr "Nenhuma expressão regular anterior" #: lib/xalloc-die.c:34 msgid "memory exhausted" @@ -346,7 +317,7 @@ 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 de %s%s \"%s\" é grande demais" +msgstr "argumento grande demais para %s%s: \"%s\"" #: lib/version-etc.c:74 #, c-format @@ -363,7 +334,7 @@ msgstr "Empacotado por %s\n" #. locale. Otherwise, do not translate "(C)"; leave it as-is. #: lib/version-etc.c:84 msgid "(C)" -msgstr "©" +msgstr "(C)" #: lib/version-etc.c:86 msgid "" @@ -378,7 +349,7 @@ msgstr "" "Licença GPLv3+: GNU GPL versão 3 ou posterior <http://gnu.org/licenses/gpl." "html>\n" "Este é um software livre: você é livre para alterá-lo e redistribuÃ-lo.\n" -"NÃO Hà GARANTIA, na máxima extensão permitida pela lei.\n" +"NÃO Hà QUALQUER GARANTIA, na máxima extensão permitida em lei.\n" "\n" #. TRANSLATORS: %s denotes an author name. @@ -500,12 +471,14 @@ msgid "" "Report bugs to: %s\n" msgstr "" "\n" -"Relate os erros para: %s\n" +"Relate erros para: %s\n" +"Relate erros de tradução para <http://ldpbr-translation@lists.sourceforge." +"net>\n" #: lib/version-etc.c:247 #, c-format msgid "Report %s bugs to: %s\n" -msgstr "Relate os erros de %s para: %s\n" +msgstr "Relate os erros do %s para: %s\n" #: lib/version-etc.c:251 #, c-format @@ -519,9 +492,9 @@ msgstr "Página do %s: <http://www.gnu.org/software/%s/>\n" #: lib/version-etc.c:256 msgid "General help using GNU software: <http://www.gnu.org/gethelp/>\n" -msgstr "Ajuda geral sobre uso de software GNU: <http://www.gnu.org/gethelp/>\n" +msgstr "Ajuda geral no uso de software GNU: <http://www.gnu.org/gethelp/>\n" -#: src/analyze.c:454 src/diff.c:1400 +#: src/analyze.c:454 src/diff.c:1401 #, c-format msgid "Files %s and %s differ\n" msgstr "Os arquivos %s e %s são diferentes\n" @@ -531,21 +504,21 @@ msgstr "Os arquivos %s e %s são diferentes\n" msgid "Binary files %s and %s differ\n" msgstr "Os arquivos binários %s e %s são diferentes\n" -#: src/analyze.c:697 src/diff3.c:1463 src/util.c:1255 +#: src/analyze.c:706 src/diff3.c:1465 src/util.c:1254 msgid "No newline at end of file" msgstr "Nenhum caractere de nova linha no final do arquivo" #. This is a proper name. See the gettext manual, section Names. -#: src/cmp.c:43 +#: src/cmp.c:44 msgid "Torbjorn Granlund" msgstr "Torbjorn Granlund" #. This is a proper name. See the gettext manual, section Names. -#: src/cmp.c:44 +#: src/cmp.c:45 msgid "David MacKenzie" msgstr "David MacKenzie" -#: src/cmp.c:118 src/diff.c:875 src/diff3.c:459 src/sdiff.c:158 +#: src/cmp.c:119 src/diff.c:877 src/diff3.c:462 src/sdiff.c:159 #, c-format msgid "Try '%s --help' for more information." msgstr "Tente \"%s --help\" para mais informações." @@ -560,12 +533,12 @@ msgstr "valor inválido --ignore-initial \"%s\"" msgid "options -l and -s are incompatible" msgstr "as opções -l e -s são incompatÃveis" -#: src/cmp.c:155 src/diff.c:884 src/diff3.c:467 src/sdiff.c:167 src/sdiff.c:315 -#: src/sdiff.c:322 src/sdiff.c:874 src/util.c:853 src/util.c:953 src/util.c:960 +#: src/cmp.c:155 src/diff.c:885 src/diff3.c:469 src/sdiff.c:167 src/sdiff.c:315 +#: src/sdiff.c:322 src/sdiff.c:874 src/util.c:852 src/util.c:952 src/util.c:959 msgid "write failed" msgstr "erro de escrita" -#: src/cmp.c:157 src/diff.c:886 src/diff.c:1465 src/diff3.c:469 src/sdiff.c:169 +#: src/cmp.c:157 src/diff.c:887 src/diff.c:1466 src/diff3.c:471 src/sdiff.c:169 msgid "standard output" msgstr "saÃda padrão" @@ -628,7 +601,7 @@ msgstr "" "Os argumentos opcionais SALTO1 e SALTO2 especificam o número de\n" "bytes para ignorar no começo de cada arquivo (zero por padrão)." -#: src/cmp.c:185 src/diff.c:996 src/diff3.c:507 src/sdiff.c:210 +#: src/cmp.c:185 src/diff.c:997 src/diff3.c:509 src/sdiff.c:210 msgid "" "Mandatory arguments to long options are mandatory for short options too.\n" msgstr "" @@ -650,7 +623,7 @@ msgstr "" msgid "If a FILE is '-' or missing, read standard input." msgstr "Se ARQUIVO for igual a \"-\" ou for omitido, ler da entrada padrão." -#: src/cmp.c:195 src/diff.c:984 src/sdiff.c:220 +#: src/cmp.c:195 src/diff.c:985 src/sdiff.c:220 msgid "Exit status is 0 if inputs are the same, 1 if different, 2 if trouble." msgstr "" "Status de saÃda é 0 se as entradas forem iguais, 1 se diferente e 2 se " @@ -661,258 +634,272 @@ msgstr "" msgid "invalid --bytes value '%s'" msgstr "valor inválido --bytes \"%s\"" -#: src/cmp.c:266 src/diff.c:793 src/diff3.c:353 src/sdiff.c:565 +#: src/cmp.c:266 src/diff.c:795 src/diff3.c:356 src/sdiff.c:565 #, c-format msgid "missing operand after '%s'" msgstr "faltando operando após \"%s\"" -#: src/cmp.c:278 src/diff.c:795 src/diff3.c:355 src/sdiff.c:567 +#: src/cmp.c:278 src/diff.c:797 src/diff3.c:358 src/sdiff.c:567 #, c-format msgid "extra operand '%s'" msgstr "operando extra \"%s\"" -#: src/cmp.c:494 +#: src/cmp.c:498 #, c-format msgid "%s %s differ: byte %s, line %s\n" msgstr "%s e %s são diferentes: byte %s, linha %s\n" -#: src/cmp.c:510 +#: src/cmp.c:514 #, c-format msgid "%s %s differ: byte %s, line %s is %3o %s %3o %s\n" msgstr "%s e %s são diferentes: byte %s, linha %s é %3o %s %3o %s\n" -#: src/cmp.c:562 +#: src/cmp.c:571 +#, c-format +msgid "cmp: EOF on %s which is empty\n" +msgstr "cmp: Fim de arquivo (EOF) em %s que está vazio\n" + +#: src/cmp.c:585 +#, c-format +msgid "cmp: EOF on %s after byte %s, line %s\n" +msgstr "cmp: Fim de arquivo (EOF) em %s após byte %s, linha %s\n" + +#: src/cmp.c:586 #, c-format -msgid "cmp: EOF on %s\n" -msgstr "cmp: Fim de arquivo (EOF) em %s\n" +msgid "cmp: EOF on %s after byte %s, in line %s\n" +msgstr "cmp: Fim de arquivo (EOF) em %s após byte %s, na linha %s\n" + +#: src/cmp.c:592 +#, c-format +msgid "cmp: EOF on %s after byte %s\n" +msgstr "cmp: Fim de arquivo (EOF) em %s após byte %s\n" #. This is a proper name. See the gettext manual, section Names. -#: src/diff.c:49 +#: src/diff.c:50 msgid "Paul Eggert" msgstr "Paul Eggert" #. This is a proper name. See the gettext manual, section Names. -#: src/diff.c:50 +#: src/diff.c:51 msgid "Mike Haertel" msgstr "Mike Haertel" #. This is a proper name. See the gettext manual, section Names. -#: src/diff.c:51 +#: src/diff.c:52 msgid "David Hayes" msgstr "David Hayes" #. This is a proper name. See the gettext manual, section Names. -#: src/diff.c:52 +#: src/diff.c:53 msgid "Richard Stallman" msgstr "Richard Stallman" #. This is a proper name. See the gettext manual, section Names. -#: src/diff.c:53 +#: src/diff.c:54 msgid "Len Tower" msgstr "Len Tower" -#: src/diff.c:351 +#: src/diff.c:353 #, c-format msgid "invalid context length '%s'" msgstr "o comprimento do contexto não é válido \"%s\"" -#: src/diff.c:434 +#: src/diff.c:436 #, c-format msgid "pagination not supported on this host" msgstr "sem suporte a paginação neste computador" -#: src/diff.c:449 src/diff3.c:335 +#: src/diff.c:451 src/diff3.c:336 #, c-format msgid "too many file label options" msgstr "número excessivo de opções de rótulo de arquivo" -#: src/diff.c:526 +#: src/diff.c:528 #, c-format msgid "invalid width '%s'" msgstr "largura inválida \"%s\"" -#: src/diff.c:530 +#: src/diff.c:532 msgid "conflicting width options" msgstr "opções de largura conflitantes" -#: src/diff.c:555 +#: src/diff.c:557 #, c-format msgid "invalid horizon length '%s'" msgstr "comprimento do horizonte inválido \"%s\"" -#: src/diff.c:611 +#: src/diff.c:613 #, c-format msgid "invalid tabsize '%s'" msgstr "tamanho de tabulação inválido \"%s\"" -#: src/diff.c:615 +#: src/diff.c:617 msgid "conflicting tabsize options" msgstr "opções de tamanho de tabulação conflitantes" -#: src/diff.c:770 +#: src/diff.c:772 msgid "--from-file and --to-file both specified" msgstr "ambos --from-file e --to-file especificados" -#: src/diff.c:890 +#: src/diff.c:891 msgid " --normal output a normal diff (the default)" msgstr " --normal cria um diff no formato normal (padrão)" -#: src/diff.c:891 +#: src/diff.c:892 msgid "-q, --brief report only when files differ" msgstr "" "-q, --brief indica apenas se os arquivos forem diferentes" -#: src/diff.c:892 +#: src/diff.c:893 msgid "-s, --report-identical-files report when two files are the same" msgstr "" "-s, --report-identical-files indica quando dois arquivos forem o idênticos" -#: src/diff.c:893 +#: src/diff.c:894 msgid "" "-c, -C NUM, --context[=NUM] output NUM (default 3) lines of copied context" msgstr "" "-c, -C NÚM, --context[=NÚM] cria em NÚM linhas (padrão 3) de contexto " "copiado" -#: src/diff.c:894 +#: src/diff.c:895 msgid "" "-u, -U NUM, --unified[=NUM] output NUM (default 3) lines of unified context" msgstr "" "-u, -U NÚM, --unified[=NÚM] cria em NÚM linhas (padrão 3) de contexto " "unificado" -#: src/diff.c:895 +#: src/diff.c:896 msgid "-e, --ed output an ed script" msgstr "-e, --ed cria um script para o editor ed" -#: src/diff.c:896 +#: src/diff.c:897 msgid "-n, --rcs output an RCS format diff" msgstr "-n, --rcs cria um diff no formato RCS" -#: src/diff.c:897 +#: src/diff.c:898 msgid "-y, --side-by-side output in two columns" msgstr "-y, --side-by-side cria em duas colunas" -#: src/diff.c:898 +#: src/diff.c:899 msgid "" "-W, --width=NUM output at most NUM (default 130) print columns" msgstr "" "-W, --width=NÚM limita a saÃda a NÚM colunas por linha (padrão " "130)" -#: src/diff.c:899 +#: src/diff.c:900 msgid "" " --left-column output only the left column of common lines" msgstr "" " --left-column emite apenas a coluna da esquerda das linhas\n" " idênticas" -#: src/diff.c:900 +#: src/diff.c:901 msgid " --suppress-common-lines do not output common lines" msgstr " --suppress-common-lines não exibe as linhas idênticas" -#: src/diff.c:902 +#: src/diff.c:903 msgid "-p, --show-c-function show which C function each change is in" msgstr "" "-p, --show-c-function mostra em qual função C está cada alteração" -#: src/diff.c:903 +#: src/diff.c:904 msgid "-F, --show-function-line=RE show the most recent line matching RE" msgstr "" "-F, --show-function-line=ER mostra a linha mais recente correspondendo à ER" -#: src/diff.c:904 -#, fuzzy +#: src/diff.c:905 msgid "" " --label LABEL use LABEL instead of file name and timestamp\n" " (can be repeated)" msgstr "" -" --label RÓTULO usa RÓTULO ao invés do nome do arquivo\n" -" (pode ser repetido)" +" --label RÓTULO usa RÓTULO ao invés do nome do arquivo e\n" +" carimbo de tempo (pode ser repetido)" -#: src/diff.c:907 +#: src/diff.c:908 msgid "-t, --expand-tabs expand tabs to spaces in output" msgstr "" "-t, --expand-tabs expande as tabulações para espaços na saÃda" -#: src/diff.c:908 +#: src/diff.c:909 msgid "-T, --initial-tab make tabs line up by prepending a tab" msgstr "" "-T, --initial-tab alinha tabulações introduzindo uma\n" " tabulação no inÃcio" -#: src/diff.c:909 +#: src/diff.c:910 msgid "" " --tabsize=NUM tab stops every NUM (default 8) print columns" msgstr "" " --tabsize=NÚM paradas de tabulação a cada NÚM colunas\n" " (padrão=8)" -#: src/diff.c:910 +#: src/diff.c:911 msgid "" " --suppress-blank-empty suppress space or tab before empty output lines" msgstr "" " --suppress-blank-empty suprime espaço ou tabulação antes de linhas\n" " vazias na saÃda" -#: src/diff.c:911 +#: src/diff.c:912 msgid "-l, --paginate pass output through 'pr' to paginate it" msgstr "" "-l, --paginate passa a saÃda por meio de \"pr\" para paginá-la" -#: src/diff.c:913 +#: src/diff.c:914 msgid "" "-r, --recursive recursively compare any subdirectories found" msgstr "" "-r, --recursive compara recursivamente os subdiretórios\n" " encontrados" -#: src/diff.c:914 +#: src/diff.c:915 msgid " --no-dereference don't follow symbolic links" msgstr " --no-dereference não interpreta links simbólicos" -#: src/diff.c:915 +#: src/diff.c:916 msgid "-N, --new-file treat absent files as empty" msgstr "" "-N, --new-file considera os arquivos ausentes como vazios" -#: src/diff.c:916 +#: src/diff.c:917 msgid " --unidirectional-new-file treat absent first files as empty" msgstr "" " --unidirectional-new-file considera os primeiros arquivos ausentes\n" " como vazios" -#: src/diff.c:917 +#: src/diff.c:918 msgid " --ignore-file-name-case ignore case when comparing file names" msgstr "" " --ignore-file-name-case não faz distinção entre letras maiúsculas e\n" " minúsculas nos nomes dos arquivos" -#: src/diff.c:918 +#: src/diff.c:919 msgid " --no-ignore-file-name-case consider case when comparing file names" msgstr "" " --no-ignore-file-name-case faz distinção entre letras maiúsculas e\n" " minúsculas nos nomes dos arquivos" -#: src/diff.c:919 +#: src/diff.c:920 msgid "-x, --exclude=PAT exclude files that match PAT" msgstr "" "-x, --exclude=PADRÃO exclui arquivos correspondendo a PADRÃO" -#: src/diff.c:920 +#: src/diff.c:921 msgid "" "-X, --exclude-from=FILE exclude files that match any pattern in FILE" msgstr "" "-X, --exclude-from=ARQUIVO exclui arquivos com correspondam a qualquer\n" " padrão contido em ARQUIVO" -#: src/diff.c:921 +#: src/diff.c:922 msgid "" "-S, --starting-file=FILE start with FILE when comparing directories" msgstr "" "-S, --starting-file=ARQUIVO inicia por ARQUIVO ao comparar diretórios" -#: src/diff.c:922 +#: src/diff.c:923 msgid "" " --from-file=FILE1 compare FILE1 to all operands;\n" " FILE1 can be a directory" @@ -920,7 +907,7 @@ msgstr "" " --from-file=ARQUIVO1 compara ARQUIVO1 com todos os operandos;\n" " ARQUIVO1 pode ser um diretório" -#: src/diff.c:924 +#: src/diff.c:925 msgid "" " --to-file=FILE2 compare all operands to FILE2;\n" " FILE2 can be a directory" @@ -928,25 +915,25 @@ msgstr "" " --to-file=ARQUIVO2 compara todos os operandos com ARQUIVO2;\n" " ARQUIVO2 pode ser um diretório" -#: src/diff.c:927 +#: src/diff.c:928 msgid "" "-i, --ignore-case ignore case differences in file contents" msgstr "" "-i, --ignore-case não faz distinção entre letras maiúsculas e\n" " minúsculas no conteúdo do arquivo" -#: src/diff.c:928 +#: src/diff.c:929 msgid "-E, --ignore-tab-expansion ignore changes due to tab expansion" msgstr "" "-E, --ignore-tab-expansion ignora as diferenças causadas pela expansão\n" " da tabulação" -#: src/diff.c:929 +#: src/diff.c:930 msgid "-Z, --ignore-trailing-space ignore white space at line end" msgstr "" "-Z, --ignore-trailing-space ignora espaços em branco no fim das linhas" -#: src/diff.c:930 +#: src/diff.c:931 msgid "" "-b, --ignore-space-change ignore changes in the amount of white space" msgstr "" @@ -954,61 +941,61 @@ msgstr "" "espaços\n" " em branco" -#: src/diff.c:931 +#: src/diff.c:932 msgid "-w, --ignore-all-space ignore all white space" msgstr "-w, --ignore-all-space ignora todos os espaços em branco" -#: src/diff.c:932 +#: src/diff.c:933 msgid "" "-B, --ignore-blank-lines ignore changes where lines are all blank" msgstr "" "-B, --ignore-blank-lines ignora diferenças onde as linhas estão vazias" -#: src/diff.c:933 +#: src/diff.c:934 msgid "-I, --ignore-matching-lines=RE ignore changes where all lines match RE" msgstr "" "-I, --ignore-matching-lines=ER ignora as diferenças nas linhas que " "correspondem\n" " à Expressão Regular" -#: src/diff.c:935 +#: src/diff.c:936 msgid "-a, --text treat all files as text" msgstr "-a, --text trata todos os arquivos como texto" -#: src/diff.c:936 +#: src/diff.c:937 msgid " --strip-trailing-cr strip trailing carriage return on input" msgstr "" " --strip-trailing-cr remove o caractere de retorno de carro\n" " (CR) ao final da linha na entrada" -#: src/diff.c:938 +#: src/diff.c:939 msgid " --binary read and write data in binary mode" msgstr " --binary lê e escreve os dados em modo binário" -#: src/diff.c:941 +#: src/diff.c:942 msgid "" "-D, --ifdef=NAME output merged file with '#ifdef NAME' diffs" msgstr "" "-D, --ifdef=NOME exibe o arquivo mesclado incluindo\n" " \"#ifndef NOME\" nas diferenças" -#: src/diff.c:942 +#: src/diff.c:943 msgid " --GTYPE-group-format=GFMT format GTYPE input groups with GFMT" msgstr "" " --GTYPE-group-format=GFMT formata grupos de entrada GTYPE com GFMT" -#: src/diff.c:943 +#: src/diff.c:944 msgid " --line-format=LFMT format all input lines with LFMT" msgstr "" " --line-format=LFMT formata todas as linhas de entrada com LFMT" -#: src/diff.c:944 +#: src/diff.c:945 msgid " --LTYPE-line-format=LFMT format LTYPE input lines with LFMT" msgstr "" " --LTYPE-line-format=LFMT formata todas as linhas de entrada LTYPE com " "LFMT" -#: src/diff.c:945 +#: src/diff.c:946 msgid "" " These format options provide fine-grained control over the output\n" " of diff, generalizing -D/--ifdef." @@ -1016,13 +1003,13 @@ msgstr "" " Essa opções de formatação fornece um controle refinado sobre a saÃda\n" " das diferenças, generalizando -D/--ifdef." -#: src/diff.c:947 +#: src/diff.c:948 msgid " LTYPE is 'old', 'new', or 'unchanged'. GTYPE is LTYPE or 'changed'." msgstr "" " LTYPE pode ser \"old\", \"new\" ou \"unchanged\". GTYPE é LTYPE ou " "\"changed\"." -#: src/diff.c:948 +#: src/diff.c:949 msgid "" " GFMT (only) may contain:\n" " %< lines from FILE1\n" @@ -1053,7 +1040,7 @@ msgstr "" " M L+1\n" " %(A=B?T:E) se A igual B, então T; senão E" -#: src/diff.c:960 +#: src/diff.c:961 msgid "" " LFMT (only) may contain:\n" " %L contents of line\n" @@ -1066,7 +1053,7 @@ msgstr "" " %[-][LARGURA][.[PREC]]{doxX}n especificação estilo printf() do número\n" " da linha da utilizando" -#: src/diff.c:964 +#: src/diff.c:965 msgid "" " Both GFMT and LFMT may contain:\n" " %% %\n" @@ -1080,154 +1067,151 @@ msgstr "" " %c'\\OOO' o caractere com código octal OOO\n" " C o caractere C (outros caracteres representam a si próprios)" -#: src/diff.c:970 +#: src/diff.c:971 msgid "-d, --minimal try hard to find a smaller set of changes" msgstr "" "-d, --minimal se esforça para localizar o menor conjunto\n" -" de diferenças" +" de diferenças" -#: src/diff.c:971 +#: src/diff.c:972 msgid " --horizon-lines=NUM keep NUM lines of the common prefix and suffix" msgstr "" " --horizon-lines=NÚM mantém NÚM linhas de prefixo e sufixo idênticos" -#: src/diff.c:972 +#: src/diff.c:973 msgid "" " --speed-large-files assume large files and many scattered small changes" msgstr "" " --speed-large-files assume arquivos grandes e muitas alterações\n" -" pequenas espalhadas" - -#: src/diff.c:973 -msgid "" -" --color[=WHEN] colorize the output; WHEN can be 'never', 'always'," -msgstr "" +" pequenas espalhadas" #: src/diff.c:974 -#, fuzzy -msgid " or 'auto' (the default)" -msgstr " --normal cria um diff no formato normal (padrão)" - -#: src/diff.c:975 msgid "" -" --palette=PALETTE specify the colors to use when --color is active" +" --color[=WHEN] colorize the output; WHEN can be 'never', " +"'always',\n" +" or 'auto' (the default)" msgstr "" +" --color[=QUANDO] colore a saÃda; QUANDO pode ser \"never\", \"always" +"\",\n" +" ou \"auto\" (o padrão)" #: src/diff.c:976 msgid "" -" PALETTE is a colon-separated list terminfo " -"capabilities" +" --palette=PALETTE the colors to use when --color is active; PALETTE " +"is\n" +" a colon-separated list of terminfo capabilities" msgstr "" +" --palette=PALETA as cores para usar quando --color está ativa;\n" +" PALETA é uma lista de capacidades de terminfo\n" +" separadas por caractere de dois pontos" -#: src/diff.c:978 +#: src/diff.c:979 msgid " --help display this help and exit" msgstr " --help mostra esta ajuda e sai" -#: src/diff.c:979 +#: src/diff.c:980 msgid "-v, --version output version information and exit" msgstr "-v, --version mostra as informações da versão e sai" -#: src/diff.c:981 -#, fuzzy +#: src/diff.c:982 msgid "FILES are 'FILE1 FILE2' or 'DIR1 DIR2' or 'DIR FILE' or 'FILE DIR'." msgstr "" -"ARQUIVOS são \"ARQUIVO1 ARQUIVO2\" ou \"DIR1 DIR2\" ou \"DIR ARQUIVO...\" " -"ou\n" -"\"ARQUIVO... DIR\"." +"ARQUIVOS são \"ARQUIVO1 ARQUIVO2\", \"DIR1 DIR2\", \"DIR ARQUIVO\" ou " +"\"ARQUIVO DIR\"." -#: src/diff.c:982 +#: src/diff.c:983 msgid "" "If --from-file or --to-file is given, there are no restrictions on FILE(s)." msgstr "" "Se --from-file ou --to-file for especificado, não há restrição em ARQUIVO(s)." -#: src/diff.c:983 src/diff3.c:526 src/sdiff.c:219 +#: src/diff.c:984 src/diff3.c:528 src/sdiff.c:219 msgid "If a FILE is '-', read standard input." msgstr "Se um ARQUIVO for igual a \"-\", lê da entrada padrão." -#: src/diff.c:993 +#: src/diff.c:994 #, c-format msgid "Usage: %s [OPTION]... FILES\n" msgstr "Uso: %s [OPÇÃO]... ARQUIVOS\n" -#: src/diff.c:994 +#: src/diff.c:995 msgid "Compare FILES line by line." msgstr "Compara ARQUIVOS linha por linha." -#: src/diff.c:1028 +#: src/diff.c:1029 #, c-format msgid "conflicting %s option value '%s'" msgstr "opção %s com valor conflitante \"%s\"" -#: src/diff.c:1041 +#: src/diff.c:1042 #, c-format msgid "conflicting output style options" msgstr "opções conflitantes de estilo de saÃda" -#: src/diff.c:1057 -#, fuzzy, c-format +#: src/diff.c:1058 +#, c-format msgid "invalid color '%s'" -msgstr "largura inválida \"%s\"" +msgstr "cor inválida \"%s\"" -#: src/diff.c:1113 src/diff.c:1323 +#: src/diff.c:1114 src/diff.c:1324 #, c-format msgid "Only in %s: %s\n" msgstr "Somente em %s: %s\n" -#: src/diff.c:1247 +#: src/diff.c:1248 msgid "cannot compare '-' to a directory" msgstr "não é possÃvel comparar \"-\" com um diretório" -#: src/diff.c:1282 +#: src/diff.c:1283 msgid "-D option not supported with directories" msgstr "Sem suporte à opção -D com diretórios" -#: src/diff.c:1291 +#: src/diff.c:1292 #, c-format msgid "Common subdirectories: %s and %s\n" msgstr "Subdiretórios idênticos: %s e %s\n" -#: src/diff.c:1333 src/diff.c:1383 +#: src/diff.c:1334 src/diff.c:1384 #, c-format msgid "File %s is a %s while file %s is a %s\n" msgstr "O arquivo %s é %s, enquanto o arquivo %s é %s\n" -#: src/diff.c:1369 +#: src/diff.c:1370 #, c-format msgid "Symbolic links %s and %s differ\n" msgstr "Os links simbólicos %s e %s são diferentes\n" -#: src/diff.c:1456 +#: src/diff.c:1457 #, c-format msgid "Files %s and %s are identical\n" msgstr "Os aquivos %s e %s são idênticos\n" #. This is a proper name. See the gettext manual, section Names. -#: src/diff3.c:41 +#: src/diff3.c:42 msgid "Randy Smith" msgstr "Randy Smith" -#: src/diff3.c:348 +#: src/diff3.c:351 #, c-format msgid "incompatible options" msgstr "opções incompatÃveis" -#: src/diff3.c:388 +#: src/diff3.c:391 msgid "'-' specified for more than one input file" msgstr "\"-\" especificado para mais de um arquivo de entrada" -#: src/diff3.c:439 src/diff3.c:1288 src/diff3.c:1692 src/diff3.c:1747 +#: src/diff3.c:442 src/diff3.c:1290 src/diff3.c:1693 src/diff3.c:1748 #: src/sdiff.c:307 src/sdiff.c:844 src/sdiff.c:855 msgid "read failed" msgstr "falha de leitura" -#: src/diff3.c:473 +#: src/diff3.c:475 msgid "-A, --show-all output all changes, bracketing conflicts" msgstr "" "-A, --show-all exibe todas as diferenças, com os conflitos\n" " entre parênteses" -#: src/diff3.c:475 +#: src/diff3.c:477 msgid "" "-e, --ed output ed script incorporating changes\n" " from OLDFILE to YOURFILE into MYFILE" @@ -1236,13 +1220,13 @@ msgstr "" " diferenças entre ARQUIVO1 e ARQUIVO2\n" " em ARQUIVO3" -#: src/diff3.c:477 +#: src/diff3.c:479 msgid "-E, --show-overlap like -e, but bracket conflicts" msgstr "" "-E, --show-overlap similar a -e, mas exibe conflitos entre " "parênteses" -#: src/diff3.c:478 +#: src/diff3.c:480 msgid "" "-3, --easy-only like -e, but incorporate only nonoverlapping " "changes" @@ -1251,7 +1235,7 @@ msgstr "" "alterações\n" " que não se sobreponham" -#: src/diff3.c:479 +#: src/diff3.c:481 msgid "" "-x, --overlap-only like -e, but incorporate only overlapping changes" msgstr "" @@ -1259,17 +1243,17 @@ msgstr "" "alterações\n" " que se sobrepõem" -#: src/diff3.c:480 +#: src/diff3.c:482 msgid "-X like -x, but bracket conflicts" msgstr "" "-X similar a -x, mas exibe conflitos entre parentes" -#: src/diff3.c:481 +#: src/diff3.c:483 msgid "-i append 'w' and 'q' commands to ed scripts" msgstr "" "-i anexa os comandos \"w\" e \"q\" aos scripts de ed" -#: src/diff3.c:483 +#: src/diff3.c:485 msgid "" "-m, --merge output actual merged file, according to\n" " -A if no other options are given" @@ -1277,27 +1261,27 @@ msgstr "" "-m, --merge emite arquivo mesclado atual, conforme\n" " -A se nenhuma outra opções for fornecida" -#: src/diff3.c:486 +#: src/diff3.c:488 msgid "-a, --text treat all files as text" msgstr "-a, --text trata todos os arquivos como texto" -#: src/diff3.c:487 +#: src/diff3.c:489 msgid " --strip-trailing-cr strip trailing carriage return on input" msgstr "" " --strip-trailing-cr remove o caractere de retorno de carro\n" " (CR) ao final da linha na entrada" -#: src/diff3.c:488 +#: src/diff3.c:490 msgid "-T, --initial-tab make tabs line up by prepending a tab" msgstr "" "-T, --initial-tab alinha tabulações introduzindo uma\n" " tabulação no inÃcio." -#: src/diff3.c:489 +#: src/diff3.c:491 msgid " --diff-program=PROGRAM use PROGRAM to compare files" msgstr " --diff-program=PROGRAMA usa o PROGRAMA para comparar os arquivos" -#: src/diff3.c:490 +#: src/diff3.c:492 msgid "" "-L, --label=LABEL use LABEL instead of file name\n" " (can be repeated up to three times)" @@ -1305,24 +1289,24 @@ msgstr "" "-L, --label RÓTULO usa RÓTULO ao invés do nome do arquivo\n" " (pode ser repetido até três vezes)" -#: src/diff3.c:493 +#: src/diff3.c:495 msgid " --help display this help and exit" msgstr " --help mostra esta ajuda e sai" -#: src/diff3.c:494 +#: src/diff3.c:496 msgid "-v, --version output version information and exit" msgstr "-v, --version mostra informação da versão e sai" -#: src/diff3.c:503 +#: src/diff3.c:505 #, c-format msgid "Usage: %s [OPTION]... MYFILE OLDFILE YOURFILE\n" msgstr "Uso: %s [OPÇÃO]... ARQUIVO1 ARQUIVO2 ARQUIVO3\n" -#: src/diff3.c:505 +#: src/diff3.c:507 msgid "Compare three files line by line." msgstr "Compara três arquivos linha por linha." -#: src/diff3.c:515 +#: src/diff3.c:517 msgid "" "\n" "The default output format is a somewhat human-readable representation of\n" @@ -1346,45 +1330,45 @@ msgstr "" "internalmente e emite o arquivo mesclado atual. Para entradas incomuns,\n" "isto é mais robusto do que usar o ed.\n" -#: src/diff3.c:527 +#: src/diff3.c:529 msgid "Exit status is 0 if successful, 1 if conflicts, 2 if trouble." msgstr "Status de saÃda é 0 se houver sucesso, 1 se conflitos e 2 se problema." -#: src/diff3.c:720 +#: src/diff3.c:722 msgid "internal error: screwup in format of diff blocks" msgstr "erro interno: confusão no formato dos blocos diff" -#: src/diff3.c:1015 +#: src/diff3.c:1017 #, c-format msgid "%s: diff failed: " msgstr "%s: diff falhou: " -#: src/diff3.c:1037 +#: src/diff3.c:1039 msgid "internal error: invalid diff type in process_diff" msgstr "erro interno: tipo de diff inválido em process_diff" -#: src/diff3.c:1062 +#: src/diff3.c:1064 msgid "invalid diff format; invalid change separator" msgstr "formato de diff inválido; separador de diferença inválido" -#: src/diff3.c:1298 +#: src/diff3.c:1300 msgid "invalid diff format; incomplete last line" msgstr "formato de diff inválido; última linha incompleta" -#: src/diff3.c:1322 src/sdiff.c:275 src/util.c:970 +#: src/diff3.c:1324 src/sdiff.c:275 src/util.c:969 #, c-format msgid "subsidiary program '%s' could not be invoked" msgstr "o programa subsidiário \"%s\" não pôde ser invocado" -#: src/diff3.c:1347 +#: src/diff3.c:1349 msgid "invalid diff format; incorrect leading line chars" msgstr "formato de diff inválido; caracteres incorretos na linha de inÃcio" -#: src/diff3.c:1420 +#: src/diff3.c:1422 msgid "internal error: invalid diff type passed to output" msgstr "erro interno: tipo de diff inválido passado para a saÃda" -#: src/diff3.c:1694 src/diff3.c:1751 +#: src/diff3.c:1695 src/diff3.c:1752 msgid "input file shrank" msgstr "o arquivo de entrada diminuiu" @@ -1399,7 +1383,7 @@ msgid "%s: recursive directory loop" msgstr "%s: loop de diretório recursivo" #. This is a proper name. See the gettext manual, section Names. -#: src/sdiff.c:42 +#: src/sdiff.c:43 msgid "Thomas Lord" msgstr "Thomas Lord" @@ -1557,15 +1541,38 @@ msgstr "" "v:\tInclui verbosamente as linhas idênticas.\n" "q:\tSai.\n" -#: src/util.c:663 -#, fuzzy, c-format +#: src/util.c:662 +#, c-format msgid "unrecognized prefix: %s" -msgstr "%s: opção não reconhecida \"--%s\"\n" +msgstr "prefixo desconhecido: %s" -#: src/util.c:693 +#: src/util.c:692 #, c-format msgid "unparsable value for --palette" -msgstr "" +msgstr "valor não analisável para --palette" + +#~ msgid "%s: option '--%s' doesn't allow an argument\n" +#~ msgstr "%s: a opção \"--%s\" não permite um argumento\n" + +#~ msgid "%s: unrecognized option '--%s'\n" +#~ msgstr "%s: opção desconhecida \"--%s\"\n" + +#~ msgid "%s: option '-W %s' is ambiguous\n" +#~ msgstr "%s: a opção \"-W %s\" é ambÃgua\n" + +#~ msgid "%s: option '-W %s' doesn't allow an argument\n" +#~ msgstr "%s: a opção \"-W %s\" não permite um argumento\n" + +#~ msgid "%s: option '-W %s' requires an argument\n" +#~ msgstr "%s: a opção \"-W %s\" exige um argumento\n" + +#~ msgid " or 'auto' (the default)" +#~ msgstr " ou \"auto\" (o padrão)" + +#~ msgid "" +#~ " --palette=PALETTE specify the colors to use when --color is active" +#~ msgstr "" +#~ " --palette=PALETA especifica as cores para usar com --color ativada" #~ msgid "%s: illegal option -- %c\n" #~ msgstr "%s: a opção -- %c é ilegal\n" Binary files differ@@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: diffutils 2.8.3\n" "Report-Msgid-Bugs-To: bug-diffutils@gnu.org\n" -"POT-Creation-Date: 2016-08-20 22:22-0700\n" +"POT-Creation-Date: 2017-05-21 13:26-0700\n" "PO-Revision-Date: 2003-08-22 08:43+0300\n" "Last-Translator: Eugen Hoanca <eugenh@urban-grafx.ro>\n" "Language-Team: Romanian <translation-team-ro@lists.sourceforge.net>\n" @@ -15,31 +15,31 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=ISO-8859-2\n" "Content-Transfer-Encoding: 8bit\n" +"X-Bugs: Report translation errors to the Language-Team address.\n" -#: lib/argmatch.c:133 -#, fuzzy, c-format +#: lib/argmatch.c:134 +#, c-format msgid "invalid argument %s for %s" -msgstr "valoare --bytes invalidã `%s'" +msgstr "" -#: lib/argmatch.c:134 +#: lib/argmatch.c:135 #, c-format msgid "ambiguous argument %s for %s" msgstr "" -#: lib/argmatch.c:153 -#, fuzzy +#: lib/argmatch.c:154 msgid "Valid arguments are:" -msgstr "valoare --bytes invalidã `%s'" +msgstr "" -#: lib/c-stack.c:204 lib/c-stack.c:297 +#: lib/c-stack.c:203 lib/c-stack.c:296 msgid "program error" msgstr "eroare de program" -#: lib/c-stack.c:205 lib/c-stack.c:298 +#: lib/c-stack.c:204 lib/c-stack.c:297 msgid "stack overflow" msgstr "stivã plinã(overflow)" -#: lib/error.c:191 +#: lib/error.c:195 msgid "Unknown system error" msgstr "Eroare de sistem necunoscutã" @@ -144,66 +144,41 @@ msgstr "" msgid "weird file" msgstr "fiºier ciudat" -#: lib/getopt.c:575 lib/getopt.c:604 +#: lib/getopt.c:278 #, fuzzy, c-format -msgid "%s: option '%s' is ambiguous; possibilities:" +msgid "%s: option '%s%s' is ambiguous\n" msgstr "%s: opþiunea `%s' este ambiguã\n" -#: lib/getopt.c:619 +#: lib/getopt.c:284 #, fuzzy, c-format -msgid "%s: option '%s' is ambiguous\n" -msgstr "%s: opþiunea `-W %s' este ambiguã\n" +msgid "%s: option '%s%s' is ambiguous; possibilities:" +msgstr "%s: opþiunea `%s' este ambiguã\n" -#: lib/getopt.c:654 lib/getopt.c:658 +#: lib/getopt.c:319 #, fuzzy, c-format -msgid "%s: option '--%s' doesn't allow an argument\n" -msgstr "%s: opþiunea `--%s' nu permite parametri\n" +msgid "%s: unrecognized option '%s%s'\n" +msgstr "%s: opþiune necunoscutã `%c%s'\n" -#: lib/getopt.c:667 lib/getopt.c:672 +#: lib/getopt.c:345 #, fuzzy, c-format -msgid "%s: option '%c%s' doesn't allow an argument\n" +msgid "%s: option '%s%s' doesn't allow an argument\n" msgstr "%s: opþiunea `%c%s' nu permite parametri\n" -#: lib/getopt.c:715 lib/getopt.c:734 +#: lib/getopt.c:360 #, fuzzy, c-format -msgid "%s: option '--%s' requires an argument\n" +msgid "%s: option '%s%s' requires an argument\n" msgstr "%s: opþiunea `%s' necesitã un parametru\n" -#: lib/getopt.c:772 lib/getopt.c:775 -#, fuzzy, c-format -msgid "%s: unrecognized option '--%s'\n" -msgstr "%s: opþiune necunoscutã `--%s'\n" - -#: lib/getopt.c:783 lib/getopt.c:786 -#, fuzzy, c-format -msgid "%s: unrecognized option '%c%s'\n" -msgstr "%s: opþiune necunoscutã `%c%s'\n" - -#: lib/getopt.c:835 lib/getopt.c:838 +#: lib/getopt.c:621 #, fuzzy, c-format msgid "%s: invalid option -- '%c'\n" msgstr "%s: opþiune invalidã -- %c\n" -#: lib/getopt.c:891 lib/getopt.c:908 lib/getopt.c:1118 lib/getopt.c:1136 +#: lib/getopt.c:636 lib/getopt.c:682 #, fuzzy, c-format msgid "%s: option requires an argument -- '%c'\n" msgstr "%s: opþiunea necesitã un parametru -- %c\n" -#: lib/getopt.c:964 lib/getopt.c:980 -#, fuzzy, c-format -msgid "%s: option '-W %s' is ambiguous\n" -msgstr "%s: opþiunea `-W %s' este ambiguã\n" - -#: lib/getopt.c:1004 lib/getopt.c:1022 -#, fuzzy, c-format -msgid "%s: option '-W %s' doesn't allow an argument\n" -msgstr "%s: opþiunea `-W %s' nu permite parametri\n" - -#: lib/getopt.c:1043 lib/getopt.c:1061 -#, fuzzy, c-format -msgid "%s: option '-W %s' requires an argument\n" -msgstr "%s: opþiunea `%s' necesitã un parametru\n" - #. TRANSLATORS: #. Get translations for open and closing quotation marks. #. The message catalog should translate "`" to a left @@ -225,11 +200,11 @@ msgstr "%s: opþiunea `%s' necesitã un parametru\n" #. If you don't know what to put here, please see #. <http://en.wikipedia.org/wiki/Quotation_marks_in_other_languages> #. and use glyphs suitable for your language. -#: lib/quotearg.c:347 +#: lib/quotearg.c:362 msgid "`" msgstr "" -#: lib/quotearg.c:348 +#: lib/quotearg.c:363 msgid "'" msgstr "" @@ -495,7 +470,7 @@ msgstr "" msgid "General help using GNU software: <http://www.gnu.org/gethelp/>\n" msgstr "" -#: src/analyze.c:454 src/diff.c:1400 +#: src/analyze.c:454 src/diff.c:1401 #, c-format msgid "Files %s and %s differ\n" msgstr "Fiºierele %s ºi %s diferã\n" @@ -505,21 +480,21 @@ msgstr "Fiºierele %s ºi %s diferã\n" msgid "Binary files %s and %s differ\n" msgstr "Fiºierele binare %s ºi %s diferã\n" -#: src/analyze.c:697 src/diff3.c:1463 src/util.c:1255 +#: src/analyze.c:706 src/diff3.c:1465 src/util.c:1254 msgid "No newline at end of file" msgstr "Nici un element de linie nouã la sfârºitul fiºierului" #. This is a proper name. See the gettext manual, section Names. -#: src/cmp.c:43 +#: src/cmp.c:44 msgid "Torbjorn Granlund" msgstr "" #. This is a proper name. See the gettext manual, section Names. -#: src/cmp.c:44 +#: src/cmp.c:45 msgid "David MacKenzie" msgstr "" -#: src/cmp.c:118 src/diff.c:875 src/diff3.c:459 src/sdiff.c:158 +#: src/cmp.c:119 src/diff.c:877 src/diff3.c:462 src/sdiff.c:159 #, fuzzy, c-format msgid "Try '%s --help' for more information." msgstr "Încercaþi `%s --help' pentru mai multe informaþii." @@ -534,12 +509,12 @@ msgstr "invalid --se ignorã valoarea iniþialã `%s'" msgid "options -l and -s are incompatible" msgstr "opþiunile -l ºi -s sunt incompatibile" -#: src/cmp.c:155 src/diff.c:884 src/diff3.c:467 src/sdiff.c:167 src/sdiff.c:315 -#: src/sdiff.c:322 src/sdiff.c:874 src/util.c:853 src/util.c:953 src/util.c:960 +#: src/cmp.c:155 src/diff.c:885 src/diff3.c:469 src/sdiff.c:167 src/sdiff.c:315 +#: src/sdiff.c:322 src/sdiff.c:874 src/util.c:852 src/util.c:952 src/util.c:959 msgid "write failed" msgstr "scriere eºuatã" -#: src/cmp.c:157 src/diff.c:886 src/diff.c:1465 src/diff3.c:469 src/sdiff.c:169 +#: src/cmp.c:157 src/diff.c:887 src/diff.c:1466 src/diff3.c:471 src/sdiff.c:169 msgid "standard output" msgstr "ieºire(output) standard" @@ -604,7 +579,7 @@ msgid "" msgstr "" "OMIS1 ºi OMIS2 sunt numerele de octeþi care sã fie omiºi din fiecare fiºier." -#: src/cmp.c:185 src/diff.c:996 src/diff3.c:507 src/sdiff.c:210 +#: src/cmp.c:185 src/diff.c:997 src/diff3.c:509 src/sdiff.c:210 msgid "" "Mandatory arguments to long options are mandatory for short options too.\n" msgstr "" @@ -625,7 +600,7 @@ msgid "If a FILE is '-' or missing, read standard input." msgstr "" "Dacã un FIªIER este `-' sau lipseºte, se citeºte intrarea(input) standard." -#: src/cmp.c:195 src/diff.c:984 src/sdiff.c:220 +#: src/cmp.c:195 src/diff.c:985 src/sdiff.c:220 msgid "Exit status is 0 if inputs are the same, 1 if different, 2 if trouble." msgstr "" @@ -634,186 +609,198 @@ msgstr "" msgid "invalid --bytes value '%s'" msgstr "valoare --bytes invalidã `%s'" -#: src/cmp.c:266 src/diff.c:793 src/diff3.c:353 src/sdiff.c:565 +#: src/cmp.c:266 src/diff.c:795 src/diff3.c:356 src/sdiff.c:565 #, fuzzy, c-format msgid "missing operand after '%s'" msgstr "lipseºte operandul dupã `%s'" -#: src/cmp.c:278 src/diff.c:795 src/diff3.c:355 src/sdiff.c:567 +#: src/cmp.c:278 src/diff.c:797 src/diff3.c:358 src/sdiff.c:567 #, fuzzy, c-format msgid "extra operand '%s'" msgstr "operand în plus(extra) `%s'" -#: src/cmp.c:494 +#: src/cmp.c:498 #, c-format msgid "%s %s differ: byte %s, line %s\n" msgstr "%s %s diferã: octetul %s, linia %s\n" -#: src/cmp.c:510 +#: src/cmp.c:514 #, c-format msgid "%s %s differ: byte %s, line %s is %3o %s %3o %s\n" msgstr "%s %s diferã: octetul %s, linia %s este %3o %s %3o %s\n" -#: src/cmp.c:562 -#, c-format -msgid "cmp: EOF on %s\n" +#: src/cmp.c:571 +#, fuzzy, c-format +msgid "cmp: EOF on %s which is empty\n" +msgstr "cmp: EOF în %s\n" + +#: src/cmp.c:585 +#, fuzzy, c-format +msgid "cmp: EOF on %s after byte %s, line %s\n" +msgstr "%s %s diferã: octetul %s, linia %s\n" + +#: src/cmp.c:586 +#, fuzzy, c-format +msgid "cmp: EOF on %s after byte %s, in line %s\n" +msgstr "%s %s diferã: octetul %s, linia %s\n" + +#: src/cmp.c:592 +#, fuzzy, c-format +msgid "cmp: EOF on %s after byte %s\n" msgstr "cmp: EOF în %s\n" #. This is a proper name. See the gettext manual, section Names. -#: src/diff.c:49 +#: src/diff.c:50 msgid "Paul Eggert" msgstr "" #. This is a proper name. See the gettext manual, section Names. -#: src/diff.c:50 +#: src/diff.c:51 msgid "Mike Haertel" msgstr "" #. This is a proper name. See the gettext manual, section Names. -#: src/diff.c:51 +#: src/diff.c:52 msgid "David Hayes" msgstr "" #. This is a proper name. See the gettext manual, section Names. -#: src/diff.c:52 +#: src/diff.c:53 msgid "Richard Stallman" msgstr "" #. This is a proper name. See the gettext manual, section Names. -#: src/diff.c:53 +#: src/diff.c:54 msgid "Len Tower" msgstr "" -#: src/diff.c:351 +#: src/diff.c:353 #, fuzzy, c-format msgid "invalid context length '%s'" msgstr "lungime invalidã de context `%s'" -#: src/diff.c:434 +#: src/diff.c:436 #, c-format msgid "pagination not supported on this host" msgstr "paginaþie nesuportatã de acest host" -#: src/diff.c:449 src/diff3.c:335 +#: src/diff.c:451 src/diff3.c:336 #, c-format msgid "too many file label options" msgstr "prea multe opþiuni de etichete fiºier" -#: src/diff.c:526 +#: src/diff.c:528 #, fuzzy, c-format msgid "invalid width '%s'" msgstr "lungime invalidã `%s'" -#: src/diff.c:530 +#: src/diff.c:532 msgid "conflicting width options" msgstr "opþiuni de lungime în conflict" -#: src/diff.c:555 +#: src/diff.c:557 #, fuzzy, c-format msgid "invalid horizon length '%s'" msgstr "lungime de orizont invalidã `%s'" -#: src/diff.c:611 +#: src/diff.c:613 #, fuzzy, c-format msgid "invalid tabsize '%s'" msgstr "mãrime tab invalidã `%s'" -#: src/diff.c:615 +#: src/diff.c:617 msgid "conflicting tabsize options" msgstr "opþiuni mãrime tab în conflict" -#: src/diff.c:770 +#: src/diff.c:772 msgid "--from-file and --to-file both specified" msgstr " --from-file ºi --to-file sunt specificate împreunã" -#: src/diff.c:890 +#: src/diff.c:891 #, fuzzy msgid " --normal output a normal diff (the default)" msgstr "--normal Afiºeazã un diff normal." -#: src/diff.c:891 +#: src/diff.c:892 #, fuzzy msgid "-q, --brief report only when files differ" msgstr "-q --brief Afiºeazã doar dacã fiºierele diferã." -#: src/diff.c:892 +#: src/diff.c:893 #, fuzzy msgid "-s, --report-identical-files report when two files are the same" msgstr "" "-s --report-identical-files Raporteazã când douã fiºiere sunt asemãnãtoare." -#: src/diff.c:893 +#: src/diff.c:894 msgid "" "-c, -C NUM, --context[=NUM] output NUM (default 3) lines of copied context" msgstr "" -#: src/diff.c:894 +#: src/diff.c:895 #, fuzzy msgid "" "-u, -U NUM, --unified[=NUM] output NUM (default 3) lines of unified context" msgstr "" "-w NUM --width=NUM Afiºeazã cel mult NUM (implicit 130) coloane tipãrite." -#: src/diff.c:895 +#: src/diff.c:896 #, fuzzy msgid "-e, --ed output an ed script" msgstr "-e --ed Afiºeazã un script ed." -#: src/diff.c:896 +#: src/diff.c:897 #, fuzzy msgid "-n, --rcs output an RCS format diff" msgstr "-n --rcs Afiºeazã un diff în format RCS." -#: src/diff.c:897 +#: src/diff.c:898 msgid "-y, --side-by-side output in two columns" msgstr "" -#: src/diff.c:898 +#: src/diff.c:899 #, fuzzy msgid "" "-W, --width=NUM output at most NUM (default 130) print columns" msgstr "" "-w NUM --width=NUM Afiºeazã cel mult NUM (implicit 130) coloane tipãrite." -#: src/diff.c:899 +#: src/diff.c:900 #, fuzzy msgid "" " --left-column output only the left column of common lines" msgstr "-l --left-column Afiºeazã doar coloana din stânga a liniilor comune." -#: src/diff.c:900 +#: src/diff.c:901 #, fuzzy msgid " --suppress-common-lines do not output common lines" msgstr "-s --suppress-common-lines Nu afiºa liniile comune." -#: src/diff.c:902 +#: src/diff.c:903 msgid "-p, --show-c-function show which C function each change is in" msgstr "" -#: src/diff.c:903 +#: src/diff.c:904 msgid "-F, --show-function-line=RE show the most recent line matching RE" msgstr "" -#: src/diff.c:904 -#, fuzzy +#: src/diff.c:905 msgid "" " --label LABEL use LABEL instead of file name and timestamp\n" " (can be repeated)" msgstr "" -"--from-file=FIªIER1 Comparã FIªIER1 cu toþi operanzii. FIªIER1 poate fi " -"director." -#: src/diff.c:907 +#: src/diff.c:908 #, fuzzy msgid "-t, --expand-tabs expand tabs to spaces in output" msgstr "-t --expand-tabs Schimbã tab-urile în spaþii la ieºire(output)." -#: src/diff.c:908 +#: src/diff.c:909 #, fuzzy msgid "-T, --initial-tab make tabs line up by prepending a tab" msgstr "-T --initial-tab Aliniazã tab-urile adãugând în faþã un tab." -#: src/diff.c:909 +#: src/diff.c:910 #, fuzzy msgid "" " --tabsize=NUM tab stops every NUM (default 8) print columns" @@ -821,56 +808,56 @@ msgstr "" "--tabsize=NUM Opririle tab-ului vor fi la fiecare NUM (implicit 8) coloane " "tipãrite." -#: src/diff.c:910 +#: src/diff.c:911 msgid "" " --suppress-blank-empty suppress space or tab before empty output lines" msgstr "" -#: src/diff.c:911 +#: src/diff.c:912 #, fuzzy msgid "-l, --paginate pass output through 'pr' to paginate it" msgstr "" "-l --paginate Trimite ieºirea(output) prin `pr' pentru a fi paginatã." -#: src/diff.c:913 +#: src/diff.c:914 #, fuzzy msgid "" "-r, --recursive recursively compare any subdirectories found" msgstr "-r --recursive Comparã recursiv orice subdirector întâlnit." -#: src/diff.c:914 +#: src/diff.c:915 msgid " --no-dereference don't follow symbolic links" msgstr "" -#: src/diff.c:915 +#: src/diff.c:916 #, fuzzy msgid "-N, --new-file treat absent files as empty" msgstr "-N --new-file Trateazã fiºierele lipsã ca vide." -#: src/diff.c:916 +#: src/diff.c:917 #, fuzzy msgid " --unidirectional-new-file treat absent first files as empty" msgstr "--unidirectional-new-file Trateazã primele fiºiere lipsã ca vide." -#: src/diff.c:917 +#: src/diff.c:918 #, fuzzy msgid " --ignore-file-name-case ignore case when comparing file names" msgstr "" "--ignore-file-name-case Ignorã cazul când se comparã numele de fiºiere." -#: src/diff.c:918 +#: src/diff.c:919 #, fuzzy msgid " --no-ignore-file-name-case consider case when comparing file names" msgstr "" "--no-ignore-file-name-case Ia în calcul cazul atunci când se comparã numele " "de fiºiere." -#: src/diff.c:919 +#: src/diff.c:920 #, fuzzy msgid "-x, --exclude=PAT exclude files that match PAT" msgstr "-x TIP --exclude=TIP Exclude fiºierele care se potrivesc TIParului." -#: src/diff.c:920 +#: src/diff.c:921 #, fuzzy msgid "" "-X, --exclude-from=FILE exclude files that match any pattern in FILE" @@ -878,7 +865,7 @@ msgstr "" "-X FIªIER --exclude-from=FIªIER Exclude fiºierele care se potrivesc " "oricãrui tipar din FIªIER." -#: src/diff.c:921 +#: src/diff.c:922 #, fuzzy msgid "" "-S, --starting-file=FILE start with FILE when comparing directories" @@ -886,7 +873,7 @@ msgstr "" "-S FIªIER --starting-file=FIªIER Începe cu FIªIER în compararea " "directoarelor." -#: src/diff.c:922 +#: src/diff.c:923 #, fuzzy msgid "" " --from-file=FILE1 compare FILE1 to all operands;\n" @@ -895,7 +882,7 @@ msgstr "" "--from-file=FIªIER1 Comparã FIªIER1 cu toþi operanzii. FIªIER1 poate fi " "director." -#: src/diff.c:924 +#: src/diff.c:925 #, fuzzy msgid "" " --to-file=FILE2 compare all operands to FILE2;\n" @@ -904,37 +891,37 @@ msgstr "" "--to-file=FIªIER2 Comparã toþi operanzii cu FIªIER2. FIªIER2 poate fi " "director." -#: src/diff.c:927 +#: src/diff.c:928 #, fuzzy msgid "" "-i, --ignore-case ignore case differences in file contents" msgstr "" "-i --ignore-case Ignorã diferenþele de caz din conþinutul fiºierului." -#: src/diff.c:928 +#: src/diff.c:929 #, fuzzy msgid "-E, --ignore-tab-expansion ignore changes due to tab expansion" msgstr "" "-E --ignore-tab-expansion Ignorã schimbãrile produse de modificarea tab-" "ului." -#: src/diff.c:929 +#: src/diff.c:930 #, fuzzy msgid "-Z, --ignore-trailing-space ignore white space at line end" msgstr "-w --ignore-all-space Ignorã tot spaþiul vid." -#: src/diff.c:930 +#: src/diff.c:931 #, fuzzy msgid "" "-b, --ignore-space-change ignore changes in the amount of white space" msgstr "-b --ignore-space-change Ignorã schimbãrile din spaþiul vid." -#: src/diff.c:931 +#: src/diff.c:932 #, fuzzy msgid "-w, --ignore-all-space ignore all white space" msgstr "-w --ignore-all-space Ignorã tot spaþiul vid." -#: src/diff.c:932 +#: src/diff.c:933 #, fuzzy msgid "" "-B, --ignore-blank-lines ignore changes where lines are all blank" @@ -942,31 +929,31 @@ msgstr "" "-B --ignore-blank-lines Ignorã schimbãrile unde toate liniile sunt " "goale(blank)." -#: src/diff.c:933 +#: src/diff.c:934 #, fuzzy msgid "-I, --ignore-matching-lines=RE ignore changes where all lines match RE" msgstr "" "-I RE --ignore-matching-lines=RE Ignorã schimbãrile la toate liniile care " "se potrivesc RE-ului." -#: src/diff.c:935 +#: src/diff.c:936 #, fuzzy msgid "-a, --text treat all files as text" msgstr "-a --text Trateazã toate fiºierele ca text." -#: src/diff.c:936 +#: src/diff.c:937 #, fuzzy msgid " --strip-trailing-cr strip trailing carriage return on input" msgstr "" "--strip-trailing-cr Eliminã returul de car(carriage return) final la " "intrare(input)." -#: src/diff.c:938 +#: src/diff.c:939 #, fuzzy msgid " --binary read and write data in binary mode" msgstr "--binary Citeºte ºi scrie date în mod binar." -#: src/diff.c:941 +#: src/diff.c:942 #, fuzzy msgid "" "-D, --ifdef=NAME output merged file with '#ifdef NAME' diffs" @@ -974,38 +961,38 @@ msgstr "" "-D NUME --ifdef=NUME Afiºeazã fiºierul rezultat(merged) pentru a arãta " "diff-urile`#ifdef NAME'." -#: src/diff.c:942 +#: src/diff.c:943 #, fuzzy msgid " --GTYPE-group-format=GFMT format GTYPE input groups with GFMT" msgstr "" "--GTYPE-group-format=GFMT Similar, dar formatul de intrare GTYPE se " "grupeazã cu GFMT." -#: src/diff.c:943 +#: src/diff.c:944 #, fuzzy msgid " --line-format=LFMT format all input lines with LFMT" msgstr "--line-format=LFMT Similar, dar formateazã toate liniile cu LFMT." -#: src/diff.c:944 +#: src/diff.c:945 #, fuzzy msgid " --LTYPE-line-format=LFMT format LTYPE input lines with LFMT" msgstr "" "--LTYPE-line-format=LFMT Similar, dar formateazã liniile de intrare LTYPE " "cu LFMT." -#: src/diff.c:945 +#: src/diff.c:946 msgid "" " These format options provide fine-grained control over the output\n" " of diff, generalizing -D/--ifdef." msgstr "" -#: src/diff.c:947 +#: src/diff.c:948 #, fuzzy msgid " LTYPE is 'old', 'new', or 'unchanged'. GTYPE is LTYPE or 'changed'." msgstr "" " LTYPE este `old', `new', sau `unchanged'. GTYPE este LTYPE sau `changed'." -#: src/diff.c:948 +#: src/diff.c:949 #, fuzzy msgid "" " GFMT (only) may contain:\n" @@ -1035,7 +1022,7 @@ msgstr "" " E F-1\n" " M L+1" -#: src/diff.c:960 +#: src/diff.c:961 #, fuzzy msgid "" " LFMT (only) may contain:\n" @@ -1049,7 +1036,7 @@ msgstr "" " %[-][WIDTH][.[PREC]]{doxX}n specificaþii stil printf-pentru " "introducerea numãrului de linie" -#: src/diff.c:964 +#: src/diff.c:965 #, fuzzy msgid "" " Both GFMT and LFMT may contain:\n" @@ -1063,18 +1050,18 @@ msgstr "" " %c'C' caracterul singular C\n" " %c'\\OOO' caracterul cu codul octal OOO" -#: src/diff.c:970 +#: src/diff.c:971 #, fuzzy msgid "-d, --minimal try hard to find a smaller set of changes" msgstr "" "-d --minimal Încearcã din greu sã gãseºti un set mai mic de schimbãri" -#: src/diff.c:971 +#: src/diff.c:972 #, fuzzy msgid " --horizon-lines=NUM keep NUM lines of the common prefix and suffix" msgstr "--horizon-lines=NUM Reþine NUM linii de prefix ºi sufix comun." -#: src/diff.c:972 +#: src/diff.c:973 #, fuzzy msgid "" " --speed-large-files assume large files and many scattered small changes" @@ -1082,44 +1069,37 @@ msgstr "" "-H --speed-large-files Presupune fiºiere mari ºi multe modificãri mici " "împrãºtiate." -#: src/diff.c:973 -msgid "" -" --color[=WHEN] colorize the output; WHEN can be 'never', 'always'," -msgstr "" - #: src/diff.c:974 -#, fuzzy -msgid " or 'auto' (the default)" -msgstr "--normal Afiºeazã un diff normal." - -#: src/diff.c:975 msgid "" -" --palette=PALETTE specify the colors to use when --color is active" +" --color[=WHEN] colorize the output; WHEN can be 'never', " +"'always',\n" +" or 'auto' (the default)" msgstr "" #: src/diff.c:976 msgid "" -" PALETTE is a colon-separated list terminfo " -"capabilities" +" --palette=PALETTE the colors to use when --color is active; PALETTE " +"is\n" +" a colon-separated list of terminfo capabilities" msgstr "" -#: src/diff.c:978 +#: src/diff.c:979 msgid " --help display this help and exit" msgstr "" -#: src/diff.c:979 +#: src/diff.c:980 #, fuzzy msgid "-v, --version output version information and exit" msgstr "-v --version Tipãreºte informaþii despre versiune." -#: src/diff.c:981 +#: src/diff.c:982 #, fuzzy msgid "FILES are 'FILE1 FILE2' or 'DIR1 DIR2' or 'DIR FILE' or 'FILE DIR'." msgstr "" "FIªIEREle sunt `FIªIER1 FIªIER2' sau `DIR1 DIR2' sau `DIR FIªIER...' or " "`FIªIER... DIR'." -#: src/diff.c:982 +#: src/diff.c:983 #, fuzzy msgid "" "If --from-file or --to-file is given, there are no restrictions on FILE(s)." @@ -1127,97 +1107,97 @@ msgstr "" "Dacã --from-file sau --to-file sunt precizate, nu existã restricþii pe " "FIªIERE." -#: src/diff.c:983 src/diff3.c:526 src/sdiff.c:219 +#: src/diff.c:984 src/diff3.c:528 src/sdiff.c:219 #, fuzzy msgid "If a FILE is '-', read standard input." msgstr "Dacã FIªIER este `-', se citeºte intrarea(input) standard." -#: src/diff.c:993 +#: src/diff.c:994 #, c-format msgid "Usage: %s [OPTION]... FILES\n" msgstr "Folosire: %s [OPÞIUNE]... FIªIERE\n" -#: src/diff.c:994 +#: src/diff.c:995 #, fuzzy msgid "Compare FILES line by line." msgstr "Comparã fiºierele linie cu linie." -#: src/diff.c:1028 +#: src/diff.c:1029 #, fuzzy, c-format msgid "conflicting %s option value '%s'" msgstr "Existã un conflict cu %s în valoarea opþiunii `%s'" -#: src/diff.c:1041 +#: src/diff.c:1042 #, c-format msgid "conflicting output style options" msgstr "Conflict în opþiunile stilului de afiºare(output)" -#: src/diff.c:1057 +#: src/diff.c:1058 #, fuzzy, c-format msgid "invalid color '%s'" -msgstr "lungime invalidã `%s'" +msgstr "lungime invalidã de context `%s'" -#: src/diff.c:1113 src/diff.c:1323 +#: src/diff.c:1114 src/diff.c:1324 #, c-format msgid "Only in %s: %s\n" msgstr "Doar în %s: %s\n" -#: src/diff.c:1247 +#: src/diff.c:1248 #, fuzzy msgid "cannot compare '-' to a directory" msgstr "nu se poate compara `-' cu un director" -#: src/diff.c:1282 +#: src/diff.c:1283 msgid "-D option not supported with directories" msgstr "opþiunea -D nu este compatibilã cu directoarele" -#: src/diff.c:1291 +#: src/diff.c:1292 #, c-format msgid "Common subdirectories: %s and %s\n" msgstr "Subdirectoare comune: %s ºi %s.\n" -#: src/diff.c:1333 src/diff.c:1383 +#: src/diff.c:1334 src/diff.c:1384 #, c-format msgid "File %s is a %s while file %s is a %s\n" msgstr "Fiºierul %s este un %s pe când fiºierul %s este un %s.\n" -#: src/diff.c:1369 +#: src/diff.c:1370 #, fuzzy, c-format msgid "Symbolic links %s and %s differ\n" msgstr "Fiºierele %s ºi %s diferã\n" -#: src/diff.c:1456 +#: src/diff.c:1457 #, c-format msgid "Files %s and %s are identical\n" msgstr "Fiºierele %s ºi %s sunt identice\n" #. This is a proper name. See the gettext manual, section Names. -#: src/diff3.c:41 +#: src/diff3.c:42 #, fuzzy msgid "Randy Smith" msgstr "Scris de Randy Smith." -#: src/diff3.c:348 +#: src/diff3.c:351 #, c-format msgid "incompatible options" msgstr "opþiuni incompatibile" -#: src/diff3.c:388 +#: src/diff3.c:391 #, fuzzy msgid "'-' specified for more than one input file" msgstr "`-' specificat pentru mai mult de un fiºier de intrare(input)" -#: src/diff3.c:439 src/diff3.c:1288 src/diff3.c:1692 src/diff3.c:1747 +#: src/diff3.c:442 src/diff3.c:1290 src/diff3.c:1693 src/diff3.c:1748 #: src/sdiff.c:307 src/sdiff.c:844 src/sdiff.c:855 msgid "read failed" msgstr "citire eºuatã" -#: src/diff3.c:473 +#: src/diff3.c:475 #, fuzzy msgid "-A, --show-all output all changes, bracketing conflicts" msgstr "-A --show-all Afiºeazã toate modificãrile, conflictele de paranteze." -#: src/diff3.c:475 +#: src/diff3.c:477 #, fuzzy msgid "" "-e, --ed output ed script incorporating changes\n" @@ -1226,14 +1206,14 @@ msgstr "" "-e --ed Trimite(output) modificãrile nerezultate(unmerged) de la " "FIªIER_VECHI la FIªIERUL_VOSTRU în FIªIERUL_MEU.." -#: src/diff3.c:477 +#: src/diff3.c:479 #, fuzzy msgid "-E, --show-overlap like -e, but bracket conflicts" msgstr "" "-E --show-overlap Afiºeazã modificãrile nerezultate(unmerged), conflictele " "de paranteze." -#: src/diff3.c:478 +#: src/diff3.c:480 #, fuzzy msgid "" "-3, --easy-only like -e, but incorporate only nonoverlapping " @@ -1242,74 +1222,74 @@ msgstr "" "-3 --easy-only Afiºeazã schimbãrile nesuprapuse(nonoverlapping) ºi " "nerezultate(unmerged)." -#: src/diff3.c:479 +#: src/diff3.c:481 #, fuzzy msgid "" "-x, --overlap-only like -e, but incorporate only overlapping changes" msgstr "-x --overlap-only Afiºeazã toate schimbãrile de suprapunere." -#: src/diff3.c:480 +#: src/diff3.c:482 msgid "-X like -x, but bracket conflicts" msgstr "" -#: src/diff3.c:481 +#: src/diff3.c:483 #, fuzzy msgid "-i append 'w' and 'q' commands to ed scripts" msgstr "-i Adaugã comenzile `w' ºi `q' la scripturile ed." -#: src/diff3.c:483 +#: src/diff3.c:485 msgid "" "-m, --merge output actual merged file, according to\n" " -A if no other options are given" msgstr "" -#: src/diff3.c:486 +#: src/diff3.c:488 #, fuzzy msgid "-a, --text treat all files as text" msgstr "-a --text Trateazã toate fiºierele ca text." -#: src/diff3.c:487 +#: src/diff3.c:489 #, fuzzy msgid " --strip-trailing-cr strip trailing carriage return on input" msgstr "" "--strip-trailing-cr Eliminã returul de car(carriage return) final la " "intrare(input)." -#: src/diff3.c:488 +#: src/diff3.c:490 #, fuzzy msgid "-T, --initial-tab make tabs line up by prepending a tab" msgstr "-T --initial-tab Aliniazã tab-urile adãugând în faþã un tab." -#: src/diff3.c:489 +#: src/diff3.c:491 #, fuzzy msgid " --diff-program=PROGRAM use PROGRAM to compare files" msgstr "--diff-program=PROGRAM Foloseºte PROGRAM pentru a compara fiºierele." -#: src/diff3.c:490 +#: src/diff3.c:492 msgid "" "-L, --label=LABEL use LABEL instead of file name\n" " (can be repeated up to three times)" msgstr "" -#: src/diff3.c:493 +#: src/diff3.c:495 msgid " --help display this help and exit" msgstr "" -#: src/diff3.c:494 +#: src/diff3.c:496 #, fuzzy msgid "-v, --version output version information and exit" msgstr "-v --version Tipãreºte informaþii despre versiune." -#: src/diff3.c:503 +#: src/diff3.c:505 #, c-format msgid "Usage: %s [OPTION]... MYFILE OLDFILE YOURFILE\n" msgstr "Folosire: %s [OPÞIUNE]... FIªIERUL_MEU FIªIER_VECHI FIªIERUL_TÃU\n" -#: src/diff3.c:505 +#: src/diff3.c:507 msgid "Compare three files line by line." msgstr "Comparã trei fiºiere linie cu linie" -#: src/diff3.c:515 +#: src/diff3.c:517 msgid "" "\n" "The default output format is a somewhat human-readable representation of\n" @@ -1323,45 +1303,45 @@ msgid "" "robust than using ed.\n" msgstr "" -#: src/diff3.c:527 +#: src/diff3.c:529 msgid "Exit status is 0 if successful, 1 if conflicts, 2 if trouble." msgstr "" -#: src/diff3.c:720 +#: src/diff3.c:722 msgid "internal error: screwup in format of diff blocks" msgstr "eroare internã: zãpãcealã în formatul blocurilor diff" -#: src/diff3.c:1015 +#: src/diff3.c:1017 #, c-format msgid "%s: diff failed: " msgstr "%s: diff eºuat: " -#: src/diff3.c:1037 +#: src/diff3.c:1039 msgid "internal error: invalid diff type in process_diff" msgstr "eroare internã: tip diff invalid în process_diff" -#: src/diff3.c:1062 +#: src/diff3.c:1064 msgid "invalid diff format; invalid change separator" msgstr "format diff invalid; separator de modificare invalid" -#: src/diff3.c:1298 +#: src/diff3.c:1300 msgid "invalid diff format; incomplete last line" msgstr "format diff invalid; ultimã-linie incompletã" -#: src/diff3.c:1322 src/sdiff.c:275 src/util.c:970 +#: src/diff3.c:1324 src/sdiff.c:275 src/util.c:969 #, fuzzy, c-format msgid "subsidiary program '%s' could not be invoked" msgstr "programul subsidiar `%s' nu a fost gãsit" -#: src/diff3.c:1347 +#: src/diff3.c:1349 msgid "invalid diff format; incorrect leading line chars" msgstr "format diff invalid; caractere precedente liniei incorecte" -#: src/diff3.c:1420 +#: src/diff3.c:1422 msgid "internal error: invalid diff type passed to output" msgstr "eroare internã: tip invalid de diff trimis spre ieºire(output)" -#: src/diff3.c:1694 src/diff3.c:1751 +#: src/diff3.c:1695 src/diff3.c:1752 msgid "input file shrank" msgstr "fiºier de intrare(input) micºorat" @@ -1376,7 +1356,7 @@ msgid "%s: recursive directory loop" msgstr "" #. This is a proper name. See the gettext manual, section Names. -#: src/sdiff.c:42 +#: src/sdiff.c:43 #, fuzzy msgid "Thomas Lord" msgstr "Scris de Thomas Lord." @@ -1548,16 +1528,36 @@ msgstr "" "v:\tInclude detaliat liniile comune.\n" "q:\tIeºire.\n" -#: src/util.c:663 +#: src/util.c:662 #, fuzzy, c-format msgid "unrecognized prefix: %s" msgstr "%s: opþiune necunoscutã `--%s'\n" -#: src/util.c:693 +#: src/util.c:692 #, c-format msgid "unparsable value for --palette" msgstr "" +#, fuzzy +#~ msgid "%s: option '--%s' doesn't allow an argument\n" +#~ msgstr "%s: opþiunea `--%s' nu permite parametri\n" + +#, fuzzy +#~ msgid "%s: unrecognized option '--%s'\n" +#~ msgstr "%s: opþiune necunoscutã `--%s'\n" + +#, fuzzy +#~ msgid "%s: option '-W %s' is ambiguous\n" +#~ msgstr "%s: opþiunea `-W %s' este ambiguã\n" + +#, fuzzy +#~ msgid "%s: option '-W %s' doesn't allow an argument\n" +#~ msgstr "%s: opþiunea `-W %s' nu permite parametri\n" + +#, fuzzy +#~ msgid "%s: option '-W %s' requires an argument\n" +#~ msgstr "%s: opþiunea `%s' necesitã un parametru\n" + #~ msgid "%s: illegal option -- %c\n" #~ msgstr "%s: opþiune ilegalã -- %c\n" @@ -1,206 +1,182 @@ -# ðÅÒÅ×ÏÄ ÓÏÏÂÝÅÎÉÊ diffutils +# Перевод Ñообщений diffutils # Copyright (C) 1998 Free Software Foundation, Inc. -# Oleg S. Tihonov <ost@tatnipi.ru>, 1998, 2001, 2002, 2005, 2007. +# This file is distributed under the same license as the diffutils package. # +# Oleg S. Tihonov <ost@tatnipi.ru>, 1998, 2001, 2002, 2005, 2007. +# Yuri Kozlov <yuray@komyakino.ru>, 2017. msgid "" msgstr "" -"Project-Id-Version: diffutils 2.8.7\n" +"Project-Id-Version: diffutils 3.5.25\n" "Report-Msgid-Bugs-To: bug-diffutils@gnu.org\n" -"POT-Creation-Date: 2016-08-20 22:22-0700\n" -"PO-Revision-Date: 2007-02-13 07:13+0300\n" -"Last-Translator: Oleg S. Tihonov <ost@tatnipi.ru>\n" -"Language-Team: Russian <ru@li.org>\n" +"POT-Creation-Date: 2017-05-21 13:26-0700\n" +"PO-Revision-Date: 2017-05-08 11:12+0300\n" +"Last-Translator: Yuri Kozlov <yuray@komyakino.ru>\n" +"Language-Team: Russian <gnu@d07.ru>\n" "Language: ru\n" "MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=koi8-r\n" +"Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"X-Bugs: Report translation errors to the Language-Team address.\n" +"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n" +"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" +"X-Generator: Lokalize 2.0\n" -#: lib/argmatch.c:133 -#, fuzzy, c-format +#: lib/argmatch.c:134 +#, c-format msgid "invalid argument %s for %s" -msgstr "ÎÅÄÏÐÕÓÔÉÍÏÅ ÚÎÁÞÅÎÉÅ --bytes `%s'" +msgstr "неверный аргумент %s Ð´Ð»Ñ %s" -#: lib/argmatch.c:134 +#: lib/argmatch.c:135 #, c-format msgid "ambiguous argument %s for %s" -msgstr "" +msgstr "двуÑмыÑленный аргумент %s Ð´Ð»Ñ %s" -#: lib/argmatch.c:153 -#, fuzzy +#: lib/argmatch.c:154 msgid "Valid arguments are:" -msgstr "ÎÅÄÏÐÕÓÔÉÍÏÅ ÚÎÁÞÅÎÉÅ --bytes `%s'" +msgstr "ДопуÑтимые аргументы:" -#: lib/c-stack.c:204 lib/c-stack.c:297 +#: lib/c-stack.c:203 lib/c-stack.c:296 msgid "program error" -msgstr "ÏÛÉÂËÁ ÐÒÏÇÒÁÍÍÙ" +msgstr "ошибка программы" -#: lib/c-stack.c:205 lib/c-stack.c:298 +#: lib/c-stack.c:204 lib/c-stack.c:297 msgid "stack overflow" -msgstr "ÐÅÒÅÐÏÌÎÅÎÉÅ ÓÔÅËÁ" +msgstr "переполнение Ñтека" -#: lib/error.c:191 +#: lib/error.c:195 msgid "Unknown system error" -msgstr "îÅÉÚ×ÅÓÔÎÁÑ ÓÉÓÔÅÍÎÁÑ ÏÛÉÂËÁ" +msgstr "ÐеизвеÑÑ‚Ð½Ð°Ñ ÑиÑÑ‚ÐµÐ¼Ð½Ð°Ñ Ð¾ÑˆÐ¸Ð±ÐºÐ°" #: lib/file-type.c:40 msgid "regular empty file" -msgstr "ÏÂÙÞÎÙÊ ÐÕÓÔÏÊ ÆÁÊÌ" +msgstr "обычный пуÑтой файл" #: lib/file-type.c:40 msgid "regular file" -msgstr "ÏÂÙÞÎÙÊ ÆÁÊÌ" +msgstr "обычный файл" #: lib/file-type.c:43 msgid "directory" -msgstr "ËÁÔÁÌÏÇ" +msgstr "каталог" #: lib/file-type.c:46 msgid "symbolic link" -msgstr "ÓÉÍ×ÏÌØÎÁÑ ÓÓÙÌËÁ" +msgstr "ÑÐ¸Ð¼Ð²Ð¾Ð»ÑŒÐ½Ð°Ñ ÑÑылка" #: lib/file-type.c:52 msgid "message queue" -msgstr "ÏÞÅÒÅÄØ ÓÏÏÂÝÅÎÉÊ" +msgstr "очередь Ñообщений" #: lib/file-type.c:55 msgid "semaphore" -msgstr "ÓÅÍÁÆÏÒ" +msgstr "Ñемафор" #: lib/file-type.c:58 msgid "shared memory object" -msgstr "ÒÁÚÄÅÌÑÅÍÙÊ ÏÂßÅËÔ" +msgstr "разделÑемый объект" #: lib/file-type.c:61 msgid "typed memory object" -msgstr "ÏÂßÅËÔ ÔÉÐÉÚÉÒÏ×ÁÎÎÏÊ ÐÁÍÑÔÉ" +msgstr "объект типизированной памÑти" #: lib/file-type.c:66 msgid "block special file" -msgstr "ÓÐÅÃÉÁÌØÎÙÊ ÆÁÊÌ Ó ÐÏÂÌÏÞÎÙÍ ÄÏÓÔÕÐÏÍ" +msgstr "Ñпециальный файл Ñ Ð¿Ð¾Ð±Ð»Ð¾Ñ‡Ð½Ñ‹Ð¼ доÑтупом" #: lib/file-type.c:69 msgid "character special file" -msgstr "ÓÐÅÃÉÁÌØÎÙÊ ÆÁÊÌ Ó ÐÏÓÉÍ×ÏÌØÎÙÍ ÄÏÓÔÕÐÏÍ" +msgstr "Ñпециальный файл Ñ Ð¿Ð¾Ñимвольным доÑтупом" #: lib/file-type.c:72 msgid "contiguous data" -msgstr "" +msgstr "непрерывные данные" #: lib/file-type.c:75 msgid "fifo" -msgstr "ÏÞÅÒÅÄØ" +msgstr "очередь" #: lib/file-type.c:78 msgid "door" -msgstr "" +msgstr "дверь" #: lib/file-type.c:81 -#, fuzzy msgid "multiplexed block special file" -msgstr "ÓÐÅÃÉÁÌØÎÙÊ ÆÁÊÌ Ó ÐÏÂÌÏÞÎÙÍ ÄÏÓÔÕÐÏÍ" +msgstr "мультиплекÑный блочный Ñпециальный файл" #: lib/file-type.c:84 -#, fuzzy msgid "multiplexed character special file" -msgstr "ÓÐÅÃÉÁÌØÎÙÊ ÆÁÊÌ Ó ÐÏÓÉÍ×ÏÌØÎÙÍ ÄÏÓÔÕÐÏÍ" +msgstr "мультиплекÑный Ñимвольный Ñпециальный файл" #: lib/file-type.c:87 msgid "multiplexed file" -msgstr "" +msgstr "мультиплекÑный файл" #: lib/file-type.c:90 -#, fuzzy msgid "named file" -msgstr "ÓÔÒÁÎÎÙÊ ÆÁÊÌ" +msgstr "именованный файл" #: lib/file-type.c:93 -#, fuzzy msgid "network special file" -msgstr "ÓÐÅÃÉÁÌØÎÙÊ ÆÁÊÌ Ó ÐÏÂÌÏÞÎÙÍ ÄÏÓÔÕÐÏÍ" +msgstr "Ñетевой Ñпециальный файл" #: lib/file-type.c:96 msgid "migrated file with data" -msgstr "" +msgstr "переноÑной файл Ñ Ð´Ð°Ð½Ð½Ñ‹Ð¼Ð¸" #: lib/file-type.c:99 msgid "migrated file without data" -msgstr "" +msgstr "переноÑной файл без данных" #: lib/file-type.c:102 msgid "port" -msgstr "" +msgstr "порт" #: lib/file-type.c:105 msgid "socket" -msgstr "ÓÏËÅÔ" +msgstr "Ñокет" #: lib/file-type.c:108 msgid "whiteout" -msgstr "" +msgstr "замазка" #: lib/file-type.c:110 msgid "weird file" -msgstr "ÓÔÒÁÎÎÙÊ ÆÁÊÌ" - -#: lib/getopt.c:575 lib/getopt.c:604 -#, fuzzy, c-format -msgid "%s: option '%s' is ambiguous; possibilities:" -msgstr "%s: ÎÅÏÄÎÏÚÎÁÞÎÙÊ ËÌÀÞ `%s'\n" - -#: lib/getopt.c:619 -#, fuzzy, c-format -msgid "%s: option '%s' is ambiguous\n" -msgstr "%s: ÎÅÏÄÎÏÚÎÁÞÎÙÊ ËÌÀÞ `-W %s'\n" - -#: lib/getopt.c:654 lib/getopt.c:658 -#, fuzzy, c-format -msgid "%s: option '--%s' doesn't allow an argument\n" -msgstr "%s: ËÌÀÞ `--%s' ÄÏÌÖÅÎ ÉÓÐÏÌØÚÏ×ÁÔØÓÑ ÂÅÚ ÁÒÇÕÍÅÎÔÁ\n" - -#: lib/getopt.c:667 lib/getopt.c:672 -#, fuzzy, c-format -msgid "%s: option '%c%s' doesn't allow an argument\n" -msgstr "%s: ËÌÀÞ `%c%s' ÄÏÌÖÅÎ ÉÓÐÏÌØÚÏ×ÁÔØÓÑ ÂÅÚ ÁÒÇÕÍÅÎÔÁ\n" - -#: lib/getopt.c:715 lib/getopt.c:734 -#, fuzzy, c-format -msgid "%s: option '--%s' requires an argument\n" -msgstr "%s: ËÌÀÞ `%s' ÄÏÌÖÅÎ ÉÓÐÏÌØÚÏ×ÁÔØÓÑ c ÁÒÇÕÍÅÎÔÏÍ\n" - -#: lib/getopt.c:772 lib/getopt.c:775 -#, fuzzy, c-format -msgid "%s: unrecognized option '--%s'\n" -msgstr "%s: ÎÅÉÚ×ÅÓÔÎÙÊ ËÌÀÞ `--%s'\n" - -#: lib/getopt.c:783 lib/getopt.c:786 -#, fuzzy, c-format -msgid "%s: unrecognized option '%c%s'\n" -msgstr "%s: ÎÅÉÚ×ÅÓÔÎÙÊ ËÌÀÞ `%c%s'\n" - -#: lib/getopt.c:835 lib/getopt.c:838 -#, fuzzy, c-format -msgid "%s: invalid option -- '%c'\n" -msgstr "%s: ÎÅ×ÅÒÎÙÊ ËÌÀÞ -- %c\n" +msgstr "Ñтранный файл" -#: lib/getopt.c:891 lib/getopt.c:908 lib/getopt.c:1118 lib/getopt.c:1136 -#, fuzzy, c-format -msgid "%s: option requires an argument -- '%c'\n" -msgstr "%s: ËÌÀÞ %c ÄÏÌÖÅÎ ÂÙ ÉÓÐÏÌØÚÏ×ÁÔØÓÑ c ÁÒÇÕÍÅÎÔÏÍ\n" +#: lib/getopt.c:278 +#, c-format +msgid "%s: option '%s%s' is ambiguous\n" +msgstr "%s: двуÑмыÑленный параметр «%s%s»\n" + +#: lib/getopt.c:284 +#, c-format +msgid "%s: option '%s%s' is ambiguous; possibilities:" +msgstr "%s: двуÑмыÑленный параметр «%s%s»; возможные варианты:" -#: lib/getopt.c:964 lib/getopt.c:980 -#, fuzzy, c-format -msgid "%s: option '-W %s' is ambiguous\n" -msgstr "%s: ÎÅÏÄÎÏÚÎÁÞÎÙÊ ËÌÀÞ `-W %s'\n" +#: lib/getopt.c:319 +#, c-format +msgid "%s: unrecognized option '%s%s'\n" +msgstr "%s: нераÑпознанный параметр «%s%s»\n" -#: lib/getopt.c:1004 lib/getopt.c:1022 -#, fuzzy, c-format -msgid "%s: option '-W %s' doesn't allow an argument\n" -msgstr "%s: ËÌÀÞ `-W %s' ÄÏÌÖÅÎ ÉÓÐÏÌØÚÏ×ÁÔØÓÑ ÂÅÚ ÁÒÇÕÍÅÎÔÁ\n" +#: lib/getopt.c:345 +#, c-format +msgid "%s: option '%s%s' doesn't allow an argument\n" +msgstr "%s: Ð´Ð»Ñ Ð¿Ð°Ñ€Ð°Ð¼ÐµÑ‚Ñ€Ð° «%s%s» Ð½ÐµÐ»ÑŒÐ·Ñ Ð¸Ñпользовать аргумент\n" -#: lib/getopt.c:1043 lib/getopt.c:1061 -#, fuzzy, c-format -msgid "%s: option '-W %s' requires an argument\n" -msgstr "%s: ËÌÀÞ `%s' ÄÏÌÖÅÎ ÉÓÐÏÌØÚÏ×ÁÔØÓÑ c ÁÒÇÕÍÅÎÔÏÍ\n" +#: lib/getopt.c:360 +#, c-format +msgid "%s: option '%s%s' requires an argument\n" +msgstr "%s: Ð´Ð»Ñ Ð¿Ð°Ñ€Ð°Ð¼ÐµÑ‚Ñ€Ð° «%s%s» требуетÑÑ Ð°Ñ€Ð³ÑƒÐ¼ÐµÐ½Ñ‚\n" + +#: lib/getopt.c:621 +#, c-format +msgid "%s: invalid option -- '%c'\n" +msgstr "%s: недопуÑтимый параметр — «%c»\n" + +#: lib/getopt.c:636 lib/getopt.c:682 +#, c-format +msgid "%s: option requires an argument -- '%c'\n" +msgstr "%s: Ð´Ð»Ñ Ð¿Ð°Ñ€Ð°Ð¼ÐµÑ‚Ñ€Ð° требуетÑÑ Ð°Ñ€Ð³ÑƒÐ¼ÐµÐ½Ñ‚ — «%c»\n" #. TRANSLATORS: #. Get translations for open and closing quotation marks. @@ -223,144 +199,142 @@ msgstr "%s: ËÌÀÞ `%s' ÄÏÌÖÅÎ ÉÓÐÏÌØÚÏ×ÁÔØÓÑ c ÁÒÇÕÍÅÎÔÏÍ\n" #. If you don't know what to put here, please see #. <http://en.wikipedia.org/wiki/Quotation_marks_in_other_languages> #. and use glyphs suitable for your language. -#: lib/quotearg.c:347 +#: lib/quotearg.c:362 msgid "`" -msgstr "" +msgstr "?" -#: lib/quotearg.c:348 +#: lib/quotearg.c:363 msgid "'" -msgstr "" +msgstr "?" #: lib/regcomp.c:135 msgid "Success" -msgstr "õÓÐÅÈ" +msgstr "Выполнено уÑпешно" #: lib/regcomp.c:138 msgid "No match" -msgstr "óÏ×ÐÁÄÅÎÉÊ ÎÅÔ" +msgstr "Совпадений нет" #: lib/regcomp.c:141 msgid "Invalid regular expression" -msgstr "îÅ×ÅÒÎÏÅ ÒÅÇÕÌÑÒÎÏÅ ×ÙÒÁÖÅÎÉÅ" +msgstr "Ðеверное регулÑрное выражение" #: lib/regcomp.c:144 msgid "Invalid collation character" -msgstr "îÅÄÏÐÕÓÔÉÍÙÊ ÄÌÑ ÓÏÒÔÉÒÏ×ËÉ ÓÉÍ×ÏÌ" +msgstr "ÐедопуÑтимый Ð´Ð»Ñ Ñортировки Ñимвол" #: lib/regcomp.c:147 msgid "Invalid character class name" -msgstr "îÅ×ÅÒÎÏÅ ÉÍÑ ËÌÁÓÓÁ ÓÉÍ×ÏÌÁ" +msgstr "Ðеверное Ð¸Ð¼Ñ ÐºÐ»Ð°ÑÑа Ñимвола" #: lib/regcomp.c:150 msgid "Trailing backslash" -msgstr "ïÂÒÁÔÎÁÑ ËÏÓÁÑ ÞÅÒÔÁ ÓÔÏÉÔ ÐÏÓÌÅÄÎÅÊ" +msgstr "ÐžÐ±Ñ€Ð°Ñ‚Ð½Ð°Ñ ÐºÐ¾ÑÐ°Ñ Ñ‡ÐµÑ€Ñ‚Ð° Ñтоит поÑледней" #: lib/regcomp.c:153 msgid "Invalid back reference" -msgstr "îÅ×ÅÒÎÁÑ ÓÓÙÌËÁ" +msgstr "ÐÐµÐ²ÐµÑ€Ð½Ð°Ñ ÑÑылка" #: lib/regcomp.c:156 -#, fuzzy msgid "Unmatched [, [^, [:, [., or [=" -msgstr "îÅÐÁÒÎÁÑ [ ÉÌÉ [^" +msgstr "ÐÐµÐ¿Ð°Ñ€Ð½Ð°Ñ [, [^, [:, [. или [=" #: lib/regcomp.c:159 msgid "Unmatched ( or \\(" -msgstr "îÅÐÁÒÎÁÑ ( ÉÌÉ \\(" +msgstr "ÐÐµÐ¿Ð°Ñ€Ð½Ð°Ñ ( или \\(" #: lib/regcomp.c:162 msgid "Unmatched \\{" -msgstr "îÅÐÁÒÎÁÑ \\{" +msgstr "ÐÐµÐ¿Ð°Ñ€Ð½Ð°Ñ \\{" #: lib/regcomp.c:165 msgid "Invalid content of \\{\\}" -msgstr "îÅ×ÅÒÎÏÅ ÓÏÄÅÒÖÉÍÏÅ \\{\\}" +msgstr "Ðеверное Ñодержимое \\{\\}" #: lib/regcomp.c:168 msgid "Invalid range end" -msgstr "îÅ×ÅÒÎÙÊ ÎÉÖÎÉÊ ÐÒÅÄÅÌ" +msgstr "Ðеверный нижний предел" #: lib/regcomp.c:171 msgid "Memory exhausted" -msgstr "ïÐÅÒÁÔÉ×ÎÁÑ ÐÁÍÑÔØ ÉÓÞÅÒÐÁÎÁ" +msgstr "ÐžÐ¿ÐµÑ€Ð°Ñ‚Ð¸Ð²Ð½Ð°Ñ Ð¿Ð°Ð¼ÑÑ‚ÑŒ иÑчерпана" #: lib/regcomp.c:174 msgid "Invalid preceding regular expression" -msgstr "îÅ×ÅÒÎÏÅ ÐÒÅÄÛÅÓÔ×ÕÀÝÅÅ ÒÅÇÕÌÑÒÎÏÅ ×ÙÒÁÖÅÎÉÅ" +msgstr "Ðеверное предшеÑтвующее регулÑрное выражение" #: lib/regcomp.c:177 msgid "Premature end of regular expression" -msgstr "ðÒÅÖÄÅ×ÒÅÍÅÎÎÙÊ ËÏÎÅà ÒÅÇÕÌÑÒÎÏÇÏ ×ÙÒÁÖÅÎÉÑ" +msgstr "Преждевременный конец регулÑрного выражениÑ" #: lib/regcomp.c:180 msgid "Regular expression too big" -msgstr "òÅÇÕÌÑÒÎÏÅ ×ÙÒÁÖÅÎÉÅ ÓÌÉÛËÏÍ ×ÅÌÉËÏ" +msgstr "РегулÑрное выражение Ñлишком велико" #: lib/regcomp.c:183 msgid "Unmatched ) or \\)" -msgstr "îÅÐÁÒÎÁÑ ) ÉÌÉ \\)" +msgstr "ÐÐµÐ¿Ð°Ñ€Ð½Ð°Ñ ) или \\)" #: lib/regcomp.c:687 msgid "No previous regular expression" -msgstr "òÅÇÕÌÑÒÎÏÅ ×ÙÒÁÖÅÎÉÅ ÎÅ ÂÙÌÏ ÚÁÄÁÎÏ ÒÁÎØÛÅ" +msgstr "РегулÑрное выражение не было задано раньше" #: lib/xalloc-die.c:34 msgid "memory exhausted" -msgstr "ÐÁÍÑÔØ ÉÓÞÅÒÐÁÎÁ" +msgstr "памÑÑ‚ÑŒ иÑчерпана" #: lib/xfreopen.c:35 msgid "stdin" -msgstr "" +msgstr "Ñтандартный ввод" #: lib/xfreopen.c:36 msgid "stdout" -msgstr "" +msgstr "Ñтандартный вывод" #: lib/xfreopen.c:37 msgid "stderr" -msgstr "" +msgstr "Ñтандартный поток ошибок" #: lib/xfreopen.c:38 -#, fuzzy msgid "unknown stream" -msgstr "îÅÉÚ×ÅÓÔÎÁÑ ÓÉÓÔÅÍÎÁÑ ÏÛÉÂËÁ" +msgstr "неизвеÑтный поток" #: lib/xfreopen.c:39 #, c-format msgid "failed to reopen %s with mode %s" -msgstr "" +msgstr "не удалоÑÑŒ повторно открыть %s в режиме %s" #: lib/xstrtol-error.c:63 -#, fuzzy, c-format +#, c-format msgid "invalid %s%s argument '%s'" -msgstr "ÎÅÄÏÐÕÓÔÉÍÏÅ ÚÎÁÞÅÎÉÅ --bytes `%s'" +msgstr "неверный аргумент %s%s в ?%s?" #: lib/xstrtol-error.c:68 #, c-format msgid "invalid suffix in %s%s argument '%s'" -msgstr "" +msgstr "неверный ÑÑƒÑ„Ñ„Ð¸ÐºÑ Ð² %s%s аргументе ?%s?" #: lib/xstrtol-error.c:72 #, c-format msgid "%s%s argument '%s' too large" -msgstr "" +msgstr "аргумент %s%s Ñлишком велик Ð´Ð»Ñ ?%s?" #: lib/version-etc.c:74 #, c-format msgid "Packaged by %s (%s)\n" -msgstr "" +msgstr "Упакован %s (%s)\n" #: lib/version-etc.c:77 #, c-format msgid "Packaged by %s\n" -msgstr "" +msgstr "Упакован %s\n" #. TRANSLATORS: Translate "(C)" to the copyright symbol #. (C-in-a-circle), if this symbol is available in the user's #. locale. Otherwise, do not translate "(C)"; leave it as-is. #: lib/version-etc.c:84 msgid "(C)" -msgstr "" +msgstr "©" #: lib/version-etc.c:86 msgid "" @@ -371,24 +345,30 @@ msgid "" "There is NO WARRANTY, to the extent permitted by law.\n" "\n" msgstr "" +"\n" +"Ð›Ð¸Ñ†ÐµÐ½Ð·Ð¸Ñ GPLv3+: GNU GPL верÑии 3 или новее <http://gnu.org/licenses/gpl." +"html>\n" +"Ðто Ñвободное ПО: вы можете продавать и раÑпроÑтранÑÑ‚ÑŒ его.\n" +"Ðет ÐИКÐКИХ ГÐÐ ÐÐТИЙ до Ñтепени, разрешённой законом.\n" +"\n" #. TRANSLATORS: %s denotes an author name. #: lib/version-etc.c:102 #, c-format msgid "Written by %s.\n" -msgstr "á×ÔÏÒ ÐÒÏÇÒÁÍÍÙ -- %s.\n" +msgstr "Ðвтор программы ? %s.\n" #. TRANSLATORS: Each %s denotes an author name. #: lib/version-etc.c:106 #, c-format msgid "Written by %s and %s.\n" -msgstr "á×ÔÏÒÙ ÐÒÏÇÒÁÍÍÙ -- %s É %s.\n" +msgstr "Ðвторы программы ? %s и %s.\n" #. TRANSLATORS: Each %s denotes an author name. #: lib/version-etc.c:110 #, c-format msgid "Written by %s, %s, and %s.\n" -msgstr "á×ÔÏÒÙ ÐÒÏÇÒÁÍÍÙ -- %s, %s É %s.\n" +msgstr "Ðвторы программы ? %s, %s и %s.\n" #. TRANSLATORS: Each %s denotes an author name. #. You can use line breaks, estimating that each author name occupies @@ -399,8 +379,8 @@ msgid "" "Written by %s, %s, %s,\n" "and %s.\n" msgstr "" -"á×ÔÏÒÙ ÐÒÏÇÒÁÍÍÙ -- %s, %s, %s\n" -"É %s.\n" +"Ðвторы программы ? %s, %s, %s\n" +"и %s.\n" #. TRANSLATORS: Each %s denotes an author name. #. You can use line breaks, estimating that each author name occupies @@ -411,8 +391,8 @@ msgid "" "Written by %s, %s, %s,\n" "%s, and %s.\n" msgstr "" -"á×ÔÏÒÙ ÐÒÏÇÒÁÍÍÙ -- %s, %s, %s,\n" -"%s É %s.\n" +"Ðвторы программы ? %s, %s, %s,\n" +"%s и %s.\n" #. TRANSLATORS: Each %s denotes an author name. #. You can use line breaks, estimating that each author name occupies @@ -423,8 +403,8 @@ msgid "" "Written by %s, %s, %s,\n" "%s, %s, and %s.\n" msgstr "" -"á×ÔÏÒÙ ÐÒÏÇÒÁÍÍÙ -- %s, %s, %s,\n" -"%s, %s É %s.\n" +"Ðвторы программы ? %s, %s, %s,\n" +"%s, %s и %s.\n" #. TRANSLATORS: Each %s denotes an author name. #. You can use line breaks, estimating that each author name occupies @@ -435,8 +415,8 @@ msgid "" "Written by %s, %s, %s,\n" "%s, %s, %s, and %s.\n" msgstr "" -"á×ÔÏÒÙ ÐÒÏÇÒÁÍÍÙ -- %s, %s, %s,\n" -"%s, %s, %s É %s.\n" +"Ðвторы программы ? %s, %s, %s,\n" +"%s, %s, %s и %s.\n" #. TRANSLATORS: Each %s denotes an author name. #. You can use line breaks, estimating that each author name occupies @@ -448,9 +428,9 @@ msgid "" "%s, %s, %s, %s,\n" "and %s.\n" msgstr "" -"á×ÔÏÒÙ ÐÒÏÇÒÁÍÍÙ -- %s, %s, %s,\n" +"Ðвторы программы ? %s, %s, %s,\n" "%s, %s, %s, %s\n" -"É %s.\n" +"и %s.\n" #. TRANSLATORS: Each %s denotes an author name. #. You can use line breaks, estimating that each author name occupies @@ -462,9 +442,9 @@ msgid "" "%s, %s, %s, %s,\n" "%s, and %s.\n" msgstr "" -"á×ÔÏÒÙ ÐÒÏÇÒÁÍÍÙ -- %s, %s, %s,\n" +"Ðвторы программы ? %s, %s, %s,\n" "%s, %s, %s, %s,\n" -"%s É %s.\n" +"%s и %s.\n" #. TRANSLATORS: Each %s denotes an author name. #. You can use line breaks, estimating that each author name occupies @@ -476,9 +456,9 @@ msgid "" "%s, %s, %s, %s,\n" "%s, %s, and others.\n" msgstr "" -"á×ÔÏÒÙ ÐÒÏÇÒÁÍÍÙ -- %s, %s, %s,\n" +"Ðвторы программы ? %s, %s, %s,\n" "%s, %s, %s, %s,\n" -"%s, %s É ÄÒÕÇÉÅ.\n" +"%s, %s и другие.\n" #. TRANSLATORS: The placeholder indicates the bug-reporting address #. for this package. Please add _another line_ saying @@ -490,136 +470,137 @@ msgid "" "\n" "Report bugs to: %s\n" msgstr "" +"\n" +"Об ошибках Ñообщайте по адреÑу <%s>\n" #: lib/version-etc.c:247 #, c-format msgid "Report %s bugs to: %s\n" -msgstr "" +msgstr "Об ошибках в %s Ñообщайте по адреÑу %s\n" #: lib/version-etc.c:251 #, c-format msgid "%s home page: <%s>\n" -msgstr "" +msgstr "ДомашнÑÑ Ñтраница %s: <%s>\n" #: lib/version-etc.c:253 #, c-format msgid "%s home page: <http://www.gnu.org/software/%s/>\n" -msgstr "" +msgstr "ДомашнÑÑ Ñтраница %s: <http://www.gnu.org/software/%s/>\n" #: lib/version-etc.c:256 msgid "General help using GNU software: <http://www.gnu.org/gethelp/>\n" -msgstr "" +msgstr "Справка по работе Ñ Ð¿Ñ€Ð¾Ð³Ñ€Ð°Ð¼Ð¼Ð°Ð¼Ð¸ GNU: <http://www.gnu.org/gethelp/>\n" -#: src/analyze.c:454 src/diff.c:1400 +#: src/analyze.c:454 src/diff.c:1401 #, c-format msgid "Files %s and %s differ\n" -msgstr "æÁÊÌÙ %s É %s ÒÁÚÌÉÞÁÀÔÓÑ\n" +msgstr "Файлы %s и %s различаютÑÑ\n" #: src/analyze.c:455 -#, fuzzy, c-format +#, c-format msgid "Binary files %s and %s differ\n" -msgstr "æÁÊÌÙ %s É %s ÒÁÚÌÉÞÁÀÔÓÑ\n" +msgstr "Двоичные файлы %s и %s различаютÑÑ\n" -#: src/analyze.c:697 src/diff3.c:1463 src/util.c:1255 +#: src/analyze.c:706 src/diff3.c:1465 src/util.c:1254 msgid "No newline at end of file" -msgstr "÷ ËÏÎÃÅ ÆÁÊÌÁ ÎÅÔ ÎÏ×ÏÊ ÓÔÒÏËÉ" +msgstr "Ð’ конце файла нет новой Ñтроки" #. This is a proper name. See the gettext manual, section Names. -#: src/cmp.c:43 +#: src/cmp.c:44 msgid "Torbjorn Granlund" -msgstr "ôÏÒÂØ£ÒÎ çÒÁÎÌÕÎÄ" +msgstr "Торбьёрн Гронлунд (Torbjorn Granlund)" #. This is a proper name. See the gettext manual, section Names. -#: src/cmp.c:44 +#: src/cmp.c:45 msgid "David MacKenzie" -msgstr "" +msgstr "ДÑвид Маккензи (David MacKenzie)" -#: src/cmp.c:118 src/diff.c:875 src/diff3.c:459 src/sdiff.c:158 -#, fuzzy, c-format +#: src/cmp.c:119 src/diff.c:877 src/diff3.c:462 src/sdiff.c:159 +#, c-format msgid "Try '%s --help' for more information." -msgstr "ðÏÐÒÏÂÕÊÔÅ `%s --help' ÄÌÑ ÐÏÌÕÞÅÎÉÑ ÂÏÌÅÅ ÐÏÄÒÏÂÎÏÇÏ ÏÐÉÓÁÎÉÑ." +msgstr "По команде ?%s --help? можно получить дополнительную информацию." #: src/cmp.c:137 -#, fuzzy, c-format +#, c-format msgid "invalid --ignore-initial value '%s'" -msgstr "ÎÅÄÏÐÕÓÔÉÍÏÅ ÚÎÁÞÅÎÉÅ --ignore-initial `%s'" +msgstr "недопуÑтимое Ð´Ð»Ñ --ignore-initial значение ?%s?" #: src/cmp.c:147 #, c-format msgid "options -l and -s are incompatible" -msgstr "ËÌÀÞÉ -l É -s ÎÅÓÏ×ÍÅÓÔÉÍÙ" +msgstr "ключи -l и -s неÑовмеÑтимы" -#: src/cmp.c:155 src/diff.c:884 src/diff3.c:467 src/sdiff.c:167 src/sdiff.c:315 -#: src/sdiff.c:322 src/sdiff.c:874 src/util.c:853 src/util.c:953 src/util.c:960 +#: src/cmp.c:155 src/diff.c:885 src/diff3.c:469 src/sdiff.c:167 src/sdiff.c:315 +#: src/sdiff.c:322 src/sdiff.c:874 src/util.c:852 src/util.c:952 src/util.c:959 msgid "write failed" -msgstr "ÚÁÐÉÓØ ÎÅÕÓÐÅÛÎÁ" +msgstr "ошибка при запиÑи" -#: src/cmp.c:157 src/diff.c:886 src/diff.c:1465 src/diff3.c:469 src/sdiff.c:169 +#: src/cmp.c:157 src/diff.c:887 src/diff.c:1466 src/diff3.c:471 src/sdiff.c:169 msgid "standard output" -msgstr "ÓÔÁÎÄÁÒÔÎÙÊ ×Ù×ÏÄ" +msgstr "Ñтандартный вывод" #: src/cmp.c:161 -#, fuzzy msgid "-b, --print-bytes print differing bytes" -msgstr "-b --print-bytes ÷Ù×ÏÄÉÔØ ÒÁÚÌÉÞÁÀÝÉÅÓÑ ÂÁÊÔÙ." +msgstr "-b, --print-bytes выводить различающиеÑÑ Ð±Ð°Ð¹Ñ‚Ñ‹" #: src/cmp.c:162 -#, fuzzy msgid "-i, --ignore-initial=SKIP skip first SKIP bytes of both inputs" -msgstr "" -"-i î --ignore-initial=î éÇÎÏÒÉÒÏ×ÁÔØ ÒÁÚÌÉÞÉÑ × ÐÅÒ×ÙÈ î ÂÁÊÔÁÈ ××ÏÄÁ." +msgstr "-i, --ignore-initial=РпропуÑтить первые Рбайт ввода" #: src/cmp.c:163 -#, fuzzy msgid "" "-i, --ignore-initial=SKIP1:SKIP2 skip first SKIP1 bytes of FILE1 and\n" " first SKIP2 bytes of FILE2" -msgstr "ðÒÏÐÕÓÔÉÔØ ÐÅÒ×ÙÅ î1 ÂÁÊÔ ÆÁÊÌÁ æáêì1 É ÐÅÒ×ÙÅ î2 ÂÁÊÔ ÆÁÊÌÁ æáêì2." +msgstr "" +"-i, --ignore-initial=Ð1:Ð2\n" +" пропуÑтить первые Ð1 байт файла ФÐЙЛ1\n" +" и первые Ð2 байт файла ФÐЙЛ2" #: src/cmp.c:165 -#, fuzzy msgid "" "-l, --verbose output byte numbers and differing byte values" -msgstr "-l --verbose ÷Ù×ÏÄÉÔØ ÎÏÍÅÒÁ É ÚÎÁÞÅÎÉÑ ×ÓÅÈ ÒÁÚÌÉÞÁÀÝÉÈÓÑ ÂÁÊÔ." +msgstr "" +"-l, --verbose выводить номера и Ð·Ð½Ð°Ñ‡ÐµÐ½Ð¸Ñ Ð²Ñех различающихÑÑ Ð±Ð°Ð¹Ñ‚" #: src/cmp.c:166 -#, fuzzy msgid "-n, --bytes=LIMIT compare at most LIMIT bytes" -msgstr "-n ðòåäåì --bytes=ðòåäåì óÒÁ×ÎÉ×ÁÔØ ÎÅ ÂÏÌÅÅ ÕËÁÚÁÎÎÏÇÏ ÞÉÓÌÁ ÂÁÊÔ." +msgstr "-n, --bytes=Ð Ñравнивать не более Рбайт" #: src/cmp.c:167 msgid "-s, --quiet, --silent suppress all normal output" -msgstr "" +msgstr "-s, --quiet, --silent не показывать обычные ÑообщениÑ" #: src/cmp.c:168 msgid " --help display this help and exit" -msgstr "" +msgstr " --help показать Ñту Ñправку и выйти" #: src/cmp.c:169 -#, fuzzy msgid "-v, --version output version information and exit" -msgstr "-v --version ðÏËÁÚÁÔØ ÉÎÆÏÒÍÁÃÉÀ Ï ×ÅÒÓÉÉ É ×ÙÊÔÉ." +msgstr "-v, --version показать информацию о верÑии и выйти" #: src/cmp.c:178 #, c-format msgid "Usage: %s [OPTION]... FILE1 [FILE2 [SKIP1 [SKIP2]]]\n" -msgstr "éÓÐÏÌØÚÏ×ÁÎÉÅ: %s [ëìàþ]... æáêì1 [æáêì2 [î1 [î2]]]\n" +msgstr "ИÑпользование: %s [КЛЮЧ]? ФÐЙЛ1 [ФÐЙЛ2 [Ð1 [Ð2]]]\n" #: src/cmp.c:180 msgid "Compare two files byte by byte." -msgstr "ðÏÂÁÊÔÏ×Ï ÓÒÁ×ÎÉ×ÁÅÔ Ä×Á ÆÁÊÌÁ." +msgstr "Побайтово Ñравнивает два файла." #: src/cmp.c:182 -#, fuzzy msgid "" "The optional SKIP1 and SKIP2 specify the number of bytes to skip\n" "at the beginning of each file (zero by default)." -msgstr "î1 É î2 -- ÜÔÏ ÞÉÓÌÏ ÂÁÊÔ, ËÏÔÏÒÙÅ ÓÌÅÄÕÅÔ ÐÒÏÐÕÓÔÉÔØ × ËÁÖÄÏÍ ÆÁÊÌÅ." +msgstr "" +"ÐеобÑзательные Ð1 и Ð2 ? Ñто чиÑло байт, которые Ñледует пропуÑтить\n" +"в каждом файле (по умолчанию 0)." -#: src/cmp.c:185 src/diff.c:996 src/diff3.c:507 src/sdiff.c:210 +#: src/cmp.c:185 src/diff.c:997 src/diff3.c:509 src/sdiff.c:210 msgid "" "Mandatory arguments to long options are mandatory for short options too.\n" msgstr "" +"Ðргументы, обÑзательные Ð´Ð»Ñ Ð´Ð»Ð¸Ð½Ð½Ñ‹Ñ… параметров, обÑзательны и Ð´Ð»Ñ ÐºÐ¾Ñ€Ð¾Ñ‚ÐºÐ¸Ñ….\n" #: src/cmp.c:191 msgid "" @@ -627,399 +608,401 @@ msgid "" "kB 1000, K 1024, MB 1,000,000, M 1,048,576,\n" "GB 1,000,000,000, G 1,073,741,824, and so on for T, P, E, Z, Y." msgstr "" -"ë ÚÎÁÞÅÎÉÑÍ î ÍÏÖÎÏ ÐÒÉÐÉÓÙ×ÁÔØ ÏÄÉÎ ÉÚ ÓÌÅÄÕÀÝÉÈ ÍÎÏÖÉÔÅÌØÎÙÈ ÓÕÆÆÉËÓÏ×:\n" +"К значениÑм Рможно припиÑывать один из Ñледующих множительных ÑуффикÑов:\n" "kB 1000, K 1024, MB 1,000,000, M 1,048,576,\n" -"GB 1,000,000,000, G 1,073,741,824, É ÔÁË ÄÁÌÅÅ ÄÌÑ T, P, E, Z, Y." +"GB 1,000,000,000, G 1,073,741,824, и так далее Ð´Ð»Ñ T, P, E, Z, Y." #: src/cmp.c:194 -#, fuzzy msgid "If a FILE is '-' or missing, read standard input." -msgstr "åÓÌÉ æáêì ÎÅ ÚÁÄÁÎ ÉÌÉ ÚÁÄÁÎ ËÁË `-', ÞÉÔÁÅÔ ÓÔÁÎÄÁÒÔÎÙÊ ××ÏÄ." +msgstr "ЕÑли ФÐЙЛ не задан или задан как ?-?, то читаетÑÑ Ñтандартный ввод." -#: src/cmp.c:195 src/diff.c:984 src/sdiff.c:220 +#: src/cmp.c:195 src/diff.c:985 src/sdiff.c:220 msgid "Exit status is 0 if inputs are the same, 1 if different, 2 if trouble." msgstr "" -"÷ÙÈÏÄÎÏÊ ÓÔÁÔÕÓ ÒÁ×ÅÎ 0, ÅÓÌÉ ×ÈÏÄÎÙÅ ÆÁÊÌÙ ÉÄÅÎÔÉÞÎÙ, 1 -- ÅÓÌÉ\n" -"ÒÁÚÌÉÞÁÀÔÓÑ, É 2 × ÓÌÕÞÁÅ ÎÅÐÏÌÁÄÏË." +"Выходной ÑÑ‚Ð°Ñ‚ÑƒÑ Ñ€Ð°Ð²ÐµÐ½ 0, еÑли входные файлы идентичны, 1 ? еÑли\n" +"различаютÑÑ, и 2 в Ñлучае неполадок." #: src/cmp.c:240 -#, fuzzy, c-format +#, c-format msgid "invalid --bytes value '%s'" -msgstr "ÎÅÄÏÐÕÓÔÉÍÏÅ ÚÎÁÞÅÎÉÅ --bytes `%s'" +msgstr "недопуÑтимое значение --bytes ?%s?" -#: src/cmp.c:266 src/diff.c:793 src/diff3.c:353 src/sdiff.c:565 -#, fuzzy, c-format +#: src/cmp.c:266 src/diff.c:795 src/diff3.c:356 src/sdiff.c:565 +#, c-format msgid "missing operand after '%s'" -msgstr "ÐÒÏÐÕÝÅÎ ÏÐÅÒÁÎÄ ÐÏÓÌÅ `%s'" +msgstr "пропущен операнд поÑле ?%s?" -#: src/cmp.c:278 src/diff.c:795 src/diff3.c:355 src/sdiff.c:567 -#, fuzzy, c-format +#: src/cmp.c:278 src/diff.c:797 src/diff3.c:358 src/sdiff.c:567 +#, c-format msgid "extra operand '%s'" -msgstr "ÉÚÌÉÛÎÉÊ ÏÐÅÒÁÎÄ `%s'" +msgstr "лишний операнд ?%s?" -#: src/cmp.c:494 +#: src/cmp.c:498 #, c-format msgid "%s %s differ: byte %s, line %s\n" -msgstr "%s %s ÒÁÚÌÉÞÁÀÔÓÑ: ÂÁÊÔ %s, ÓÔÒÏËÁ %s\n" +msgstr "%s %s различаютÑÑ: байт %s, Ñтрока %s\n" -#: src/cmp.c:510 +#: src/cmp.c:514 #, c-format msgid "%s %s differ: byte %s, line %s is %3o %s %3o %s\n" -msgstr "%s %s ÒÁÚÌÉÞÁÀÔÓÑ: ÂÁÊÔ %s, ÓÔÒÏËÁ %s ÒÁ×ÅÎ %3o %s %3o %s\n" +msgstr "%s %s различаютÑÑ: байт %s, Ñтрока %s равен %3o %s %3o %s\n" + +#: src/cmp.c:571 +#, c-format +msgid "cmp: EOF on %s which is empty\n" +msgstr "cmp: EOF в %s, который пуÑÑ‚\n" + +#: src/cmp.c:585 +#, c-format +msgid "cmp: EOF on %s after byte %s, line %s\n" +msgstr "cmp: EOF в %s поÑле байта %s, Ñтрока %s\n" -#: src/cmp.c:562 +#: src/cmp.c:586 #, c-format -msgid "cmp: EOF on %s\n" -msgstr "cmp: ËÏÎÅà ÆÁÊÌÁ × %s\n" +msgid "cmp: EOF on %s after byte %s, in line %s\n" +msgstr "cmp: EOF в %s поÑле байта %s в Ñтроке %s\n" + +#: src/cmp.c:592 +#, c-format +msgid "cmp: EOF on %s after byte %s\n" +msgstr "cmp: EOF в %s поÑле байта %s\n" #. This is a proper name. See the gettext manual, section Names. -#: src/diff.c:49 +#: src/diff.c:50 msgid "Paul Eggert" -msgstr "" +msgstr "Поль Ðггерт (Paul Eggert)" #. This is a proper name. See the gettext manual, section Names. -#: src/diff.c:50 +#: src/diff.c:51 msgid "Mike Haertel" -msgstr "" +msgstr "Майк Гертель (Mike Haertel)" #. This is a proper name. See the gettext manual, section Names. -#: src/diff.c:51 +#: src/diff.c:52 msgid "David Hayes" -msgstr "" +msgstr "ДÑвид Хейз (David Hayes)" #. This is a proper name. See the gettext manual, section Names. -#: src/diff.c:52 +#: src/diff.c:53 msgid "Richard Stallman" -msgstr "" +msgstr "Ричард Столлман (Richard Stallman)" #. This is a proper name. See the gettext manual, section Names. -#: src/diff.c:53 +#: src/diff.c:54 msgid "Len Tower" -msgstr "" +msgstr "Лен ТауÑÑ€ (Len Tower)" -#: src/diff.c:351 -#, fuzzy, c-format +#: src/diff.c:353 +#, c-format msgid "invalid context length '%s'" -msgstr "ÎÅÄÏÐÕÓÔÉÍÁÑ ÄÌÉÎÁ ËÏÎÔÅËÓÔÁ `%s'" +msgstr "недопуÑÑ‚Ð¸Ð¼Ð°Ñ Ð´Ð»Ð¸Ð½Ð° контекÑта ?%s?" -#: src/diff.c:434 +#: src/diff.c:436 #, c-format msgid "pagination not supported on this host" -msgstr "ÒÁÚÂÉÅÎÉÅ ÎÁ ÓÔÒÁÎÉÃÙ ÎÅ ÐÏÄÄÅÒÖÉ×ÁÅÔÓÑ ÎÁ ÄÁÎÎÏÊ ÍÁÛÉÎÅ" +msgstr "разбиение на Ñтраницы не поддерживаетÑÑ Ð½Ð° данной машине" -#: src/diff.c:449 src/diff3.c:335 +#: src/diff.c:451 src/diff3.c:336 #, c-format msgid "too many file label options" -msgstr "ÓÌÉÛËÏÍ ÍÎÏÇÏ ËÌÀÞÅÊ ÚÁÄÁÀÝÉÈ ÍÅÔËÉ ÆÁÊÌÏ×" +msgstr "Ñлишком много ключей задающих метки файлов" -#: src/diff.c:526 -#, fuzzy, c-format +#: src/diff.c:528 +#, c-format msgid "invalid width '%s'" -msgstr "ÎÅÄÏÐÕÓÔÉÍÁÑ ÛÉÒÉÎÁ `%s'" +msgstr "недопуÑÑ‚Ð¸Ð¼Ð°Ñ ÑˆÐ¸Ñ€Ð¸Ð½Ð° ?%s?" -#: src/diff.c:530 +#: src/diff.c:532 msgid "conflicting width options" -msgstr "ÐÒÏÔÉ×ÏÒÅÞÉ×ÙÅ ËÌÀÞÉ ÚÁÄÁÎÉÑ ÛÉÒÉÎÙ" +msgstr "противоречивые ключи Ð·Ð°Ð´Ð°Ð½Ð¸Ñ ÑˆÐ¸Ñ€Ð¸Ð½Ñ‹" -#: src/diff.c:555 -#, fuzzy, c-format +#: src/diff.c:557 +#, c-format msgid "invalid horizon length '%s'" -msgstr "ÎÅÄÏÐÕÓÔÉÍÁÑ ÄÌÉÎÁ ÇÏÒÉÚÏÎÔÁ `%s'" +msgstr "недопуÑÑ‚Ð¸Ð¼Ð°Ñ Ð´Ð»Ð¸Ð½Ð° горизонта ?%s?" -#: src/diff.c:611 -#, fuzzy, c-format +#: src/diff.c:613 +#, c-format msgid "invalid tabsize '%s'" -msgstr "ÎÅÄÏÐÕÓÔÉÍÁÑ ÛÉÒÉÎÁ ÔÁÂÕÌÑÃÉÉ `%s'" +msgstr "недопуÑÑ‚Ð¸Ð¼Ð°Ñ ÑˆÐ¸Ñ€Ð¸Ð½Ð° табулÑции ?%s?" -#: src/diff.c:615 +#: src/diff.c:617 msgid "conflicting tabsize options" -msgstr "ÐÒÏÔÉ×ÏÒÅÞÉ×ÙÅ ËÌÀÞÉ ÚÁÄÁÎÉÑ ÛÉÒÉÎÙ ÔÁÂÕÌÑÃÉÉ" +msgstr "противоречивые ключи Ð·Ð°Ð´Ð°Ð½Ð¸Ñ ÑˆÐ¸Ñ€Ð¸Ð½Ñ‹ табулÑции" -#: src/diff.c:770 +#: src/diff.c:772 msgid "--from-file and --to-file both specified" -msgstr "ÎÅÏÂÈÏÄÉÍÏ ÚÁÄÁÔØ ËÁË --from-file, ÔÁË É --to-file" +msgstr "необходимо задать как --from-file, так и --to-file" -#: src/diff.c:890 -#, fuzzy +#: src/diff.c:891 msgid " --normal output a normal diff (the default)" -msgstr "--normal ÷Ù×ÏÄÉÔØ × ÏÂÙÞÎÏÍ ÆÏÒÍÁÔÅ diff." +msgstr " --normal выводить в обычном формате diff (по умолчанию)" -#: src/diff.c:891 -#, fuzzy +#: src/diff.c:892 msgid "-q, --brief report only when files differ" -msgstr "-q --brief îÁÐÅÞÁÔÁÔØ ÔÏÌØËÏ ÒÁÚÌÉÞÁÀÔÓÑ ÌÉ ÆÁÊÌÙ." +msgstr "-q, --brief напечатать только различаютÑÑ Ð»Ð¸ файлы" -#: src/diff.c:892 -#, fuzzy +#: src/diff.c:893 msgid "-s, --report-identical-files report when two files are the same" -msgstr "-s --report-identical-files óÏÏÂÝÁÔØ Ï ÏÄÉÎÁËÏ×ÙÈ ÆÁÊÌÁÈ." +msgstr "" +"-s, --report-identical-files\n" +" Ñообщать об одинаковых файлах" -#: src/diff.c:893 +#: src/diff.c:894 msgid "" "-c, -C NUM, --context[=NUM] output NUM (default 3) lines of copied context" msgstr "" +"-c, -C Ð, --context[=Ð] выводить по Ð (по умолчанию 3) Ñтрок\n" +" копируемого контекÑта" -#: src/diff.c:894 -#, fuzzy +#: src/diff.c:895 msgid "" "-u, -U NUM, --unified[=NUM] output NUM (default 3) lines of unified context" msgstr "" -"-w þéóìï --width=þéóìï ÷Ù×ÏÄÉÔØ ÍÁËÓÉÍÕÍ ÚÁÄÁÎÎÏÅ þéóìï ÚÎÁËÏ× × ÓÔÒÏËÅ.\n" -" (ÐÏ ÕÍÏÌÞÁÎÉÀ 130)" +"-u, -U Ð, --unified[=Ð] выводить по Ð (по умолчанию 3) Ñтрок\n" +" объединенного контекÑта" -#: src/diff.c:895 -#, fuzzy +#: src/diff.c:896 msgid "-e, --ed output an ed script" -msgstr "-e --ed ÷Ù×ÏÄÉÔØ ÓÃÅÎÁÒÉÊ ed." +msgstr "-e, --ed выводить как Ñценарий ed" -#: src/diff.c:896 -#, fuzzy +#: src/diff.c:897 msgid "-n, --rcs output an RCS format diff" -msgstr "-n --rcs ÷Ù×ÏÄÉÔØ × ÆÏÒÍÁÔÅ RCS." +msgstr "-n, --rcs выводить в формате RCS diff" -#: src/diff.c:897 +#: src/diff.c:898 msgid "-y, --side-by-side output in two columns" -msgstr "" +msgstr "-y, --side-by-side выводить в две колонки" -#: src/diff.c:898 -#, fuzzy +#: src/diff.c:899 msgid "" "-W, --width=NUM output at most NUM (default 130) print columns" msgstr "" -"-w þéóìï --width=þéóìï ÷Ù×ÏÄÉÔØ ÍÁËÓÉÍÕÍ ÚÁÄÁÎÎÏÅ þéóìï ÚÎÁËÏ× × ÓÔÒÏËÅ.\n" -" (ÐÏ ÕÍÏÌÞÁÎÉÀ 130)" +"-W, --width=Рвыводить не более Рзнаков в Ñтроке\n" +" (по умолчанию 130)" -#: src/diff.c:899 -#, fuzzy +#: src/diff.c:900 msgid "" " --left-column output only the left column of common lines" -msgstr "-l --left-column ÷Ù×ÏÄÉÔØ ÔÏÌØËÏ ÌÅ×ÕÀ ËÏÌÏÎËÕ ÏÂÝÉÈ ÓÔÒÏË." +msgstr " --left-column выводить только левую колонку общих Ñтрок" -#: src/diff.c:900 -#, fuzzy +#: src/diff.c:901 msgid " --suppress-common-lines do not output common lines" -msgstr "-s --suppress-common-lines îÅ ×Ù×ÏÄÉÔØ ÏÂÝÉÅ ÓÔÒÏËÉ." +msgstr "" +" --suppress-common-lines\n" +" не выводить общие Ñтроки" -#: src/diff.c:902 +#: src/diff.c:903 msgid "-p, --show-c-function show which C function each change is in" msgstr "" +"-p, --show-c-function отображать в какой функции Си находитÑÑ\n" +" каждое изменение" -#: src/diff.c:903 +#: src/diff.c:904 msgid "-F, --show-function-line=RE show the most recent line matching RE" msgstr "" +"-F, --show-function-line=RE\n" +" отображать поÑледнюю Ñовпавшую Ñ RE Ñтроку" -#: src/diff.c:904 -#, fuzzy +#: src/diff.c:905 msgid "" " --label LABEL use LABEL instead of file name and timestamp\n" " (can be repeated)" msgstr "" -"--from-file=æáêì1 óÒÁ×ÎÉÔØ æáêì1 ÓÏ ×ÓÅÍÉ ÏÐÅÒÁÎÄÁÍÉ.\n" -" æáêì1 ÍÏÖÅÔ ÂÙÔØ ËÁÔÁÌÏÇÏÍ." +" --label МЕТКРиÑпользовать МЕТКУ вмеÑто имени файла и времени\n" +" (может повторÑÑ‚ÑŒÑÑ)" -#: src/diff.c:907 -#, fuzzy +#: src/diff.c:908 msgid "-t, --expand-tabs expand tabs to spaces in output" -msgstr "-t --expand-tabs òÁÓËÒÙ×ÁÔØ ÐÒÉ ×Ù×ÏÄÅ ÓÉÍ×ÏÌÙ ÔÁÂÕÌÑÃÉÉ × ÐÒÏÂÅÌÙ." +msgstr "" +"-t, --expand-tabs раÑкрывать при выводе Ñимволы табулÑции в пробелы" -#: src/diff.c:908 -#, fuzzy +#: src/diff.c:909 msgid "-T, --initial-tab make tabs line up by prepending a tab" msgstr "" -"-T --initial-tab ÷ÙÒÁ×ÎÉ×ÁÔØ ÔÁÂÕÌÑÃÉÀ ÄÏÂÁ×ÌÑÑ × ÎÁÞÁÌÏ ÓÉÍ×ÏÌ ÔÁÂÕÌÑÃÉÉ." +"-T, --initial-tab выравнивать Ñтроки, добавлÑÑ Ð² начало Ñимвол " +"табулÑции" -#: src/diff.c:909 -#, fuzzy +#: src/diff.c:910 msgid "" " --tabsize=NUM tab stops every NUM (default 8) print columns" msgstr "" -"--tabsize=þéóìï ôÁÂÕÌÑÃÉÑ ÞÅÒÅÚ ÚÁÄÁÎÎÏÅ þéóìï ÚÎÁËÏ× (ÐÏ ÕÍÏÌÞÁÎÉÀ 8)." +" --tabsize=РтабулÑÑ†Ð¸Ñ Ñ‡ÐµÑ€ÐµÐ· каждые Рзнаков (по умолчанию 8)" -#: src/diff.c:910 +#: src/diff.c:911 msgid "" " --suppress-blank-empty suppress space or tab before empty output lines" msgstr "" +" --suppress-blank-empty\n" +" не вÑтавлÑÑ‚ÑŒ пробел или табулÑцию перед\n" +" выводом пуÑÑ‚Ñ‹Ñ… Ñтрок" -#: src/diff.c:911 -#, fuzzy +#: src/diff.c:912 msgid "-l, --paginate pass output through 'pr' to paginate it" -msgstr "" -"-l --paginate îÁÐÒÁ×ÉÔØ ×Ù×ÏÄ ÐÒÏÇÒÁÍÍÅ `pr' ÄÌÑ ÒÁÚÂÉÅÎÉÑ ÎÁ ÓÔÒÁÎÉÃÙ." +msgstr "-l, --paginate направить вывод в pr Ð´Ð»Ñ Ñ€Ð°Ð·Ð±Ð¸ÐµÐ½Ð¸Ñ Ð½Ð° Ñтраницы" -#: src/diff.c:913 -#, fuzzy +#: src/diff.c:914 msgid "" "-r, --recursive recursively compare any subdirectories found" -msgstr "-r --recursive òÅËÕÒÓÉ×ÎÏ ÓÒÁ×ÎÉ×ÁÔØ ÐÏÄËÁÔÁÌÏÇÉ." +msgstr "-r, --recursive рекурÑивно Ñравнивать подкаталоги" -#: src/diff.c:914 +#: src/diff.c:915 msgid " --no-dereference don't follow symbolic links" -msgstr "" +msgstr " --no-dereference не переходить по Ñимвольным ÑÑылкам" -#: src/diff.c:915 -#, fuzzy +#: src/diff.c:916 msgid "-N, --new-file treat absent files as empty" -msgstr "-N --new-file ÷ÏÓÐÒÉÎÉÍÁÔØ ÎÅÓÕÝÅÓÔ×ÕÀÝÉÅ ÆÁÊÌÙ ËÁË ÐÕÓÔÙÅ." +msgstr "-N, --new-file воÑпринимать неÑущеÑтвующие файлы как пуÑтые" -#: src/diff.c:916 -#, fuzzy +#: src/diff.c:917 msgid " --unidirectional-new-file treat absent first files as empty" msgstr "" -"--unidirectional-new-file ÷ÏÓÐÒÉÎÉÍÁÔØ ÎÅÓÕÝÅÓÔ×ÕÀÝÉÅ ÐÅÒ×ÙÅ ÆÁÊÌÙ ËÁË " -"ÐÕÓÔÙÅ." +" --unidirectional-new-file\n" +" воÑпринимать неÑущеÑтвующие первые файлы как пуÑтые" -#: src/diff.c:917 -#, fuzzy +#: src/diff.c:918 msgid " --ignore-file-name-case ignore case when comparing file names" -msgstr "--ignore-file-name-case éÇÎÏÒÉÒÏ×ÁÔØ ÒÅÇÉÓÔÒ ÂÕË× × ÉÍÅÎÁÈ ÆÁÊÌÏ×." +msgstr "" +" --ignore-file-name-case\n" +" игнорировать региÑÑ‚Ñ€ в именах файлов" -#: src/diff.c:918 -#, fuzzy +#: src/diff.c:919 msgid " --no-ignore-file-name-case consider case when comparing file names" -msgstr "--no-ignore-file-name-case õÞÉÔÙ×ÁÔØ ÒÅÇÉÓÔÒ ÂÕË× × ÉÍÅÎÁÈ ÆÁÊÌÏ×." +msgstr "" +" --no-ignore-file-name-case\n" +" учитывать региÑÑ‚Ñ€ в именах файлов" -#: src/diff.c:919 -#, fuzzy +#: src/diff.c:920 msgid "-x, --exclude=PAT exclude files that match PAT" msgstr "" -"-x ïâòáúåã --exclude=ïâòáúåã éÓËÌÀÞÉÔØ ÆÁÊÌÙ, ÞØÉ ÉÍÅÎÁ ÓÏ×ÐÁÄÁÀÔ Ó " -"ïâòáúãïí." +"-x, --exclude=ОБРÐЗЕЦ иÑключить файлы, чьи имена Ñовпадают Ñ ÐžÐ‘Ð ÐЗЦОМ" -#: src/diff.c:920 -#, fuzzy +#: src/diff.c:921 msgid "" "-X, --exclude-from=FILE exclude files that match any pattern in FILE" msgstr "" -"-X æáêì --exclude-from=æáêì éÓËÌÀÞÉÔØ ÆÁÊÌÙ, ÞØÉ ÉÍÅÎÁ ÓÏ×ÐÁÄÁÀÔ Ó ËÁËÉÍ-" -"ÌÉÂÏ\n" -" ÏÂÒÁÚÃÏÍ ÉÚ ÚÁÐÉÓÁÎÎÙÈ × æáêìå." +"-X, --exclude-from=ФÐЙЛ иÑключить файлы Ñ Ð¸Ð¼ÐµÐ½Ð°Ð¼Ð¸, Ñовпадающими\n" +" Ñ Ð»ÑŽÐ±Ñ‹Ð¼ образцом из ФÐЙЛÐ" -#: src/diff.c:921 -#, fuzzy +#: src/diff.c:922 msgid "" "-S, --starting-file=FILE start with FILE when comparing directories" -msgstr "-S æáêì --starting-file=æáêì ðÒÉ ÓÒÁ×ÎÅÎÉÉ ËÁÔÁÌÏÇÏ× ÎÁÞÁÔØ Ó æáêìá." +msgstr "" +"-S, --starting-file=ФÐЙЛ\n" +" при Ñравнении каталогов начать Ñ Ð¤ÐЙЛÐ" -#: src/diff.c:922 -#, fuzzy +#: src/diff.c:923 msgid "" " --from-file=FILE1 compare FILE1 to all operands;\n" " FILE1 can be a directory" msgstr "" -"--from-file=æáêì1 óÒÁ×ÎÉÔØ æáêì1 ÓÏ ×ÓÅÍÉ ÏÐÅÒÁÎÄÁÍÉ.\n" -" æáêì1 ÍÏÖÅÔ ÂÙÔØ ËÁÔÁÌÏÇÏÍ." +" --from-file=ФÐЙЛ1 Ñравнить ФÐЙЛ1 Ñо вÑеми операндами;\n" +" ФÐЙЛ1 может быть каталогом" -#: src/diff.c:924 -#, fuzzy +#: src/diff.c:925 msgid "" " --to-file=FILE2 compare all operands to FILE2;\n" " FILE2 can be a directory" msgstr "" -"--to-file=æáêì2 óÒÁ×ÎÉÔØ ×ÓÅ ÏÐÅÒÁÎÄÙ Ó æáêìïí2. æáêì2 ÍÏÖÅÔ ÂÙÔØ " -"ËÁÔÁÌÏÇÏÍ." +" --to-file=ФÐЙЛ2 Ñравнить вÑе операнды Ñ Ð¤ÐЙЛОМ2;\n" +" ФÐЙЛ2 может быть каталогом" -#: src/diff.c:927 -#, fuzzy +#: src/diff.c:928 msgid "" "-i, --ignore-case ignore case differences in file contents" -msgstr "-i --ignore-case éÇÎÏÒÉÒÏ×ÁÔØ ÒÅÇÉÓÔÒ ÂÕË× × ÓÏÄÅÒÖÉÍÏÍ ÆÁÊÌÏ×." +msgstr "-i, --ignore-case игнорировать региÑÑ‚Ñ€ в Ñодержимом файла" -#: src/diff.c:928 -#, fuzzy +#: src/diff.c:929 msgid "-E, --ignore-tab-expansion ignore changes due to tab expansion" msgstr "" -"-E --ignore-tab-expansion éÇÎÏÒÉÒÏ×ÁÔØ ÉÚÍÅÎÅÎÉÑ, ×ÙÚ×ÁÎÎÙÅ ÒÁÓËÒÙÔÉÅÍ " -"ÔÁÂÕÌÑÃÉÉ." +"-E, --ignore-tab-expansion\n" +" игнорировать изменениÑ, вызванные раÑкрытием " +"табулÑции" -#: src/diff.c:929 -#, fuzzy +#: src/diff.c:930 msgid "-Z, --ignore-trailing-space ignore white space at line end" -msgstr "-w --ignore-all-space éÇÎÏÒÉÒÏ×ÁÔØ ×ÓÅ ÐÒÏÂÅÌØÎÙÅ ÓÉÍ×ÏÌÙ." +msgstr "" +"-Z, --ignore-trailing-space\n" +" игнорировать пробельные Ñимволы в конце Ñтроки" -#: src/diff.c:930 -#, fuzzy +#: src/diff.c:931 msgid "" "-b, --ignore-space-change ignore changes in the amount of white space" msgstr "" -"-b --ignore-space-change éÇÎÏÒÉÒÏ×ÁÔØ ÉÚÍÅÎÅÎÉÑ ÞÉÓÌÁ ÐÒÏÂÅÌØÎÙÈ ÓÉÍ×ÏÌÏ×." +"-b, --ignore-space-change\n" +" игнорировать Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ ÐºÐ¾Ð»Ð¸Ñ‡ÐµÑтва пробельных Ñимволов" -#: src/diff.c:931 -#, fuzzy +#: src/diff.c:932 msgid "-w, --ignore-all-space ignore all white space" -msgstr "-w --ignore-all-space éÇÎÏÒÉÒÏ×ÁÔØ ×ÓÅ ÐÒÏÂÅÌØÎÙÅ ÓÉÍ×ÏÌÙ." +msgstr "-w, --ignore-all-space игнорировать вÑе пробельные Ñимволы" -#: src/diff.c:932 -#, fuzzy +#: src/diff.c:933 msgid "" "-B, --ignore-blank-lines ignore changes where lines are all blank" -msgstr "-B --ignore-blank-lines éÇÎÏÒÉÒÏ×ÁÔØ ÉÚÍÅÎÅÎÉÑ ÞÉÓÌÁ ÐÕÓÔÙÈ ÓÔÒÏË." +msgstr "" +"-B, --ignore-blank-lines\n" +" игнорировать Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ ÐºÐ¾Ð»Ð¸Ñ‡ÐµÑтва пуÑÑ‚Ñ‹Ñ… Ñтрок" -#: src/diff.c:933 -#, fuzzy +#: src/diff.c:934 msgid "-I, --ignore-matching-lines=RE ignore changes where all lines match RE" msgstr "" -"-I ò÷ --ignore-matching-lines=ò÷ éÇÎÏÒÉÒÏ×ÁÔØ ÉÚÍÅÎÅÎÉÑ, ÓÔÒÏËÉ ËÏÔÏÒÙÈ\n" -" ÐÏÌÎÏÓÔØÀ ÓÏÏÔ×ÅÔÓÔ×ÕÀÔ ÚÁÄÁÎÎÏÍÕ ÒÅÇÕÌÑÒÎÏÍÕ " -"×ÙÒÁÖÅÎÉÀ" +"-I, --ignore-matching-lines=RE\n" +" игнорировать Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ Ñтрок, Ñовпадающих Ñ RE" -#: src/diff.c:935 -#, fuzzy +#: src/diff.c:936 msgid "-a, --text treat all files as text" -msgstr "-a --text óÞÉÔÁÔØ ×ÓÅ ÆÁÊÌÙ ÔÅËÓÔÏ×ÙÍÉ." +msgstr "-a, --text Ñчитать вÑе файлы текÑтовыми" -#: src/diff.c:936 -#, fuzzy +#: src/diff.c:937 msgid " --strip-trailing-cr strip trailing carriage return on input" -msgstr "--strip-trailing-cr õÄÁÌÉÔØ ÎÁ ×Ù×ÏÄÅ ÚÁ×ÅÒÛÁÀÝÉÊ ×ÏÚ×ÒÁÔ ËÁÒÅÔËÉ." +msgstr " --strip-trailing-cr удалÑÑ‚ÑŒ из ввода завершающий возврат каретки" -#: src/diff.c:938 -#, fuzzy +#: src/diff.c:939 msgid " --binary read and write data in binary mode" -msgstr "--binary þÉÔÁÔØ É ÚÁÐÉÓÙ×ÁÔØ ÆÁÊÌÙ × Ä×ÏÉÞÎÏÊ ÆÏÒÍÅ." +msgstr " --binary читать и запиÑывать файлы в двоичном режиме" -#: src/diff.c:941 -#, fuzzy +#: src/diff.c:942 msgid "" "-D, --ifdef=NAME output merged file with '#ifdef NAME' diffs" msgstr "" -"-D éíñ --ifdef=éíñ ÷Ù×ÏÄÉÔØ ÚÁÐÌÁÔÙ, ÉÓÐÏÌØÚÕÀÝÉÅ ËÏÎÓÔÒÕËÃÉÀ `#ifdef éíñ'." +"-D, --ifdef=ИМЯ выводить заплаты, иÑпользующие конÑтрукцию ?#ifdef " +"ИМЯ?" -#: src/diff.c:942 -#, fuzzy +#: src/diff.c:943 msgid " --GTYPE-group-format=GFMT format GTYPE input groups with GFMT" msgstr "" -"--çôéð-group-format=çæíô áÎÁÌÏÇÉÞÎÏ, ÎÏ ÆÏÒÍÁÔÉÒÏ×ÁÔØ ×ÈÏÄÎÙÅ ÇÒÕÐÐÙ ÔÉÐÁ " -"çôéð\n" -" × ÓÏÏÔ×ÅÔÓÔ×ÉÉ Ó ÆÏÒÍÁÔÏÍ çæíô." +" --GTYPE-group-format=GFMT\n" +" форматировать входные группы типа GTYPE\n" +" в ÑоответÑтвии GFMT" -#: src/diff.c:943 -#, fuzzy +#: src/diff.c:944 msgid " --line-format=LFMT format all input lines with LFMT" msgstr "" -"--line-format=óæíô áÎÁÌÏÇÉÞÎÏ, ÎÏ ÆÏÒÍÁÔÉÒÏ×ÁÔØ ×ÓÅ ×ÈÏÄÎÙÅ ÓÔÒÏËÉ Ó óæíô." +" --line-format=LFMT форматировать вÑе входные Ñтроки в ÑоответÑтвии Ñ " +"LFMT" -#: src/diff.c:944 -#, fuzzy +#: src/diff.c:945 msgid " --LTYPE-line-format=LFMT format LTYPE input lines with LFMT" msgstr "" -"--óôéð-group-format=óæíô áÎÁÌÏÇÉÞÎÏ, ÎÏ ÆÏÒÍÁÔÉÒÏ×ÁÔØ ×ÈÏÄÎÙÅ ÓÔÒÏËÉ ÔÉÐÁ " -"óôéð\n" -" × ÓÏÏÔ×ÅÔÓÔ×ÉÉ Ó ÆÏÒÍÁÔÏÍ óæíô." +" --LTYPE-line-format=LFMT\n" +" форматировать входные Ñтроки типа LTYPE\n" +" в ÑоответÑтвии LFMT" -#: src/diff.c:945 +#: src/diff.c:946 msgid "" " These format options provide fine-grained control over the output\n" " of diff, generalizing -D/--ifdef." msgstr "" +"Параметры Ñ„Ð¾Ñ€Ð¼Ð°Ñ‚Ð¸Ñ€Ð¾Ð²Ð°Ð½Ð¸Ñ Ð¿Ñ€ÐµÐ´Ð¾ÑтавлÑÑŽÑ‚ точный контроль над конечным diff\n" +"обобщающими -D/--ifdef." -#: src/diff.c:947 -#, fuzzy +#: src/diff.c:948 msgid " LTYPE is 'old', 'new', or 'unchanged'. GTYPE is LTYPE or 'changed'." msgstr "" -" óôéð ÍÏÖÅÔ ÂÙÔØ `old', `new', ÉÌÉ `unchanged', çôéð -- ÔÏ ÖÅ É `changed'." +" LTYPE может быть ?old?, ?new? или ?unchanged?.\n" +" Значение GTYPE те же или ?changed?." -#: src/diff.c:948 -#, fuzzy +#: src/diff.c:949 msgid "" " GFMT (only) may contain:\n" " %< lines from FILE1\n" @@ -1034,34 +1017,33 @@ msgid "" " M L+1\n" " %(A=B?T:E) if A equals B then T else E" msgstr "" -" çæíô ÍÏÖÅÔ ÓÏÄÅÒÖÁÔØ:\n" -" %< ÓÔÒÏËÉ ÉÚ æáêìá1\n" -" %> ÓÔÒÏËÉ ÉÚ æáêìá2\n" -" %= ÓÔÒÏËÉ, ÏÂÝÉÅ ÄÌÑ æáêìá1 É æáêìá2\n" -" %[-][ûéòéîá][.[ôïþî]]{doxX}âõë÷á ÆÏÒÍÁÔ ÄÌÑ âõë÷ù × ÓÔÉÌÅ printf\n" -" âõë÷á ÐÒÉÎÉÍÁÅÔ ÓÌÅÄÕÀÝÉÅ ÚÎÁÞÅÎÉÑ ÄÌÑ ÎÏ×ÙÈ ÇÒÕÐÐ, ÄÌÑ ÓÔÁÒÙÈ " -"ÓÔÒÏÞÎÙÅ:\n" -" F ÎÏÍÅÒ ÐÅÒ×ÏÊ ÓÔÒÏËÉ\n" -" L ÎÏÍÅÒ ÐÏÓÌÅÄÎÅÊ ÓÔÒÏËÉ\n" -" N ÞÉÓÌÏ ÓÔÒÏË = L-F+1\n" +" GFMT может Ñодержать (только):\n" +" %< Ñтроки из ФÐЙЛÐ1\n" +" %> Ñтроки из ФÐЙЛÐ2\n" +" %= Ñтроки, общие Ð´Ð»Ñ Ð¤ÐЙЛÐ1 и ФÐЙЛÐ2\n" +" %[-][ШИРИÐÐ][.[ТОЧÐ]]{doxX}БУКВРформат Ð´Ð»Ñ Ð‘Ð£ÐšÐ’Ð« в Ñтиле printf\n" +" БУКВРпринимает Ñледующие Ð·Ð½Ð°Ñ‡ÐµÐ½Ð¸Ñ Ð´Ð»Ñ Ð½Ð¾Ð²Ñ‹Ñ… групп, Ð´Ð»Ñ Ñтарых " +"Ñтрочные:\n" +" F номер первой Ñтроки\n" +" L номер поÑледней Ñтроки\n" +" N чиÑло Ñтрок = L-F+1\n" " E F-1\n" -" M L+1" +" M L+1\n" +" %(A=B?T:E) еÑли A равно B, то T, иначе E" -#: src/diff.c:960 -#, fuzzy +#: src/diff.c:961 msgid "" " LFMT (only) may contain:\n" " %L contents of line\n" " %l contents of line, excluding any trailing newline\n" " %[-][WIDTH][.[PREC]]{doxX}n printf-style spec for input line number" msgstr "" -" óæíô ÍÏÖÅÔ ÓÏÄÅÒÖÁÔØ:\n" -" %L ÓÏÄÅÒÖÉÍÏÅ ÓÔÒÏËÉ\n" -" %l ÓÏÄÅÒÖÉÍÏÅ ÓÔÒÏËÉ, ÉÓËÌÀÞÁÑ ×ÓÅ ÎÏ×ÙÅ ÓÔÒÏËÉ × ËÏÎÃÅ\n" -" %[-][ûéòéîá][.[ôïþî]]{doxX}n ÆÏÒÍÁÔ ÎÏÍÅÒÁ ×ÈÏÄÎÏÊ ÓÔÒÏËÉ × ÓÔÉÌÅ printf" +" LFMT может Ñодержать (только):\n" +" %L Ñодержимое Ñтроки\n" +" %l Ñодержимое Ñтроки, иÑÐºÐ»ÑŽÑ‡Ð°Ñ Ð²Ñе конечные Ñимволы новой Ñтроки\n" +" %[-][ШИРИÐÐ][.[ТОЧÐ]]{doxX}n формат номера входной Ñтроки в Ñтиле printf" -#: src/diff.c:964 -#, fuzzy +#: src/diff.c:965 msgid "" " Both GFMT and LFMT may contain:\n" " %% %\n" @@ -1069,255 +1051,236 @@ msgid "" " %c'\\OOO' the character with octal code OOO\n" " C the character C (other characters represent themselves)" msgstr "" -" ïÂÁ çæíô É óæíô ÍÏÇÕÔ ÓÏÄÅÒÖÁÔØ:\n" +" GFMT и LFMT могут Ñодержать:\n" " %% %\n" -" %c'ó' ÏÄÉÎ ÓÉÍ×ÏÌ ó\n" -" %c'\\OOO' ÏÄÉÎ ÓÉÍ×ÏÌ Ó ×ÏÓØÍÅÒÉÞÎÙÍ ËÏÄÏÍ OOO" - -#: src/diff.c:970 -#, fuzzy -msgid "-d, --minimal try hard to find a smaller set of changes" -msgstr "-d --minimal ðÙÔÁÔØÓÑ ÎÁÊÔÉ ÎÁÉÍÅÎØÛÉÊ ÎÁÂÏÒ ÉÚÍÅÎÅÎÉÊ." +" %c'С' один Ñимвол С\n" +" %c'\\OOO' Ñимвол в воÑьмеричным коде OOO\n" +" C Ñимвол C (Ñимволы, предÑтавлÑющие Ñами ÑебÑ)" #: src/diff.c:971 -#, fuzzy -msgid " --horizon-lines=NUM keep NUM lines of the common prefix and suffix" -msgstr "" -"--horizon-lines=þéóìï ÷Ù×ÏÄÉÔØ þéóìï ÏÂÝÉÈ ÓÔÒÏË ÄÏ É ÐÏÓÌÅ ÒÁÚÌÉÞÁÀÝÉÈÓÑ." +msgid "-d, --minimal try hard to find a smaller set of changes" +msgstr "-d, --minimal пытатьÑÑ Ð½Ð°Ð¹Ñ‚Ð¸ наименьший набор изменений" #: src/diff.c:972 -#, fuzzy -msgid "" -" --speed-large-files assume large files and many scattered small changes" +msgid " --horizon-lines=NUM keep NUM lines of the common prefix and suffix" msgstr "" -"-H --speed-large-files ðÒÅÄÐÏÌÁÇÁÔØ, ÞÔÏ ÆÁÊÌÙ ÂÏÌØÛÉÅ ÓÏ ÍÎÏÇÉÍÉ\n" -" ÒÁÚÂÒÏÓÁÎÎÙÍÉ ÍÅÌËÉÍÉ ÉÚÍÅÎÅÎÉÑÍÉ." +" --horizon-lines=РоÑтавлÑÑ‚ÑŒ Робщих Ñтрок до и поÑле различающихÑÑ" #: src/diff.c:973 msgid "" -" --color[=WHEN] colorize the output; WHEN can be 'never', 'always'," +" --speed-large-files assume large files and many scattered small changes" msgstr "" +" --speed-large-files предполагать, что файлы большие и еÑÑ‚ÑŒ много\n" +" разброÑанных мелких изменений" #: src/diff.c:974 -#, fuzzy -msgid " or 'auto' (the default)" -msgstr "--normal ÷Ù×ÏÄÉÔØ × ÏÂÙÞÎÏÍ ÆÏÒÍÁÔÅ diff." - -#: src/diff.c:975 msgid "" -" --palette=PALETTE specify the colors to use when --color is active" +" --color[=WHEN] colorize the output; WHEN can be 'never', " +"'always',\n" +" or 'auto' (the default)" msgstr "" +" --color[=КОГДÐ] вывод в цвете; КОГДРможет быть «never», «always»\n" +" или «auto» (по умолчанию)" #: src/diff.c:976 msgid "" -" PALETTE is a colon-separated list terminfo " -"capabilities" +" --palette=PALETTE the colors to use when --color is active; PALETTE " +"is\n" +" a colon-separated list of terminfo capabilities" msgstr "" +" --palette=ПÐЛИТРРнабор цветов при активном --color; ПÐЛИТРРÑто\n" +" ÑпиÑок ÑвойÑтв terminfo через двоеточие" -#: src/diff.c:978 +#: src/diff.c:979 msgid " --help display this help and exit" -msgstr "" +msgstr " --help показать Ñту Ñправку и выйти" -#: src/diff.c:979 -#, fuzzy +#: src/diff.c:980 msgid "-v, --version output version information and exit" -msgstr "-v --version ðÏËÁÚÁÔØ ÉÎÆÏÒÍÁÃÉÀ Ï ×ÅÒÓÉÉ É ×ÙÊÔÉ." +msgstr "-v, --version показать информацию о верÑии и выйти" -#: src/diff.c:981 -#, fuzzy +#: src/diff.c:982 msgid "FILES are 'FILE1 FILE2' or 'DIR1 DIR2' or 'DIR FILE' or 'FILE DIR'." msgstr "" -"æáêìù ÜÔÏ `æáêì1 æáêì2', ÉÌÉ `ëáôáìïç1 ëáôáìïç2', ÉÌÉ `ëáôáìïç æáêì...',\n" -"ÉÌÉ `æáêì... ëáôáìïç'." +"ФÐЙЛЫ Ñто ?ФÐЙЛ1 ФÐЙЛ2?, ?КÐТÐЛОГ1 КÐТÐЛОГ2?, ?КÐТÐЛОГ ФÐЙЛ??\n" +"или ?ФÐЙЛ? КÐТÐЛОГ?." -#: src/diff.c:982 -#, fuzzy +#: src/diff.c:983 msgid "" "If --from-file or --to-file is given, there are no restrictions on FILE(s)." -msgstr "åÓÌÉ ÚÁÄÁÎ --from-file ÉÌÉ --to-file, ÎÁ æáêìù ÎÅÔ ÏÇÒÁÎÉÞÅÎÉÊ." +msgstr "ЕÑли задан --from-file или --to-file, то на ФÐЙЛЫ нет ограничений." -#: src/diff.c:983 src/diff3.c:526 src/sdiff.c:219 -#, fuzzy +#: src/diff.c:984 src/diff3.c:528 src/sdiff.c:219 msgid "If a FILE is '-', read standard input." -msgstr "åÓÌÉ æáêì ÚÁÄÁÎ ËÁË `-', ÞÉÔÁÅÔ ÓÔÁÎÄÁÒÔÎÙÊ ××ÏÄ." +msgstr "ЕÑли ФÐЙЛ задан как ?-?, читает Ñтандартный ввод." -#: src/diff.c:993 +#: src/diff.c:994 #, c-format msgid "Usage: %s [OPTION]... FILES\n" -msgstr "éÓÐÏÌØÚÏ×ÁÎÉÅ: %s [ëìàþ]... æáêìù\n" +msgstr "ИÑпользование: %s [КЛЮЧ]? ФÐЙЛЫ\n" -#: src/diff.c:994 -#, fuzzy +#: src/diff.c:995 msgid "Compare FILES line by line." -msgstr "ðÏÓÔÒÏÞÎÏ ÓÒÁ×ÎÉ×ÁÅÔ Ä×Á ÆÁÊÌÁ." +msgstr "ПоÑтрочно Ñравнивает ФÐЙЛЫ." -#: src/diff.c:1028 -#, fuzzy, c-format +#: src/diff.c:1029 +#, c-format msgid "conflicting %s option value '%s'" -msgstr "ÐÒÏÔÉ×ÏÒÅÞÉ×ÏÅ ÚÎÁÞÅÎÉÅ %s ÄÌÑ ËÌÀÞÁ `%s'" +msgstr "противоречивое значение %s Ð´Ð»Ñ ÐºÐ»ÑŽÑ‡Ð° ?%s?" -#: src/diff.c:1041 +#: src/diff.c:1042 #, c-format msgid "conflicting output style options" -msgstr "ÐÒÏÔÉ×ÏÒÅÞÉ×ÙÅ ËÌÀÞÉ ÚÁÄÁÎÉÑ ÓÔÉÌÑ ×Ù×ÏÄÁ" +msgstr "противоречивые ключи Ð·Ð°Ð´Ð°Ð½Ð¸Ñ ÑÑ‚Ð¸Ð»Ñ Ð²Ñ‹Ð²Ð¾Ð´Ð°" -#: src/diff.c:1057 -#, fuzzy, c-format +#: src/diff.c:1058 +#, c-format msgid "invalid color '%s'" -msgstr "ÎÅÄÏÐÕÓÔÉÍÁÑ ÛÉÒÉÎÁ `%s'" +msgstr "неправильное указание цвета ?%s?" -#: src/diff.c:1113 src/diff.c:1323 +#: src/diff.c:1114 src/diff.c:1324 #, c-format msgid "Only in %s: %s\n" -msgstr "ôÏÌØËÏ × %s: %s\n" +msgstr "Только в %s: %s\n" -#: src/diff.c:1247 -#, fuzzy +#: src/diff.c:1248 msgid "cannot compare '-' to a directory" -msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÓÒÁ×ÎÉÔØ `-' Ó ËÁÔÁÌÏÇÏÍ" +msgstr "невозможно Ñравнить ?-? Ñ ÐºÐ°Ñ‚Ð°Ð»Ð¾Ð³Ð¾Ð¼" -#: src/diff.c:1282 +#: src/diff.c:1283 msgid "-D option not supported with directories" -msgstr "-D option not supported with directories" +msgstr "ключ -D не поддерживаетÑÑ Ð´Ð»Ñ ÐºÐ°Ñ‚Ð°Ð»Ð¾Ð³Ð¾Ð²" -#: src/diff.c:1291 +#: src/diff.c:1292 #, c-format msgid "Common subdirectories: %s and %s\n" -msgstr "ïÂÝÉÅ ÐÏÄËÁÔÁÌÏÇÉ: %s É %s\n" +msgstr "Общие подкаталоги: %s и %s\n" -#: src/diff.c:1333 src/diff.c:1383 +#: src/diff.c:1334 src/diff.c:1384 #, c-format msgid "File %s is a %s while file %s is a %s\n" -msgstr "æÁÊÌ %s ÜÔÏ %s, ÔÏÇÄÁ ËÁË ÆÁÊÌ %s -- %s\n" +msgstr "Файл %s Ñто %s, тогда как файл %s ? %s\n" -#: src/diff.c:1369 -#, fuzzy, c-format +#: src/diff.c:1370 +#, c-format msgid "Symbolic links %s and %s differ\n" -msgstr "æÁÊÌÙ %s É %s ÒÁÚÌÉÞÁÀÔÓÑ\n" +msgstr "СимволичеÑкие ÑÑылки %s и %s различаютÑÑ\n" -#: src/diff.c:1456 +#: src/diff.c:1457 #, c-format msgid "Files %s and %s are identical\n" -msgstr "æÁÊÌÙ %s É %s ÉÄÅÎÔÉÞÎÙ\n" +msgstr "Файлы %s и %s идентичны\n" #. This is a proper name. See the gettext manual, section Names. -#: src/diff3.c:41 +#: src/diff3.c:42 msgid "Randy Smith" -msgstr "" +msgstr "Ð Ñнди Смит (Randy Smith)" -#: src/diff3.c:348 +#: src/diff3.c:351 #, c-format msgid "incompatible options" -msgstr "ÎÅÓÏ×ÍÅÓÔÉÍÙÅ ËÌÀÞÉ" +msgstr "неÑовмеÑтимые ключи" -#: src/diff3.c:388 -#, fuzzy +#: src/diff3.c:391 msgid "'-' specified for more than one input file" -msgstr "`-' ÚÁÄÁÎ ÄÌÑ ÂÏÌÅÅ ÏÄÎÏÇÏ ×ÈÏÄÎÏÇÏ ÆÁÊÌÁ" +msgstr "?-? задан Ð´Ð»Ñ Ð±Ð¾Ð»ÐµÐµ одного входного файла" -#: src/diff3.c:439 src/diff3.c:1288 src/diff3.c:1692 src/diff3.c:1747 +#: src/diff3.c:442 src/diff3.c:1290 src/diff3.c:1693 src/diff3.c:1748 #: src/sdiff.c:307 src/sdiff.c:844 src/sdiff.c:855 msgid "read failed" -msgstr "ÞÔÅÎÉÅ ÎÅÕÓÐÅÛÎÏ" +msgstr "ошибка чтениÑ" -#: src/diff3.c:473 -#, fuzzy +#: src/diff3.c:475 msgid "-A, --show-all output all changes, bracketing conflicts" msgstr "" -"-A --show-all ÷Ù×ÏÄÉÔØ ×ÓÅ ÉÚÍÅÎÅÎÉÑ, ÚÁËÌÀÞÁÑ ËÏÎÆÌÉËÔÎÙÅ ÍÅÓÔÁ × ÓËÏÂËÉ." +"-A, --show-all выводить вÑе изменениÑ, Ð·Ð°ÐºÐ»ÑŽÑ‡Ð°Ñ ÐºÐ¾Ð½Ñ„Ð»Ð¸ÐºÑ‚Ð½Ñ‹Ðµ\n" +" меÑта в Ñкобки" -#: src/diff3.c:475 -#, fuzzy +#: src/diff3.c:477 msgid "" "-e, --ed output ed script incorporating changes\n" " from OLDFILE to YOURFILE into MYFILE" msgstr "" -"-e --ed ÷Ù×ÏÄÉÔØ ÎÅ ÏÂßÅÄÉÎÅÎÎÙÅ ÉÚÍÅÎÅÎÉÑ × óôïòïí-æáêìå ÉÚ ÷áûåçï-æáêìá\n" -" × íïê-æáêì." +"-e, --ed вывеÑти Ñценарий ed, изменÑющий\n" +" СТÐРЫЙ_ФÐЙЛ из Ð’ÐШ_ФÐЙЛ, в МОЙ_ФÐЙЛ" -#: src/diff3.c:477 -#, fuzzy +#: src/diff3.c:479 msgid "-E, --show-overlap like -e, but bracket conflicts" -msgstr "" -"-E --show-overlap ÷Ù×ÏÄÉÔØ ÎÅ ÏÂßÅÄÉÎÅÎÎÙÅ ÉÚÍÅÎÅÎÉÑ,\n" -" ÚÁËÌÀÞÁÑ ËÏÎÆÌÉËÔÎÙÅ ÍÅÓÔÁ × ÓËÏÂËÉ." +msgstr "-E, --show-overlap как -e Ð¿Ð»ÑŽÑ ÐºÐ¾Ð½Ñ„Ð»Ð¸ÐºÑ‚Ñ‹ в Ñкобках" -#: src/diff3.c:478 -#, fuzzy +#: src/diff3.c:480 msgid "" "-3, --easy-only like -e, but incorporate only nonoverlapping " "changes" -msgstr "-3 --easy-only ÷Ù×ÏÄÉÔØ ÎÅ ÏÂßÅÄÉÎÅÎÎÙÅ ÎÅÐÅÒÅÓÅËÁÀÝÉÅÓÑ ÉÚÍÅÎÅÎÉÑ." +msgstr "-3, --easy-only как -e, но только непереÑекающиеÑÑ Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ" -#: src/diff3.c:479 -#, fuzzy +#: src/diff3.c:481 msgid "" "-x, --overlap-only like -e, but incorporate only overlapping changes" -msgstr "-x --overlap-only ÷Ù×ÏÄÉÔØ ÐÅÒÅËÒÙ×ÁÀÝÉÅÓÑ ÉÚÍÅÎÅÎÉÑ." +msgstr "-x, --overlap-only как -e, но только перекрывающиеÑÑ Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ" -#: src/diff3.c:480 +#: src/diff3.c:482 msgid "-X like -x, but bracket conflicts" -msgstr "" +msgstr "-X как -x Ð¿Ð»ÑŽÑ ÐºÐ¾Ð½Ñ„Ð»Ð¸ÐºÑ‚Ñ‹ в Ñкобках" -#: src/diff3.c:481 -#, fuzzy +#: src/diff3.c:483 msgid "-i append 'w' and 'q' commands to ed scripts" -msgstr "-i äÏÂÁ×ÉÔØ ËÏÍÁÎÄÙ `w' É `q' × ËÏÎÅà ÓÃÅÎÁÒÉÑ ed." +msgstr "-i добавить команды ?w? и ?q? в Ñценарий ed" -#: src/diff3.c:483 +#: src/diff3.c:485 msgid "" "-m, --merge output actual merged file, according to\n" " -A if no other options are given" msgstr "" +"-m, --merge выводить объединенный файл ÑоглаÑно\n" +" -A, еÑли не указаны другие параметры" -#: src/diff3.c:486 -#, fuzzy +#: src/diff3.c:488 msgid "-a, --text treat all files as text" -msgstr "-a --text óÞÉÔÁÔØ ×ÓÅ ÆÁÊÌÙ ÔÅËÓÔÏ×ÙÍÉ." +msgstr "-a, --text Ñчитать вÑе файлы текÑтовыми" -#: src/diff3.c:487 -#, fuzzy +#: src/diff3.c:489 msgid " --strip-trailing-cr strip trailing carriage return on input" -msgstr "--strip-trailing-cr õÄÁÌÉÔØ ÎÁ ×Ù×ÏÄÅ ÚÁ×ÅÒÛÁÀÝÉÊ ×ÏÚ×ÒÁÔ ËÁÒÅÔËÉ." +msgstr " --strip-trailing-cr удалÑÑ‚ÑŒ из ввода завершающий возврат каретки" -#: src/diff3.c:488 -#, fuzzy +#: src/diff3.c:490 msgid "-T, --initial-tab make tabs line up by prepending a tab" msgstr "" -"-T --initial-tab ÷ÙÒÁ×ÎÉ×ÁÔØ ÔÁÂÕÌÑÃÉÀ ÄÏÂÁ×ÌÑÑ × ÎÁÞÁÌÏ ÓÉÍ×ÏÌ ÔÁÂÕÌÑÃÉÉ." +"-T, --initial-tab выравнивать Ñтроки, добавлÑÑ Ð² начало Ñимвол " +"табулÑции" -#: src/diff3.c:489 -#, fuzzy +#: src/diff3.c:491 msgid " --diff-program=PROGRAM use PROGRAM to compare files" msgstr "" -"--diff-program=ðòïçòáííá éÓÐÏÌØÚÏ×ÁÔØ ÄÌÑ ÓÒÁ×ÎÉÑ ÆÁÊÌÏ× ÕËÁÚÁÎÎÕÀ " -"ðòïçòáííõ." +" --diff-program=ПРОГРÐММÐ\n" +" Ð´Ð»Ñ ÑÑ€Ð°Ð²Ð½ÐµÐ½Ð¸Ñ Ñ„Ð°Ð¹Ð»Ð¾Ð² иÑпользовать ПРОГРÐММУ" -#: src/diff3.c:490 +#: src/diff3.c:492 msgid "" "-L, --label=LABEL use LABEL instead of file name\n" " (can be repeated up to three times)" msgstr "" +"-L, --label=МЕТКРиÑпользовать МЕТКУ вмеÑто имени файла\n" +" (может повторÑÑ‚ÑŒÑÑ Ð´Ð¾ трёх раз)" -#: src/diff3.c:493 +#: src/diff3.c:495 msgid " --help display this help and exit" -msgstr "" +msgstr " --help показать Ñту Ñправку и выйти" -#: src/diff3.c:494 -#, fuzzy +#: src/diff3.c:496 msgid "-v, --version output version information and exit" -msgstr "-v --version ðÏËÁÚÁÔØ ÉÎÆÏÒÍÁÃÉÀ Ï ×ÅÒÓÉÉ É ×ÙÊÔÉ." +msgstr "-v, --version показать информацию о верÑии и выйти" -#: src/diff3.c:503 +#: src/diff3.c:505 #, c-format msgid "Usage: %s [OPTION]... MYFILE OLDFILE YOURFILE\n" -msgstr "éÓÐÏÌØÚÏ×ÁÎÉÅ: %s [ëìàþ]... íïê-æáêì óôáòùê-æáêì ÷áû-æáêì\n" +msgstr "ИÑпользование: %s [КЛЮЧ]? МОЙ_ФÐЙЛ СТÐРЫЙ_ФÐЙЛ Ð’ÐШ_ФÐЙЛ\n" -#: src/diff3.c:505 +#: src/diff3.c:507 msgid "Compare three files line by line." -msgstr "ðÏÓÔÒÏÞÎÏ ÓÒÁ×ÎÉ×ÁÅÔ ÔÒÉ ÆÁÊÌÁ." +msgstr "ПоÑтрочно Ñравнивает три файла." -#: src/diff3.c:515 +#: src/diff3.c:517 msgid "" "\n" "The default output format is a somewhat human-readable representation of\n" @@ -1330,205 +1293,201 @@ msgid "" "and output the actual merged file. For unusual input, this is more\n" "robust than using ed.\n" msgstr "" +"\n" +"По умолчанию формат вывода предÑтавлÑет Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ Ð´Ð»Ñ Ñ‡Ñ‚ÐµÐ½Ð¸Ñ Ñ‡ÐµÐ»Ð¾Ð²ÐµÐºÐ¾Ð¼.\n" +"\n" +"Параметры -e, -E, -x, -X (и их длинные аналоги) включают\n" +"вывод в виде ÑÑ†ÐµÐ½Ð°Ñ€Ð¸Ñ ed вмеÑто формата по умолчанию.\n" +"\n" +"Параметр -m (--merge) заÑтавлÑет diff3 выполнÑÑ‚ÑŒ внутреннее ÑлиÑние\n" +"и выводить уже объединённый файл. Ð”Ð»Ñ Ð½ÐµÐ¾Ð±Ñ‹Ñ‡Ð½Ð¾Ð³Ð¾ ввода Ñто более\n" +"разумно, чем иÑпользование ed.\n" -#: src/diff3.c:527 +#: src/diff3.c:529 msgid "Exit status is 0 if successful, 1 if conflicts, 2 if trouble." msgstr "" -"÷ÙÈÏÄÎÏÊ ÓÔÁÔÕÓ ÒÁ×ÅÎ 0 × ÓÌÕÞÁÅ ÕÓÐÅÈÁ, 1 × ÓÌÕÞÁÅ ËÏÎÆÌÉËÔÏ× É 2 ×\n" -"ÓÌÕÞÁÅ ÎÅÐÏÌÁÄÏË." +"Выходной ÑÑ‚Ð°Ñ‚ÑƒÑ Ñ€Ð°Ð²ÐµÐ½ 0 в Ñлучае уÑпеха, 1 в Ñлучае конфликтов и 2 в\n" +"Ñлучае неполадок." -#: src/diff3.c:720 +#: src/diff3.c:722 msgid "internal error: screwup in format of diff blocks" -msgstr "×ÎÕÔÒÅÎÎÑÑ ÏÛÉÂËÁ: ÐÏ×ÒÅÖÄÅÎÎÙÊ ÆÏÒÍÁÔ ÂÌÏËÏ× ÚÁÐÌÁÔÙ" +msgstr "внутреннÑÑ Ð¾ÑˆÐ¸Ð±ÐºÐ°: поврежденный формат блоков заплаты" -#: src/diff3.c:1015 +#: src/diff3.c:1017 #, c-format msgid "%s: diff failed: " -msgstr "%s: ÐÏÉÓË ÒÁÚÌÉÞÉÊ ÎÅÕÓÐÅÛÅÎ: " +msgstr "%s: ошибка при поиÑке различий: " -#: src/diff3.c:1037 +#: src/diff3.c:1039 msgid "internal error: invalid diff type in process_diff" -msgstr "×ÎÕÔÒÅÎÎÑÑ ÏÛÉÂËÁ: ÎÅ×ÅÒÎÙÊ ÔÉÐ ÚÁÐÌÁÔÙ × ÆÕÎËÃÉÉ `process_diff'" +msgstr "внутреннÑÑ Ð¾ÑˆÐ¸Ð±ÐºÐ°: неверный тип заплаты в функции process_diff" -#: src/diff3.c:1062 +#: src/diff3.c:1064 msgid "invalid diff format; invalid change separator" -msgstr "ÎÅ×ÅÒÎÙÊ ÆÏÒÍÁÔ ÚÁÐÌÁÔÙ; ÎÅ×ÅÒÎÙÊ ÒÁÚÄÅÌÉÔÅÌØ ÉÚÍÅÎÅÎÉÑ" +msgstr "неверный формат заплаты; неверный разделитель изменениÑ" -#: src/diff3.c:1298 +#: src/diff3.c:1300 msgid "invalid diff format; incomplete last line" -msgstr "ÎÅ×ÅÒÎÙÊ ÆÏÒÍÁÔ ÚÁÐÌÁÔÙ; ÎÅÐÏÌÎÁÑ ÐÏÓÌÅÄÎÑÑ ÓÔÒÏËÁ" +msgstr "неверный формат заплаты; Ð½ÐµÐ¿Ð¾Ð»Ð½Ð°Ñ Ð¿Ð¾ÑледнÑÑ Ñтрока" -#: src/diff3.c:1322 src/sdiff.c:275 src/util.c:970 -#, fuzzy, c-format +#: src/diff3.c:1324 src/sdiff.c:275 src/util.c:969 +#, c-format msgid "subsidiary program '%s' could not be invoked" -msgstr "ÎÅ ÕÄÁÌÏÓØ ÚÁÐÕÓÔÉÔØ ×ÓÐÏÍÏÇÁÔÅÌØÎÕÀ ÐÒÏÇÒÁÍÍÕ `%s'" +msgstr "не удалоÑÑŒ запуÑтить вÑпомогательную программу ?%s?" -#: src/diff3.c:1347 +#: src/diff3.c:1349 msgid "invalid diff format; incorrect leading line chars" -msgstr "ÎÅ×ÅÒÎÙÊ ÆÏÒÍÁÔ ÚÁÐÌÁÔÙ; ÎÅÐÒÁ×ÌØÎÙÅ ÐÅÒ×ÙÅ ÓÉÍ×ÏÌÙ ÓÔÒÏËÉ" +msgstr "неверный формат заплаты; неправильные первые Ñимволы Ñтроки" -#: src/diff3.c:1420 +#: src/diff3.c:1422 msgid "internal error: invalid diff type passed to output" -msgstr "×ÎÕÔÒÅÎÎÑÑ ÏÛÉÂËÁ: ÎÁ ×ÙÈÏÄ ÐÅÒÅÄÁÎ ÎÅ×ÅÒÎÙÊ ÔÉÐ ÚÁÐÌÁÔÙ" +msgstr "внутреннÑÑ Ð¾ÑˆÐ¸Ð±ÐºÐ°: на выход передан неверный тип заплаты" -#: src/diff3.c:1694 src/diff3.c:1751 +#: src/diff3.c:1695 src/diff3.c:1752 msgid "input file shrank" -msgstr "×ÈÏÄÎÏÊ ÆÁÊÌ ÕÍÅÎØÛÉÌÓÑ" +msgstr "входной файл уменьшилÑÑ" #: src/dir.c:156 -#, fuzzy, c-format +#, c-format msgid "cannot compare file names '%s' and '%s'" -msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÓÒÁ×ÎÉÔØ ÉÍÅÎÁ ÆÁÊÌÏ× `%s' É `%s'" +msgstr "невозможно Ñравнить имена файлов ?%s? и ?%s?" #: src/dir.c:225 #, c-format msgid "%s: recursive directory loop" -msgstr "" +msgstr "%s: каталоги зациклены" #. This is a proper name. See the gettext manual, section Names. -#: src/sdiff.c:42 +#: src/sdiff.c:43 msgid "Thomas Lord" -msgstr "" +msgstr "Ð¢Ð¾Ð¼Ð°Ñ Ð›Ð¾Ñ€Ð´ (Thomas Lord)" #: src/sdiff.c:173 -#, fuzzy msgid "" "-o, --output=FILE operate interactively, sending output to FILE" -msgstr "-o æáêì --output=æáêì òÁÂÏÔÁÔØ ÉÎÔÅÒÁËÔÉ×ÎÏ, ÚÁÐÉÓÙ×ÁÑ ×Ù×ÏÄ × æáêì." +msgstr "-o, --output=ФÐЙЛ работать интерактивно, запиÑÑ‹Ð²Ð°Ñ Ð²Ñ‹Ð²Ð¾Ð´ в ФÐЙЛ" #: src/sdiff.c:175 -#, fuzzy msgid "" "-i, --ignore-case consider upper- and lower-case to be the same" -msgstr "-i --ignore-case éÇÎÏÒÉÒÏ×ÁÔØ ÒÅÇÉÓÔÒ ÂÕË×." +msgstr "-i, --ignore-case игнорировать региÑÑ‚Ñ€ Ñимволов" #: src/sdiff.c:176 -#, fuzzy msgid "-E, --ignore-tab-expansion ignore changes due to tab expansion" msgstr "" -"-E --ignore-tab-expansion éÇÎÏÒÉÒÏ×ÁÔØ ÉÚÍÅÎÅÎÉÑ, ×ÙÚ×ÁÎÎÙÅ ÒÁÓËÒÙÔÉÅÍ " -"ÔÁÂÕÌÑÃÉÉ." +"-E, --ignore-tab-expansion\n" +" игнорировать изменениÑ, вызванные раÑкрытием " +"табулÑции" #: src/sdiff.c:177 -#, fuzzy msgid "-Z, --ignore-trailing-space ignore white space at line end" -msgstr "-w --ignore-all-space éÇÎÏÒÉÒÏ×ÁÔØ ×ÓÅ ÐÒÏÂÅÌØÎÙÅ ÓÉÍ×ÏÌÙ." +msgstr "" +"-Z, --ignore-trailing-space\n" +" игнорировать пробельные Ñимволы в конце Ñтроки" #: src/sdiff.c:178 -#, fuzzy msgid "" "-b, --ignore-space-change ignore changes in the amount of white space" msgstr "" -"-b --ignore-space-change éÇÎÏÒÉÒÏ×ÁÔØ ÉÚÍÅÎÅÎÉÑ ÞÉÓÌÁ ÐÒÏÂÅÌØÎÙÈ ÓÉÍ×ÏÌÏ×." +"-b, --ignore-space-change\n" +" игнорировать Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ ÐºÐ¾Ð»Ð¸Ñ‡ÐµÑтва пробельных Ñимволов" #: src/sdiff.c:179 -#, fuzzy msgid "-W, --ignore-all-space ignore all white space" -msgstr "-W --ignore-all-space éÇÎÏÒÉÒÏ×ÁÔØ ×ÓÅ ÐÒÏÂÅÌØÎÙÅ ÓÉÍ×ÏÌÙ." +msgstr "-W, --ignore-all-space игнорировать вÑе пробельные Ñимволы" #: src/sdiff.c:180 -#, fuzzy msgid "-B, --ignore-blank-lines ignore changes whose lines are all blank" -msgstr "-B --ignore-blank-lines éÇÎÏÒÉÒÏ×ÁÔØ ÉÚÍÅÎÅÎÉÑ ÞÉÓÌÁ ÐÕÓÔÙÈ ÓÔÒÏË." +msgstr "" +"-B, --ignore-blank-lines\n" +" игнорировать Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ ÐºÐ¾Ð»Ð¸Ñ‡ÐµÑтва пуÑÑ‚Ñ‹Ñ… Ñтрок" #: src/sdiff.c:181 -#, fuzzy msgid "-I, --ignore-matching-lines=RE ignore changes all whose lines match RE" msgstr "" -"-I ò÷ --ignore-matching-lines=ò÷ éÇÎÏÒÉÒÏ×ÁÔØ ÉÚÍÅÎÅÎÉÑ, ÓÔÒÏËÉ ËÏÔÏÒÙÈ\n" -" ÐÏÌÎÏÓÔØÀ ÓÏÏÔ×ÅÔÓÔ×ÕÀÔ ÚÁÄÁÎÎÏÍÕ ÒÅÇÕÌÑÒÎÏÍÕ " -"×ÙÒÁÖÅÎÉÀ" +"-I, --ignore-matching-lines=RE\n" +" игнорировать Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ Ñтрок, Ñовпадающих Ñ RE" #: src/sdiff.c:182 -#, fuzzy msgid " --strip-trailing-cr strip trailing carriage return on input" -msgstr "--strip-trailing-cr õÄÁÌÉÔØ ÎÁ ×Ù×ÏÄÅ ÚÁ×ÅÒÛÁÀÝÉÊ ×ÏÚ×ÒÁÔ ËÁÒÅÔËÉ." +msgstr " --strip-trailing-cr удалÑÑ‚ÑŒ из ввода завершающий возврат каретки" #: src/sdiff.c:183 -#, fuzzy msgid "-a, --text treat all files as text" -msgstr "-a --text óÞÉÔÁÔØ ×ÓÅ ÆÁÊÌÙ ÔÅËÓÔÏ×ÙÍÉ." +msgstr "-a, --text Ñчитать вÑе файлы текÑтовыми" #: src/sdiff.c:185 -#, fuzzy msgid "" "-w, --width=NUM output at most NUM (default 130) print columns" msgstr "" -"-w þéóìï --width=þéóìï ÷Ù×ÏÄÉÔØ ÍÁËÓÉÍÕÍ ÚÁÄÁÎÎÏÅ þéóìï ÚÎÁËÏ× × ÓÔÒÏËÅ.\n" -" (ÐÏ ÕÍÏÌÞÁÎÉÀ 130)" +"-w, --width=Рвыводить не более Рзнаков в Ñтроке\n" +" (по умолчанию 130)" #: src/sdiff.c:186 -#, fuzzy msgid "" "-l, --left-column output only the left column of common lines" -msgstr "-l --left-column ÷Ù×ÏÄÉÔØ ÔÏÌØËÏ ÌÅ×ÕÀ ËÏÌÏÎËÕ ÏÂÝÉÈ ÓÔÒÏË." +msgstr "--left-column выводить только левую колонку общих Ñтрок" #: src/sdiff.c:187 -#, fuzzy msgid "-s, --suppress-common-lines do not output common lines" -msgstr "-s --suppress-common-lines îÅ ×Ù×ÏÄÉÔØ ÏÂÝÉÅ ÓÔÒÏËÉ." +msgstr "" +"--suppress-common-lines\n" +" не выводить общие Ñтроки" #: src/sdiff.c:189 -#, fuzzy msgid "-t, --expand-tabs expand tabs to spaces in output" -msgstr "-t --expand-tabs òÁÓËÒÙ×ÁÔØ ÐÒÉ ×Ù×ÏÄÅ ÓÉÍ×ÏÌÙ ÔÁÂÕÌÑÃÉÉ × ÐÒÏÂÅÌÙ." +msgstr "" +"-t, --expand-tabs раÑкрывать при выводе Ñимволы табулÑции в пробелы" #: src/sdiff.c:190 -#, fuzzy msgid "" " --tabsize=NUM tab stops at every NUM (default 8) print columns" msgstr "" -"--tabsize=þéóìï ôÁÂÕÌÑÃÉÑ ÞÅÒÅÚ ÚÁÄÁÎÎÏÅ þéóìï ÚÎÁËÏ× (ÐÏ ÕÍÏÌÞÁÎÉÀ 8)." +" --tabsize=РтабулÑÑ†Ð¸Ñ Ñ‡ÐµÑ€ÐµÐ· каждые Рзнаков (по умолчанию 8)" #: src/sdiff.c:192 -#, fuzzy msgid "-d, --minimal try hard to find a smaller set of changes" -msgstr "-d --minimal ðÙÔÁÔØÓÑ ÎÁÊÔÉ ÎÁÉÍÅÎØÛÉÊ ÎÁÂÏÒ ÉÚÍÅÎÅÎÉÊ." +msgstr "-d, --minimal пытатьÑÑ Ð½Ð°Ð¹Ñ‚Ð¸ наименьший набор изменений" #: src/sdiff.c:193 -#, fuzzy msgid "" "-H, --speed-large-files assume large files, many scattered small changes" msgstr "" -"-H --speed-large-files ðÒÅÄÐÏÌÁÇÁÔØ, ÞÔÏ ÆÁÊÌÙ ÂÏÌØÛÉÅ ÓÏ ÍÎÏÇÉÍÉ\n" -" ÒÁÚÂÒÏÓÁÎÎÙÍÉ ÍÅÌËÉÍÉ ÉÚÍÅÎÅÎÉÑÍÉ." +"-H, --speed-large-files предполагать, что файлы большие и еÑÑ‚ÑŒ много\n" +" разброÑанных мелких изменений" #: src/sdiff.c:194 -#, fuzzy msgid " --diff-program=PROGRAM use PROGRAM to compare files" msgstr "" -"--diff-program=ðòïçòáííá éÓÐÏÌØÚÏ×ÁÔØ ÄÌÑ ÓÒÁ×ÎÉÑ ÆÁÊÌÏ× ÕËÁÚÁÎÎÕÀ " -"ðòïçòáííõ." +" --diff-program=ПРОГРÐММÐ\n" +" Ð´Ð»Ñ ÑÑ€Ð°Ð²Ð½ÐµÐ½Ð¸Ñ Ñ„Ð°Ð¹Ð»Ð¾Ð² иÑпользовать ПРОГРÐММУ" #: src/sdiff.c:196 msgid " --help display this help and exit" -msgstr "" +msgstr " --help показать Ñту Ñправку и выйти" #: src/sdiff.c:197 -#, fuzzy msgid "-v, --version output version information and exit" -msgstr "-v --version ðÏËÁÚÁÔØ ÉÎÆÏÒÍÁÃÉÀ Ï ×ÅÒÓÉÉ É ×ÙÊÔÉ." +msgstr "-v, --version показать информацию о верÑии и выйти" #: src/sdiff.c:206 #, c-format msgid "Usage: %s [OPTION]... FILE1 FILE2\n" -msgstr "éÓÐÏÌØÚÏ×ÁÎÉÅ: %s [ëìàþ]... æáêì1 æáêì2\n" +msgstr "ИÑпользование: %s [КЛЮЧ]? ФÐЙЛ1 ФÐЙЛ2\n" #: src/sdiff.c:208 -#, fuzzy msgid "Side-by-side merge of differences between FILE1 and FILE2." -msgstr "éÎÔÅÒÁËÔÉ×ÎÏ ÓÌÉ×ÁÅÔ ÒÁÚÌÉÞÉÑ ÆÁÊÌÏ×." +msgstr "Интерактивно объединÑет Ñ€Ð°Ð·Ð»Ð¸Ñ‡Ð¸Ñ Ð¼ÐµÐ¶Ð´Ñƒ ФÐЙЛОМ1 и ФÐЙЛОМ2." #: src/sdiff.c:329 msgid "cannot interactively merge standard input" -msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÉÎÔÅÒÁËÔÉ×ÎÏ ÓÌÉ×ÁÔØ ÓÔÁÎÄÁÒÔÎÙÊ ××ÏÄ" +msgstr "невозможно интерактивно объединить Ñтандартный ввод" #: src/sdiff.c:595 msgid "both files to be compared are directories" -msgstr "ÏÂÁ ÓÒÁ×ÎÉ×ÁÅÍÙÈ ÆÁÊÌÁ -- ËÁÔÁÌÏÇÉ" +msgstr "оба Ñравниваемых файла ? каталоги" #: src/sdiff.c:818 -#, fuzzy msgid "" "ed:\tEdit then use both versions, each decorated with a header.\n" "eb:\tEdit then use both versions.\n" @@ -1541,29 +1500,51 @@ msgid "" "v:\tVerbosely include common lines.\n" "q:\tQuit.\n" msgstr "" -"ed:\tòÅÄÁËÔÉÒÏ×ÁÔØ É ÉÓÐÏÌØÚÏ×ÁÔØ ÏÂÅ ×ÅÒÓÉÉ, ×ËÌÀÞÉ× × ËÁÖÄÕÀ ÚÁÇÏÌÏ×ÏË.\n" -"eb:\tòÅÄÁËÔÉÒÏ×ÁÔØ É ÉÓÐÏÌØÚÏ×ÁÔØ ÏÂÅ ×ÅÒÓÉÉ.\n" -"el:\tòÅÄÁËÔÉÒÏ×ÁÔØ É ÉÓÐÏÌØÚÏ×ÁÔØ ÌÅ×ÕÀ ×ÅÒÓÉÀ.\n" -"er:\tòÅÄÁËÔÉÒÏ×ÁÔØ É ÉÓÐÏÌØÚÏ×ÁÔØ ÐÒÁ×ÕÀ ×ÅÒÓÉÀ.\n" -"e:\téÓÐÏÌØÚÏ×ÁÔØ ÎÏ×ÕÀ ×ÅÒÓÉÀ.\n" -"l:\téÓÐÏÌØÚÏ×ÁÔØ ÌÅ×ÕÀ ×ÅÒÓÉÀ.\n" -"r:\téÓÐÏÌØÚÏ×ÁÔØ ÐÒÁ×ÕÀ ×ÅÒÓÉÀ.\n" -"s:\t÷ËÌÀÞÁÔØ ÏÂÝÉÅ ÓÔÒÏËÉ, ÎÅ ×ÙÄÁ×ÁÑ ÓÏÏÂÝÅÎÉÑ.\n" -"v:\t÷ËÌÀÞÁÔØ ÏÂÝÉÅ ÓÔÒÏËÉ, ×ÙÄÁ×ÁÑ ÓÏÏÂÝÅÎÉÅ.\n" -"q:\t÷ÙÊÔÉ.\n" - -#: src/util.c:663 -#, fuzzy, c-format +"ed:\tРедактировать и иÑпользовать обе верÑии, включив в каждую заголовок.\n" +"eb:\tРедактировать и иÑпользовать обе верÑии.\n" +"el или e1:\tРедактировать и иÑпользовать левую верÑию.\n" +"er или e2:\tРедактировать и иÑпользовать правую верÑию.\n" +"e:\tОтброÑить обе и редактировать новую верÑию.\n" +"l или 1:\tИÑпользовать левую верÑию.\n" +"r или 2:\tИÑпользовать правую верÑию.\n" +"s:\tВключать общие Ñтроки, не Ð²Ñ‹Ð´Ð°Ð²Ð°Ñ ÑообщениÑ.\n" +"v:\tВключать общие Ñтроки, Ð²Ñ‹Ð´Ð°Ð²Ð°Ñ Ñообщение.\n" +"q:\tВыйти.\n" + +#: src/util.c:662 +#, c-format msgid "unrecognized prefix: %s" -msgstr "%s: ÎÅÉÚ×ÅÓÔÎÙÊ ËÌÀÞ `--%s'\n" +msgstr "неизвеÑтный префикÑ: %s" -#: src/util.c:693 +#: src/util.c:692 #, c-format msgid "unparsable value for --palette" -msgstr "" +msgstr "невозможно разобрать значение --palette" + +#~ 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' is ambiguous\n" +#~ msgstr "%s: двуÑмыÑленный параметр ?-W %s?\n" + +#~ msgid "%s: option '-W %s' doesn't allow an argument\n" +#~ msgstr "%s: у параметра ?-W %s? не может быть аргумента\n" + +#~ msgid "%s: option '-W %s' requires an argument\n" +#~ msgstr "%s: Ð´Ð»Ñ Ð¿Ð°Ñ€Ð°Ð¼ÐµÑ‚Ñ€Ð° ?-W %s? требуетÑÑ Ð°Ñ€Ð³ÑƒÐ¼ÐµÐ½Ñ‚\n" + +#~ msgid " or 'auto' (the default)" +#~ msgstr " или ?auto? (по умолчанию)" + +#~ msgid "" +#~ " --palette=PALETTE specify the colors to use when --color is active" +#~ msgstr " --palette=ПÐЛИТРРзадать набор цветов при активном --color" #~ msgid "%s: illegal option -- %c\n" -#~ msgstr "%s: ÎÅÄÏÐÕÓÔÉÍÙÊ ËÌÀÞ -- %c\n" +#~ msgstr "%s: недопуÑтимый ключ -- %c\n" #~ msgid "" #~ "This is free software; see the source for copying conditions. There is " @@ -1571,28 +1552,28 @@ msgstr "" #~ "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR " #~ "PURPOSE.\n" #~ msgstr "" -#~ "üÔÏ Ó×ÏÂÏÄÎÁÑ ÐÒÏÇÒÁÍÍÁ; ÐÏÄÒÏÂÎÏÓÔÉ Ï ÕÓÌÏ×ÉÑÈ ÒÁÓÐÒÏÓÔÒÁÎÅÎÉÑ\n" -#~ "ÓÍÏÔÒÉÔÅ × ÉÓÈÏÄÎÏÍ ÔÅËÓÔÅ. íÙ îå ÐÒÅÄÏÓÔÁ×ÌÑÅÍ ÇÁÒÁÎÔÉÊ; ÄÁÖÅ ÇÁÒÁÎÔÉÊ\n" -#~ "ëïííåòþåóëïê ðòéçïäîïóôé ÉÌÉ ðòéçïäîïóôé äìñ ëáëïê-ìéâï ãåìé.\n" +#~ "Ðто ÑÐ²Ð¾Ð±Ð¾Ð´Ð½Ð°Ñ Ð¿Ñ€Ð¾Ð³Ñ€Ð°Ð¼Ð¼Ð°; подробноÑти об уÑловиÑÑ… раÑпроÑтранениÑ\n" +#~ "Ñмотрите в иÑходном текÑте. Мы ÐЕ предоÑтавлÑем гарантий; даже гарантий\n" +#~ "КОММЕРЧЕСКОЙ ПРИГОДÐОСТИ или ПРИГОДÐОСТИ ДЛЯ КÐКОЙ-ЛИБО ЦЕЛИ.\n" #~ msgid "-i SKIP1:SKIP2 --ignore-initial=SKIP1:SKIP2" -#~ msgstr "-i î1:î2 --ignore-initial=î1:î2" +#~ msgstr "-i Ð1:Ð2 --ignore-initial=Ð1:Ð2" #~ msgid "-s --quiet --silent Output nothing; yield exit status only." #~ msgstr "" -#~ "-s --quiet --silent îÅ ×Ù×ÏÄÉÔØ, ÔÏÌØËÏ ÓÏÏÂÝÉÔØ ×ÏÚ×ÒÁÝÁÅÍÏÅ ÚÎÁÞÅÎÉÅ." +#~ "-s --quiet --silent Ðе выводить, только Ñообщить возвращаемое значение." #~ msgid "--help Output this help." -#~ msgstr "--help ðÏËÁÚÁÔØ ÜÔÕ ÓÐÒÁ×ËÕ É ×ÙÊÔÉ." +#~ msgstr "--help Показать Ñту Ñправку и выйти." #~ msgid "Report bugs to <bug-gnu-utils@gnu.org>." -#~ msgstr "ï ÏÛÉÂËÁÈ ÓÏÏÂÝÁÊÔÅ <bug-gnu-utils@gnu.org>." +#~ msgstr "Об ошибках Ñообщайте <bug-gnu-utils@gnu.org>." #~ msgid "`-%ld' option is obsolete; use `-%c %ld'" -#~ msgstr "ËÌÀÞ `-%ld' ÕÓÔÁÒÅÌ; ÉÓÐÏÌØÚÕÊÔÅ `-%c %ld'" +#~ msgstr "ключ `-%ld' уÑтарел; иÑпользуйте `-%c %ld'" #~ msgid "`-%ld' option is obsolete; omit it" -#~ msgstr "ËÌÀÞ `-%ld' ÕÓÔÁÒÅÌ; ÏÐÕÓËÁÊÔÅ ÅÇÏ" +#~ msgstr "ключ `-%ld' уÑтарел; опуÑкайте его" #~ msgid "" #~ "-c -C NUM --context[=NUM] Output NUM (default 3) lines of copied " @@ -1603,15 +1584,15 @@ msgstr "" #~ " -p --show-c-function Show which C function each change is in.\n" #~ " -F RE --show-function-line=RE Show the most recent line matching RE." #~ msgstr "" -#~ "-c -C þéóìï --context[=þéóìï] ëÏÐÉÒÏ×ÁÔØ þéóìï (ÐÏ ÕÍÏÌÞÁÎÉÀ 3) ÓÔÒÏË " -#~ "ËÏÎÔÅËÓÔÁ.\n" -#~ "-u -U þéóìï --unified[=þéóìï] ÷Ù×ÏÄÉÔØ þéóìï (ÐÏ ÕÍÏÌÞÁÎÉÀ 3) ÓÔÒÏË\n" -#~ " ÏÂßÅÄÉÎÅÎÎÏÇÏ ËÏÎÔÅËÓÔÁ.\n" -#~ " -L íåôëá --label íåôëá éÓÐÏÌØÚÏ×ÁÔØ íåôëõ ×ÍÅÓÔÏ ÉÍÅÎÉ ÆÁÊÌÁ.\n" -#~ " -p --show-c-function ðÏËÁÚÙ×ÁÔØ C-ÆÕÎËÃÉÀ, ÓÏÄÅÒÖÁÝÕÀ ÉÚÍÅÎÅÎÉÅ.\n" -#~ " -F ò÷ --show-function-line=ò÷ ðÏËÁÚÙ×ÁÔØ ÐÒÅÄÛÅÓÔ×ÕÀÝÕÀ ÓÔÒÏËÕ, " -#~ "ÓÏ×ÐÁÄÁÀÝÕÀ\n" -#~ " Ó ÚÁÄÁÎÎÙÍ ÒÅÇÕÌÑÒÎÙÍ ×ÙÒÁÖÅÎÉÅÍ." +#~ "-c -C ЧИСЛО --context[=ЧИСЛО] Копировать ЧИСЛО (по умолчанию 3) Ñтрок " +#~ "контекÑта.\n" +#~ "-u -U ЧИСЛО --unified[=ЧИСЛО] Выводить ЧИСЛО (по умолчанию 3) Ñтрок\n" +#~ " объединенного контекÑта.\n" +#~ " -L МЕТКР--label МЕТКРИÑпользовать МЕТКУ вмеÑто имени файла.\n" +#~ " -p --show-c-function Показывать C-функцию, Ñодержащую изменение.\n" +#~ " -F Ð Ð’ --show-function-line=Ð Ð’ Показывать предшеÑтвующую Ñтроку, " +#~ "Ñовпадающую\n" +#~ " Ñ Ð·Ð°Ð´Ð°Ð½Ð½Ñ‹Ð¼ регулÑрным выражением." #~ msgid "" #~ "-y --side-by-side Output in two columns.\n" @@ -1619,36 +1600,36 @@ msgstr "" #~ " --left-column Output only the left column of common lines.\n" #~ " --suppress-common-lines Do not output common lines." #~ msgstr "" -#~ "-y --side-by-side ÷Ù×ÏÄÉÔØ × Ä×Å ËÏÌÏÎËÉ.\n" -#~ " -W þéóìï --width=þéóìï ÷Ù×ÏÄÉÔØ ÍÁËÓÉÍÕÍ ÚÁÄÁÎÎÏÅ þéóìï ÚÎÁËÏ× × " -#~ "ÓÔÒÏËÅ.\n" -#~ " (ÐÏ ÕÍÏÌÞÁÎÉÀ 130)\n" -#~ " --left-column ÷Ù×ÏÄÉÔØ ÔÏÌØËÏ ÌÅ×ÕÀ ËÏÌÏÎËÕ ÏÂÝÉÈ ÓÔÒÏË.\n" -#~ " --suppress-common-lines îÅ ×Ù×ÏÄÉÔØ ÏÂÝÉÅ ÓÔÒÏËÉ." +#~ "-y --side-by-side Выводить в две колонки.\n" +#~ " -W ЧИСЛО --width=ЧИСЛО Выводить макÑимум заданное ЧИСЛО знаков в " +#~ "Ñтроке.\n" +#~ " (по умолчанию 130)\n" +#~ " --left-column Выводить только левую колонку общих Ñтрок.\n" +#~ " --suppress-common-lines Ðе выводить общие Ñтроки." #~ msgid "" #~ "--speed-large-files Assume large files and many scattered small changes." #~ msgstr "" -#~ "--speed-large-files ðÒÅÄÐÏÌÁÇÁÔØ, ÞÔÏ ÆÁÊÌÙ ÂÏÌØÛÉÅ ÓÏ ÍÎÏÇÉÍÉ\n" -#~ " ÒÁÚÂÒÏÓÁÎÎÙÍÉ ÍÅÌËÉÍÉ ÉÚÍÅÎÅÎÉÑÍÉ." +#~ "--speed-large-files Предполагать, что файлы большие Ñо многими\n" +#~ " разброÑанными мелкими изменениÑми." #~ msgid "-X Output overlapping changes, bracketing them." -#~ msgstr "-X ÷Ù×ÏÄÉÔØ ÐÅÒÅÓÅËÁÀÝÉÅÓÑ ÉÚÍÅÎÅÎÉÑ, ÚÁËÌÀÞÁÑ ÉÈ × ÓËÏÂËÉ." +#~ msgstr "-X Выводить переÑекающиеÑÑ Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ, Ð·Ð°ÐºÐ»ÑŽÑ‡Ð°Ñ Ð¸Ñ… в Ñкобки." #~ msgid "-m --merge Output merged file instead of ed script (default -A)." #~ msgstr "" -#~ "-m --merge ÷Ù×ÏÄÉÔØ ÏÂßÅÄÉÎÅÎÎÙÊ ÆÁÊÌ ×ÍÅÓÔÏ ÓÃÅÎÁÒÉÑ ed (ÐÏ ÕÍÏÌÞÁÎÉÀ -" +#~ "-m --merge Выводить объединенный файл вмеÑто ÑÑ†ÐµÐ½Ð°Ñ€Ð¸Ñ ed (по умолчанию -" #~ "A)." #~ msgid "-L LABEL --label=LABEL Use LABEL instead of file name." -#~ msgstr "-L íåôëá --label=íåôëá éÓÐÏÌØÚÏ×ÁÔØ íåôëõ ×ÍÅÓÔÏ ÉÍÅÎÉ ÆÁÊÌÁ." +#~ msgstr "-L МЕТКР--label=МЕТКРИÑпользовать МЕТКУ вмеÑто имени файла." #~ msgid "subsidiary program `%s' not found" -#~ msgstr "ÎÅ ÎÁÊÄÅÎÁ ×ÓÐÏÍÏÇÁÔÅÌØÎÁÑ ÐÒÏÇÒÁÍÍÁ `%s'" +#~ msgstr "не найдена вÑÐ¿Ð¾Ð¼Ð¾Ð³Ð°Ñ‚ÐµÐ»ÑŒÐ½Ð°Ñ Ð¿Ñ€Ð¾Ð³Ñ€Ð°Ð¼Ð¼Ð° `%s'" #~ msgid "subsidiary program `%s' failed" -#~ msgstr "ÄÏÞÅÒÎÑÑ ÐÒÏÇÒÁÍÍÁ `%s' ÚÁ×ÅÒÛÉÌÁÓØ ÎÅÕÓÐÅÛÎÏ" +#~ msgstr "дочернÑÑ Ð¿Ñ€Ð¾Ð³Ñ€Ð°Ð¼Ð¼Ð° `%s' завершилаÑÑŒ ошибкой" #~ msgid "subsidiary program `%s' failed (exit status %d)" #~ msgstr "" -#~ "×ÓÐÏÍÏÇÁÔÅÌØÎÁÑ ÐÒÏÇÒÁÍÍÁ `%s' ÚÁ×ÅÒÛÉÌÁÓØ ÎÅÕÓÐÅÛÎÏ (×ÙÈÏÄÎÏÊ ÓÔÁÔÕÓ %d) " +#~ "вÑÐ¿Ð¾Ð¼Ð¾Ð³Ð°Ñ‚ÐµÐ»ÑŒÐ½Ð°Ñ Ð¿Ñ€Ð¾Ð³Ñ€Ð°Ð¼Ð¼Ð° `%s' завершилаÑÑŒ неуÑпешно (выходной ÑÑ‚Ð°Ñ‚ÑƒÑ %d) " Binary files differ@@ -1,14 +1,14 @@ # Serbian translation of `diffutils'. -# Copyright (C) 2004 Free Software Foundation, Inc. +# Copyright © 2004 Free Software Foundation, Inc. # This file is distributed under the same license as the diffutils package. # Aleksandar Jelenak <jelenak@netlinkplus.net>, 2004. -# МироÑлав Ðиколић <miroslavnikolic@rocketmail.com>, 2013. +# МироÑлав Ðиколић <miroslavnikolic@rocketmail.com>, 2013—2017. msgid "" msgstr "" -"Project-Id-Version: diffutils 3.3-pre1\n" +"Project-Id-Version: diffutils 3.5.14\n" "Report-Msgid-Bugs-To: bug-diffutils@gnu.org\n" -"POT-Creation-Date: 2016-08-20 22:22-0700\n" -"PO-Revision-Date: 2013-10-07 11:40+0200\n" +"POT-Creation-Date: 2017-05-21 13:26-0700\n" +"PO-Revision-Date: 2017-02-05 14:48+0200\n" "Last-Translator: МироÑлав Ðиколић <miroslavnikolic@rocketmail.com>\n" "Language-Team: Serbian <(nothing)>\n" "Language: sr\n" @@ -17,31 +17,31 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n" "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" +"X-Bugs: Report translation errors to the Language-Team address.\n" -#: lib/argmatch.c:133 -#, fuzzy, c-format +#: lib/argmatch.c:134 +#, c-format msgid "invalid argument %s for %s" -msgstr "неиÑправан %s%s аргумент „%s“" +msgstr "неиÑправан аргумент „%s“ за „%s“" -#: lib/argmatch.c:134 +#: lib/argmatch.c:135 #, c-format msgid "ambiguous argument %s for %s" -msgstr "" +msgstr "нејаÑан аргумент „%s“ за „%s“" -#: lib/argmatch.c:153 -#, fuzzy +#: lib/argmatch.c:154 msgid "Valid arguments are:" -msgstr "неиÑправан %s%s аргумент „%s“" +msgstr "ИÑправни аргументи Ñу:" -#: lib/c-stack.c:204 lib/c-stack.c:297 +#: lib/c-stack.c:203 lib/c-stack.c:296 msgid "program error" msgstr "грешка програма" -#: lib/c-stack.c:205 lib/c-stack.c:298 +#: lib/c-stack.c:204 lib/c-stack.c:297 msgid "stack overflow" msgstr "Ñтек препуњен" -#: lib/error.c:191 +#: lib/error.c:195 msgid "Unknown system error" msgstr "Ðепозната ÑиÑтемÑка грешка" @@ -87,7 +87,7 @@ msgstr "датотека знаковног уређаја" #: lib/file-type.c:72 msgid "contiguous data" -msgstr "" +msgstr "непрекидни подаци" #: lib/file-type.c:75 msgid "fifo" @@ -95,43 +95,39 @@ msgstr "пупи" #: lib/file-type.c:78 msgid "door" -msgstr "" +msgstr "врата" #: lib/file-type.c:81 -#, fuzzy msgid "multiplexed block special file" -msgstr "датотека блоковÑког уређаја" +msgstr "мултиплекÑирана датотека блоковÑког уређаја" #: lib/file-type.c:84 -#, fuzzy msgid "multiplexed character special file" -msgstr "датотека знаковног уређаја" +msgstr "мултиплекÑирана датотека знаковног уређаја" #: lib/file-type.c:87 msgid "multiplexed file" -msgstr "" +msgstr "мултиплекÑирана датотека" #: lib/file-type.c:90 -#, fuzzy msgid "named file" -msgstr "чудна датотека" +msgstr "именована датотека" #: lib/file-type.c:93 -#, fuzzy msgid "network special file" -msgstr "датотека блоковÑког уређаја" +msgstr "датотека мрежног уређаја" #: lib/file-type.c:96 msgid "migrated file with data" -msgstr "" +msgstr "преÑељена датотека Ñа подацима" #: lib/file-type.c:99 msgid "migrated file without data" -msgstr "" +msgstr "преÑељена датотека без података" #: lib/file-type.c:102 msgid "port" -msgstr "" +msgstr "прикључник" #: lib/file-type.c:105 msgid "socket" @@ -139,72 +135,47 @@ msgstr "прикључница" #: lib/file-type.c:108 msgid "whiteout" -msgstr "" +msgstr "празноÑÑ‚" #: lib/file-type.c:110 msgid "weird file" msgstr "чудна датотека" -#: lib/getopt.c:575 lib/getopt.c:604 -#, c-format -msgid "%s: option '%s' is ambiguous; possibilities:" -msgstr "%s: опција „%s“ је нејаÑна; могућноÑти:" +#: lib/getopt.c:278 +#, fuzzy, c-format +msgid "%s: option '%s%s' is ambiguous\n" +msgstr "%s: опција „%s“ је нејаÑна\n" -#: lib/getopt.c:619 +#: lib/getopt.c:284 #, fuzzy, c-format -msgid "%s: option '%s' is ambiguous\n" -msgstr "%s: опција „-W %s“ је нејаÑна\n" +msgid "%s: option '%s%s' is ambiguous; possibilities:" +msgstr "%s: опција „%s“ је нејаÑна; могућноÑти:" -#: lib/getopt.c:654 lib/getopt.c:658 -#, c-format -msgid "%s: option '--%s' doesn't allow an argument\n" -msgstr "%s: опција „--%s“ не дозвољава аргумент\n" +#: lib/getopt.c:319 +#, fuzzy, c-format +msgid "%s: unrecognized option '%s%s'\n" +msgstr "%s: непозната опција „%c%s“\n" -#: lib/getopt.c:667 lib/getopt.c:672 -#, c-format -msgid "%s: option '%c%s' doesn't allow an argument\n" +#: lib/getopt.c:345 +#, fuzzy, c-format +msgid "%s: option '%s%s' doesn't allow an argument\n" msgstr "%s: опција „%c%s“ не дозвољава аргумент\n" -#: lib/getopt.c:715 lib/getopt.c:734 -#, c-format -msgid "%s: option '--%s' requires an argument\n" +#: lib/getopt.c:360 +#, fuzzy, c-format +msgid "%s: option '%s%s' requires an argument\n" msgstr "%s: опција „%s“ захтева аргумент\n" -#: lib/getopt.c:772 lib/getopt.c:775 -#, c-format -msgid "%s: unrecognized option '--%s'\n" -msgstr "%s: непозната опција „--%s“\n" - -#: lib/getopt.c:783 lib/getopt.c:786 -#, c-format -msgid "%s: unrecognized option '%c%s'\n" -msgstr "%s: непозната опција „%c%s“\n" - -#: lib/getopt.c:835 lib/getopt.c:838 +#: lib/getopt.c:621 #, c-format msgid "%s: invalid option -- '%c'\n" msgstr "%s: неиÑправна опција -- „%c“\n" -#: lib/getopt.c:891 lib/getopt.c:908 lib/getopt.c:1118 lib/getopt.c:1136 +#: lib/getopt.c:636 lib/getopt.c:682 #, c-format msgid "%s: option requires an argument -- '%c'\n" msgstr "%s: опција захтева аргумент -- „%c“\n" -#: lib/getopt.c:964 lib/getopt.c:980 -#, c-format -msgid "%s: option '-W %s' is ambiguous\n" -msgstr "%s: опција „-W %s“ је нејаÑна\n" - -#: lib/getopt.c:1004 lib/getopt.c:1022 -#, c-format -msgid "%s: option '-W %s' doesn't allow an argument\n" -msgstr "%s: опција „-W %s“ не дозвољава аргумент\n" - -#: lib/getopt.c:1043 lib/getopt.c:1061 -#, c-format -msgid "%s: option '-W %s' requires an argument\n" -msgstr "%s: опција „-W %s“ захтева аргумент\n" - #. TRANSLATORS: #. Get translations for open and closing quotation marks. #. The message catalog should translate "`" to a left @@ -226,11 +197,11 @@ msgstr "%s: опција „-W %s“ захтева аргумент\n" #. If you don't know what to put here, please see #. <http://en.wikipedia.org/wiki/Quotation_marks_in_other_languages> #. and use glyphs suitable for your language. -#: lib/quotearg.c:347 +#: lib/quotearg.c:362 msgid "`" msgstr "„" -#: lib/quotearg.c:348 +#: lib/quotearg.c:363 msgid "'" msgstr "“" @@ -263,9 +234,8 @@ msgid "Invalid back reference" msgstr "ÐеиÑправна повратна упута" #: lib/regcomp.c:156 -#, fuzzy msgid "Unmatched [, [^, [:, [., or [=" -msgstr "Ðеупарено [ или [^" +msgstr "Ðеупарено [, [^, [:, [., или [=" #: lib/regcomp.c:159 msgid "Unmatched ( or \\(" @@ -520,7 +490,7 @@ msgstr "%s матична Ñтраница: <http://www.gnu.org/software/%s/>\n" msgid "General help using GNU software: <http://www.gnu.org/gethelp/>\n" msgstr "Општа помоћ кориÑтећи ГÐУ Ñофтвер: <http://www.gnu.org/gethelp/>\n" -#: src/analyze.c:454 src/diff.c:1400 +#: src/analyze.c:454 src/diff.c:1401 #, c-format msgid "Files %s and %s differ\n" msgstr "Датотеке „%s“ и „%s“ Ñу различите\n" @@ -530,21 +500,21 @@ msgstr "Датотеке „%s“ и „%s“ Ñу различите\n" msgid "Binary files %s and %s differ\n" msgstr "Бинарне датотеке %s и %s различите\n" -#: src/analyze.c:697 src/diff3.c:1463 src/util.c:1255 +#: src/analyze.c:706 src/diff3.c:1465 src/util.c:1254 msgid "No newline at end of file" msgstr "Без новог реда на крају датотеке" #. This is a proper name. See the gettext manual, section Names. -#: src/cmp.c:43 +#: src/cmp.c:44 msgid "Torbjorn Granlund" msgstr "Торбјорн Гранлунд" #. This is a proper name. See the gettext manual, section Names. -#: src/cmp.c:44 +#: src/cmp.c:45 msgid "David MacKenzie" msgstr "Дејвид Мек Кензи" -#: src/cmp.c:118 src/diff.c:875 src/diff3.c:459 src/sdiff.c:158 +#: src/cmp.c:119 src/diff.c:877 src/diff3.c:462 src/sdiff.c:159 #, c-format msgid "Try '%s --help' for more information." msgstr "Покушајте „%s --help“ за више информација." @@ -559,12 +529,12 @@ msgstr "неиÑправна „--ignore-initial“ вредноÑÑ‚ „%s“" msgid "options -l and -s are incompatible" msgstr "опције -l и -s не иду заједно" -#: src/cmp.c:155 src/diff.c:884 src/diff3.c:467 src/sdiff.c:167 src/sdiff.c:315 -#: src/sdiff.c:322 src/sdiff.c:874 src/util.c:853 src/util.c:953 src/util.c:960 +#: src/cmp.c:155 src/diff.c:885 src/diff3.c:469 src/sdiff.c:167 src/sdiff.c:315 +#: src/sdiff.c:322 src/sdiff.c:874 src/util.c:852 src/util.c:952 src/util.c:959 msgid "write failed" msgstr "запиÑивање није уÑпело" -#: src/cmp.c:157 src/diff.c:886 src/diff.c:1465 src/diff3.c:469 src/sdiff.c:169 +#: src/cmp.c:157 src/diff.c:887 src/diff.c:1466 src/diff3.c:471 src/sdiff.c:169 msgid "standard output" msgstr "Ñтандардни излаз" @@ -626,7 +596,7 @@ msgstr "" "Изборни БРОЈ1 и БРОЈ2 Ñу бројеви бајтова за изоÑтављање на почетку\n" "Ñваке датотеке (подразумева Ñе нула)." -#: src/cmp.c:185 src/diff.c:996 src/diff3.c:507 src/sdiff.c:210 +#: src/cmp.c:185 src/diff.c:997 src/diff3.c:509 src/sdiff.c:210 msgid "" "Mandatory arguments to long options are mandatory for short options too.\n" msgstr "" @@ -647,7 +617,7 @@ msgstr "" msgid "If a FILE is '-' or missing, read standard input." msgstr "Чита Ñтандардни улаз ако ДÐТОТЕКРнедоÑтаје или је „-“." -#: src/cmp.c:195 src/diff.c:984 src/sdiff.c:220 +#: src/cmp.c:195 src/diff.c:985 src/sdiff.c:220 msgid "Exit status is 0 if inputs are the same, 1 if different, 2 if trouble." msgstr "Излазно Ñтање је 0 ако Ñу улази иÑти, 1 за различите, 2 за грешку." @@ -656,247 +626,262 @@ msgstr "Излазно Ñтање је 0 ако Ñу улази иÑти, 1 за msgid "invalid --bytes value '%s'" msgstr "неиÑправна --bytes вредноÑÑ‚ „%s“" -#: src/cmp.c:266 src/diff.c:793 src/diff3.c:353 src/sdiff.c:565 +#: src/cmp.c:266 src/diff.c:795 src/diff3.c:356 src/sdiff.c:565 #, c-format msgid "missing operand after '%s'" msgstr "недоÑтаје оператор поÑле „%s“" -#: src/cmp.c:278 src/diff.c:795 src/diff3.c:355 src/sdiff.c:567 +#: src/cmp.c:278 src/diff.c:797 src/diff3.c:358 src/sdiff.c:567 #, c-format msgid "extra operand '%s'" msgstr "вишак оператор „%s“" -#: src/cmp.c:494 +#: src/cmp.c:498 #, c-format msgid "%s %s differ: byte %s, line %s\n" msgstr "%s %s Ñе разликују: бајт %s, ред %s\n" -#: src/cmp.c:510 +#: src/cmp.c:514 #, c-format msgid "%s %s differ: byte %s, line %s is %3o %s %3o %s\n" msgstr "%s %s Ñе разликују: бајт %s, ред %s је %3o %s %3o %s\n" -#: src/cmp.c:562 -#, c-format -msgid "cmp: EOF on %s\n" +#: src/cmp.c:571 +#, fuzzy, c-format +msgid "cmp: EOF on %s which is empty\n" +msgstr "cmp: крај датотеке на %s\n" + +#: src/cmp.c:585 +#, fuzzy, c-format +msgid "cmp: EOF on %s after byte %s, line %s\n" +msgstr "%s %s Ñе разликују: бајт %s, ред %s\n" + +#: src/cmp.c:586 +#, fuzzy, c-format +msgid "cmp: EOF on %s after byte %s, in line %s\n" +msgstr "%s %s Ñе разликују: бајт %s, ред %s\n" + +#: src/cmp.c:592 +#, fuzzy, c-format +msgid "cmp: EOF on %s after byte %s\n" msgstr "cmp: крај датотеке на %s\n" #. This is a proper name. See the gettext manual, section Names. -#: src/diff.c:49 +#: src/diff.c:50 msgid "Paul Eggert" msgstr "Пол Егерт" #. This is a proper name. See the gettext manual, section Names. -#: src/diff.c:50 +#: src/diff.c:51 msgid "Mike Haertel" msgstr "Мајк Хартел" #. This is a proper name. See the gettext manual, section Names. -#: src/diff.c:51 +#: src/diff.c:52 msgid "David Hayes" msgstr "Дејвид ХејеÑ" #. This is a proper name. See the gettext manual, section Names. -#: src/diff.c:52 +#: src/diff.c:53 msgid "Richard Stallman" msgstr "Ричард Столман" #. This is a proper name. See the gettext manual, section Names. -#: src/diff.c:53 +#: src/diff.c:54 msgid "Len Tower" msgstr "Лен Тауер" -#: src/diff.c:351 +#: src/diff.c:353 #, c-format msgid "invalid context length '%s'" msgstr "неиÑправна дужина Ñклопа „%s“" -#: src/diff.c:434 +#: src/diff.c:436 #, c-format msgid "pagination not supported on this host" msgstr "прелом Ñтрана није подржан на овом рачунару" -#: src/diff.c:449 src/diff3.c:335 +#: src/diff.c:451 src/diff3.c:336 #, c-format msgid "too many file label options" msgstr "иÑувише опција за ознаку датотеке" -#: src/diff.c:526 +#: src/diff.c:528 #, c-format msgid "invalid width '%s'" msgstr "неиÑправна дужина „%s“" -#: src/diff.c:530 +#: src/diff.c:532 msgid "conflicting width options" msgstr "Ñукобљене опције ширине" -#: src/diff.c:555 +#: src/diff.c:557 #, c-format msgid "invalid horizon length '%s'" msgstr "неиÑправна дужина видокруга „%s“" -#: src/diff.c:611 +#: src/diff.c:613 #, c-format msgid "invalid tabsize '%s'" msgstr "неиÑправна величина табулатора „%s“" -#: src/diff.c:615 +#: src/diff.c:617 msgid "conflicting tabsize options" msgstr "Ñукобљене опције величине табулатора" -#: src/diff.c:770 +#: src/diff.c:772 msgid "--from-file and --to-file both specified" msgstr "„--from-file“ и „--to-file“ Ñу наведени оба" -#: src/diff.c:890 +#: src/diff.c:891 msgid " --normal output a normal diff (the default)" msgstr " --normal иÑпиÑује обичне разлике (оÑновно)" -#: src/diff.c:891 +#: src/diff.c:892 msgid "-q, --brief report only when files differ" msgstr "-q --brief иÑпиÑује Ñамо када Ñе датотеке разликују" -#: src/diff.c:892 +#: src/diff.c:893 msgid "-s, --report-identical-files report when two files are the same" msgstr "-s --report-identical-files извештава када Ñу две датотеке иÑте" -#: src/diff.c:893 +#: src/diff.c:894 msgid "" "-c, -C NUM, --context[=NUM] output NUM (default 3) lines of copied context" msgstr "" "-c, -C БРОЈ, --context[=БРОЈ] иÑпиÑује БРОЈ (почетно 3) редова умноженог " "Ñклопа" -#: src/diff.c:894 +#: src/diff.c:895 msgid "" "-u, -U NUM, --unified[=NUM] output NUM (default 3) lines of unified context" msgstr "" "-w БРОЈ --width=БРОЈ иÑпиÑује БРОЈ (почетно 3) редова обједињеног " "Ñклопа" -#: src/diff.c:895 +#: src/diff.c:896 msgid "-e, --ed output an ed script" msgstr "-e --ed иÑпиÑује ед ÑпиÑ" -#: src/diff.c:896 +#: src/diff.c:897 msgid "-n, --rcs output an RCS format diff" msgstr "-n --rcs иÑпиÑује РЦС Ð·Ð°Ð¿Ð¸Ñ Ñ€Ð°Ð·Ð»Ð¸ÐºÐ°" -#: src/diff.c:897 +#: src/diff.c:898 msgid "-y, --side-by-side output in two columns" msgstr "-y, --side-by-side иÑпиÑује у две колоне" -#: src/diff.c:898 +#: src/diff.c:899 msgid "" "-W, --width=NUM output at most NUM (default 130) print columns" msgstr "" "-w БРЈ --width=БРЈ иÑпиÑује на највише БРЈ (почетно 130) колона" -#: src/diff.c:899 +#: src/diff.c:900 msgid "" " --left-column output only the left column of common lines" msgstr "" "-l --left-column иÑпиÑује Ñамо леву колону заједничких редова" -#: src/diff.c:900 +#: src/diff.c:901 msgid " --suppress-common-lines do not output common lines" msgstr "-s --suppress-common-lines не приказује заједничке редове" -#: src/diff.c:902 +#: src/diff.c:903 msgid "-p, --show-c-function show which C function each change is in" msgstr "" "-p, --show-c-function приказује у којој Ц функцији је Ñвака промена" -#: src/diff.c:903 +#: src/diff.c:904 msgid "-F, --show-function-line=RE show the most recent line matching RE" msgstr "" "-F, --show-function-line=РИ приказује најÑкорији ред који одговара РИ" -#: src/diff.c:904 -#, fuzzy +#: src/diff.c:905 msgid "" " --label LABEL use LABEL instead of file name and timestamp\n" " (can be repeated)" msgstr "" -" --label ОЗÐÐКРкориÑти ОЗÐÐКУ умеÑто назива датотеке\n" +" --label ОЗÐÐКРкориÑти ОЗÐÐКУ умеÑто назива датотеке и " +"временÑке ознаке\n" " (може да Ñе понавља)" -#: src/diff.c:907 +#: src/diff.c:908 msgid "-t, --expand-tabs expand tabs to spaces in output" msgstr "-t --expand-tabs развија табулаторе у размаке за излаз" -#: src/diff.c:908 +#: src/diff.c:909 msgid "-T, --initial-tab make tabs line up by prepending a tab" msgstr "" "-T --initial-tab поравнава табулаторе додајући један табулатор." -#: src/diff.c:909 +#: src/diff.c:910 msgid "" " --tabsize=NUM tab stops every NUM (default 8) print columns" msgstr "" "--tabsize=БРЈ величина табулатора је БРЈ (почетно 8) колона" -#: src/diff.c:910 +#: src/diff.c:911 msgid "" " --suppress-blank-empty suppress space or tab before empty output lines" msgstr "" "--suppress-blank-empty потиÑкује размак или табулатор пре празних " "редова излаза" -#: src/diff.c:911 +#: src/diff.c:912 msgid "-l, --paginate pass output through 'pr' to paginate it" msgstr "-l --paginate пропушта излаз кроз „pr“ за прелом" -#: src/diff.c:913 +#: src/diff.c:914 msgid "" "-r, --recursive recursively compare any subdirectories found" msgstr "" "-r --recursive дубинÑки упоређује Ñве пронађене " "поддиректоријуме" -#: src/diff.c:914 +#: src/diff.c:915 msgid " --no-dereference don't follow symbolic links" msgstr " --no-dereference не прати Ñимболичке везе" -#: src/diff.c:915 +#: src/diff.c:916 msgid "-N, --new-file treat absent files as empty" msgstr "-N --new-file Ñматра празним недоÑтајуће датотеке" -#: src/diff.c:916 +#: src/diff.c:917 msgid " --unidirectional-new-file treat absent first files as empty" msgstr "" " --unidirectional-new-file Ñматра празним прве недоÑтајуће датотеке" -#: src/diff.c:917 +#: src/diff.c:918 msgid " --ignore-file-name-case ignore case when comparing file names" msgstr "" " --ignore-file-name-case занемарује Ñловну величину поређујући назива " "датотека" -#: src/diff.c:918 +#: src/diff.c:919 msgid " --no-ignore-file-name-case consider case when comparing file names" msgstr "" " --no-ignore-file-name-case урачунава Ñловну величину поређујући називе " "датотека" -#: src/diff.c:919 +#: src/diff.c:920 msgid "-x, --exclude=PAT exclude files that match PAT" msgstr "-x, --exclude=ОБРиÑкључује датотеке које поклапају ОБР" -#: src/diff.c:920 +#: src/diff.c:921 msgid "" "-X, --exclude-from=FILE exclude files that match any pattern in FILE" msgstr "" "-X, --exclude-from=ТЕКРиÑкључује датотеке које поклапа било који " "образац у ТЕКÐ" -#: src/diff.c:921 +#: src/diff.c:922 msgid "" "-S, --starting-file=FILE start with FILE when comparing directories" msgstr "" "-S, --starting-file=ТЕКРпочиње од ТЕКРпри поређењу директоријума" -#: src/diff.c:922 +#: src/diff.c:923 msgid "" " --from-file=FILE1 compare FILE1 to all operands;\n" " FILE1 can be a directory" @@ -904,7 +889,7 @@ msgstr "" " --from-file=ТЕКÐ1 упоређује ТЕКУ1 Ñа Ñвим оперантима. ТЕКÐ1 " "може бити директоријум" -#: src/diff.c:924 +#: src/diff.c:925 msgid "" " --to-file=FILE2 compare all operands to FILE2;\n" " FILE2 can be a directory" @@ -912,75 +897,75 @@ msgstr "" " --to-file=ТЕКÐ2 упоређује Ñве операнте Ñа ТЕКОМ2. ТЕКÐ2 може " "бити директоријум" -#: src/diff.c:927 +#: src/diff.c:928 msgid "" "-i, --ignore-case ignore case differences in file contents" msgstr "" "-i --ignore-case занемарује Ñловну величину у Ñклопу датотека" -#: src/diff.c:928 +#: src/diff.c:929 msgid "-E, --ignore-tab-expansion ignore changes due to tab expansion" msgstr "" "-E --ignore-tab-expansion занемарује промене уÑлед развијања табулатора" -#: src/diff.c:929 +#: src/diff.c:930 msgid "-Z, --ignore-trailing-space ignore white space at line end" msgstr "-Z, --ignore-trailing-space занемарује размак на крају реда" -#: src/diff.c:930 +#: src/diff.c:931 msgid "" "-b, --ignore-space-change ignore changes in the amount of white space" msgstr "" "-b --ignore-space-change занемарује промене због количине празног " "проÑтора" -#: src/diff.c:931 +#: src/diff.c:932 msgid "-w, --ignore-all-space ignore all white space" msgstr "-w --ignore-all-space занемарује Ñве празне проÑторе" -#: src/diff.c:932 +#: src/diff.c:933 msgid "" "-B, --ignore-blank-lines ignore changes where lines are all blank" msgstr "" "-B --ignore-blank-lines занемарује промене уÑлед празних редова" -#: src/diff.c:933 +#: src/diff.c:934 msgid "-I, --ignore-matching-lines=RE ignore changes where all lines match RE" msgstr "" "-I, --ignore-matching-lines=РИ занемарује промене чији редови поклапају РИ" -#: src/diff.c:935 +#: src/diff.c:936 msgid "-a, --text treat all files as text" msgstr "-a --text Ñматра Ñве датотеке као текÑÑ‚" -#: src/diff.c:936 +#: src/diff.c:937 msgid " --strip-trailing-cr strip trailing carriage return on input" msgstr " --strip-trailing-cr огољава пратеће <CR> на улазу" -#: src/diff.c:938 +#: src/diff.c:939 msgid " --binary read and write data in binary mode" msgstr " --binary чита и пише податке у бинарном режиму" -#: src/diff.c:941 +#: src/diff.c:942 msgid "" "-D, --ifdef=NAME output merged file with '#ifdef NAME' diffs" msgstr "" "-D, --ifdef=ÐÐЗИВ иÑпиÑује Ñтопљену датотеку да прикаже " "„#ifdef ÐÐЗИВ“ разлике" -#: src/diff.c:942 +#: src/diff.c:943 msgid " --GTYPE-group-format=GFMT format GTYPE input groups with GFMT" msgstr " --GTYPE-group-format=ГОБЛ обликује GTYPE улазне групе Ñа ГОБЛ" -#: src/diff.c:943 +#: src/diff.c:944 msgid " --line-format=LFMT format all input lines with LFMT" msgstr " --line-format=РОБЛ обликује Ñве улазне редове Ñа РОБЛ" -#: src/diff.c:944 +#: src/diff.c:945 msgid " --LTYPE-line-format=LFMT format LTYPE input lines with LFMT" msgstr " --LTYPE-line-format=РОБЛ обликује LTYPE улазне редове Ñа РОБЛ" -#: src/diff.c:945 +#: src/diff.c:946 msgid "" " These format options provide fine-grained control over the output\n" " of diff, generalizing -D/--ifdef." @@ -988,12 +973,12 @@ msgstr "" " Ове опције запиÑа обезбеђује фино подешено управљање преко излаза\n" " различника, генерализујући -D/--ifdef." -#: src/diff.c:947 +#: src/diff.c:948 msgid " LTYPE is 'old', 'new', or 'unchanged'. GTYPE is LTYPE or 'changed'." msgstr "" " LTYPE је „old“, „new“, или „unchanged“. GTYPE је LTYPE или „changed“." -#: src/diff.c:948 +#: src/diff.c:949 msgid "" " GFMT (only) may contain:\n" " %< lines from FILE1\n" @@ -1021,7 +1006,7 @@ msgstr "" " M L+1\n" " %(A=B?T:E) ако је РиÑто као Б онда Т Ñупротно Е" -#: src/diff.c:960 +#: src/diff.c:961 msgid "" " LFMT (only) may contain:\n" " %L contents of line\n" @@ -1033,7 +1018,7 @@ msgstr "" " %l Ñадржај реда, изузев пратећих знакова за нови ред\n" " %[-][ШИРÐ][.[ТÐЧÐ]]{doxX}n printf-Ñтил за улазни број реда" -#: src/diff.c:964 +#: src/diff.c:965 msgid "" " Both GFMT and LFMT may contain:\n" " %% %\n" @@ -1047,150 +1032,147 @@ msgstr "" " %c'\\OOO' знак Ñа окталним кодом OOO\n" " З знак З (други знаци предÑтављају Ñами Ñебе)" -#: src/diff.c:970 +#: src/diff.c:971 msgid "-d, --minimal try hard to find a smaller set of changes" msgstr "-d --minimal труди Ñе да нађе мањи Ñкуп промена" -#: src/diff.c:971 +#: src/diff.c:972 msgid " --horizon-lines=NUM keep NUM lines of the common prefix and suffix" msgstr "" " --horizon-lines=БРЈ чува БРЈ редова заједничког префикÑа и ÑуфикÑа" -#: src/diff.c:972 +#: src/diff.c:973 msgid "" " --speed-large-files assume large files and many scattered small changes" msgstr "" " --speed-large-files за велике датотеке Ñа много раштрканих малих измена" -#: src/diff.c:973 -msgid "" -" --color[=WHEN] colorize the output; WHEN can be 'never', 'always'," -msgstr "" - #: src/diff.c:974 #, fuzzy -msgid " or 'auto' (the default)" -msgstr " --normal иÑпиÑује обичне разлике (оÑновно)" - -#: src/diff.c:975 msgid "" -" --palette=PALETTE specify the colors to use when --color is active" +" --color[=WHEN] colorize the output; WHEN can be 'never', " +"'always',\n" +" or 'auto' (the default)" msgstr "" +" --color[=КÐДÐ] обојава излаз; КÐДРможе бити „never“ (никада), " +"„always“ (увек)," #: src/diff.c:976 +#, fuzzy msgid "" -" PALETTE is a colon-separated list terminfo " -"capabilities" +" --palette=PALETTE the colors to use when --color is active; PALETTE " +"is\n" +" a colon-separated list of terminfo capabilities" msgstr "" +" ПÐЛЕТРје ÑпиÑак могућноÑти података термина " +"раздвојен двотачком" -#: src/diff.c:978 +#: src/diff.c:979 msgid " --help display this help and exit" msgstr " --help приказује ову помоћ и излази" -#: src/diff.c:979 +#: src/diff.c:980 msgid "-v, --version output version information and exit" msgstr "-v --version иÑпиÑује податке о издању" -#: src/diff.c:981 -#, fuzzy +#: src/diff.c:982 msgid "FILES are 'FILE1 FILE2' or 'DIR1 DIR2' or 'DIR FILE' or 'FILE DIR'." msgstr "" -"ДÐТОТЕКЕ Ñу „ТЕКÐ1 ТЕКÐ2“ или „ДИР1 ДИР2“ или „ДИРТЕКÐ...“ или „ТЕКÐ... " -"ДИР“." +"ДÐТОТЕКЕ Ñу „ТЕКÐ1 ТЕКÐ2“ или „ДИР1 ДИР2“ или „ДИРТЕКГ или „ТЕКРДИР“." -#: src/diff.c:982 +#: src/diff.c:983 msgid "" "If --from-file or --to-file is given, there are no restrictions on FILE(s)." msgstr "" "Ðема ограничења за ДÐТОТЕКЕ ако је задато „--from-file“ или „--to-file“." -#: src/diff.c:983 src/diff3.c:526 src/sdiff.c:219 +#: src/diff.c:984 src/diff3.c:528 src/sdiff.c:219 msgid "If a FILE is '-', read standard input." msgstr "Ðко је ДÐТОТЕКР„-“, чита Ñтандардни улаз." -#: src/diff.c:993 +#: src/diff.c:994 #, c-format msgid "Usage: %s [OPTION]... FILES\n" msgstr "Употреба: %s [ОПЦИЈÐ]... ДÐТОТЕКЕ\n" -#: src/diff.c:994 +#: src/diff.c:995 msgid "Compare FILES line by line." msgstr "Поредите ДÐТОТЕКЕ ред по ред." -#: src/diff.c:1028 +#: src/diff.c:1029 #, c-format msgid "conflicting %s option value '%s'" msgstr "Ñукоб вредноÑти „%s“ опције „%s“" -#: src/diff.c:1041 +#: src/diff.c:1042 #, c-format msgid "conflicting output style options" msgstr "Ñукобљене опције излазног Ñтила" -#: src/diff.c:1057 -#, fuzzy, c-format +#: src/diff.c:1058 +#, c-format msgid "invalid color '%s'" -msgstr "неиÑправна дужина „%s“" +msgstr "неиÑправна боја „%s“" -#: src/diff.c:1113 src/diff.c:1323 +#: src/diff.c:1114 src/diff.c:1324 #, c-format msgid "Only in %s: %s\n" msgstr "Само у %s: %s\n" -#: src/diff.c:1247 +#: src/diff.c:1248 msgid "cannot compare '-' to a directory" msgstr "не могу поредити „-“ Ñа директоријумом" -#: src/diff.c:1282 +#: src/diff.c:1283 msgid "-D option not supported with directories" msgstr "опција „-D“ није подржана за директоријуме" -#: src/diff.c:1291 +#: src/diff.c:1292 #, c-format msgid "Common subdirectories: %s and %s\n" msgstr "Заједнички поддиректоријуми: %s и %s\n" -#: src/diff.c:1333 src/diff.c:1383 +#: src/diff.c:1334 src/diff.c:1384 #, c-format msgid "File %s is a %s while file %s is a %s\n" msgstr "Датотека „%s“ је „%s“ док је датотека „%s“ „%s“\n" -#: src/diff.c:1369 +#: src/diff.c:1370 #, c-format msgid "Symbolic links %s and %s differ\n" msgstr "Симболичке везе „%s“ и „%s“ Ñу различите\n" -#: src/diff.c:1456 +#: src/diff.c:1457 #, c-format msgid "Files %s and %s are identical\n" msgstr "Датотеке „%s“ и „%s“ Ñе иÑтоветне\n" #. This is a proper name. See the gettext manual, section Names. -#: src/diff3.c:41 +#: src/diff3.c:42 msgid "Randy Smith" msgstr "Ренди Смит" -#: src/diff3.c:348 +#: src/diff3.c:351 #, c-format msgid "incompatible options" msgstr "неÑаглаÑне опције" -#: src/diff3.c:388 +#: src/diff3.c:391 msgid "'-' specified for more than one input file" msgstr "„-“ је наведено за више од једне улазне датотеке" -#: src/diff3.c:439 src/diff3.c:1288 src/diff3.c:1692 src/diff3.c:1747 +#: src/diff3.c:442 src/diff3.c:1290 src/diff3.c:1693 src/diff3.c:1748 #: src/sdiff.c:307 src/sdiff.c:844 src/sdiff.c:855 msgid "read failed" msgstr "читање није уÑпело" -#: src/diff3.c:473 +#: src/diff3.c:475 msgid "-A, --show-all output all changes, bracketing conflicts" msgstr "" "-A --show-all иÑпиÑује Ñве промене, означавајући Ñукобе " "заградама" -#: src/diff3.c:475 +#: src/diff3.c:477 msgid "" "-e, --ed output ed script incorporating changes\n" " from OLDFILE to YOURFILE into MYFILE" @@ -1198,31 +1180,31 @@ msgstr "" "-e --ed иÑпиÑује неÑпојене промене између СТÐÐ ÐТЕКРи " "ТВОЈÐТЕКРу МОЈÐТЕКÐ" -#: src/diff3.c:477 +#: src/diff3.c:479 msgid "-E, --show-overlap like -e, but bracket conflicts" msgstr "-E --show-overlap као -e, означавајући Ñукобе заградама" -#: src/diff3.c:478 +#: src/diff3.c:480 msgid "" "-3, --easy-only like -e, but incorporate only nonoverlapping " "changes" msgstr "" "-3 --easy-only као -e, али обједињује непреклопљене промене" -#: src/diff3.c:479 +#: src/diff3.c:481 msgid "" "-x, --overlap-only like -e, but incorporate only overlapping changes" msgstr "-x, --overlap-only као -e, али обједињује преклопљене промене" -#: src/diff3.c:480 +#: src/diff3.c:482 msgid "-X like -x, but bracket conflicts" msgstr "-X као -x, означавајући Ñукобе заградама" -#: src/diff3.c:481 +#: src/diff3.c:483 msgid "-i append 'w' and 'q' commands to ed scripts" msgstr "-i придодаје „w“ и „q“ наредбе ед ÑпиÑима" -#: src/diff3.c:483 +#: src/diff3.c:485 msgid "" "-m, --merge output actual merged file, according to\n" " -A if no other options are given" @@ -1230,24 +1212,24 @@ msgstr "" "-m, --merge иÑпиÑује тренутну Ñтопљену датотеку, у Ñкладу\n" " Ñа -A ако ниÑу дате друге опције" -#: src/diff3.c:486 +#: src/diff3.c:488 msgid "-a, --text treat all files as text" msgstr "-a --text Ñматра Ñве датотеке као текÑÑ‚" -#: src/diff3.c:487 +#: src/diff3.c:489 msgid " --strip-trailing-cr strip trailing carriage return on input" msgstr " --strip-trailing-cr огољава пратеће <CR> на улазу" -#: src/diff3.c:488 +#: src/diff3.c:490 msgid "-T, --initial-tab make tabs line up by prepending a tab" msgstr "" "-T --initial-tab поравнава табулаторе додајући један табулатор" -#: src/diff3.c:489 +#: src/diff3.c:491 msgid " --diff-program=PROGRAM use PROGRAM to compare files" msgstr " --diff-program=ПРОГРÐÐœ кориÑти ПРОГРÐÐœ за поређење датотека" -#: src/diff3.c:490 +#: src/diff3.c:492 msgid "" "-L, --label=LABEL use LABEL instead of file name\n" " (can be repeated up to three times)" @@ -1255,24 +1237,24 @@ msgstr "" "-L, --label=ОЗÐÐКРкориÑти ОЗÐÐКУ умеÑто назива датотеке\n" " (може да Ñе понови до три пута)" -#: src/diff3.c:493 +#: src/diff3.c:495 msgid " --help display this help and exit" msgstr " --help приказује ову помоћ и излази" -#: src/diff3.c:494 +#: src/diff3.c:496 msgid "-v, --version output version information and exit" msgstr "-v, --version иÑпиÑује податке о издању и излази" -#: src/diff3.c:503 +#: src/diff3.c:505 #, c-format msgid "Usage: %s [OPTION]... MYFILE OLDFILE YOURFILE\n" msgstr "Употреба: %s [ОПЦИЈÐ]... МОЈÐТЕКРСТÐÐ ÐТЕКРТВОЈÐТЕКÐ\n" -#: src/diff3.c:505 +#: src/diff3.c:507 msgid "Compare three files line by line." msgstr "Поредите три датотеке ред по ред." -#: src/diff3.c:515 +#: src/diff3.c:517 msgid "" "\n" "The default output format is a somewhat human-readable representation of\n" @@ -1295,45 +1277,45 @@ msgstr "" "и да иÑпише тренутно Ñтопљену датотеку. За необичан улаз, ово је много\n" "рогпадније него употреба еда.\n" -#: src/diff3.c:527 +#: src/diff3.c:529 msgid "Exit status is 0 if successful, 1 if conflicts, 2 if trouble." msgstr "Излазно Ñтање је 0 за уÑпех, 1 за Ñукобе, 2 за грешку." -#: src/diff3.c:720 +#: src/diff3.c:722 msgid "internal error: screwup in format of diff blocks" msgstr "унутрашња грешка: зез у запиÑу блокова разлика" -#: src/diff3.c:1015 +#: src/diff3.c:1017 #, c-format msgid "%s: diff failed: " msgstr "%s: разлике ниÑу уÑпеле: " -#: src/diff3.c:1037 +#: src/diff3.c:1039 msgid "internal error: invalid diff type in process_diff" msgstr "унутрашња грешка: неиÑправна врÑта разлика у „process_diff“" -#: src/diff3.c:1062 +#: src/diff3.c:1064 msgid "invalid diff format; invalid change separator" msgstr "неиÑправан Ð·Ð°Ð¿Ð¸Ñ Ñ€Ð°Ð·Ð»Ð¸ÐºÐ°; неиÑправан раздвојник измена" -#: src/diff3.c:1298 +#: src/diff3.c:1300 msgid "invalid diff format; incomplete last line" msgstr "неиÑправан облик разлика; непотпун задњи ред" -#: src/diff3.c:1322 src/sdiff.c:275 src/util.c:970 +#: src/diff3.c:1324 src/sdiff.c:275 src/util.c:969 #, c-format msgid "subsidiary program '%s' could not be invoked" msgstr "помоћни програм „%s“ не може бити покренут" -#: src/diff3.c:1347 +#: src/diff3.c:1349 msgid "invalid diff format; incorrect leading line chars" msgstr "неиÑправан Ð·Ð°Ð¿Ð¸Ñ Ñ€Ð°Ð·Ð»Ð¸ÐºÐ°; нетачни водећи знакови реда" -#: src/diff3.c:1420 +#: src/diff3.c:1422 msgid "internal error: invalid diff type passed to output" msgstr "унутрашња грешка: неиÑправна врÑта разлика проÑлеђена излазу" -#: src/diff3.c:1694 src/diff3.c:1751 +#: src/diff3.c:1695 src/diff3.c:1752 msgid "input file shrank" msgstr "улазна датотека Ñе Ñкупила" @@ -1348,7 +1330,7 @@ msgid "%s: recursive directory loop" msgstr "%s: дубинÑка петља кроз директоријуме" #. This is a proper name. See the gettext manual, section Names. -#: src/sdiff.c:42 +#: src/sdiff.c:43 msgid "Thomas Lord" msgstr "Ð¢Ð¾Ð¼Ð°Ñ Ð›Ð¾Ñ€Ð´" @@ -1489,12 +1471,36 @@ msgstr "" "v: Умеће заједничке редове бучно.\n" "q: Завршава.\n" -#: src/util.c:663 -#, fuzzy, c-format +#: src/util.c:662 +#, c-format msgid "unrecognized prefix: %s" -msgstr "%s: непозната опција „--%s“\n" +msgstr "непознат префикÑ: %s" -#: src/util.c:693 +#: src/util.c:692 #, c-format msgid "unparsable value for --palette" -msgstr "" +msgstr "необрадива вредноÑÑ‚ за „--palette“" + +#~ msgid " or 'auto' (the default)" +#~ msgstr " или „auto“ (подразумевано)" + +#~ msgid "" +#~ " --palette=PALETTE specify the colors to use when --color is active" +#~ msgstr "" +#~ " --palette=ПÐЛЕТРнаводи боје за коришћење када је активно „--" +#~ "color“" + +#~ 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' is ambiguous\n" +#~ msgstr "%s: опција „-W %s“ је нејаÑна\n" + +#~ msgid "%s: option '-W %s' doesn't allow an argument\n" +#~ msgstr "%s: опција „-W %s“ не дозвољава аргумент\n" + +#~ msgid "%s: option '-W %s' requires an argument\n" +#~ msgstr "%s: опција „-W %s“ захтева аргумент\n" Binary files differ@@ -1,47 +1,47 @@ # Swedish messages for diffutils. -# Copyright © 1996, 2001, 2002, 2004, 2006, 2010, 2011, 2012 Free Software Foundation, Inc. +# Copyright © 1996, 2001, 2002, 2004, 2006, 2010, 2011, 2012, 2017 Free Software Foundation, Inc. # This file is distributed under the same license as the diffutils package. -# Göran Uddeborg <goeran@uddeborg.se>, 1996, 2001, 2002, 2004, 2006, 2010, 2011, 2012. +# Göran Uddeborg <goeran@uddeborg.se>, 1996, 2001, 2002, 2004, 2006, 2010, 2011, 2012, 2017. # -# $Revision: 1.43 $ +# $Revision: 1.48 $ # msgid "" msgstr "" -"Project-Id-Version: diffutils 3.3-pre1\n" +"Project-Id-Version: diffutils 3.5.25\n" "Report-Msgid-Bugs-To: bug-diffutils@gnu.org\n" -"POT-Creation-Date: 2016-08-20 22:22-0700\n" -"PO-Revision-Date: 2012-10-31 21:15+0100\n" +"POT-Creation-Date: 2017-05-21 13:26-0700\n" +"PO-Revision-Date: 2017-05-13 18:08+0200\n" "Last-Translator: Göran Uddeborg <goeran@uddeborg.se>\n" "Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n" "Language: sv\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" -#: lib/argmatch.c:133 -#, fuzzy, c-format +#: lib/argmatch.c:134 +#, c-format msgid "invalid argument %s for %s" -msgstr "ogiltigt argument till %s%s â€%sâ€" +msgstr "ogiltigt argument %s till %s" -#: lib/argmatch.c:134 +#: lib/argmatch.c:135 #, c-format msgid "ambiguous argument %s for %s" -msgstr "" +msgstr "tvetydigt argument %s till %s" -#: lib/argmatch.c:153 -#, fuzzy +#: lib/argmatch.c:154 msgid "Valid arguments are:" -msgstr "ogiltigt argument till %s%s â€%sâ€" +msgstr "Giltiga argument är:" -#: lib/c-stack.c:204 lib/c-stack.c:297 +#: lib/c-stack.c:203 lib/c-stack.c:296 msgid "program error" msgstr "programfel" -#: lib/c-stack.c:205 lib/c-stack.c:298 +#: lib/c-stack.c:204 lib/c-stack.c:297 msgid "stack overflow" msgstr "stackspill" -#: lib/error.c:191 +#: lib/error.c:195 msgid "Unknown system error" msgstr "Okänt systemfel" @@ -87,7 +87,7 @@ msgstr "en teckenspecialfil" #: lib/file-type.c:72 msgid "contiguous data" -msgstr "" +msgstr "sammanhängande data" #: lib/file-type.c:75 msgid "fifo" @@ -95,43 +95,39 @@ msgstr "en fifo" #: lib/file-type.c:78 msgid "door" -msgstr "" +msgstr "en dörr" #: lib/file-type.c:81 -#, fuzzy msgid "multiplexed block special file" -msgstr "en blockspecialfil" +msgstr "en multiplexad blockspecialfil" #: lib/file-type.c:84 -#, fuzzy msgid "multiplexed character special file" -msgstr "en teckenspecialfil" +msgstr "en multiplexad teckenspecialfil" #: lib/file-type.c:87 msgid "multiplexed file" -msgstr "" +msgstr "en multiplexad fil" #: lib/file-type.c:90 -#, fuzzy msgid "named file" -msgstr "en konstig fil" +msgstr "en namngiven fil" #: lib/file-type.c:93 -#, fuzzy msgid "network special file" -msgstr "en blockspecialfil" +msgstr "en nätverksspecialfil" #: lib/file-type.c:96 msgid "migrated file with data" -msgstr "" +msgstr "en migrerad fil med data" #: lib/file-type.c:99 msgid "migrated file without data" -msgstr "" +msgstr "en migrerad fil utan data" #: lib/file-type.c:102 msgid "port" -msgstr "" +msgstr "en port" #: lib/file-type.c:105 msgid "socket" @@ -139,71 +135,46 @@ msgstr "ett uttag (socket)" #: lib/file-type.c:108 msgid "whiteout" -msgstr "" +msgstr "en övertäckningsfil" #: lib/file-type.c:110 msgid "weird file" msgstr "en konstig fil" -#: lib/getopt.c:575 lib/getopt.c:604 -#, c-format -msgid "%s: option '%s' is ambiguous; possibilities:" -msgstr "%s: flaggan \"%s\" är tvetydig; möjligheter:" - -#: lib/getopt.c:619 -#, fuzzy, c-format -msgid "%s: option '%s' is ambiguous\n" -msgstr "%s: flaggan \"-W %s\" är tvetydig\n" - -#: lib/getopt.c:654 lib/getopt.c:658 +#: lib/getopt.c:278 #, c-format -msgid "%s: option '--%s' doesn't allow an argument\n" -msgstr "%s: flaggan \"--%s\" tar inget argument\n" +msgid "%s: option '%s%s' is ambiguous\n" +msgstr "%s: flaggan â€%s%s†är tvetydig\n" -#: lib/getopt.c:667 lib/getopt.c:672 +#: lib/getopt.c:284 #, c-format -msgid "%s: option '%c%s' doesn't allow an argument\n" -msgstr "%s: flaggan \"%c%s\" tar inget argument\n" +msgid "%s: option '%s%s' is ambiguous; possibilities:" +msgstr "%s: flaggan â€%s%s†är tvetydig; möjligheter:" -#: lib/getopt.c:715 lib/getopt.c:734 +#: lib/getopt.c:319 #, c-format -msgid "%s: option '--%s' requires an argument\n" -msgstr "%s: flaggan \"%s\" behöver ett argument\n" +msgid "%s: unrecognized option '%s%s'\n" +msgstr "%s: okänd flagga â€%s%sâ€\n" -#: lib/getopt.c:772 lib/getopt.c:775 +#: lib/getopt.c:345 #, c-format -msgid "%s: unrecognized option '--%s'\n" -msgstr "%s: okänd flagga \"--%s\"\n" +msgid "%s: option '%s%s' doesn't allow an argument\n" +msgstr "%s: flaggan â€%s%s†tar inget argument\n" -#: lib/getopt.c:783 lib/getopt.c:786 +#: lib/getopt.c:360 #, c-format -msgid "%s: unrecognized option '%c%s'\n" -msgstr "%s: okänd flagga \"%c%s\"\n" +msgid "%s: option '%s%s' requires an argument\n" +msgstr "%s: flaggan â€%s%s†behöver ett argument\n" -#: lib/getopt.c:835 lib/getopt.c:838 +#: lib/getopt.c:621 #, c-format msgid "%s: invalid option -- '%c'\n" -msgstr "%s: ogiltig flagga -- \"%c\"\n" +msgstr "%s: ogiltig flagga – â€%câ€\n" -#: lib/getopt.c:891 lib/getopt.c:908 lib/getopt.c:1118 lib/getopt.c:1136 +#: lib/getopt.c:636 lib/getopt.c:682 #, c-format msgid "%s: option requires an argument -- '%c'\n" -msgstr "%s: flaggan behöver ett argument -- \"%c\"\n" - -#: lib/getopt.c:964 lib/getopt.c:980 -#, c-format -msgid "%s: option '-W %s' is ambiguous\n" -msgstr "%s: flaggan \"-W %s\" är tvetydig\n" - -#: lib/getopt.c:1004 lib/getopt.c:1022 -#, c-format -msgid "%s: option '-W %s' doesn't allow an argument\n" -msgstr "%s: flaggan \"-W %s\" tar inget argument\n" - -#: lib/getopt.c:1043 lib/getopt.c:1061 -#, c-format -msgid "%s: option '-W %s' requires an argument\n" -msgstr "%s: flaggan \"-W %s\" behöver ett argument\n" +msgstr "%s: flaggan behöver ett argument – â€%câ€\n" #. TRANSLATORS: #. Get translations for open and closing quotation marks. @@ -226,11 +197,11 @@ msgstr "%s: flaggan \"-W %s\" behöver ett argument\n" #. If you don't know what to put here, please see #. <http://en.wikipedia.org/wiki/Quotation_marks_in_other_languages> #. and use glyphs suitable for your language. -#: lib/quotearg.c:347 +#: lib/quotearg.c:362 msgid "`" msgstr "â€" -#: lib/quotearg.c:348 +#: lib/quotearg.c:363 msgid "'" msgstr "â€" @@ -240,7 +211,7 @@ msgstr "Lyckades" #: lib/regcomp.c:138 msgid "No match" -msgstr "Ingen match" +msgstr "Ingen träff" #: lib/regcomp.c:141 msgid "Invalid regular expression" @@ -263,9 +234,8 @@ msgid "Invalid back reference" msgstr "Ogiltig bakÃ¥treferens" #: lib/regcomp.c:156 -#, fuzzy msgid "Unmatched [, [^, [:, [., or [=" -msgstr "Oparad [ eller [^" +msgstr "Oparad [, [^, [:, [. eller [=" #: lib/regcomp.c:159 msgid "Unmatched ( or \\(" @@ -376,7 +346,7 @@ msgstr "" "\n" "Licens GPLv3+: GNU GPL version 3 eller senare <http://gnu.org/licenses/gpl." "html>.\n" -"Detta är fri programvaraL: du fÃ¥r fritt ändra och vidaredistribuera den.\n" +"Detta är fri programvara: du fÃ¥r fritt ändra och vidaredistribuera den.\n" "Det finns INGEN GARANTI, sÃ¥ lÃ¥ngt lagen tillÃ¥ter.\n" "\n" @@ -522,7 +492,7 @@ msgid "General help using GNU software: <http://www.gnu.org/gethelp/>\n" msgstr "" "Allmän hjälp med att använda GNU-program: <http://www.gnu.org/gethelp/>\n" -#: src/analyze.c:454 src/diff.c:1400 +#: src/analyze.c:454 src/diff.c:1401 #, c-format msgid "Files %s and %s differ\n" msgstr "Filerna %s och %s skiljer\n" @@ -532,21 +502,21 @@ msgstr "Filerna %s och %s skiljer\n" msgid "Binary files %s and %s differ\n" msgstr "De binära filerna %s och %s skiljer\n" -#: src/analyze.c:697 src/diff3.c:1463 src/util.c:1255 +#: src/analyze.c:706 src/diff3.c:1465 src/util.c:1254 msgid "No newline at end of file" msgstr "Ingen nyrad vid filslut" #. This is a proper name. See the gettext manual, section Names. -#: src/cmp.c:43 +#: src/cmp.c:44 msgid "Torbjorn Granlund" msgstr "Torbjörn Granlund" #. This is a proper name. See the gettext manual, section Names. -#: src/cmp.c:44 +#: src/cmp.c:45 msgid "David MacKenzie" msgstr "David MacKenzie" -#: src/cmp.c:118 src/diff.c:875 src/diff3.c:459 src/sdiff.c:158 +#: src/cmp.c:119 src/diff.c:877 src/diff3.c:462 src/sdiff.c:159 #, c-format msgid "Try '%s --help' for more information." msgstr "Försök med â€%s --help†för mer information." @@ -561,12 +531,12 @@ msgstr "ogiltigt --ignore-initial-värde â€%sâ€" msgid "options -l and -s are incompatible" msgstr "flaggorna -l och -s är motstridiga" -#: src/cmp.c:155 src/diff.c:884 src/diff3.c:467 src/sdiff.c:167 src/sdiff.c:315 -#: src/sdiff.c:322 src/sdiff.c:874 src/util.c:853 src/util.c:953 src/util.c:960 +#: src/cmp.c:155 src/diff.c:885 src/diff3.c:469 src/sdiff.c:167 src/sdiff.c:315 +#: src/sdiff.c:322 src/sdiff.c:874 src/util.c:852 src/util.c:952 src/util.c:959 msgid "write failed" msgstr "skrivning misslyckades" -#: src/cmp.c:157 src/diff.c:886 src/diff.c:1465 src/diff3.c:469 src/sdiff.c:169 +#: src/cmp.c:157 src/diff.c:887 src/diff.c:1466 src/diff3.c:471 src/sdiff.c:169 msgid "standard output" msgstr "standard ut" @@ -625,10 +595,10 @@ msgid "" "The optional SKIP1 and SKIP2 specify the number of bytes to skip\n" "at the beginning of each file (zero by default)." msgstr "" -"De valfria HOPP1 och HOPP2 anger antalet antalet byte att hoppa över\n" +"De valfria HOPP1 och HOPP2 anger antalet byte att hoppa över\n" "i början varje fil (noll som standard)." -#: src/cmp.c:185 src/diff.c:996 src/diff3.c:507 src/sdiff.c:210 +#: src/cmp.c:185 src/diff.c:997 src/diff3.c:509 src/sdiff.c:210 msgid "" "Mandatory arguments to long options are mandatory for short options too.\n" msgstr "" @@ -649,7 +619,7 @@ msgstr "" msgid "If a FILE is '-' or missing, read standard input." msgstr "Om FIL är â€-†eller utelämnats, läs standard in." -#: src/cmp.c:195 src/diff.c:984 src/sdiff.c:220 +#: src/cmp.c:195 src/diff.c:985 src/sdiff.c:220 msgid "Exit status is 0 if inputs are the same, 1 if different, 2 if trouble." msgstr "Slutsstatus är 0 om indata är lika, 1 om olika, 2 vid problem." @@ -658,187 +628,201 @@ msgstr "Slutsstatus är 0 om indata är lika, 1 om olika, 2 vid problem." msgid "invalid --bytes value '%s'" msgstr "ogiltigt --bytes-värde â€%sâ€" -#: src/cmp.c:266 src/diff.c:793 src/diff3.c:353 src/sdiff.c:565 +#: src/cmp.c:266 src/diff.c:795 src/diff3.c:356 src/sdiff.c:565 #, c-format msgid "missing operand after '%s'" msgstr "saknad operand efter â€%sâ€" -#: src/cmp.c:278 src/diff.c:795 src/diff3.c:355 src/sdiff.c:567 +#: src/cmp.c:278 src/diff.c:797 src/diff3.c:358 src/sdiff.c:567 #, c-format msgid "extra operand '%s'" msgstr "extra operand â€%sâ€" -#: src/cmp.c:494 +#: src/cmp.c:498 #, c-format msgid "%s %s differ: byte %s, line %s\n" msgstr "%s %s skiljer: byte %s, rad %s\n" -#: src/cmp.c:510 +#: src/cmp.c:514 #, c-format msgid "%s %s differ: byte %s, line %s is %3o %s %3o %s\n" msgstr "%s %s skiljer: byte %s, rad %s är %3o %s %3o %s\n" -#: src/cmp.c:562 +#: src/cmp.c:571 #, c-format -msgid "cmp: EOF on %s\n" -msgstr "cmp: EOF i %s\n" +msgid "cmp: EOF on %s which is empty\n" +msgstr "cmp: EOF i %s som är tom\n" + +#: src/cmp.c:585 +#, c-format +msgid "cmp: EOF on %s after byte %s, line %s\n" +msgstr "cmp: EOF i %s efter byte %s, rad %s\n" + +#: src/cmp.c:586 +#, c-format +msgid "cmp: EOF on %s after byte %s, in line %s\n" +msgstr "cmp: EOF i %s efter byte %s, pÃ¥ rad %s\n" + +#: src/cmp.c:592 +#, c-format +msgid "cmp: EOF on %s after byte %s\n" +msgstr "cmp: EOF i %s efter byte %s\n" #. This is a proper name. See the gettext manual, section Names. -#: src/diff.c:49 +#: src/diff.c:50 msgid "Paul Eggert" msgstr "Paul Eggert" #. This is a proper name. See the gettext manual, section Names. -#: src/diff.c:50 +#: src/diff.c:51 msgid "Mike Haertel" msgstr "Mike Haertel" #. This is a proper name. See the gettext manual, section Names. -#: src/diff.c:51 +#: src/diff.c:52 msgid "David Hayes" msgstr "David Hayes" #. This is a proper name. See the gettext manual, section Names. -#: src/diff.c:52 +#: src/diff.c:53 msgid "Richard Stallman" msgstr "Richard Stallman" #. This is a proper name. See the gettext manual, section Names. -#: src/diff.c:53 +#: src/diff.c:54 msgid "Len Tower" msgstr "Len Tower" -#: src/diff.c:351 +#: src/diff.c:353 #, c-format msgid "invalid context length '%s'" msgstr "ogiltig omgivningslängd â€%sâ€" -#: src/diff.c:434 +#: src/diff.c:436 #, c-format msgid "pagination not supported on this host" msgstr "sidvisning stödjs ej pÃ¥ denna värd" -#: src/diff.c:449 src/diff3.c:335 +#: src/diff.c:451 src/diff3.c:336 #, c-format msgid "too many file label options" msgstr "för mÃ¥nga etikettflaggor" -#: src/diff.c:526 +#: src/diff.c:528 #, c-format msgid "invalid width '%s'" msgstr "ogiltig bredd â€%sâ€" -#: src/diff.c:530 +#: src/diff.c:532 msgid "conflicting width options" msgstr "konflikt mellan breddflaggor" -#: src/diff.c:555 +#: src/diff.c:557 #, c-format msgid "invalid horizon length '%s'" msgstr "ogiltig horisontlängd â€%sâ€" -#: src/diff.c:611 +#: src/diff.c:613 #, c-format msgid "invalid tabsize '%s'" msgstr "ogiltigt tabulatorsteg â€%sâ€" -#: src/diff.c:615 +#: src/diff.c:617 msgid "conflicting tabsize options" msgstr "konflikt mellan tabulatorflaggor" -#: src/diff.c:770 +#: src/diff.c:772 msgid "--from-file and --to-file both specified" msgstr "bÃ¥de --from-file och --to-file angavs" -#: src/diff.c:890 +#: src/diff.c:891 msgid " --normal output a normal diff (the default)" msgstr " --normal skriv ut en normal diff (standard)" -#: src/diff.c:891 +#: src/diff.c:892 msgid "-q, --brief report only when files differ" msgstr "-q, --brief rapportera endast när filer skiljer sig" -#: src/diff.c:892 +#: src/diff.c:893 msgid "-s, --report-identical-files report when two files are the same" msgstr "-s --report-identical-files rapportera om tvÃ¥ filer är lika" -#: src/diff.c:893 +#: src/diff.c:894 msgid "" "-c, -C NUM, --context[=NUM] output NUM (default 3) lines of copied context" msgstr "" "-c, -C ANT, --context[=ANT] skriv ANT (3 som standard) rader kopia av " "sammanhang" -#: src/diff.c:894 +#: src/diff.c:895 msgid "" "-u, -U NUM, --unified[=NUM] output NUM (default 3) lines of unified context" msgstr "" "-u, -U ANT, --unified[=ANT] skriv ut ANT (3 som standard) rader med\n" " sammanslagen omgivning" -#: src/diff.c:895 +#: src/diff.c:896 msgid "-e, --ed output an ed script" msgstr "-e, --ed skriv ut ett ed-skript" -#: src/diff.c:896 +#: src/diff.c:897 msgid "-n, --rcs output an RCS format diff" msgstr "-n, --rcs skriv ut skillnader i RCS-format" -#: src/diff.c:897 +#: src/diff.c:898 msgid "-y, --side-by-side output in two columns" msgstr "-y, --side-by-side skriv ut i tvÃ¥ kolumner" -#: src/diff.c:898 +#: src/diff.c:899 msgid "" "-W, --width=NUM output at most NUM (default 130) print columns" msgstr "" "-W, --width=ANT skriv ut högst ANT (130 som standard) kolumner" -#: src/diff.c:899 +#: src/diff.c:900 msgid "" " --left-column output only the left column of common lines" msgstr "" " --left-column skriv ut endast vänstra kolumnen av gemensamma " "rader" -#: src/diff.c:900 +#: src/diff.c:901 msgid " --suppress-common-lines do not output common lines" msgstr " --suppress-common-lines skriv inte ut gemensamma rader" -#: src/diff.c:902 +#: src/diff.c:903 msgid "-p, --show-c-function show which C function each change is in" msgstr "-p, --show-c-function visa vilken C-funktion varje rad finns i" -#: src/diff.c:903 +#: src/diff.c:904 msgid "-F, --show-function-line=RE show the most recent line matching RE" -msgstr "-F, --show-function-line=RU visa dn senaste raden som matchar RU" +msgstr "-F, --show-function-line=RU visa den senaste raden som matchar RU" -#: src/diff.c:904 -#, fuzzy +#: src/diff.c:905 msgid "" " --label LABEL use LABEL instead of file name and timestamp\n" " (can be repeated)" msgstr "" -" --label ETIKETT använd ETIKETT istället för filnamn\n" -" (kan upprepas)" +" --label ETIKETT använd ETIKETT istället för filnamn och\n" +" tidsstämpel (kan upprepas)" -#: src/diff.c:907 +#: src/diff.c:908 msgid "-t, --expand-tabs expand tabs to spaces in output" msgstr "" "-t, --expand-tabs expandera tabulatorer till blanksteg i utdata" -#: src/diff.c:908 +#: src/diff.c:909 msgid "-T, --initial-tab make tabs line up by prepending a tab" msgstr "" "-T, --initial-tab justera tabulatorer genom att skjuta in en" -#: src/diff.c:909 +#: src/diff.c:910 msgid "" " --tabsize=NUM tab stops every NUM (default 8) print columns" msgstr "" " --tabsize=N tabulatorstopp var N:e (8 som standard) kolumn" -#: src/diff.c:910 +#: src/diff.c:911 msgid "" " --suppress-blank-empty suppress space or tab before empty output lines" msgstr "" @@ -846,54 +830,54 @@ msgstr "" "tomma\n" " utrader" -#: src/diff.c:911 +#: src/diff.c:912 msgid "-l, --paginate pass output through 'pr' to paginate it" msgstr "-l, --paginate skicka utdata till â€pr†för paginering" -#: src/diff.c:913 +#: src/diff.c:914 msgid "" "-r, --recursive recursively compare any subdirectories found" msgstr "" "-r, --recursive jämför underkataloger som hittas rekursivt" -#: src/diff.c:914 +#: src/diff.c:915 msgid " --no-dereference don't follow symbolic links" msgstr " --no-dereference följ inte symboliska länkar" -#: src/diff.c:915 +#: src/diff.c:916 msgid "-N, --new-file treat absent files as empty" msgstr "-N, --new-file behandla saknade filer som tomma" -#: src/diff.c:916 +#: src/diff.c:917 msgid " --unidirectional-new-file treat absent first files as empty" msgstr " --unidirectional-new-file behandla saknade förstafiler som tomma" -#: src/diff.c:917 +#: src/diff.c:918 msgid " --ignore-file-name-case ignore case when comparing file names" msgstr "" " --ignore-file-name-case bortse frÃ¥n skiftläge när filnamn jämförs" -#: src/diff.c:918 +#: src/diff.c:919 msgid " --no-ignore-file-name-case consider case when comparing file names" msgstr "" " --no-ignore-file-name-case ta hänsyn till skiftläge när filnamn jämförs" -#: src/diff.c:919 +#: src/diff.c:920 msgid "-x, --exclude=PAT exclude files that match PAT" msgstr "-x, --exclude=MNS ta inte med filer som matchar MNS" -#: src/diff.c:920 +#: src/diff.c:921 msgid "" "-X, --exclude-from=FILE exclude files that match any pattern in FILE" msgstr "" "-X, --exclude-from=FIL uteslut filer som matchar nÃ¥got mönster i FIL" -#: src/diff.c:921 +#: src/diff.c:922 msgid "" "-S, --starting-file=FILE start with FILE when comparing directories" msgstr "-S, --starting-file=FIL börja med FIL när kataloger jämförs" -#: src/diff.c:922 +#: src/diff.c:923 msgid "" " --from-file=FILE1 compare FILE1 to all operands;\n" " FILE1 can be a directory" @@ -901,7 +885,7 @@ msgstr "" " --from-file=FIL1 jämför FIL1 med alla operander;\n" " FIL1 kan vara en katalog" -#: src/diff.c:924 +#: src/diff.c:925 msgid "" " --to-file=FILE2 compare all operands to FILE2;\n" " FILE2 can be a directory" @@ -909,92 +893,92 @@ msgstr "" " --to-file=FIL2 jämför alla operander med FIL2;\n" " FIL2 kan vara en katalog" -#: src/diff.c:927 +#: src/diff.c:928 msgid "" "-i, --ignore-case ignore case differences in file contents" msgstr "" "-i, --ignore-case bortse frÃ¥n skillnader i skiftläge i " "filinnehÃ¥ll" -#: src/diff.c:928 +#: src/diff.c:929 msgid "-E, --ignore-tab-expansion ignore changes due to tab expansion" msgstr "" "-E, --ignore-tab-expansion bortse frÃ¥n ändringar pÃ¥ grund av tab-" "expansion" -#: src/diff.c:929 +#: src/diff.c:930 msgid "-Z, --ignore-trailing-space ignore white space at line end" msgstr "" "-Z, --ignore-trailing-space ignorera alla blanktecken i slutet av raden" -#: src/diff.c:930 +#: src/diff.c:931 msgid "" "-b, --ignore-space-change ignore changes in the amount of white space" msgstr "-b, --ignore-space-change bortse frÃ¥n ändringar i antalet blanka" -#: src/diff.c:931 +#: src/diff.c:932 msgid "-w, --ignore-all-space ignore all white space" msgstr "-w, --ignore-all-space bortse frÃ¥n alla blanktecken" -#: src/diff.c:932 +#: src/diff.c:933 msgid "" "-B, --ignore-blank-lines ignore changes where lines are all blank" msgstr "" "-B, --ignore-blank-lines bortse frÃ¥n ändringar där raderna är helt " "blanka" -#: src/diff.c:933 +#: src/diff.c:934 msgid "-I, --ignore-matching-lines=RE ignore changes where all lines match RE" msgstr "" "-I, --ignore-matching-lines=RU bortse frÃ¥n ändringar där alla rader matchar " "RU" -#: src/diff.c:935 +#: src/diff.c:936 msgid "-a, --text treat all files as text" msgstr "-a, --text behandla alla filer som text" -#: src/diff.c:936 +#: src/diff.c:937 msgid " --strip-trailing-cr strip trailing carriage return on input" msgstr "" " --strip-trailing-cr tag bort avslutande vagnreturer i indata" -#: src/diff.c:938 +#: src/diff.c:939 msgid " --binary read and write data in binary mode" msgstr " --binary läs och skriv data binärt" -#: src/diff.c:941 +#: src/diff.c:942 msgid "" "-D, --ifdef=NAME output merged file with '#ifdef NAME' diffs" msgstr "" "-D, --ifdef=NAMN skriv sammanslagen fil med skillnader inom\n" " â€#ifdef NAMNâ€" -#: src/diff.c:942 +#: src/diff.c:943 msgid " --GTYPE-group-format=GFMT format GTYPE input groups with GFMT" msgstr " --GTYP-group-format=GFMT formatera GTYP-ingrupper med GFMT" -#: src/diff.c:943 +#: src/diff.c:944 msgid " --line-format=LFMT format all input lines with LFMT" msgstr " --line-format=RFMT formatera alla inrader med RFMT" -#: src/diff.c:944 +#: src/diff.c:945 msgid " --LTYPE-line-format=LFMT format LTYPE input lines with LFMT" msgstr " --RTYP-line-format=RFMT formatera RTYP-inrader med RFMT" -#: src/diff.c:945 +#: src/diff.c:946 msgid "" " These format options provide fine-grained control over the output\n" " of diff, generalizing -D/--ifdef." msgstr "" -" Dessa formatflagger gör det möjligt att finjustera utskriften frÃ¥n\n" +" Dessa formatflaggor gör det möjligt att finjustera utskriften frÃ¥n\n" " diff, generaliserande -D/--ifdef." -#: src/diff.c:947 +#: src/diff.c:948 msgid " LTYPE is 'old', 'new', or 'unchanged'. GTYPE is LTYPE or 'changed'." msgstr "" -" LTYP är â€oldâ€, â€new†eller â€unchangedâ€. GTYP är LTYP eller â€changedâ€." +" RTYP är â€oldâ€, â€new†eller â€unchangedâ€. GTYP är RTYP eller â€changedâ€." -#: src/diff.c:948 +#: src/diff.c:949 msgid "" " GFMT (only) may contain:\n" " %< lines from FILE1\n" @@ -1022,7 +1006,7 @@ msgstr "" " M L+1\n" " %(A=B?T:E) om A är lika med B dÃ¥ T annars E" -#: src/diff.c:960 +#: src/diff.c:961 msgid "" " LFMT (only) may contain:\n" " %L contents of line\n" @@ -1034,7 +1018,7 @@ msgstr "" " %l radinnehÃ¥ll exklusive avslutande nyrad\n" " %[-][BREDD][.[PREC]]{doxX}n printf-stil spec. för inradnummer" -#: src/diff.c:964 +#: src/diff.c:965 msgid "" " Both GFMT and LFMT may contain:\n" " %% %\n" @@ -1044,155 +1028,152 @@ msgid "" msgstr "" " BÃ¥de GFMT och RFMT kan innehÃ¥lla:\n" " %% %\n" -" %c'T' det ensamma tecknet C\n" +" %c'T' det ensamma tecknet T\n" " %c'\\OOO' tecknet med oktalkod OOO\n" " T tecknet T (övriga tecken representerar sig själva)" -#: src/diff.c:970 +#: src/diff.c:971 msgid "-d, --minimal try hard to find a smaller set of changes" msgstr "" "-d, --minimal arbeta hÃ¥rt för att hitta en mindre mängd av " "ändringar" -#: src/diff.c:971 +#: src/diff.c:972 msgid " --horizon-lines=NUM keep NUM lines of the common prefix and suffix" msgstr "" " --horizon-lines=ANT spara ANT rader av gemensamt prefix och suffix" -#: src/diff.c:972 +#: src/diff.c:973 msgid "" " --speed-large-files assume large files and many scattered small changes" msgstr " --speed-large-files antag stora filer och smÃ¥ spridda ändringar" -#: src/diff.c:973 -msgid "" -" --color[=WHEN] colorize the output; WHEN can be 'never', 'always'," -msgstr "" - #: src/diff.c:974 -#, fuzzy -msgid " or 'auto' (the default)" -msgstr " --normal skriv ut en normal diff (standard)" - -#: src/diff.c:975 msgid "" -" --palette=PALETTE specify the colors to use when --color is active" +" --color[=WHEN] colorize the output; WHEN can be 'never', " +"'always',\n" +" or 'auto' (the default)" msgstr "" +" --color[=NÄR] färglägg utdata; NÄR kan vara â€neverâ€, â€alwaysâ€,\n" +" eller â€auto†(standard)" #: src/diff.c:976 msgid "" -" PALETTE is a colon-separated list terminfo " -"capabilities" +" --palette=PALETTE the colors to use when --color is active; PALETTE " +"is\n" +" a colon-separated list of terminfo capabilities" msgstr "" +" --palette=PALETT färgerna att använda när --color är aktivt; PALETT " +"är\n" +" en kolonseparerad lista av terminfoförmÃ¥gor" -#: src/diff.c:978 +#: src/diff.c:979 msgid " --help display this help and exit" msgstr " --help visa denna hjälp och avsluta" -#: src/diff.c:979 +#: src/diff.c:980 msgid "-v, --version output version information and exit" msgstr "-v, --version visa versionsinformation och avsluta" -#: src/diff.c:981 -#, fuzzy +#: src/diff.c:982 msgid "FILES are 'FILE1 FILE2' or 'DIR1 DIR2' or 'DIR FILE' or 'FILE DIR'." msgstr "" -"FILER är â€FIL1 FIL2†eller â€KAT1 KAT2†eller \"KAT FIL…†eller â€FIL… KATâ€." +"FILER är â€FIL1 FIL2†eller â€KAT1 KAT2†eller â€KAT FIL†eller â€FIL KATâ€." -#: src/diff.c:982 +#: src/diff.c:983 msgid "" "If --from-file or --to-file is given, there are no restrictions on FILE(s)." msgstr "" "Om --from-file eller --to-file är angivet finns det inga begränsningar\n" "pÃ¥ FILER." -#: src/diff.c:983 src/diff3.c:526 src/sdiff.c:219 +#: src/diff.c:984 src/diff3.c:528 src/sdiff.c:219 msgid "If a FILE is '-', read standard input." msgstr "Om en FIL är â€-â€, läs standard in." -#: src/diff.c:993 +#: src/diff.c:994 #, c-format msgid "Usage: %s [OPTION]... FILES\n" msgstr "Användning: %s [FLAGGA]... FILER\n" -#: src/diff.c:994 +#: src/diff.c:995 msgid "Compare FILES line by line." msgstr "Jämför FILER rad för rad." -#: src/diff.c:1028 +#: src/diff.c:1029 #, c-format msgid "conflicting %s option value '%s'" msgstr "motstridigt %s-flaggsvärde â€%sâ€" -#: src/diff.c:1041 +#: src/diff.c:1042 #, c-format msgid "conflicting output style options" msgstr "motstridig utmatningsstilsflagga" -#: src/diff.c:1057 -#, fuzzy, c-format +#: src/diff.c:1058 +#, c-format msgid "invalid color '%s'" -msgstr "ogiltig bredd â€%sâ€" +msgstr "ogiltig färg â€%sâ€" -#: src/diff.c:1113 src/diff.c:1323 +#: src/diff.c:1114 src/diff.c:1324 #, c-format msgid "Only in %s: %s\n" msgstr "Endast i %s: %s\n" -#: src/diff.c:1247 +#: src/diff.c:1248 msgid "cannot compare '-' to a directory" msgstr "kan inte jämföra â€-†med en katalog" -#: src/diff.c:1282 +#: src/diff.c:1283 msgid "-D option not supported with directories" -msgstr "-D flaggan stödjs ej för kataloger" +msgstr "flaggan -D stödjs ej för kataloger" -#: src/diff.c:1291 +#: src/diff.c:1292 #, c-format msgid "Common subdirectories: %s and %s\n" msgstr "Lika underkataloger: %s och %s\n" -#: src/diff.c:1333 src/diff.c:1383 +#: src/diff.c:1334 src/diff.c:1384 #, c-format msgid "File %s is a %s while file %s is a %s\n" msgstr "Filen %s är %s medan filen %s är %s\n" -#: src/diff.c:1369 +#: src/diff.c:1370 #, c-format msgid "Symbolic links %s and %s differ\n" msgstr "De symboliska länkarna %s och %s skiljer\n" -#: src/diff.c:1456 +#: src/diff.c:1457 #, c-format msgid "Files %s and %s are identical\n" msgstr "Filerna %s och %s är lika\n" #. This is a proper name. See the gettext manual, section Names. -#: src/diff3.c:41 +#: src/diff3.c:42 msgid "Randy Smith" msgstr "Randy Smith" -#: src/diff3.c:348 +#: src/diff3.c:351 #, c-format msgid "incompatible options" msgstr "oförenliga flaggor" -#: src/diff3.c:388 +#: src/diff3.c:391 msgid "'-' specified for more than one input file" msgstr "â€-†angivet för mer än en infil" -#: src/diff3.c:439 src/diff3.c:1288 src/diff3.c:1692 src/diff3.c:1747 +#: src/diff3.c:442 src/diff3.c:1290 src/diff3.c:1693 src/diff3.c:1748 #: src/sdiff.c:307 src/sdiff.c:844 src/sdiff.c:855 msgid "read failed" msgstr "läsning misslyckades" -#: src/diff3.c:473 +#: src/diff3.c:475 msgid "-A, --show-all output all changes, bracketing conflicts" msgstr "" "-A, --show-all skriv alla ändringar med markering runt " "konflikter" -#: src/diff3.c:475 +#: src/diff3.c:477 msgid "" "-e, --ed output ed script incorporating changes\n" " from OLDFILE to YOURFILE into MYFILE" @@ -1200,12 +1181,12 @@ msgstr "" "-e, --ed skriv ut ett ed-skript som innehÃ¥ller ändringar\n" " frÃ¥n GAMMALFIL till DINFIL i MINFIL" -#: src/diff3.c:477 +#: src/diff3.c:479 msgid "-E, --show-overlap like -e, but bracket conflicts" msgstr "" "-E, --show-overlap som -e, men med markeringar runt konflikter" -#: src/diff3.c:478 +#: src/diff3.c:480 msgid "" "-3, --easy-only like -e, but incorporate only nonoverlapping " "changes" @@ -1213,22 +1194,22 @@ msgstr "" "-3, --easy-only som -e, men tag endast med ej överlappande " "ändringar" -#: src/diff3.c:479 +#: src/diff3.c:481 msgid "" "-x, --overlap-only like -e, but incorporate only overlapping changes" msgstr "" "-x, --overlap-only som -e, men tag endast med överlappande ändringar" -#: src/diff3.c:480 +#: src/diff3.c:482 msgid "-X like -x, but bracket conflicts" msgstr "-X som -x, men skriv klamrar om konflikter" -#: src/diff3.c:481 +#: src/diff3.c:483 msgid "-i append 'w' and 'q' commands to ed scripts" msgstr "" "-i lägg till â€wâ€- och â€qâ€-kommandon till ed-skript" -#: src/diff3.c:483 +#: src/diff3.c:485 msgid "" "-m, --merge output actual merged file, according to\n" " -A if no other options are given" @@ -1236,25 +1217,25 @@ msgstr "" "-m, --merge skriv ut en faktiskt sammanslagen fil, enligt\n" " -A om inga andra flaggor ges" -#: src/diff3.c:486 +#: src/diff3.c:488 msgid "-a, --text treat all files as text" msgstr "-a, --text betrakta alla filer som text" -#: src/diff3.c:487 +#: src/diff3.c:489 msgid " --strip-trailing-cr strip trailing carriage return on input" msgstr " --strip-trailing-cr tag bort avslutande vagnreturer i indata" -#: src/diff3.c:488 +#: src/diff3.c:490 msgid "-T, --initial-tab make tabs line up by prepending a tab" msgstr "" "-T, --initial-tab justera tabulatorer genom att skjuta in en " "tabulator" -#: src/diff3.c:489 +#: src/diff3.c:491 msgid " --diff-program=PROGRAM use PROGRAM to compare files" msgstr " --diff-program=PROGRAM använd PROGRAM för att jämföra filer" -#: src/diff3.c:490 +#: src/diff3.c:492 msgid "" "-L, --label=LABEL use LABEL instead of file name\n" " (can be repeated up to three times)" @@ -1262,24 +1243,24 @@ msgstr "" "-L, --label=ETIKETT använd ETIKETT istället för filnamn\n" " (kan upprepas upp till tre gÃ¥nger)" -#: src/diff3.c:493 +#: src/diff3.c:495 msgid " --help display this help and exit" msgstr " --help visa denna hjälp och avsluta" -#: src/diff3.c:494 +#: src/diff3.c:496 msgid "-v, --version output version information and exit" msgstr "-v, --version visa versionsinformation och avsluta" -#: src/diff3.c:503 +#: src/diff3.c:505 #, c-format msgid "Usage: %s [OPTION]... MYFILE OLDFILE YOURFILE\n" msgstr "Användning: %s [FLAGGA]... MINFIL GAMMALFIL DINFIL\n" -#: src/diff3.c:505 +#: src/diff3.c:507 msgid "Compare three files line by line." msgstr "Jämför tre filer rad för rad." -#: src/diff3.c:515 +#: src/diff3.c:517 msgid "" "\n" "The default output format is a somewhat human-readable representation of\n" @@ -1305,45 +1286,45 @@ msgstr "" "och skriva ut den faktiskt sammanslagna filen. För ovanlig indata är detta\n" "mer robust än att använda ed.\n" -#: src/diff3.c:527 +#: src/diff3.c:529 msgid "Exit status is 0 if successful, 1 if conflicts, 2 if trouble." msgstr "Slutstatus är 0 om allt bra, 1 vid konflikt, 2 vid problem." -#: src/diff3.c:720 +#: src/diff3.c:722 msgid "internal error: screwup in format of diff blocks" msgstr "internt fel: trasigt format i diff-block" -#: src/diff3.c:1015 +#: src/diff3.c:1017 #, c-format msgid "%s: diff failed: " msgstr "%s: diff misslyckades: " -#: src/diff3.c:1037 +#: src/diff3.c:1039 msgid "internal error: invalid diff type in process_diff" msgstr "internt fel: ogiltig diff-typ i process_diff" -#: src/diff3.c:1062 +#: src/diff3.c:1064 msgid "invalid diff format; invalid change separator" msgstr "ogiltigt diff-format; ogiltig ändringsseparator" -#: src/diff3.c:1298 +#: src/diff3.c:1300 msgid "invalid diff format; incomplete last line" msgstr "ogiltigt diff-format; ofullständig sista rad" -#: src/diff3.c:1322 src/sdiff.c:275 src/util.c:970 +#: src/diff3.c:1324 src/sdiff.c:275 src/util.c:969 #, c-format msgid "subsidiary program '%s' could not be invoked" msgstr "underprogram â€%s†kunde inte startas" -#: src/diff3.c:1347 +#: src/diff3.c:1349 msgid "invalid diff format; incorrect leading line chars" msgstr "ogiltigt diff-format; felaktiga starttecken pÃ¥ rad" -#: src/diff3.c:1420 +#: src/diff3.c:1422 msgid "internal error: invalid diff type passed to output" msgstr "internt fel: ogiltig diff-typ utskickad" -#: src/diff3.c:1694 src/diff3.c:1751 +#: src/diff3.c:1695 src/diff3.c:1752 msgid "input file shrank" msgstr "infilen krympte" @@ -1358,7 +1339,7 @@ msgid "%s: recursive directory loop" msgstr "%s: rekursiv katalogslinga" #. This is a proper name. See the gettext manual, section Names. -#: src/sdiff.c:42 +#: src/sdiff.c:43 msgid "Thomas Lord" msgstr "Thomas Lord" @@ -1421,8 +1402,7 @@ msgstr "" msgid "" "-l, --left-column output only the left column of common lines" msgstr "" -"-l, --left-column skriv ut endast ut gemensamma raders vänstra " -"kolumn" +"-l, --left-column skriv endast ut gemensamma raders vänstra kolumn" #: src/sdiff.c:187 msgid "-s, --suppress-common-lines do not output common lines" @@ -1504,12 +1484,12 @@ msgstr "" "v:\tInkludera och tillkännage gemensamma rader.\n" "q:\tAvsluta.\n" -#: src/util.c:663 -#, fuzzy, c-format +#: src/util.c:662 +#, c-format msgid "unrecognized prefix: %s" -msgstr "%s: okänd flagga \"--%s\"\n" +msgstr "okänt prefix: %s" -#: src/util.c:693 +#: src/util.c:692 #, c-format msgid "unparsable value for --palette" -msgstr "" +msgstr "otolkbart värde för --palette" Binary files differ@@ -1,49 +1,49 @@ -# translation of diffutils-3.3-pre1.tr.po to Turkish +# translation of diffutils-3.5.25.tr.po to Turkish # Diffutils Turkish translation # Copyright (C) 2001, 2005 Free Software Foundation, Inc. -# # This file is distributed under the same license as the diffutils package. # Deniz Akkus Kanca <deniz@arayan.com>, 2001. # Volkan Gezer <vlkngzr@gmail.com>, 2013. +# Mehmet Kececi <mkececi@mehmetkececi.com>, 2017. msgid "" msgstr "" -"Project-Id-Version: diffutils 3.3-pre1\n" +"Project-Id-Version: diffutils 3.5.25\n" "Report-Msgid-Bugs-To: bug-diffutils@gnu.org\n" -"POT-Creation-Date: 2016-08-20 22:22-0700\n" -"PO-Revision-Date: 2013-03-09 15:49+0100\n" -"Last-Translator: Volkan Gezer <vlkngzr@gmail.com>\n" +"POT-Creation-Date: 2017-05-21 13:26-0700\n" +"PO-Revision-Date: 2017-05-08 11:19+0300\n" +"Last-Translator: Mehmet Kececi <mkececi@mehmetkececi.com>\n" "Language-Team: Turkish <gnu-tr-u12a@lists.sourceforge.net>\n" "Language: tr\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: Lokalize 1.5\n" -"Plural-Forms: nplurals=1; plural=0;\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" +"X-Generator: Virtaal 0.7.1\n" +"X-Bugs: Report translation errors to the Language-Team address.\n" -#: lib/argmatch.c:133 -#, fuzzy, c-format +#: lib/argmatch.c:134 +#, c-format msgid "invalid argument %s for %s" -msgstr "Geçersiz %s%s argümanı '%s'" +msgstr "%s için geçersiz bağımsız deÄŸiÅŸken %s" -#: lib/argmatch.c:134 +#: lib/argmatch.c:135 #, c-format msgid "ambiguous argument %s for %s" -msgstr "" +msgstr "%s için belirsiz bağımsız deÄŸiÅŸkeni %s" -#: lib/argmatch.c:153 -#, fuzzy +#: lib/argmatch.c:154 msgid "Valid arguments are:" -msgstr "Geçersiz %s%s argümanı '%s'" +msgstr "Geçerli argümanlar ÅŸunlardır:" -#: lib/c-stack.c:204 lib/c-stack.c:297 +#: lib/c-stack.c:203 lib/c-stack.c:296 msgid "program error" msgstr "yazılım hatası" -#: lib/c-stack.c:205 lib/c-stack.c:298 +#: lib/c-stack.c:204 lib/c-stack.c:297 msgid "stack overflow" msgstr "yığıt taÅŸması" -#: lib/error.c:191 +#: lib/error.c:195 msgid "Unknown system error" msgstr "Bilinmeyen sistem hatası" @@ -89,7 +89,7 @@ msgstr "karakter özel dosyası" #: lib/file-type.c:72 msgid "contiguous data" -msgstr "" +msgstr "bitiÅŸik veri" #: lib/file-type.c:75 msgid "fifo" @@ -97,43 +97,39 @@ msgstr "fifo" #: lib/file-type.c:78 msgid "door" -msgstr "" +msgstr "kapı" #: lib/file-type.c:81 -#, fuzzy msgid "multiplexed block special file" -msgstr "blok özel dosyası" +msgstr "çoklu blok özel dosyası" #: lib/file-type.c:84 -#, fuzzy msgid "multiplexed character special file" -msgstr "karakter özel dosyası" +msgstr "çoklu karakter özel dosyası" #: lib/file-type.c:87 msgid "multiplexed file" -msgstr "" +msgstr "çoklu dosya" #: lib/file-type.c:90 -#, fuzzy msgid "named file" -msgstr "dosya garip" +msgstr "adlandırılmış dosya" #: lib/file-type.c:93 -#, fuzzy msgid "network special file" -msgstr "blok özel dosyası" +msgstr "aÄŸ özel dosyası" #: lib/file-type.c:96 msgid "migrated file with data" -msgstr "" +msgstr "veri ile geçirilen dosya" #: lib/file-type.c:99 msgid "migrated file without data" -msgstr "" +msgstr "veriler olmadan geçirilen dosya" #: lib/file-type.c:102 msgid "port" -msgstr "" +msgstr "baÄŸlantı noktası" #: lib/file-type.c:105 msgid "socket" @@ -141,72 +137,47 @@ msgstr "soket" #: lib/file-type.c:108 msgid "whiteout" -msgstr "" +msgstr "sıfır görüş" #: lib/file-type.c:110 msgid "weird file" msgstr "dosya garip" -#: lib/getopt.c:575 lib/getopt.c:604 +#: lib/getopt.c:278 #, c-format -msgid "%s: option '%s' is ambiguous; possibilities:" -msgstr "%s: `%s' seçeneÄŸi belirsiz; kullanılabilecekler:" +msgid "%s: option '%s%s' is ambiguous\n" +msgstr "%s: '%s%s' seçeneÄŸi belirsiz\n" -#: lib/getopt.c:619 -#, fuzzy, c-format -msgid "%s: option '%s' is ambiguous\n" -msgstr "%s: `-W %s' seçeneÄŸi belirsiz\n" - -#: lib/getopt.c:654 lib/getopt.c:658 +#: lib/getopt.c:284 #, c-format -msgid "%s: option '--%s' doesn't allow an argument\n" -msgstr "%s: `--%s' seçeneÄŸi argümansız kullanılır\n" +msgid "%s: option '%s%s' is ambiguous; possibilities:" +msgstr "%s: '%s%s' seçeneÄŸi belirsiz; kullanılabilecekler:" -#: lib/getopt.c:667 lib/getopt.c:672 +#: lib/getopt.c:319 #, c-format -msgid "%s: option '%c%s' doesn't allow an argument\n" -msgstr "%s: seçenek `%c%s' argümansız kullanılır\n" +msgid "%s: unrecognized option '%s%s'\n" +msgstr "%s: `%s%s' seçeneÄŸi bilinmiyor\n" -#: lib/getopt.c:715 lib/getopt.c:734 +#: lib/getopt.c:345 #, c-format -msgid "%s: option '--%s' requires an argument\n" -msgstr "%s: `%s' seçeneÄŸi bir argümanla kullanılır\n" +msgid "%s: option '%s%s' doesn't allow an argument\n" +msgstr "%s: seçenek '%s%s' argümansız kullanılır\n" -#: lib/getopt.c:772 lib/getopt.c:775 +#: lib/getopt.c:360 #, c-format -msgid "%s: unrecognized option '--%s'\n" -msgstr "%s: `--%s' seçeneÄŸi bilinmiyor\n" +msgid "%s: option '%s%s' requires an argument\n" +msgstr "%s: '%s%s' seçeneÄŸi bir argümanla kullanılır\n" -#: lib/getopt.c:783 lib/getopt.c:786 -#, c-format -msgid "%s: unrecognized option '%c%s'\n" -msgstr "%s: `%c%s' seçeneÄŸi bilinmiyor\n" - -#: lib/getopt.c:835 lib/getopt.c:838 +#: lib/getopt.c:621 #, c-format msgid "%s: invalid option -- '%c'\n" msgstr "%s: geçersiz seçenek -- %c\n" -#: lib/getopt.c:891 lib/getopt.c:908 lib/getopt.c:1118 lib/getopt.c:1136 +#: lib/getopt.c:636 lib/getopt.c:682 #, c-format msgid "%s: option requires an argument -- '%c'\n" msgstr "%s: seçenek bir argümanla kullanılır -- %c\n" -#: lib/getopt.c:964 lib/getopt.c:980 -#, c-format -msgid "%s: option '-W %s' is ambiguous\n" -msgstr "%s: `-W %s' seçeneÄŸi belirsiz\n" - -#: lib/getopt.c:1004 lib/getopt.c:1022 -#, c-format -msgid "%s: option '-W %s' doesn't allow an argument\n" -msgstr "%s: `-W %s' seçeneÄŸi argümansız kullanılır\n" - -#: lib/getopt.c:1043 lib/getopt.c:1061 -#, c-format -msgid "%s: option '-W %s' requires an argument\n" -msgstr "%s: `%s' seçeneÄŸi bir argümanla kullanılır\n" - #. TRANSLATORS: #. Get translations for open and closing quotation marks. #. The message catalog should translate "`" to a left @@ -228,11 +199,11 @@ msgstr "%s: `%s' seçeneÄŸi bir argümanla kullanılır\n" #. If you don't know what to put here, please see #. <http://en.wikipedia.org/wiki/Quotation_marks_in_other_languages> #. and use glyphs suitable for your language. -#: lib/quotearg.c:347 +#: lib/quotearg.c:362 msgid "`" msgstr "`" -#: lib/quotearg.c:348 +#: lib/quotearg.c:363 msgid "'" msgstr "'" @@ -265,9 +236,8 @@ msgid "Invalid back reference" msgstr "Geriye baÅŸvuru geçersiz" #: lib/regcomp.c:156 -#, fuzzy msgid "Unmatched [, [^, [:, [., or [=" -msgstr "[ ya da [^ eÅŸleÅŸmiyor" +msgstr "[, [^, [:, [., veya [= eÅŸleÅŸmiyor" #: lib/regcomp.c:159 msgid "Unmatched ( or \\(" @@ -550,7 +520,7 @@ msgid "General help using GNU software: <http://www.gnu.org/gethelp/>\n" msgstr "" "GNU yazılımı kullanımı hakkında genel yardım: <http://www.gnu.org/gethelp/>\n" -#: src/analyze.c:454 src/diff.c:1400 +#: src/analyze.c:454 src/diff.c:1401 #, c-format msgid "Files %s and %s differ\n" msgstr "%s ve %s dosyaları birbirinden farklı\n" @@ -560,21 +530,21 @@ msgstr "%s ve %s dosyaları birbirinden farklı\n" msgid "Binary files %s and %s differ\n" msgstr "Ä°kili %s ve %s birbirinden farklı\n" -#: src/analyze.c:697 src/diff3.c:1463 src/util.c:1255 +#: src/analyze.c:706 src/diff3.c:1465 src/util.c:1254 msgid "No newline at end of file" msgstr "Dosya sonunda yenisatır yok." #. This is a proper name. See the gettext manual, section Names. -#: src/cmp.c:43 +#: src/cmp.c:44 msgid "Torbjorn Granlund" msgstr "Torbjorn Granlund" #. This is a proper name. See the gettext manual, section Names. -#: src/cmp.c:44 +#: src/cmp.c:45 msgid "David MacKenzie" msgstr "David MacKenzie" -#: src/cmp.c:118 src/diff.c:875 src/diff3.c:459 src/sdiff.c:158 +#: src/cmp.c:119 src/diff.c:877 src/diff3.c:462 src/sdiff.c:159 #, c-format msgid "Try '%s --help' for more information." msgstr "Daha fazla bilgi için `%s --help' komutunu deneyin." @@ -589,12 +559,12 @@ msgstr "geçersiz --ignore-initial deÄŸeri '%s'" msgid "options -l and -s are incompatible" msgstr "-l ve -s seçenekleri beraber kullanılamaz" -#: src/cmp.c:155 src/diff.c:884 src/diff3.c:467 src/sdiff.c:167 src/sdiff.c:315 -#: src/sdiff.c:322 src/sdiff.c:874 src/util.c:853 src/util.c:953 src/util.c:960 +#: src/cmp.c:155 src/diff.c:885 src/diff3.c:469 src/sdiff.c:167 src/sdiff.c:315 +#: src/sdiff.c:322 src/sdiff.c:874 src/util.c:852 src/util.c:952 src/util.c:959 msgid "write failed" msgstr "yazma baÅŸarısız oldu" -#: src/cmp.c:157 src/diff.c:886 src/diff.c:1465 src/diff3.c:469 src/sdiff.c:169 +#: src/cmp.c:157 src/diff.c:887 src/diff.c:1466 src/diff3.c:471 src/sdiff.c:169 msgid "standard output" msgstr "standart çıktı" @@ -655,7 +625,7 @@ msgstr "" "Ä°steÄŸe baÄŸlı ATLA1 ve ATLA2, her dosyanın başından atlanacak\n" "(öntanımlı olarak sıfır) bayt sayısını belirtir." -#: src/cmp.c:185 src/diff.c:996 src/diff3.c:507 src/sdiff.c:210 +#: src/cmp.c:185 src/diff.c:997 src/diff3.c:509 src/sdiff.c:210 msgid "" "Mandatory arguments to long options are mandatory for short options too.\n" msgstr "" @@ -676,7 +646,7 @@ msgstr "" msgid "If a FILE is '-' or missing, read standard input." msgstr "EÄŸer DOSYA `-' ise veya yoksa, standart girdi okunur." -#: src/cmp.c:195 src/diff.c:984 src/sdiff.c:220 +#: src/cmp.c:195 src/diff.c:985 src/sdiff.c:220 msgid "Exit status is 0 if inputs are the same, 1 if different, 2 if trouble." msgstr "Girdiler aynı ise çıkış durumu 0, farklı ise 1, sorun var ise 2 olur." @@ -685,165 +655,179 @@ msgstr "Girdiler aynı ise çıkış durumu 0, farklı ise 1, sorun var ise 2 ol msgid "invalid --bytes value '%s'" msgstr "geçersiz --bytes deÄŸeri `%s'" -#: src/cmp.c:266 src/diff.c:793 src/diff3.c:353 src/sdiff.c:565 +#: src/cmp.c:266 src/diff.c:795 src/diff3.c:356 src/sdiff.c:565 #, c-format msgid "missing operand after '%s'" msgstr "`%s'den sonra iÅŸlenen eksik" -#: src/cmp.c:278 src/diff.c:795 src/diff3.c:355 src/sdiff.c:567 +#: src/cmp.c:278 src/diff.c:797 src/diff3.c:358 src/sdiff.c:567 #, c-format msgid "extra operand '%s'" msgstr "fazla iÅŸlenen `%s'" -#: src/cmp.c:494 +#: src/cmp.c:498 #, c-format msgid "%s %s differ: byte %s, line %s\n" msgstr "%s %s farklı: bayt %s, satır %s\n" -#: src/cmp.c:510 +#: src/cmp.c:514 #, c-format msgid "%s %s differ: byte %s, line %s is %3o %s %3o %s\n" msgstr "%s %s farklı: bayt %s, satır %s: %3o %s %3o %s\n" -#: src/cmp.c:562 +#: src/cmp.c:571 +#, c-format +msgid "cmp: EOF on %s which is empty\n" +msgstr "cmp: %s'da EOF (dosya sonu) boÅŸ\n" + +#: src/cmp.c:585 +#, c-format +msgid "cmp: EOF on %s after byte %s, line %s\n" +msgstr "cmp: EOF üzerinde %s sonrası byte %s, satır %s\n" + +#: src/cmp.c:586 +#, c-format +msgid "cmp: EOF on %s after byte %s, in line %s\n" +msgstr "cmp: EOF üzerinde %s sonrası byte %s, satır %s\n" + +#: src/cmp.c:592 #, c-format -msgid "cmp: EOF on %s\n" -msgstr "cmp: %s'da EOF (dosyasonu)\n" +msgid "cmp: EOF on %s after byte %s\n" +msgstr "cmp: EOF üzerinde %s sonrası byte %s\n" #. This is a proper name. See the gettext manual, section Names. -#: src/diff.c:49 +#: src/diff.c:50 msgid "Paul Eggert" msgstr "Paul Eggert" #. This is a proper name. See the gettext manual, section Names. -#: src/diff.c:50 +#: src/diff.c:51 msgid "Mike Haertel" msgstr "Mike Haertel" #. This is a proper name. See the gettext manual, section Names. -#: src/diff.c:51 +#: src/diff.c:52 msgid "David Hayes" msgstr "David Hayes" #. This is a proper name. See the gettext manual, section Names. -#: src/diff.c:52 +#: src/diff.c:53 msgid "Richard Stallman" msgstr "Richard Stallman" #. This is a proper name. See the gettext manual, section Names. -#: src/diff.c:53 +#: src/diff.c:54 msgid "Len Tower" msgstr "Len Tower" -#: src/diff.c:351 +#: src/diff.c:353 #, c-format msgid "invalid context length '%s'" msgstr "`%s' baÄŸlam uzunluÄŸu geçersiz" -#: src/diff.c:434 +#: src/diff.c:436 #, c-format msgid "pagination not supported on this host" msgstr "sayfalama bu makina üzerinde desteklenmiyor" -#: src/diff.c:449 src/diff3.c:335 +#: src/diff.c:451 src/diff3.c:336 #, c-format msgid "too many file label options" msgstr "çok fazla dosya etiket seçeneÄŸi" -#: src/diff.c:526 +#: src/diff.c:528 #, c-format msgid "invalid width '%s'" msgstr "geçersiz geniÅŸlik `%s'" -#: src/diff.c:530 +#: src/diff.c:532 msgid "conflicting width options" msgstr "çeliÅŸkili geniÅŸlik seçenekleri" -#: src/diff.c:555 +#: src/diff.c:557 #, c-format msgid "invalid horizon length '%s'" msgstr "geçersiz ufuk uzunluÄŸu `%s'" -#: src/diff.c:611 +#: src/diff.c:613 #, c-format msgid "invalid tabsize '%s'" msgstr "geçersiz sekme geniÅŸliÄŸi `%s'" -#: src/diff.c:615 +#: src/diff.c:617 msgid "conflicting tabsize options" msgstr "çeliÅŸkili geniÅŸlik seçenekleri" -#: src/diff.c:770 +#: src/diff.c:772 msgid "--from-file and --to-file both specified" msgstr "hem --from-file hem de --to-file belirtilmiÅŸ" -#: src/diff.c:890 +#: src/diff.c:891 msgid " --normal output a normal diff (the default)" msgstr " --normal normal bir diff çıktılar (öntanımlı)" -#: src/diff.c:891 +#: src/diff.c:892 msgid "-q, --brief report only when files differ" msgstr "-q, --brief yalnızca dosyalar farklı ise göster" -#: src/diff.c:892 +#: src/diff.c:893 msgid "-s, --report-identical-files report when two files are the same" msgstr "" "-s, --report-identical-files iki dosyanın birbirinin aynısı ise göster" -#: src/diff.c:893 +#: src/diff.c:894 msgid "" "-c, -C NUM, --context[=NUM] output NUM (default 3) lines of copied context" msgstr "" "-c, -C SAYI, --context[=SAYI] kopyalanan baÄŸlamı SAYI satırınca (öntanımlı " "3) bastırır" -#: src/diff.c:894 +#: src/diff.c:895 msgid "" "-u, -U NUM, --unified[=NUM] output NUM (default 3) lines of unified context" msgstr "" "-u, -U SAYI, --unified[=SAYI] birleÅŸik baÄŸlamın SAYI (öntanımlı 3) " "satırınca çıktı gösterir" -#: src/diff.c:895 +#: src/diff.c:896 msgid "-e, --ed output an ed script" msgstr "-e, --ed bir ed betiÄŸi çıktılar" -#: src/diff.c:896 +#: src/diff.c:897 msgid "-n, --rcs output an RCS format diff" msgstr "-n, --rcs RCS biçeminde diff çıktılar" -#: src/diff.c:897 +#: src/diff.c:898 msgid "-y, --side-by-side output in two columns" msgstr "-y, --side-by-side iki sütunda çıktı göster" -#: src/diff.c:898 +#: src/diff.c:899 msgid "" "-W, --width=NUM output at most NUM (default 130) print columns" msgstr "" "-W, --width=SAYI satır başına en fazla SAYI kadar karakter " "çıktılar (öntanımlı 130)" -#: src/diff.c:899 +#: src/diff.c:900 msgid "" " --left-column output only the left column of common lines" msgstr "" " --left-column ortak satırları yalnızca sol sütunda çıktılar" -#: src/diff.c:900 +#: src/diff.c:901 msgid " --suppress-common-lines do not output common lines" msgstr " --suppress-common-lines ortak satırlayı gösterme" -#: src/diff.c:902 +#: src/diff.c:903 msgid "-p, --show-c-function show which C function each change is in" msgstr "-p, --show-c-function içinde deÄŸiÅŸen her C iÅŸlevini göster" -#: src/diff.c:903 +#: src/diff.c:904 msgid "-F, --show-function-line=RE show the most recent line matching RE" msgstr "" "-F, --show-function-line=DÃœZÄ°F DÃœZÄ°F ile eÅŸleÅŸen en yakın satırı göster" -#: src/diff.c:904 -#, fuzzy +#: src/diff.c:905 msgid "" " --label LABEL use LABEL instead of file name and timestamp\n" " (can be repeated)" @@ -851,85 +835,85 @@ msgstr "" " --label ETÄ°KET dosya adı yerine ETÄ°KET kullan\n" " (tekrarlanabilir)" -#: src/diff.c:907 +#: src/diff.c:908 msgid "-t, --expand-tabs expand tabs to spaces in output" msgstr "-t, --expand-tabs çıktıda sekmeleri boÅŸluk haline getir" -#: src/diff.c:908 +#: src/diff.c:909 msgid "-T, --initial-tab make tabs line up by prepending a tab" msgstr "" "-T, --initial-tab baÅŸlarına bir sekme ilave ederek sekmelerin " "hizalanmasını saÄŸla" -#: src/diff.c:909 +#: src/diff.c:910 msgid "" " --tabsize=NUM tab stops every NUM (default 8) print columns" msgstr "" " --tabsize=SAYI sekmeler SAYI sütun geniÅŸliÄŸine (öntanımlı 8) " "ayarlanır." -#: src/diff.c:910 +#: src/diff.c:911 msgid "" " --suppress-blank-empty suppress space or tab before empty output lines" msgstr "" " --suppress-blank-empty boÅŸ çıktı satırlarından önce boÅŸluk veya " "sekmeyi gözardı et" -#: src/diff.c:911 +#: src/diff.c:912 msgid "-l, --paginate pass output through 'pr' to paginate it" msgstr "" "-l, --paginate çıktıyı 'pr' komutundan geçirerek sayfala" -#: src/diff.c:913 +#: src/diff.c:914 msgid "" "-r, --recursive recursively compare any subdirectories found" msgstr "" "-r, --recursive çevrimli olarak bulunan bütün alt dizinleri " "karşılaÅŸtır" -#: src/diff.c:914 +#: src/diff.c:915 msgid " --no-dereference don't follow symbolic links" msgstr " --no-dereference sembolik baÄŸlantıları takip etme" -#: src/diff.c:915 +#: src/diff.c:916 msgid "-N, --new-file treat absent files as empty" msgstr "-N, --new-file var olmayan dosyaları boÅŸ varsay" -#: src/diff.c:916 +#: src/diff.c:917 msgid " --unidirectional-new-file treat absent first files as empty" msgstr " --unidirectional-new-file var olmayan birinci dosyayı boÅŸ varsay" -#: src/diff.c:917 +#: src/diff.c:918 msgid " --ignore-file-name-case ignore case when comparing file names" msgstr "" " --ignore-file-name-case dosya isimlerinde büyük/küçük harf " "farklarını yoksay" -#: src/diff.c:918 +#: src/diff.c:919 msgid " --no-ignore-file-name-case consider case when comparing file names" msgstr "" " --no-ignore-file-name-case dosya isimlerinde büyük/küçük harf farkını " "göz önüne al" -#: src/diff.c:919 +#: src/diff.c:920 msgid "-x, --exclude=PAT exclude files that match PAT" msgstr "" "-x, --exclude=KALIP KALIP'a uyan dosyaları iÅŸleme dahil etme" -#: src/diff.c:920 +#: src/diff.c:921 msgid "" "-X, --exclude-from=FILE exclude files that match any pattern in FILE" msgstr "" "-X, --exclude-from=DOSYA DOSYA'da bulunan kalıplara uyan dosyaları " "iÅŸlem dışı tut" -#: src/diff.c:921 +#: src/diff.c:922 msgid "" "-S, --starting-file=FILE start with FILE when comparing directories" msgstr "" "-S, --starting-file=DOSYA dizinleri karşılaÅŸtırırken DOSYA'dan baÅŸla" -#: src/diff.c:922 +#: src/diff.c:923 msgid "" " --from-file=FILE1 compare FILE1 to all operands;\n" " FILE1 can be a directory" @@ -937,7 +921,7 @@ msgstr "" " --from-file=DOSYA1 DOSYA1'i bütün iÅŸlenenlerle karşılaÅŸtır;\n" " DOSYA1 bir dizin olabilir" -#: src/diff.c:924 +#: src/diff.c:925 msgid "" " --to-file=FILE2 compare all operands to FILE2;\n" " FILE2 can be a directory" @@ -945,82 +929,82 @@ msgstr "" " --to-file=DOSYA2 DOSYA2'yi bütün iÅŸlenenlerle karşılaÅŸtır;\n" " DOSYA2 bir dizin olabilir" -#: src/diff.c:927 +#: src/diff.c:928 msgid "" "-i, --ignore-case ignore case differences in file contents" msgstr "" "-i, --ignore-case dosya içeriÄŸinde büyük/küçük harf farklarını " "yoksay" -#: src/diff.c:928 +#: src/diff.c:929 msgid "-E, --ignore-tab-expansion ignore changes due to tab expansion" msgstr "" "-E, --ignore-tab-expansion sekmelerin açılmasından doÄŸan farkları yoksay" -#: src/diff.c:929 +#: src/diff.c:930 msgid "-Z, --ignore-trailing-space ignore white space at line end" msgstr "-Z, --ignore-trailing-space bütün satır sonu boÅŸluklarını yoksay" -#: src/diff.c:930 +#: src/diff.c:931 msgid "" "-b, --ignore-space-change ignore changes in the amount of white space" msgstr "" "-b, --ignore-space-change boÅŸluk miktarındaki deÄŸiÅŸiklikleri yoksay" -#: src/diff.c:931 +#: src/diff.c:932 msgid "-w, --ignore-all-space ignore all white space" msgstr "-w, --ignore-all-space bütün boÅŸlukları yoksay" -#: src/diff.c:932 +#: src/diff.c:933 msgid "" "-B, --ignore-blank-lines ignore changes where lines are all blank" msgstr "" "-B, --ignore-blank-lines satırları boÅŸ olan deÄŸiÅŸiklikleri dikkate " "alma" -#: src/diff.c:933 +#: src/diff.c:934 msgid "-I, --ignore-matching-lines=RE ignore changes where all lines match RE" msgstr "" "-I, --ignore-matching-lines=DÃœZÄ°F satırları DÃœZÄ°F kalıbına uyan farkları " "yok say" -#: src/diff.c:935 +#: src/diff.c:936 msgid "-a, --text treat all files as text" msgstr "-a, --text bütün dosyaları metin olarak iÅŸle" -#: src/diff.c:936 +#: src/diff.c:937 msgid " --strip-trailing-cr strip trailing carriage return on input" msgstr "" " --strip-trailing-cr girdiden en sonda sarkan satır başını soy" -#: src/diff.c:938 +#: src/diff.c:939 msgid " --binary read and write data in binary mode" msgstr " --binary veriyi ikilik kipte yaz ve oku" -#: src/diff.c:941 +#: src/diff.c:942 msgid "" "-D, --ifdef=NAME output merged file with '#ifdef NAME' diffs" msgstr "" "-D, --ifdef=Ä°SÄ°M '#ifdef Ä°SÄ°M' farklarını gösteren " "harmanlanmış dosya çıktıla." -#: src/diff.c:942 +#: src/diff.c:943 msgid " --GTYPE-group-format=GFMT format GTYPE input groups with GFMT" msgstr "" " --GTYPE-group-format=GFMT GTYPE girdi gruplarını GFMT ile biçimlendir" -#: src/diff.c:943 +#: src/diff.c:944 msgid " --line-format=LFMT format all input lines with LFMT" msgstr "" " --line-format=LFMT tüm girdi satırlarını LFMT ile biçimlendir" -#: src/diff.c:944 +#: src/diff.c:945 msgid " --LTYPE-line-format=LFMT format LTYPE input lines with LFMT" msgstr "" " --LTYPE-line-format=LFMT tüm LTYPE girdi satırlarını LFMT ile " "biçimlendir" -#: src/diff.c:945 +#: src/diff.c:946 msgid "" " These format options provide fine-grained control over the output\n" " of diff, generalizing -D/--ifdef." @@ -1029,13 +1013,13 @@ msgstr "" "grained control over the output\n" " tanecik denetimi saÄŸlar. -D/--ifdef genelleÅŸtirmesi yapar." -#: src/diff.c:947 +#: src/diff.c:948 msgid " LTYPE is 'old', 'new', or 'unchanged'. GTYPE is LTYPE or 'changed'." msgstr "" " LTYPE 'old', 'new' veya 'unchanged' olabilir. GTYPE, LTYPE veya " "'changed'dir." -#: src/diff.c:948 +#: src/diff.c:949 msgid "" " GFMT (only) may contain:\n" " %< lines from FILE1\n" @@ -1064,7 +1048,7 @@ msgstr "" " M L+1\n" " %(A=B?T:E) eÄŸer A eÅŸittir B ise T deÄŸilse E" -#: src/diff.c:960 +#: src/diff.c:961 msgid "" " LFMT (only) may contain:\n" " %L contents of line\n" @@ -1077,7 +1061,7 @@ msgstr "" " %[-][GENÄ°ÅžLÄ°K][.[KESÄ°NLÄ°K]]{doxX}n girdi satır sayısı için printf tarzı " "biçem" -#: src/diff.c:964 +#: src/diff.c:965 msgid "" " Both GFMT and LFMT may contain:\n" " %% %\n" @@ -1091,151 +1075,149 @@ msgstr "" " %c'\\OOO' Sekizlik kodu OOO olan karakter\n" " C C karakteri (diÄŸer karakterler kendilerini temsil eder)" -#: src/diff.c:970 +#: src/diff.c:971 msgid "-d, --minimal try hard to find a smaller set of changes" msgstr "-d, --minimal daha küçük bir fark kümesi bulmaya çalış" -#: src/diff.c:971 +#: src/diff.c:972 msgid " --horizon-lines=NUM keep NUM lines of the common prefix and suffix" msgstr " --horizon-lines=SAYI ortak ön ek ve son eklerin SAYI satırını tut" -#: src/diff.c:972 +#: src/diff.c:973 msgid "" " --speed-large-files assume large files and many scattered small changes" msgstr "" " --speed-large-files büyük dosyalar ve çok sayıda dağınık küçük farklar " "olduÄŸunu varsay" -#: src/diff.c:973 -msgid "" -" --color[=WHEN] colorize the output; WHEN can be 'never', 'always'," -msgstr "" - #: src/diff.c:974 -#, fuzzy -msgid " or 'auto' (the default)" -msgstr " --normal normal bir diff çıktılar (öntanımlı)" - -#: src/diff.c:975 msgid "" -" --palette=PALETTE specify the colors to use when --color is active" +" --color[=WHEN] colorize the output; WHEN can be 'never', " +"'always',\n" +" or 'auto' (the default)" msgstr "" +"--color[=WHEN] renklendirme çıktısı; WHEN (Ne zaman) olabilir 'asla', " +"'devmalı',\n" +" veya 'oto' (varsayılan)" #: src/diff.c:976 msgid "" -" PALETTE is a colon-separated list terminfo " -"capabilities" +" --palette=PALETTE the colors to use when --color is active; PALETTE " +"is\n" +" a colon-separated list of terminfo capabilities" msgstr "" +"--palette=PALETTE renkler kullanıldığında --color aktiftir; PALET\n" +" bir virgülle ayrılmış terminfo yetenekleri " +"listelenmiÅŸtir" -#: src/diff.c:978 +#: src/diff.c:979 msgid " --help display this help and exit" msgstr " --help bu yardım metnini göster ve çık" -#: src/diff.c:979 +#: src/diff.c:980 msgid "-v, --version output version information and exit" msgstr "-v, --version sürüm bilgisini göster ve çık" -#: src/diff.c:981 -#, fuzzy +#: src/diff.c:982 msgid "FILES are 'FILE1 FILE2' or 'DIR1 DIR2' or 'DIR FILE' or 'FILE DIR'." msgstr "" -"DOSYAlar: `DOSYA1 DOSYA2' veya `DÄ°ZÄ°N1 DÄ°ZÄ°N2' veya `DÄ°ZÄ°N DOSYA...' veya " -"`DOSYA...DÄ°ZÄ°N' olabilir." +"`DOSYA1 DOSYA2' veya `DÄ°ZÄ°N1 DÄ°ZÄ°N2' veya `DÄ°ZÄ°N DOSYA' veya `DOSYA DÄ°ZÄ°N' " +"DOSYAlARdır." -#: src/diff.c:982 +#: src/diff.c:983 msgid "" "If --from-file or --to-file is given, there are no restrictions on FILE(s)." msgstr "" "EÄŸer --from-file veya --to-file kullanılmışsa, DOSYAlar üzerinde kısıtlama " "yoktur." -#: src/diff.c:983 src/diff3.c:526 src/sdiff.c:219 +#: src/diff.c:984 src/diff3.c:528 src/sdiff.c:219 msgid "If a FILE is '-', read standard input." msgstr "EÄŸer bir DOSYA `-' ise, standart girdi okunur." -#: src/diff.c:993 +#: src/diff.c:994 #, c-format msgid "Usage: %s [OPTION]... FILES\n" msgstr "Kullanım: %s [SEÇENEK]... DOSYAlar\n" -#: src/diff.c:994 +#: src/diff.c:995 msgid "Compare FILES line by line." msgstr "DOSYAları satır satır karşılaÅŸtırır." -#: src/diff.c:1028 +#: src/diff.c:1029 #, c-format msgid "conflicting %s option value '%s'" msgstr "çeliÅŸkili %s seçeneÄŸi deÄŸeri: '%s'" -#: src/diff.c:1041 +#: src/diff.c:1042 #, c-format msgid "conflicting output style options" msgstr "çeliÅŸkili çıktı tarz seçenekleri" -#: src/diff.c:1057 -#, fuzzy, c-format +#: src/diff.c:1058 +#, c-format msgid "invalid color '%s'" -msgstr "geçersiz geniÅŸlik `%s'" +msgstr "geçersiz renk '%s'" -#: src/diff.c:1113 src/diff.c:1323 +#: src/diff.c:1114 src/diff.c:1324 #, c-format msgid "Only in %s: %s\n" msgstr "Yalnızca %s'da: %s\n" -#: src/diff.c:1247 +#: src/diff.c:1248 msgid "cannot compare '-' to a directory" msgstr "'-', bir dizinle karşılaÅŸtırılamaz" -#: src/diff.c:1282 +#: src/diff.c:1283 msgid "-D option not supported with directories" msgstr "-D seçenek dizinler için kullanılamaz." -#: src/diff.c:1291 +#: src/diff.c:1292 #, c-format msgid "Common subdirectories: %s and %s\n" msgstr "Ortak alt dizinler: %s ve %s\n" -#: src/diff.c:1333 src/diff.c:1383 +#: src/diff.c:1334 src/diff.c:1384 #, c-format msgid "File %s is a %s while file %s is a %s\n" msgstr "%s dosyası, bir %s, halbuki %s dosyası bir %s\n" -#: src/diff.c:1369 +#: src/diff.c:1370 #, c-format msgid "Symbolic links %s and %s differ\n" msgstr "%s ve %s sembolik baÄŸlantıları birbirinden farklı\n" -#: src/diff.c:1456 +#: src/diff.c:1457 #, c-format msgid "Files %s and %s are identical\n" msgstr "%s ve %s dosyaları birbirinin aynı\n" #. This is a proper name. See the gettext manual, section Names. -#: src/diff3.c:41 +#: src/diff3.c:42 msgid "Randy Smith" msgstr "Randy Smith" -#: src/diff3.c:348 +#: src/diff3.c:351 #, c-format msgid "incompatible options" msgstr "uyumsuz seçenekler" -#: src/diff3.c:388 +#: src/diff3.c:391 msgid "'-' specified for more than one input file" msgstr "'-' birden fazla girdi dosyası için belirtilmiÅŸ" -#: src/diff3.c:439 src/diff3.c:1288 src/diff3.c:1692 src/diff3.c:1747 +#: src/diff3.c:442 src/diff3.c:1290 src/diff3.c:1693 src/diff3.c:1748 #: src/sdiff.c:307 src/sdiff.c:844 src/sdiff.c:855 msgid "read failed" msgstr "okuma baÅŸarısız oldu" -#: src/diff3.c:473 +#: src/diff3.c:475 msgid "-A, --show-all output all changes, bracketing conflicts" msgstr "" "-A, --show-all bütün deÄŸiÅŸiklikleri çıktıla, çakışmaları köşeli " "parantez içine al" -#: src/diff3.c:475 +#: src/diff3.c:477 msgid "" "-e, --ed output ed script incorporating changes\n" " from OLDFILE to YOURFILE into MYFILE" @@ -1244,13 +1226,13 @@ msgstr "" "harmanlanmamış\n" " ed betiklerini BENÄ°MDOSYA'ya çıktıla" -#: src/diff3.c:477 +#: src/diff3.c:479 msgid "-E, --show-overlap like -e, but bracket conflicts" msgstr "" "-E, --show-overlap -e'ye benzer, fakat çakışmaları parantez içine " "alır" -#: src/diff3.c:478 +#: src/diff3.c:480 msgid "" "-3, --easy-only like -e, but incorporate only nonoverlapping " "changes" @@ -1258,25 +1240,25 @@ msgstr "" "-3, --easy-only -e gibi, fakat sadece örtüşmeyen deÄŸiÅŸiklikleri " "birleÅŸtir" -#: src/diff3.c:479 +#: src/diff3.c:481 msgid "" "-x, --overlap-only like -e, but incorporate only overlapping changes" msgstr "" "-x, --overlap-only -e gibi, fakat sadece örtüşen deÄŸiÅŸiklikleri " "birleÅŸtir" -#: src/diff3.c:480 +#: src/diff3.c:482 msgid "-X like -x, but bracket conflicts" msgstr "" "-X -x gibi ancak çakışmaları parantez içine alır" -#: src/diff3.c:481 +#: src/diff3.c:483 msgid "-i append 'w' and 'q' commands to ed scripts" msgstr "" "-i ed betiklerinin sonuna `w' ve `q' komutlarını " "ekle" -#: src/diff3.c:483 +#: src/diff3.c:485 msgid "" "-m, --merge output actual merged file, according to\n" " -A if no other options are given" @@ -1284,26 +1266,26 @@ msgstr "" "-m, --merge asıl birleÅŸtirilmiÅŸ dosyayı, baÅŸka bir seçenek\n" " verilmediyse -A ya göre gösterir" -#: src/diff3.c:486 +#: src/diff3.c:488 msgid "-a, --text treat all files as text" msgstr "-a, --text bütün dosyaları metin olarak iÅŸle" -#: src/diff3.c:487 +#: src/diff3.c:489 msgid " --strip-trailing-cr strip trailing carriage return on input" msgstr " --strip-trailing-cr girdiden en sonda sarkan satır başını soy" -#: src/diff3.c:488 +#: src/diff3.c:490 msgid "-T, --initial-tab make tabs line up by prepending a tab" msgstr "" "-T, --initial-tab baÅŸlarına bir sekme ilave ederek sekmelerin " "hizalanmasını saÄŸla" -#: src/diff3.c:489 +#: src/diff3.c:491 msgid " --diff-program=PROGRAM use PROGRAM to compare files" msgstr "" " --diff-program=YAZILIM dosyaları karşılaÅŸtırmak için YAZILIM'ı kullan" -#: src/diff3.c:490 +#: src/diff3.c:492 msgid "" "-L, --label=LABEL use LABEL instead of file name\n" " (can be repeated up to three times)" @@ -1311,24 +1293,24 @@ msgstr "" "-L, --label=ETÄ°KET dosya adı yerine ETÄ°KET kullan\n" " (üç defaya kadar tekrarlanabilir)" -#: src/diff3.c:493 +#: src/diff3.c:495 msgid " --help display this help and exit" msgstr " --help bu yardım metnini göster ve çık" -#: src/diff3.c:494 +#: src/diff3.c:496 msgid "-v, --version output version information and exit" msgstr "-v, --version sürüm bilgisini göster ve çık" -#: src/diff3.c:503 +#: src/diff3.c:505 #, c-format msgid "Usage: %s [OPTION]... MYFILE OLDFILE YOURFILE\n" msgstr "Kullanım: %s [SEÇENEK]... BENÄ°MDOSYA ESKÄ°DOSYA SÄ°ZÄ°NDOSYA\n" -#: src/diff3.c:505 +#: src/diff3.c:507 msgid "Compare three files line by line." msgstr "Üç dosyayı satır satır karşılaÅŸtırır." -#: src/diff3.c:515 +#: src/diff3.c:517 msgid "" "\n" "The default output format is a somewhat human-readable representation of\n" @@ -1351,47 +1333,47 @@ msgstr "" "yapmasına neden olur ve asıl birleÅŸtirilen dosya çıkarılır. Alışılmadık\n" "girdiler için, bu ed kullanımından daha dayanıklıdır.\n" -#: src/diff3.c:527 +#: src/diff3.c:529 msgid "Exit status is 0 if successful, 1 if conflicts, 2 if trouble." msgstr "" "EÄŸer iÅŸleme baÅŸarılı ise çıkış durumu 0, çeliÅŸkiler var ise 1,\n" "sorun var ise 2 olur." -#: src/diff3.c:720 +#: src/diff3.c:722 msgid "internal error: screwup in format of diff blocks" msgstr "iç hata: diff blokları biçemlemesinde hata oluÅŸtu" -#: src/diff3.c:1015 +#: src/diff3.c:1017 #, c-format msgid "%s: diff failed: " msgstr "%s: diff baÅŸarısız oldu: " -#: src/diff3.c:1037 +#: src/diff3.c:1039 msgid "internal error: invalid diff type in process_diff" msgstr "iç hata: process_diff iÅŸlevi içinde geçersiz diff türü" -#: src/diff3.c:1062 +#: src/diff3.c:1064 msgid "invalid diff format; invalid change separator" msgstr "geçersiz diff biçemi; geçersiz fark ayracı" -#: src/diff3.c:1298 +#: src/diff3.c:1300 msgid "invalid diff format; incomplete last line" msgstr "geçersiz diff biçemi; tamamlanmamış son satır" -#: src/diff3.c:1322 src/sdiff.c:275 src/util.c:970 +#: src/diff3.c:1324 src/sdiff.c:275 src/util.c:969 #, c-format msgid "subsidiary program '%s' could not be invoked" msgstr "alt yazılım '%s' çalıştırılamadı" -#: src/diff3.c:1347 +#: src/diff3.c:1349 msgid "invalid diff format; incorrect leading line chars" msgstr "geçersiz diff biçemi; geçersiz satır başı karakterleri" -#: src/diff3.c:1420 +#: src/diff3.c:1422 msgid "internal error: invalid diff type passed to output" msgstr "iç hata: çıktıya geçersiz diff türü geçirildi" -#: src/diff3.c:1694 src/diff3.c:1751 +#: src/diff3.c:1695 src/diff3.c:1752 msgid "input file shrank" msgstr "girdi dosyası küçüldü" @@ -1406,7 +1388,7 @@ msgid "%s: recursive directory loop" msgstr "%s: iç dizin döngüsü" #. This is a proper name. See the gettext manual, section Names. -#: src/sdiff.c:42 +#: src/sdiff.c:43 msgid "Thomas Lord" msgstr "Thomas Lord" @@ -1554,15 +1536,24 @@ msgstr "" "v:\tOrtak satırları bilgi vererek dahil eder.\n" "q:\tÇıkar.\n" -#: src/util.c:663 -#, fuzzy, c-format +#: src/util.c:662 +#, c-format msgid "unrecognized prefix: %s" -msgstr "%s: `--%s' seçeneÄŸi bilinmiyor\n" +msgstr "tanınmamış önek: %s" -#: src/util.c:693 +#: src/util.c:692 #, c-format msgid "unparsable value for --palette" -msgstr "" +msgstr "--palette için ayrıştırılamayan deÄŸer" + +#~ msgid "%s: option '--%s' doesn't allow an argument\n" +#~ msgstr "%s: `--%s' seçeneÄŸi argümansız kullanılır\n" + +#~ msgid "%s: option '-W %s' doesn't allow an argument\n" +#~ msgstr "%s: `-W %s' seçeneÄŸi argümansız kullanılır\n" + +#~ msgid "%s: option '-W %s' requires an argument\n" +#~ msgstr "%s: `%s' seçeneÄŸi bir argümanla kullanılır\n" #~ msgid "%s: illegal option -- %c\n" #~ msgstr "%s: kuraldışı seçenek -- %c\n" Binary files differ@@ -3,46 +3,46 @@ # This file is distributed under the same license as the diffutils package. # # Maxim V. Dziumanenko <dziumanenko@gmail.com>, 2006. -# Yuri Chornoivan <yurchor@ukr.net>, 2011, 2012. +# Yuri Chornoivan <yurchor@ukr.net>, 2011, 2012, 2017. msgid "" msgstr "" -"Project-Id-Version: diffutils 3.3-pre1\n" +"Project-Id-Version: diffutils 3.5.25\n" "Report-Msgid-Bugs-To: bug-diffutils@gnu.org\n" -"POT-Creation-Date: 2016-08-20 22:22-0700\n" -"PO-Revision-Date: 2012-10-31 08:58+0200\n" +"POT-Creation-Date: 2017-05-21 13:26-0700\n" +"PO-Revision-Date: 2017-05-07 22:08+0300\n" "Last-Translator: Yuri Chornoivan <yurchor@ukr.net>\n" "Language-Team: Ukrainian <translation-team-uk@lists.sourceforge.net>\n" "Language: uk\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"X-Bugs: Report translation errors to the Language-Team address.\n" "X-Generator: Lokalize 1.5\n" "Plural-Forms: nplurals=1; plural=0;\n" -#: lib/argmatch.c:133 -#, fuzzy, c-format +#: lib/argmatch.c:134 +#, c-format msgid "invalid argument %s for %s" -msgstr "некоректний аргумент %s%s — «%s»" +msgstr "некоректний аргумент %s до %s" -#: lib/argmatch.c:134 +#: lib/argmatch.c:135 #, c-format msgid "ambiguous argument %s for %s" -msgstr "" +msgstr "неоднозначний аргумент %s до %s" -#: lib/argmatch.c:153 -#, fuzzy +#: lib/argmatch.c:154 msgid "Valid arguments are:" -msgstr "некоректний аргумент %s%s — «%s»" +msgstr "СпиÑок коректних аргументів:" -#: lib/c-stack.c:204 lib/c-stack.c:297 +#: lib/c-stack.c:203 lib/c-stack.c:296 msgid "program error" msgstr "помилка програми" -#: lib/c-stack.c:205 lib/c-stack.c:298 +#: lib/c-stack.c:204 lib/c-stack.c:297 msgid "stack overflow" msgstr "Ð¿ÐµÑ€ÐµÐ¿Ð¾Ð²Ð½ÐµÐ½Ð½Ñ Ñтеку" -#: lib/error.c:191 +#: lib/error.c:195 msgid "Unknown system error" msgstr "Ðевідома ÑиÑтемна помилка" @@ -88,7 +88,7 @@ msgstr "Ñпеціальний файл з Ñимвольним доÑтупом #: lib/file-type.c:72 msgid "contiguous data" -msgstr "" +msgstr "неперервні дані" #: lib/file-type.c:75 msgid "fifo" @@ -96,43 +96,39 @@ msgstr "черга" #: lib/file-type.c:78 msgid "door" -msgstr "" +msgstr "двері" #: lib/file-type.c:81 -#, fuzzy msgid "multiplexed block special file" -msgstr "Ñпеціальний файл з блоковим доÑтупом" +msgstr "Ñпеціальний файл ущільненого блокового приÑтрою" #: lib/file-type.c:84 -#, fuzzy msgid "multiplexed character special file" -msgstr "Ñпеціальний файл з Ñимвольним доÑтупом" +msgstr "Ñпеціальний файл ущільненого Ñимвольного приÑтрою" #: lib/file-type.c:87 msgid "multiplexed file" -msgstr "" +msgstr "ущільнений файл" #: lib/file-type.c:90 -#, fuzzy msgid "named file" -msgstr "дивний файл" +msgstr "іменований файл" #: lib/file-type.c:93 -#, fuzzy msgid "network special file" -msgstr "Ñпеціальний файл з блоковим доÑтупом" +msgstr "Ñпеціальний файл мережі" #: lib/file-type.c:96 msgid "migrated file with data" -msgstr "" +msgstr "перенеÑений файл з даними" #: lib/file-type.c:99 msgid "migrated file without data" -msgstr "" +msgstr "перенеÑений файл без даних" #: lib/file-type.c:102 msgid "port" -msgstr "" +msgstr "порт" #: lib/file-type.c:105 msgid "socket" @@ -140,72 +136,47 @@ msgstr "Ñокет" #: lib/file-type.c:108 msgid "whiteout" -msgstr "" +msgstr "забілюваннÑ" #: lib/file-type.c:110 msgid "weird file" msgstr "дивний файл" -#: lib/getopt.c:575 lib/getopt.c:604 -#, c-format -msgid "%s: option '%s' is ambiguous; possibilities:" -msgstr "%s: неоднозначний параметр «%s»; можливі варіанти:" - -#: lib/getopt.c:619 -#, fuzzy, c-format -msgid "%s: option '%s' is ambiguous\n" -msgstr "%s: параметр «-W %s» не Ñ” однозначним\n" - -#: lib/getopt.c:654 lib/getopt.c:658 +#: lib/getopt.c:278 #, c-format -msgid "%s: option '--%s' doesn't allow an argument\n" -msgstr "%s: Ð´Ð¾Ð´Ð°Ð²Ð°Ð½Ð½Ñ Ð°Ñ€Ð³ÑƒÐ¼ÐµÐ½Ñ‚Ñ–Ð² до параметра «--%s» не передбачено\n" +msgid "%s: option '%s%s' is ambiguous\n" +msgstr "%s: параметр «%s%s» не Ñ” однозначним\n" -#: lib/getopt.c:667 lib/getopt.c:672 +#: lib/getopt.c:284 #, c-format -msgid "%s: option '%c%s' doesn't allow an argument\n" -msgstr "%s: Ð´Ð¾Ð´Ð°Ð²Ð°Ð½Ð½Ñ Ð°Ñ€Ð³ÑƒÐ¼ÐµÐ½Ñ‚Ñ–Ð² до параметра «%c%s» не передбачено\n" +msgid "%s: option '%s%s' is ambiguous; possibilities:" +msgstr "%s: неоднозначний параметр «%s%s»; можливі варіанти:" -#: lib/getopt.c:715 lib/getopt.c:734 +#: lib/getopt.c:319 #, c-format -msgid "%s: option '--%s' requires an argument\n" -msgstr "%s: до параметра «--%s» Ñлід додати аргумент\n" +msgid "%s: unrecognized option '%s%s'\n" +msgstr "%s: невідомий параметр «%s%s»\n" -#: lib/getopt.c:772 lib/getopt.c:775 +#: lib/getopt.c:345 #, c-format -msgid "%s: unrecognized option '--%s'\n" -msgstr "%s: невідомий параметр «--%s»\n" +msgid "%s: option '%s%s' doesn't allow an argument\n" +msgstr "%s: Ð´Ð¾Ð´Ð°Ð²Ð°Ð½Ð½Ñ Ð°Ñ€Ð³ÑƒÐ¼ÐµÐ½Ñ‚Ñ–Ð² до параметра «%s%s» не передбачено\n" -#: lib/getopt.c:783 lib/getopt.c:786 +#: lib/getopt.c:360 #, c-format -msgid "%s: unrecognized option '%c%s'\n" -msgstr "%s: невідомий параметр «%c%s»\n" +msgid "%s: option '%s%s' requires an argument\n" +msgstr "%s: до параметра «%s%s» Ñлід додати аргумент\n" -#: lib/getopt.c:835 lib/getopt.c:838 +#: lib/getopt.c:621 #, c-format msgid "%s: invalid option -- '%c'\n" msgstr "%s: некоректний параметр — «%c»\n" -#: lib/getopt.c:891 lib/getopt.c:908 lib/getopt.c:1118 lib/getopt.c:1136 +#: lib/getopt.c:636 lib/getopt.c:682 #, c-format msgid "%s: option requires an argument -- '%c'\n" msgstr "%s: до параметра Ñлід додати аргумент — «%c»\n" -#: lib/getopt.c:964 lib/getopt.c:980 -#, c-format -msgid "%s: option '-W %s' is ambiguous\n" -msgstr "%s: параметр «-W %s» не Ñ” однозначним\n" - -#: lib/getopt.c:1004 lib/getopt.c:1022 -#, c-format -msgid "%s: option '-W %s' doesn't allow an argument\n" -msgstr "%s: Ð´Ð¾Ð´Ð°Ð²Ð°Ð½Ð½Ñ Ð°Ñ€Ð³ÑƒÐ¼ÐµÐ½Ñ‚Ñ–Ð² до параметра «-W %s» не передбачено\n" - -#: lib/getopt.c:1043 lib/getopt.c:1061 -#, c-format -msgid "%s: option '-W %s' requires an argument\n" -msgstr "%s: до параметра «-W %s» Ñлід додати аргумент\n" - #. TRANSLATORS: #. Get translations for open and closing quotation marks. #. The message catalog should translate "`" to a left @@ -227,11 +198,11 @@ msgstr "%s: до параметра «-W %s» Ñлід додати аргуме #. If you don't know what to put here, please see #. <http://en.wikipedia.org/wiki/Quotation_marks_in_other_languages> #. and use glyphs suitable for your language. -#: lib/quotearg.c:347 +#: lib/quotearg.c:362 msgid "`" msgstr "`" -#: lib/quotearg.c:348 +#: lib/quotearg.c:363 msgid "'" msgstr "'" @@ -264,9 +235,8 @@ msgid "Invalid back reference" msgstr "Ðеправильне поÑиланнÑ" #: lib/regcomp.c:156 -#, fuzzy msgid "Unmatched [, [^, [:, [., or [=" -msgstr "Ðепарна [ чи [^" +msgstr "Ðепарна [, [^, [:, [. або [=" #: lib/regcomp.c:159 msgid "Unmatched ( or \\(" @@ -524,7 +494,7 @@ msgstr "" "Загальна довідка з програмного Ð·Ð°Ð±ÐµÐ·Ð¿ÐµÑ‡ÐµÐ½Ð½Ñ GNU: <http://www.gnu.org/gethelp/" ">\n" -#: src/analyze.c:454 src/diff.c:1400 +#: src/analyze.c:454 src/diff.c:1401 #, c-format msgid "Files %s and %s differ\n" msgstr "Файли %s та %s відрізнÑÑŽÑ‚ÑŒÑÑ\n" @@ -534,21 +504,21 @@ msgstr "Файли %s та %s відрізнÑÑŽÑ‚ÑŒÑÑ\n" msgid "Binary files %s and %s differ\n" msgstr "Двійкові файли %s та %s відрізнÑÑŽÑ‚ÑŒÑÑ\n" -#: src/analyze.c:697 src/diff3.c:1463 src/util.c:1255 +#: src/analyze.c:706 src/diff3.c:1465 src/util.c:1254 msgid "No newline at end of file" -msgstr "Ðаприкінці файлу немає нового Ñ€Ñдка" +msgstr "Ðаприкінці файла немає нового Ñ€Ñдка" #. This is a proper name. See the gettext manual, section Names. -#: src/cmp.c:43 +#: src/cmp.c:44 msgid "Torbjorn Granlund" msgstr "Torbjorn Granlund" #. This is a proper name. See the gettext manual, section Names. -#: src/cmp.c:44 +#: src/cmp.c:45 msgid "David MacKenzie" msgstr "David MacKenzie" -#: src/cmp.c:118 src/diff.c:875 src/diff3.c:459 src/sdiff.c:158 +#: src/cmp.c:119 src/diff.c:877 src/diff3.c:462 src/sdiff.c:159 #, c-format msgid "Try '%s --help' for more information." msgstr "Спробуйте «%s --help» Ð´Ð»Ñ Ð¾Ñ‚Ñ€Ð¸Ð¼Ð°Ð½Ð½Ñ Ð´Ð¾ÐºÐ»Ð°Ð´Ð½Ñ–ÑˆÐ¾Ð³Ð¾ опиÑу." @@ -563,12 +533,12 @@ msgstr "неприпуÑтиме Ð·Ð½Ð°Ñ‡ÐµÐ½Ð½Ñ --ignore-initial «%s»" msgid "options -l and -s are incompatible" msgstr "параметри -l та -s неÑуміÑні" -#: src/cmp.c:155 src/diff.c:884 src/diff3.c:467 src/sdiff.c:167 src/sdiff.c:315 -#: src/sdiff.c:322 src/sdiff.c:874 src/util.c:853 src/util.c:953 src/util.c:960 +#: src/cmp.c:155 src/diff.c:885 src/diff3.c:469 src/sdiff.c:167 src/sdiff.c:315 +#: src/sdiff.c:322 src/sdiff.c:874 src/util.c:852 src/util.c:952 src/util.c:959 msgid "write failed" msgstr "Ð·Ð°Ð¿Ð¸Ñ Ð½ÐµÐ²Ð´Ð°Ð»Ð¸Ð¹" -#: src/cmp.c:157 src/diff.c:886 src/diff.c:1465 src/diff3.c:469 src/sdiff.c:169 +#: src/cmp.c:157 src/diff.c:887 src/diff.c:1466 src/diff3.c:471 src/sdiff.c:169 msgid "standard output" msgstr "Ñтандартний вивід" @@ -633,7 +603,7 @@ msgstr "" "Додаткові аргументи Ð1 та Ð2 визначають кількіÑÑ‚ÑŒ байтів, Ñкі Ñлід\n" "пропуÑтити на початку кожного файла (типово байти не пропуÑкаютьÑÑ)." -#: src/cmp.c:185 src/diff.c:996 src/diff3.c:507 src/sdiff.c:210 +#: src/cmp.c:185 src/diff.c:997 src/diff3.c:509 src/sdiff.c:210 msgid "" "Mandatory arguments to long options are mandatory for short options too.\n" msgstr "" @@ -656,7 +626,7 @@ msgstr "" "Якщо ФÐЙЛ не вказано або вказано Ñк «-», дані буде прочитано зі Ñтандартного " "потоку введеннÑ." -#: src/cmp.c:195 src/diff.c:984 src/sdiff.c:220 +#: src/cmp.c:195 src/diff.c:985 src/sdiff.c:220 msgid "Exit status is 0 if inputs are the same, 1 if different, 2 if trouble." msgstr "" "Код Ð·Ð°Ð²ÐµÑ€ÑˆÐµÐ½Ð½Ñ Ð´Ð¾Ñ€Ñ–Ð²Ð½ÑŽÑ” 0, Ñкщо вхідні файли ідентичні, 1 -- Ñкщо\n" @@ -667,246 +637,261 @@ msgstr "" msgid "invalid --bytes value '%s'" msgstr "некоректне Ð·Ð½Ð°Ñ‡ÐµÐ½Ð½Ñ --bytes «%s»" -#: src/cmp.c:266 src/diff.c:793 src/diff3.c:353 src/sdiff.c:565 +#: src/cmp.c:266 src/diff.c:795 src/diff3.c:356 src/sdiff.c:565 #, c-format msgid "missing operand after '%s'" msgstr "пропущено операнд піÑÐ»Ñ Â«%s»" -#: src/cmp.c:278 src/diff.c:795 src/diff3.c:355 src/sdiff.c:567 +#: src/cmp.c:278 src/diff.c:797 src/diff3.c:358 src/sdiff.c:567 #, c-format msgid "extra operand '%s'" msgstr "зайвий операнд «%s»" -#: src/cmp.c:494 +#: src/cmp.c:498 #, c-format msgid "%s %s differ: byte %s, line %s\n" msgstr "%s %s відрізнÑÑŽÑ‚ÑŒÑÑ: байт %s, Ñ€Ñдок %s\n" -#: src/cmp.c:510 +#: src/cmp.c:514 #, c-format msgid "%s %s differ: byte %s, line %s is %3o %s %3o %s\n" msgstr "%s %s відрізнÑÑŽÑ‚ÑŒÑÑ: байт %s, Ñ€Ñдок %s дорівнює %3o %s %3o %s\n" -#: src/cmp.c:562 +#: src/cmp.c:571 +#, c-format +msgid "cmp: EOF on %s which is empty\n" +msgstr "cmp: кінець файла у %s, Ñкий Ñ” порожнім\n" + +#: src/cmp.c:585 #, c-format -msgid "cmp: EOF on %s\n" -msgstr "cmp: кінець файлу у %s\n" +msgid "cmp: EOF on %s after byte %s, line %s\n" +msgstr "cmp: кінець файла у %s піÑÐ»Ñ Ð±Ð°Ð¹Ñ‚Ð° %s, Ñ€Ñдок %s\n" + +#: src/cmp.c:586 +#, c-format +msgid "cmp: EOF on %s after byte %s, in line %s\n" +msgstr "cmp: кінець файла у %s піÑÐ»Ñ Ð±Ð°Ð¹Ñ‚Ð° %s, у Ñ€Ñдку %s\n" + +#: src/cmp.c:592 +#, c-format +msgid "cmp: EOF on %s after byte %s\n" +msgstr "cmp: кінець файла у %s піÑÐ»Ñ Ð±Ð°Ð¹Ñ‚Ð° %s\n" #. This is a proper name. See the gettext manual, section Names. -#: src/diff.c:49 +#: src/diff.c:50 msgid "Paul Eggert" msgstr "Paul Eggert" #. This is a proper name. See the gettext manual, section Names. -#: src/diff.c:50 +#: src/diff.c:51 msgid "Mike Haertel" msgstr "Mike Haertel" #. This is a proper name. See the gettext manual, section Names. -#: src/diff.c:51 +#: src/diff.c:52 msgid "David Hayes" msgstr "David Hayes" #. This is a proper name. See the gettext manual, section Names. -#: src/diff.c:52 +#: src/diff.c:53 msgid "Richard Stallman" msgstr "Richard Stallman" #. This is a proper name. See the gettext manual, section Names. -#: src/diff.c:53 +#: src/diff.c:54 msgid "Len Tower" msgstr "Len Tower" -#: src/diff.c:351 +#: src/diff.c:353 #, c-format msgid "invalid context length '%s'" msgstr "некоректна довжина контекÑту «%s»" -#: src/diff.c:434 +#: src/diff.c:436 #, c-format msgid "pagination not supported on this host" msgstr "Ñ€Ð¾Ð·Ð±Ð¸Ñ‚Ñ‚Ñ Ð½Ð° Ñторінки не підтримуєтьÑÑ Ð½Ð° цій машині" -#: src/diff.c:449 src/diff3.c:335 +#: src/diff.c:451 src/diff3.c:336 #, c-format msgid "too many file label options" msgstr "надто багато параметрів, що вказують позначки файлів" -#: src/diff.c:526 +#: src/diff.c:528 #, c-format msgid "invalid width '%s'" msgstr "некоректна ширина «%s»" -#: src/diff.c:530 +#: src/diff.c:532 msgid "conflicting width options" msgstr "Ñуперечливі параметри Ð²Ð¸Ð·Ð½Ð°Ñ‡ÐµÐ½Ð½Ñ ÑˆÐ¸Ñ€Ð¸Ð½Ð¸" -#: src/diff.c:555 +#: src/diff.c:557 #, c-format msgid "invalid horizon length '%s'" msgstr "некоректна довжина горизонту «%s»" -#: src/diff.c:611 +#: src/diff.c:613 #, c-format msgid "invalid tabsize '%s'" msgstr "неприпуÑтима ширина табулÑції «%s»" -#: src/diff.c:615 +#: src/diff.c:617 msgid "conflicting tabsize options" msgstr "Ñуперечливі параметри Ð²Ð¸Ð·Ð½Ð°Ñ‡ÐµÐ½Ð½Ñ ÑˆÐ¸Ñ€Ð¸Ð½Ð¸ табулÑції" -#: src/diff.c:770 +#: src/diff.c:772 msgid "--from-file and --to-file both specified" msgstr "необхідно вказати Ñк --from-file, так Ñ– --to-file" -#: src/diff.c:890 +#: src/diff.c:891 msgid " --normal output a normal diff (the default)" msgstr "" " --normal вивеÑти дані у форматі звичайного diff (типово)" -#: src/diff.c:891 +#: src/diff.c:892 msgid "-q, --brief report only when files differ" msgstr "-q, --brief Ñповіщати лише про різні файли" -#: src/diff.c:892 +#: src/diff.c:893 msgid "-s, --report-identical-files report when two files are the same" msgstr "-s --report-identical-files Ñповіщати про однакові файли" -#: src/diff.c:893 +#: src/diff.c:894 msgid "" "-c, -C NUM, --context[=NUM] output NUM (default 3) lines of copied context" msgstr "" "-c, -C КТЬ, --context[=КТЬ] вивеÑти КТЬ (типово 3) Ñ€Ñдки Ñкопійованого " "контекÑту" -#: src/diff.c:894 +#: src/diff.c:895 msgid "" "-u, -U NUM, --unified[=NUM] output NUM (default 3) lines of unified context" msgstr "" "-u, -U ЧИСЛО, --unified[=ЧИСЛО] вивеÑти ЧИСЛО (типово 3) Ñ€Ñдків Ñпільного " "контекÑту" -#: src/diff.c:895 +#: src/diff.c:896 msgid "-e, --ed output an ed script" msgstr "-e, --ed вивеÑти дані у форматі запиÑу ed" -#: src/diff.c:896 +#: src/diff.c:897 msgid "-n, --rcs output an RCS format diff" msgstr "" "-n, --rcs виводити у форматі diff ÑиÑтем ÐºÐµÑ€ÑƒÐ²Ð°Ð½Ð½Ñ " "верÑÑ–Ñми" -#: src/diff.c:897 +#: src/diff.c:898 msgid "-y, --side-by-side output in two columns" msgstr "-y, --side-by-side вивеÑти дані у два Ñтовпчики" -#: src/diff.c:898 +#: src/diff.c:899 msgid "" "-W, --width=NUM output at most NUM (default 130) print columns" msgstr "" "-W, --width=ЧИСЛО виводити текÑÑ‚ не більше ніж у ЧИСЛО (типово " "130) позицій у Ñ€Ñдок" -#: src/diff.c:899 +#: src/diff.c:900 msgid "" " --left-column output only the left column of common lines" msgstr "" " --left-column виводити Ñпільні Ñ€Ñдки лише у ліву колонку" -#: src/diff.c:900 +#: src/diff.c:901 msgid " --suppress-common-lines do not output common lines" msgstr " --suppress-common-lines не виводити однакові Ñ€Ñдки" -#: src/diff.c:902 +#: src/diff.c:903 msgid "-p, --show-c-function show which C function each change is in" msgstr "" "-p, --show-c-function показати дані щодо функцій C у Ñких виÑвлено " "кожну зі змін" -#: src/diff.c:903 +#: src/diff.c:904 msgid "-F, --show-function-line=RE show the most recent line matching RE" msgstr "" "-F, --show-function-line=RE показати оÑтанній Ñ€Ñдок, що відповідає " "формальному виразу RE" -#: src/diff.c:904 -#, fuzzy +#: src/diff.c:905 msgid "" " --label LABEL use LABEL instead of file name and timestamp\n" " (can be repeated)" msgstr "" -" --label МІТКРвикориÑтати МІТКУ заміÑÑ‚ÑŒ назви файла\n" +" --label МІТКРвикориÑтати МІТКУ заміÑÑ‚ÑŒ назви файла Ñ– " +"чаÑової позначки\n" " (можна викориÑтовувати декілька разів)" -#: src/diff.c:907 +#: src/diff.c:908 msgid "-t, --expand-tabs expand tabs to spaces in output" msgstr "" "-t --expand-tabs замінювати Ñимволи табулÑції пробілами у виводі" -#: src/diff.c:908 +#: src/diff.c:909 msgid "-T, --initial-tab make tabs line up by prepending a tab" msgstr "" "-T --initial-tab вирівнювати табулÑцію Ñимволами табулÑції" -#: src/diff.c:909 +#: src/diff.c:910 msgid "" " --tabsize=NUM tab stops every NUM (default 8) print columns" msgstr "" " --tabsize=ЧИСЛО табулÑÑ†Ñ–Ñ ÐºÐ¾Ð¶Ð½Ñ– ЧИСЛО позицій Ð²Ð¸Ð²ÐµÐ´ÐµÐ½Ð½Ñ " "(типово 8)" -#: src/diff.c:910 +#: src/diff.c:911 msgid "" " --suppress-blank-empty suppress space or tab before empty output lines" msgstr "" " --suppress-blank-empty не показувати пробіли або табулÑції перед " "порожніми Ñ€Ñдками" -#: src/diff.c:911 +#: src/diff.c:912 msgid "-l, --paginate pass output through 'pr' to paginate it" msgstr "" "-l --paginate ÑпрÑмувати дані до «pr» Ð´Ð»Ñ Ñ€Ð¾Ð·Ð±Ð¸Ñ‚Ñ‚Ñ Ð½Ð° " "Ñторінки." -#: src/diff.c:913 +#: src/diff.c:914 msgid "" "-r, --recursive recursively compare any subdirectories found" msgstr "" "-r, --recursive рекурÑивно порівнÑти вÑÑ– знайдені підкаталоги" -#: src/diff.c:914 +#: src/diff.c:915 msgid " --no-dereference don't follow symbolic links" msgstr "" " --no-dereference не переходити за Ñимволічними поÑиланнÑми" -#: src/diff.c:915 +#: src/diff.c:916 msgid "-N, --new-file treat absent files as empty" msgstr "-N, --new-file вважати незнайдені файли порожніми" -#: src/diff.c:916 +#: src/diff.c:917 msgid " --unidirectional-new-file treat absent first files as empty" msgstr "" " --unidirectional-new-file вважати незнайдені у першому джерелі файли " "порожніми" -#: src/diff.c:917 +#: src/diff.c:918 msgid " --ignore-file-name-case ignore case when comparing file names" msgstr "" " --ignore-file-name-case ігнорувати регіÑÑ‚Ñ€ назв файлів під Ñ‡Ð°Ñ " "порівнÑннÑ" -#: src/diff.c:918 +#: src/diff.c:919 msgid " --no-ignore-file-name-case consider case when comparing file names" msgstr "" " --no-ignore-file-name-case враховувати регіÑÑ‚Ñ€ Ñимволів назв файлів" -#: src/diff.c:919 +#: src/diff.c:920 msgid "-x, --exclude=PAT exclude files that match PAT" msgstr "" "-x --exclude=ЗРÐЗОК виключити файли, назви Ñких відповідають " "ЗРÐЗКУ" -#: src/diff.c:920 +#: src/diff.c:921 msgid "" "-X, --exclude-from=FILE exclude files that match any pattern in FILE" msgstr "" @@ -914,13 +899,13 @@ msgstr "" "зразкам\n" " з файла." -#: src/diff.c:921 +#: src/diff.c:922 msgid "" "-S, --starting-file=FILE start with FILE when comparing directories" msgstr "" "-S, --starting-file=ФÐЙЛ починати порівнÑÐ½Ð½Ñ ÐºÐ°Ñ‚Ð°Ð»Ð¾Ð³Ñ–Ð² на файлі ФÐЙЛ" -#: src/diff.c:922 +#: src/diff.c:923 msgid "" " --from-file=FILE1 compare FILE1 to all operands;\n" " FILE1 can be a directory" @@ -928,7 +913,7 @@ msgstr "" " --from-file=ФÐЙЛ1 порівнÑти ФÐЙЛ1 з уÑіма операндами;\n" " ФÐЙЛ1 може бути каталогом" -#: src/diff.c:924 +#: src/diff.c:925 msgid "" " --to-file=FILE2 compare all operands to FILE2;\n" " FILE2 can be a directory" @@ -936,84 +921,84 @@ msgstr "" " --to-file=ФÐЙЛ2 порівнÑти вÑÑ– операнди з ФÐЙЛОМ " "2; ФÐЙЛ2 може бути каталогом." -#: src/diff.c:927 +#: src/diff.c:928 msgid "" "-i, --ignore-case ignore case differences in file contents" msgstr "" "-i --ignore-case ігнорувати регіÑÑ‚Ñ€ літер у вміÑÑ‚Ñ– файлів" -#: src/diff.c:928 +#: src/diff.c:929 msgid "-E, --ignore-tab-expansion ignore changes due to tab expansion" msgstr "" "-E --ignore-tab-expansion ігнорувати зміни, викликані заміною " "табулÑції пробілами" -#: src/diff.c:929 +#: src/diff.c:930 msgid "-Z, --ignore-trailing-space ignore white space at line end" msgstr "-Z, --ignore-trailing-space ігнорувати пробіли наприкінці Ñ€Ñдка" -#: src/diff.c:930 +#: src/diff.c:931 msgid "" "-b, --ignore-space-change ignore changes in the amount of white space" msgstr "-b --ignore-space-change ігнорувати зміни у кількоÑÑ‚Ñ– пробілів" -#: src/diff.c:931 +#: src/diff.c:932 msgid "-w, --ignore-all-space ignore all white space" msgstr "-w --ignore-all-space ігнорувати уÑÑ– пробіли" -#: src/diff.c:932 +#: src/diff.c:933 msgid "" "-B, --ignore-blank-lines ignore changes where lines are all blank" msgstr "" "-B --ignore-blank-lines ігнорувати зміни кількоÑÑ‚Ñ– порожніх Ñ€Ñдків" -#: src/diff.c:933 +#: src/diff.c:934 msgid "-I, --ignore-matching-lines=RE ignore changes where all lines match RE" msgstr "" "-I, --ignore-matching-lines=RE ігнорувати зміни, Ñкі відповідають " "формальному виразу RE" -#: src/diff.c:935 +#: src/diff.c:936 msgid "-a, --text treat all files as text" msgstr "-a, --text вважати вÑÑ– файли текÑтовими" -#: src/diff.c:936 +#: src/diff.c:937 msgid " --strip-trailing-cr strip trailing carriage return on input" msgstr "" " --strip-trailing-cr вилучити з виведених даних вÑÑ– завершальні " "Ñимволи нового Ñ€Ñдка" -#: src/diff.c:938 +#: src/diff.c:939 msgid " --binary read and write data in binary mode" msgstr "" " --binary читати та запиÑувати файли у двійковій формі" -#: src/diff.c:941 +#: src/diff.c:942 msgid "" "-D, --ifdef=NAME output merged file with '#ifdef NAME' diffs" msgstr "" "-D, --ifdef=ÐÐЗВРвиводити diff-блоки, що викориÑтовують " "конÑтрукцію «#ifdef ÐÐЗВл." -#: src/diff.c:942 +#: src/diff.c:943 msgid " --GTYPE-group-format=GFMT format GTYPE input groups with GFMT" msgstr "" " --ГТИП-group-format=ГФМТ форматувати вхідні групи типу ГТИП\n" " у відповідноÑÑ‚Ñ– до формату ГФМТ." -#: src/diff.c:943 +#: src/diff.c:944 msgid " --line-format=LFMT format all input lines with LFMT" msgstr "" " --line-format=СФМТ форматувати вÑÑ– вхідні Ñ€Ñдки за допомогою " "СФМТ." -#: src/diff.c:944 +#: src/diff.c:945 msgid " --LTYPE-line-format=LFMT format LTYPE input lines with LFMT" msgstr "" " --CТИП-group-format=СФМТ форматувати вхідні Ñ€Ñдки типу СТИП\n" " у відповідноÑÑ‚Ñ– до формату СФМТ" -#: src/diff.c:945 +#: src/diff.c:946 msgid "" " These format options provide fine-grained control over the output\n" " of diff, generalizing -D/--ifdef." @@ -1021,12 +1006,12 @@ msgstr "" " За допомогою цих параметрів Ñ„Ð¾Ñ€Ð¼Ð°Ñ‚ÑƒÐ²Ð°Ð½Ð½Ñ Ð¼Ð¾Ð¶Ð½Ð° точно налаштувати\n" " вивід diff, з узагальненнÑм -D/--ifdef." -#: src/diff.c:947 +#: src/diff.c:948 msgid " LTYPE is 'old', 'new', or 'unchanged'. GTYPE is LTYPE or 'changed'." msgstr "" " СТИП може бути «old», «new» чи «unchanged», ГТИП — те Ñаме або «changed»." -#: src/diff.c:948 +#: src/diff.c:949 msgid "" " GFMT (only) may contain:\n" " %< lines from FILE1\n" @@ -1054,7 +1039,7 @@ msgstr "" " M L+1\n" " %(A=B?T:E) Ñкщо A дорівнює B, T, інакше E" -#: src/diff.c:960 +#: src/diff.c:961 msgid "" " LFMT (only) may contain:\n" " %L contents of line\n" @@ -1066,7 +1051,7 @@ msgstr "" " %l вміÑÑ‚ Ñ€Ñдка без Ñимволу нового Ñ€Ñдка наприкінці\n" " %[-][ШИРИÐÐ][.[ТОЧÐ]]{doxX}n формат номеру вхідного Ñ€Ñдка у Ñтилі printf" -#: src/diff.c:964 +#: src/diff.c:965 msgid "" " Both GFMT and LFMT may contain:\n" " %% %\n" @@ -1080,155 +1065,153 @@ msgstr "" " %c'\\OOO' один Ñимвол з віÑімковим кодом OOO\n" " C Ñимвол C (інші Ñимволи не оброблÑтимутьÑÑ)" -#: src/diff.c:970 +#: src/diff.c:971 msgid "-d, --minimal try hard to find a smaller set of changes" msgstr "-d --minimal намагатиÑÑŒ знайти найменший набір змін" -#: src/diff.c:971 +#: src/diff.c:972 msgid " --horizon-lines=NUM keep NUM lines of the common prefix and suffix" msgstr "" " --horizon-lines=ЧИСЛО зберегти ЧИСЛО Ñпільних Ñ€Ñдків, до та піÑÐ»Ñ Ñ€Ñ–Ð·Ð½Ð¸Ñ…" -#: src/diff.c:972 +#: src/diff.c:973 msgid "" " --speed-large-files assume large files and many scattered small changes" msgstr "" " --speed-large-files вважати файли великими з багатьма розкиданими\n" " дрібними змінами." -#: src/diff.c:973 -msgid "" -" --color[=WHEN] colorize the output; WHEN can be 'never', 'always'," -msgstr "" - #: src/diff.c:974 -#, fuzzy -msgid " or 'auto' (the default)" -msgstr "" -" --normal вивеÑти дані у форматі звичайного diff (типово)" - -#: src/diff.c:975 msgid "" -" --palette=PALETTE specify the colors to use when --color is active" +" --color[=WHEN] colorize the output; WHEN can be 'never', " +"'always',\n" +" or 'auto' (the default)" msgstr "" +" --color[=КОЛИ] розфарбовувати виведеннÑ; значеннÑм КОЛИ може бути " +"«never», «always»,\n" +" або «auto» (типовий варіант)" #: src/diff.c:976 msgid "" -" PALETTE is a colon-separated list terminfo " -"capabilities" +" --palette=PALETTE the colors to use when --color is active; PALETTE " +"is\n" +" a colon-separated list of terminfo capabilities" msgstr "" +" --palette=ПÐЛІТРРкольори, Ñкі Ñлід викориÑтовувати, Ñкщо додано --" +"color;\n" +" ПÐЛІТРР— відокремлений двокрапками ÑпиÑок " +"можливоÑтей terminfo" -#: src/diff.c:978 +#: src/diff.c:979 msgid " --help display this help and exit" msgstr "" " --help показати це довідкове Ð¿Ð¾Ð²Ñ–Ð´Ð¾Ð¼Ð»ÐµÐ½Ð½Ñ Ñ– завершити " "роботу" -#: src/diff.c:979 +#: src/diff.c:980 msgid "-v, --version output version information and exit" msgstr "-v, --version показати дані щодо верÑÑ–Ñ— Ñ– завершити роботу" -#: src/diff.c:981 -#, fuzzy +#: src/diff.c:982 msgid "FILES are 'FILE1 FILE2' or 'DIR1 DIR2' or 'DIR FILE' or 'FILE DIR'." msgstr "" -"ФÐЙЛИ — це «ФÐЙЛ1 ФÐЙЛ2», чи «КÐТÐЛОГ1 КÐТÐЛОГ2», чи «КÐТÐЛОГ ФÐЙЛ...»,\n" -"чи «ФÐЙЛ... КÐТÐЛОГ»." +"ФÐЙЛИ — це «ФÐЙЛ1 ФÐЙЛ2», чи «КÐТÐЛОГ1 КÐТÐЛОГ2», чи «КÐТÐЛОГ ФÐЙЛ»,\n" +"чи «ФÐЙЛ КÐТÐЛОГ»." -#: src/diff.c:982 +#: src/diff.c:983 msgid "" "If --from-file or --to-file is given, there are no restrictions on FILE(s)." msgstr "Якщо вказано --from-file чи --to-file, на ФÐЙЛИ обмежень немає." -#: src/diff.c:983 src/diff3.c:526 src/sdiff.c:219 +#: src/diff.c:984 src/diff3.c:528 src/sdiff.c:219 msgid "If a FILE is '-', read standard input." msgstr "" "Якщо ФÐЙЛ вказано Ñк «-», дані буде прочитано зі Ñтандартного потоку " "введеннÑ." -#: src/diff.c:993 +#: src/diff.c:994 #, c-format msgid "Usage: %s [OPTION]... FILES\n" msgstr "ВикориÑтаннÑ: %s [КЛЮЧ]... ФÐЙЛИ\n" -#: src/diff.c:994 +#: src/diff.c:995 msgid "Compare FILES line by line." msgstr "Порівнює два файли за Ñ€Ñдками." -#: src/diff.c:1028 +#: src/diff.c:1029 #, c-format msgid "conflicting %s option value '%s'" msgstr "Ñуперечливі Ð·Ð½Ð°Ñ‡ÐµÐ½Ð½Ñ %s Ð´Ð»Ñ ÐºÐ»ÑŽÑ‡Ð° «%s»" -#: src/diff.c:1041 +#: src/diff.c:1042 #, c-format msgid "conflicting output style options" msgstr "Ñуперечливі ключі Ð²Ð¸Ð·Ð½Ð°Ñ‡ÐµÐ½Ð½Ñ Ñтилю виводу" -#: src/diff.c:1057 -#, fuzzy, c-format +#: src/diff.c:1058 +#, c-format msgid "invalid color '%s'" -msgstr "некоректна ширина «%s»" +msgstr "некоректний колір «%s»" -#: src/diff.c:1113 src/diff.c:1323 +#: src/diff.c:1114 src/diff.c:1324 #, c-format msgid "Only in %s: %s\n" msgstr "Лише у %s: %s\n" -#: src/diff.c:1247 +#: src/diff.c:1248 msgid "cannot compare '-' to a directory" msgstr "не можна порівнювати «-» з каталогом" -#: src/diff.c:1282 +#: src/diff.c:1283 msgid "-D option not supported with directories" msgstr "-D параметр не підтримуєтьÑÑ Ð´Ð»Ñ ÐºÐ°Ñ‚Ð°Ð»Ð¾Ð³Ñ–Ð²" -#: src/diff.c:1291 +#: src/diff.c:1292 #, c-format msgid "Common subdirectories: %s and %s\n" msgstr "Спільні підкаталоги: %s та %s\n" -#: src/diff.c:1333 src/diff.c:1383 +#: src/diff.c:1334 src/diff.c:1384 #, c-format msgid "File %s is a %s while file %s is a %s\n" msgstr "Файл %s це %s, тоді Ñк файл %s -- %s\n" -#: src/diff.c:1369 +#: src/diff.c:1370 #, c-format msgid "Symbolic links %s and %s differ\n" msgstr "Символічні поÑÐ¸Ð»Ð°Ð½Ð½Ñ %s Ñ– %s Ñ” різними\n" -#: src/diff.c:1456 +#: src/diff.c:1457 #, c-format msgid "Files %s and %s are identical\n" msgstr "Файли %s та %s ідентичні\n" #. This is a proper name. See the gettext manual, section Names. -#: src/diff3.c:41 +#: src/diff3.c:42 msgid "Randy Smith" msgstr "Randy Smith" -#: src/diff3.c:348 +#: src/diff3.c:351 #, c-format msgid "incompatible options" msgstr "неÑуміÑні ключі" -#: src/diff3.c:388 +#: src/diff3.c:391 msgid "'-' specified for more than one input file" msgstr "«-» вказано Ð´Ð»Ñ Ð±Ñ–Ð»ÑŒÑˆ ніж одного вхідного файла" -#: src/diff3.c:439 src/diff3.c:1288 src/diff3.c:1692 src/diff3.c:1747 +#: src/diff3.c:442 src/diff3.c:1290 src/diff3.c:1693 src/diff3.c:1748 #: src/sdiff.c:307 src/sdiff.c:844 src/sdiff.c:855 msgid "read failed" msgstr "помилка читаннÑ" -#: src/diff3.c:473 +#: src/diff3.c:475 msgid "-A, --show-all output all changes, bracketing conflicts" msgstr "" "-A --show-all вивеÑти вÑÑ– зміни, беручи конфліктні міÑÑ†Ñ Ñƒ " "дужки." -#: src/diff3.c:475 +#: src/diff3.c:477 msgid "" "-e, --ed output ed script incorporating changes\n" " from OLDFILE to YOURFILE into MYFILE" @@ -1236,13 +1219,13 @@ msgstr "" "-e --ed вивеÑти необ'єднані зміни у СТÐРОМУ-ФÐЙЛІ\n" " порівнÑно з Ð’ÐШИМ-ФÐЙЛОМ до МОГО-ФÐЙЛÐ." -#: src/diff3.c:477 +#: src/diff3.c:479 msgid "-E, --show-overlap like -e, but bracket conflicts" msgstr "" "-E --show-overlap подібно до -e, але з взÑÑ‚Ñ‚Ñм конфліктних міÑць у " "дужки" -#: src/diff3.c:478 +#: src/diff3.c:480 msgid "" "-3, --easy-only like -e, but incorporate only nonoverlapping " "changes" @@ -1250,25 +1233,25 @@ msgstr "" "-3, --easy-only подібно до -e, але включити лише зміни без " "перекриттÑ" -#: src/diff3.c:479 +#: src/diff3.c:481 msgid "" "-x, --overlap-only like -e, but incorporate only overlapping changes" msgstr "" "-x, --overlap-only подібно до -e, але включати лише зміни з " "перекриттÑм" -#: src/diff3.c:480 +#: src/diff3.c:482 msgid "-X like -x, but bracket conflicts" msgstr "" "-X подібно до -x, але з взÑÑ‚Ñ‚Ñм розбіжноÑтей у дужки" -#: src/diff3.c:481 +#: src/diff3.c:483 msgid "-i append 'w' and 'q' commands to ed scripts" msgstr "" "-i допиÑувати команди «w» Ñ– «q» в кінець Ñценарію " "ed." -#: src/diff3.c:483 +#: src/diff3.c:485 msgid "" "-m, --merge output actual merged file, according to\n" " -A if no other options are given" @@ -1277,28 +1260,28 @@ msgstr "" "до\n" " -A, Ñкщо не вказано інших параметрів" -#: src/diff3.c:486 +#: src/diff3.c:488 msgid "-a, --text treat all files as text" msgstr "-a, --text вважати вÑÑ– файли текÑтовими" -#: src/diff3.c:487 +#: src/diff3.c:489 msgid " --strip-trailing-cr strip trailing carriage return on input" msgstr "" " --strip-trailing-cr вилучити з виведених даних вÑÑ– завершальні " "Ñимволи нового Ñ€Ñдка" -#: src/diff3.c:488 +#: src/diff3.c:490 msgid "-T, --initial-tab make tabs line up by prepending a tab" msgstr "" "-T --initial-tab вирівнювати табулÑцію додаючи на початок Ñимвол " "табулÑції" -#: src/diff3.c:489 +#: src/diff3.c:491 msgid " --diff-program=PROGRAM use PROGRAM to compare files" msgstr "" " --diff-program=ПРОГРÐМРвикориÑтовувати Ð´Ð»Ñ Ð¿Ð¾Ñ€Ñ–Ð²Ð½ÑÐ½Ð½Ñ Ð²ÐºÐ°Ð·Ð°Ð½Ñƒ ПРОГРÐМУ" -#: src/diff3.c:490 +#: src/diff3.c:492 msgid "" "-L, --label=LABEL use LABEL instead of file name\n" " (can be repeated up to three times)" @@ -1306,27 +1289,27 @@ msgstr "" "-L, --label=МІТКРвикориÑтовувати МІТКУ заміÑÑ‚ÑŒ назви файла\n" " (можна викориÑтовувати не більше трьох разів)" -#: src/diff3.c:493 +#: src/diff3.c:495 msgid " --help display this help and exit" msgstr "" " --help показати це довідкове Ð¿Ð¾Ð²Ñ–Ð´Ð¾Ð¼Ð»ÐµÐ½Ð½Ñ Ñ– завершити " "роботу" -#: src/diff3.c:494 +#: src/diff3.c:496 msgid "-v, --version output version information and exit" msgstr "" "-v, --version показати дані щодо верÑÑ–Ñ— Ñ– завершити роботу" -#: src/diff3.c:503 +#: src/diff3.c:505 #, c-format msgid "Usage: %s [OPTION]... MYFILE OLDFILE YOURFILE\n" msgstr "ВикориÑтаннÑ: %s [КЛЮЧ]... МІЙ-ФÐЙЛ СТÐРИЙ-ФÐЙЛ Ð’ÐШ-ФÐЙЛ\n" -#: src/diff3.c:505 +#: src/diff3.c:507 msgid "Compare three files line by line." msgstr "ПорівнÑÐ½Ð½Ñ Ñ‚Ñ€ÑŒÐ¾Ñ… файлів Ñ€Ñдками." -#: src/diff3.c:515 +#: src/diff3.c:517 msgid "" "\n" "The default output format is a somewhat human-readable representation of\n" @@ -1350,48 +1333,48 @@ msgstr "" "diff3 з виводом Ñ—Ñ… до об’єднаного файла. Ð”Ð»Ñ Ð½ÐµÑ‚Ð¸Ð¿Ð¾Ð²Ð¸Ñ… вхідних даних\n" "такий варіант працює краще за варіант з викориÑтаннÑм ed.\n" -#: src/diff3.c:527 +#: src/diff3.c:529 msgid "Exit status is 0 if successful, 1 if conflicts, 2 if trouble." msgstr "" "Код Ð·Ð°Ð²ÐµÑ€ÑˆÐµÐ½Ð½Ñ Ð´Ð¾Ñ€Ñ–Ð²Ð½ÑŽÑ” 0 при нормальному завершенні, 1 при конфліктах\n" " та 2 при неÑправноÑÑ‚ÑÑ…." -#: src/diff3.c:720 +#: src/diff3.c:722 msgid "internal error: screwup in format of diff blocks" msgstr "Ð²Ð½ÑƒÑ‚Ñ€Ñ–ÑˆÐ½Ñ Ð¿Ð¾Ð¼Ð¸Ð»ÐºÐ°: пошкоджений формат diff-блоків" -#: src/diff3.c:1015 +#: src/diff3.c:1017 #, c-format msgid "%s: diff failed: " msgstr "%s: помилка при пошуку відмінноÑтей: " -#: src/diff3.c:1037 +#: src/diff3.c:1039 msgid "internal error: invalid diff type in process_diff" msgstr "" "Ð²Ð½ÑƒÑ‚Ñ€Ñ–ÑˆÐ½Ñ Ð¿Ð¾Ð¼Ð¸Ð»ÐºÐ°: неправильний тип diff-блоку у функції `process_diff'" -#: src/diff3.c:1062 +#: src/diff3.c:1064 msgid "invalid diff format; invalid change separator" -msgstr "неправильний формат diff-файлу; неправильний розділювач змін" +msgstr "неправильний формат diff-файла; неправильний розділювач змін" -#: src/diff3.c:1298 +#: src/diff3.c:1300 msgid "invalid diff format; incomplete last line" -msgstr "неправильний формат diff-файлу; неповний оÑтанній Ñ€Ñдок" +msgstr "неправильний формат diff-файла; неповний оÑтанній Ñ€Ñдок" -#: src/diff3.c:1322 src/sdiff.c:275 src/util.c:970 +#: src/diff3.c:1324 src/sdiff.c:275 src/util.c:969 #, c-format msgid "subsidiary program '%s' could not be invoked" msgstr "не вдаєтьÑÑ Ð·Ð°Ð¿ÑƒÑтити допоміжну програму «%s»" -#: src/diff3.c:1347 +#: src/diff3.c:1349 msgid "invalid diff format; incorrect leading line chars" msgstr "неправильний diff-формат; неправильні перші Ñимволи Ñ€Ñдка" -#: src/diff3.c:1420 +#: src/diff3.c:1422 msgid "internal error: invalid diff type passed to output" -msgstr "Ð²Ð½ÑƒÑ‚Ñ€Ñ–ÑˆÐ½Ñ Ð¿Ð¾Ð¼Ð¸Ð»ÐºÐ°: на вхід подано неправильний тип diff-файлу" +msgstr "Ð²Ð½ÑƒÑ‚Ñ€Ñ–ÑˆÐ½Ñ Ð¿Ð¾Ð¼Ð¸Ð»ÐºÐ°: на вхід подано неправильний тип diff-файла" -#: src/diff3.c:1694 src/diff3.c:1751 +#: src/diff3.c:1695 src/diff3.c:1752 msgid "input file shrank" msgstr "вхідний файл зменшивÑÑ" @@ -1406,7 +1389,7 @@ msgid "%s: recursive directory loop" msgstr "%s: Ð·Ð°Ñ†Ð¸ÐºÐ»ÐµÐ½Ð½Ñ Ñ€ÐµÐºÑƒÑ€Ñивного проходу каталогів" #. This is a proper name. See the gettext manual, section Names. -#: src/sdiff.c:42 +#: src/sdiff.c:43 msgid "Thomas Lord" msgstr "Thomas Lord" @@ -1558,12 +1541,36 @@ msgstr "" "v:\tВключати Ñпільні Ñ€Ñдки, виводÑчи повідомленнÑ.\n" "q:\tВийти.\n" -#: src/util.c:663 -#, fuzzy, c-format +#: src/util.c:662 +#, c-format msgid "unrecognized prefix: %s" -msgstr "%s: невідомий параметр «--%s»\n" +msgstr "невідомий префікÑ: %s" -#: src/util.c:693 +#: src/util.c:692 #, c-format msgid "unparsable value for --palette" -msgstr "" +msgstr "непридатне до обробки Ð·Ð½Ð°Ñ‡ÐµÐ½Ð½Ñ Ð´Ð»Ñ --palette" + +#~ 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' is ambiguous\n" +#~ msgstr "%s: параметр «-W %s» не Ñ” однозначним\n" + +#~ msgid "%s: option '-W %s' doesn't allow an argument\n" +#~ msgstr "%s: Ð´Ð¾Ð´Ð°Ð²Ð°Ð½Ð½Ñ Ð°Ñ€Ð³ÑƒÐ¼ÐµÐ½Ñ‚Ñ–Ð² до параметра «-W %s» не передбачено\n" + +#~ msgid "%s: option '-W %s' requires an argument\n" +#~ msgstr "%s: до параметра «-W %s» Ñлід додати аргумент\n" + +#~ msgid " or 'auto' (the default)" +#~ msgstr " або «auto» (типове значеннÑ)" + +#~ msgid "" +#~ " --palette=PALETTE specify the colors to use when --color is active" +#~ msgstr "" +#~ " --palette=ПÐЛІТРРвказати кольори, Ñкі Ñлід викориÑтовувати, Ñкщо " +#~ "додано --color" Binary files differ@@ -1,50 +1,50 @@ # Vietnamese translation for Diff Utils. -# Copyright © 2012 Free Software Foundation, Inc. +# Copyright © 2013 Free Software Foundation, Inc. # This file is distributed under the same license as the diffutils package. # Clytie Siddall <clytie@riverland.net.au>, 2005-2010. -# Trần Ngá»c Quân <vnwildman@gmail.com>, 2012. +# Trần Ngá»c Quân <vnwildman@gmail.com>, 2013, 2017. # msgid "" msgstr "" -"Project-Id-Version: diffutils-3.3-pre1\n" +"Project-Id-Version: diffutils 3.5.25\n" "Report-Msgid-Bugs-To: bug-diffutils@gnu.org\n" -"POT-Creation-Date: 2016-08-20 22:22-0700\n" -"PO-Revision-Date: 2012-11-01 13:51+0700\n" +"POT-Creation-Date: 2017-05-21 13:26-0700\n" +"PO-Revision-Date: 2017-05-08 07:10+0700\n" "Last-Translator: Trần Ngá»c Quân <vnwildman@gmail.com>\n" "Language-Team: Vietnamese <translation-team-vi@lists.sourceforge.net>\n" "Language: vi\n" "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" "Team-Website: <http://translationproject.org/team/vi.html>\n" "Plural-Forms: nplurals=1; plural=0;\n" -"X-Generator: LocFactoryEditor 1.8\n" +"X-Generator: Gtranslator 2.91.7\n" "X-Poedit-SourceCharset: UTF-8\n" -#: lib/argmatch.c:133 -#, fuzzy, c-format +#: lib/argmatch.c:134 +#, c-format msgid "invalid argument %s for %s" -msgstr "đối số %s%s không hợp lệ “%sâ€" +msgstr "tham số %s cho %s không hợp lệ" -#: lib/argmatch.c:134 +#: lib/argmatch.c:135 #, c-format msgid "ambiguous argument %s for %s" -msgstr "" +msgstr "tham số %s không rõ rà ng vá»›i %s" -#: lib/argmatch.c:153 -#, fuzzy +#: lib/argmatch.c:154 msgid "Valid arguments are:" -msgstr "đối số %s%s không hợp lệ “%sâ€" +msgstr "Các tham số hợp lệ là :" -#: lib/c-stack.c:204 lib/c-stack.c:297 +#: lib/c-stack.c:203 lib/c-stack.c:296 msgid "program error" msgstr "lá»—i chÆ°Æ¡ng trình" -#: lib/c-stack.c:205 lib/c-stack.c:298 +#: lib/c-stack.c:204 lib/c-stack.c:297 msgid "stack overflow" msgstr "stack bị trà n" -#: lib/error.c:191 +#: lib/error.c:195 msgid "Unknown system error" msgstr "Không biết lá»—i hệ thống" @@ -90,7 +90,7 @@ msgstr "táºp tin đặc biệt ký tá»±" #: lib/file-type.c:72 msgid "contiguous data" -msgstr "" +msgstr "dữ liệu liên tiếp" #: lib/file-type.c:75 msgid "fifo" @@ -98,43 +98,39 @@ msgstr "fifo (và o trÆ°á»›c, ra trÆ°á»›c)" #: lib/file-type.c:78 msgid "door" -msgstr "" +msgstr "cá»a" #: lib/file-type.c:81 -#, fuzzy msgid "multiplexed block special file" -msgstr "táºp tin đặc biệt khối" +msgstr "táºp tin đặc biệt khối Ä‘a phức hợp" #: lib/file-type.c:84 -#, fuzzy msgid "multiplexed character special file" -msgstr "táºp tin đặc biệt ký tá»±" +msgstr "táºp tin đặc biệt ký tá»± Ä‘a phức hợp" #: lib/file-type.c:87 msgid "multiplexed file" -msgstr "" +msgstr "táºp tin Ä‘a phức hợp" #: lib/file-type.c:90 -#, fuzzy msgid "named file" -msgstr "táºp tin lạ" +msgstr "táºp tin tên" #: lib/file-type.c:93 -#, fuzzy msgid "network special file" -msgstr "táºp tin đặc biệt khối" +msgstr "táºp tin đặc biệt mạng" #: lib/file-type.c:96 msgid "migrated file with data" -msgstr "" +msgstr "chuyển đổi táºp tin vá»›i dữ liệu" #: lib/file-type.c:99 msgid "migrated file without data" -msgstr "" +msgstr "chuyển đổi táºp tin không cùng dữ liệu" #: lib/file-type.c:102 msgid "port" -msgstr "" +msgstr "cổng" #: lib/file-type.c:105 msgid "socket" @@ -142,72 +138,47 @@ msgstr "socket" #: lib/file-type.c:108 msgid "whiteout" -msgstr "" +msgstr "bá» trắng" #: lib/file-type.c:110 msgid "weird file" msgstr "táºp tin lạ" -#: lib/getopt.c:575 lib/getopt.c:604 -#, c-format -msgid "%s: option '%s' is ambiguous; possibilities:" -msgstr "%s: tùy chá»n “%s†chÆ°a rõ rà ng; khả năng là :" - -#: lib/getopt.c:619 -#, fuzzy, c-format -msgid "%s: option '%s' is ambiguous\n" -msgstr "%s: tùy chá»n “-W %s†chÆ°a rõ rà ng\n" - -#: lib/getopt.c:654 lib/getopt.c:658 +#: lib/getopt.c:278 #, c-format -msgid "%s: option '--%s' doesn't allow an argument\n" -msgstr "%s: tùy chá»n “--%s†không cho phép đối số\n" +msgid "%s: option '%s%s' is ambiguous\n" +msgstr "%s: tùy chá»n “%s%s†chÆ°a rõ rà ng\n" -#: lib/getopt.c:667 lib/getopt.c:672 +#: lib/getopt.c:284 #, c-format -msgid "%s: option '%c%s' doesn't allow an argument\n" -msgstr "%s: tùy chá»n “%c%s†không cho phép đối số\n" +msgid "%s: option '%s%s' is ambiguous; possibilities:" +msgstr "%s: tùy chá»n “%s%s†chÆ°a rõ rà ng; khả năng là :" -#: lib/getopt.c:715 lib/getopt.c:734 +#: lib/getopt.c:319 #, c-format -msgid "%s: option '--%s' requires an argument\n" -msgstr "%s: tùy chá»n “--%s†yêu cầu má»™t đối số\n" +msgid "%s: unrecognized option '%s%s'\n" +msgstr "%s: không nháºn ra tùy chá»n “%s%sâ€\n" -#: lib/getopt.c:772 lib/getopt.c:775 +#: lib/getopt.c:345 #, c-format -msgid "%s: unrecognized option '--%s'\n" -msgstr "%s: không nháºn ra tùy chá»n “--%sâ€\n" +msgid "%s: option '%s%s' doesn't allow an argument\n" +msgstr "%s: tùy chá»n “%s%s†không không cho phép má»™t đối số\n" -#: lib/getopt.c:783 lib/getopt.c:786 +#: lib/getopt.c:360 #, c-format -msgid "%s: unrecognized option '%c%s'\n" -msgstr "%s: không nháºn ra tùy chá»n “%c%sâ€\n" +msgid "%s: option '%s%s' requires an argument\n" +msgstr "%s: tùy chá»n “%s%s†cần má»™t đối số\n" -#: lib/getopt.c:835 lib/getopt.c:838 +#: lib/getopt.c:621 #, c-format msgid "%s: invalid option -- '%c'\n" msgstr "%s: tùy chá»n không hợp lệ -- “%câ€\n" -#: lib/getopt.c:891 lib/getopt.c:908 lib/getopt.c:1118 lib/getopt.c:1136 +#: lib/getopt.c:636 lib/getopt.c:682 #, c-format msgid "%s: option requires an argument -- '%c'\n" msgstr "%s: tùy chá»n yêu cầu má»™t đối số -- “%câ€\n" -#: lib/getopt.c:964 lib/getopt.c:980 -#, c-format -msgid "%s: option '-W %s' is ambiguous\n" -msgstr "%s: tùy chá»n “-W %s†chÆ°a rõ rà ng\n" - -#: lib/getopt.c:1004 lib/getopt.c:1022 -#, c-format -msgid "%s: option '-W %s' doesn't allow an argument\n" -msgstr "%s: tùy chá»n “-W %s†không cho phép đối số\n" - -#: lib/getopt.c:1043 lib/getopt.c:1061 -#, c-format -msgid "%s: option '-W %s' requires an argument\n" -msgstr "%s: tùy chá»n “-W %s†yêu cầu má»™t đối số\n" - #. TRANSLATORS: #. Get translations for open and closing quotation marks. #. The message catalog should translate "`" to a left @@ -229,11 +200,11 @@ msgstr "%s: tùy chá»n “-W %s†yêu cầu má»™t đối số\n" #. If you don't know what to put here, please see #. <http://en.wikipedia.org/wiki/Quotation_marks_in_other_languages> #. and use glyphs suitable for your language. -#: lib/quotearg.c:347 +#: lib/quotearg.c:362 msgid "`" msgstr "“" -#: lib/quotearg.c:348 +#: lib/quotearg.c:363 msgid "'" msgstr "â€" @@ -255,7 +226,7 @@ msgstr "Ký tá»± đối chiếu không hợp lệ" #: lib/regcomp.c:147 msgid "Invalid character class name" -msgstr "Tên hạng ký tá»± không hợp lệ" +msgstr "Tên lá»›p ký tá»± không hợp lệ" #: lib/regcomp.c:150 msgid "Trailing backslash" @@ -263,12 +234,11 @@ msgstr "Có gạch ngược theo sau" #: lib/regcomp.c:153 msgid "Invalid back reference" -msgstr "Tham chiếu trở lại không hợp lệ" +msgstr "Tham chiếu ngược trở lại không hợp lệ" #: lib/regcomp.c:156 -#, fuzzy msgid "Unmatched [, [^, [:, [., or [=" -msgstr "ChÆ°a khá»›p [ hay [^" +msgstr "ChÆ°a khá»›p cặp ký tá»± [, [^, [:, [., hay [=" #: lib/regcomp.c:159 msgid "Unmatched ( or \\(" @@ -525,7 +495,7 @@ msgid "General help using GNU software: <http://www.gnu.org/gethelp/>\n" msgstr "" "Trợ giúp chung vá» cách sá» dụng phần má»m GNU: <http://www.gnu.org/gethelp/>\n" -#: src/analyze.c:454 src/diff.c:1400 +#: src/analyze.c:454 src/diff.c:1401 #, c-format msgid "Files %s and %s differ\n" msgstr "Hai táºp tin %s và %s là khác nhau.\n" @@ -535,22 +505,22 @@ msgstr "Hai táºp tin %s và %s là khác nhau.\n" msgid "Binary files %s and %s differ\n" msgstr "Hai táºp tin nhị phân %s và %s khác nhau\n" -#: src/analyze.c:697 src/diff3.c:1463 src/util.c:1255 +#: src/analyze.c:706 src/diff3.c:1465 src/util.c:1254 msgid "No newline at end of file" msgstr "Không có ký tá»± dòng má»›i tại kêt thức táºp tin." #. This is a proper name. See the gettext manual, section Names. -#: src/cmp.c:43 +#: src/cmp.c:44 msgid "Torbjorn Granlund" msgstr "Torbjorn Granlund" # Tên há» #. This is a proper name. See the gettext manual, section Names. -#: src/cmp.c:44 +#: src/cmp.c:45 msgid "David MacKenzie" msgstr "David MacKenzie" -#: src/cmp.c:118 src/diff.c:875 src/diff3.c:459 src/sdiff.c:158 +#: src/cmp.c:119 src/diff.c:877 src/diff3.c:462 src/sdiff.c:159 #, c-format msgid "Try '%s --help' for more information." msgstr "Hãy chạy lệnh “%s --help†để xem thông tin thêm." @@ -566,12 +536,12 @@ msgstr "" msgid "options -l and -s are incompatible" msgstr "hai tùy chá»n -l và -s không tÆ°Æ¡ng thÃch vá»›i nhau" -#: src/cmp.c:155 src/diff.c:884 src/diff3.c:467 src/sdiff.c:167 src/sdiff.c:315 -#: src/sdiff.c:322 src/sdiff.c:874 src/util.c:853 src/util.c:953 src/util.c:960 +#: src/cmp.c:155 src/diff.c:885 src/diff3.c:469 src/sdiff.c:167 src/sdiff.c:315 +#: src/sdiff.c:322 src/sdiff.c:874 src/util.c:852 src/util.c:952 src/util.c:959 msgid "write failed" msgstr "không ghi được" -#: src/cmp.c:157 src/diff.c:886 src/diff.c:1465 src/diff3.c:469 src/sdiff.c:169 +#: src/cmp.c:157 src/diff.c:887 src/diff.c:1466 src/diff3.c:471 src/sdiff.c:169 msgid "standard output" msgstr "thiết bị xuất chuẩn" @@ -589,8 +559,8 @@ msgid "" "-i, --ignore-initial=SKIP1:SKIP2 skip first SKIP1 bytes of FILE1 and\n" " first SKIP2 bytes of FILE2" msgstr "" -"-i, --ignore-initial=Sá»1:Sá»2 bá» qua Sá»1 byte đầu của TỆP-TIN1 và \n" -" Sá»2 byte đầu của TỆP-TIN2." +"-i, --ignore-initial=Sá»1:Sá»2 bá» qua Sá»1 byte đầu của TẬP-TIN1 và \n" +" Sá»2 byte đầu của TẬP-TIN2." #: src/cmp.c:165 msgid "" @@ -617,7 +587,7 @@ msgstr "-v, --version Ä‘Æ°a ra thông tin phiên bản rồi thoát #: src/cmp.c:178 #, c-format msgid "Usage: %s [OPTION]... FILE1 [FILE2 [SKIP1 [SKIP2]]]\n" -msgstr "Cách dùng: %s [TÙY_CHỌN]... TẬP_TIN1 [TẬP_TIN2 [SKIP1 [SKIP2]]]\n" +msgstr "Cách dùng: %s [TÙY_CHỌN]… TẬP_TIN1 [TẬP_TIN2 [SKIP1 [SKIP2]]]\n" #: src/cmp.c:180 msgid "Compare two files byte by byte." @@ -631,7 +601,7 @@ msgstr "" "Tùy chá»n SKIP1 và SKIP2 chỉ định số byte sẽ được bá» qua\n" "tại vị trà bắt đầu của má»—i táºp tin (số không là mặc định)." -#: src/cmp.c:185 src/diff.c:996 src/diff3.c:507 src/sdiff.c:210 +#: src/cmp.c:185 src/diff.c:997 src/diff3.c:509 src/sdiff.c:210 msgid "" "Mandatory arguments to long options are mandatory for short options too.\n" msgstr "Tùy chá»n dà i yêu cầu đối số thì tùy chá»n ngắn cÅ©ng váºy.\n" @@ -652,7 +622,7 @@ msgstr "" msgid "If a FILE is '-' or missing, read standard input." msgstr "Nếu TẬP-TIN là “-â€, hay bá» trống, thì Ä‘á»c từ đầu và o tiêu chuẩn." -#: src/cmp.c:195 src/diff.c:984 src/sdiff.c:220 +#: src/cmp.c:195 src/diff.c:985 src/sdiff.c:220 msgid "Exit status is 0 if inputs are the same, 1 if different, 2 if trouble." msgstr "" "Trạng thái thoát là số 0 nếu hai đầu và o bằng nhau, số 1 nếu là khác nhau và " @@ -663,260 +633,275 @@ msgstr "" msgid "invalid --bytes value '%s'" msgstr "giá trị cho tùy chá»n --bytes “%s†không hợp lệ" -#: src/cmp.c:266 src/diff.c:793 src/diff3.c:353 src/sdiff.c:565 +#: src/cmp.c:266 src/diff.c:795 src/diff3.c:356 src/sdiff.c:565 #, c-format msgid "missing operand after '%s'" msgstr "thiếu toán hạng sau “%sâ€" -#: src/cmp.c:278 src/diff.c:795 src/diff3.c:355 src/sdiff.c:567 +#: src/cmp.c:278 src/diff.c:797 src/diff3.c:358 src/sdiff.c:567 #, c-format msgid "extra operand '%s'" msgstr "toán hạng bổ xung “%sâ€" -#: src/cmp.c:494 +#: src/cmp.c:498 #, c-format msgid "%s %s differ: byte %s, line %s\n" msgstr "%s %s có khác nhau: byte %s, dòng %s\n" -#: src/cmp.c:510 +#: src/cmp.c:514 #, c-format msgid "%s %s differ: byte %s, line %s is %3o %s %3o %s\n" msgstr "%s %s có khác nhau: byte %s, dòng %s là %3o %s %3o %s\n" -#: src/cmp.c:562 +#: src/cmp.c:571 #, c-format -msgid "cmp: EOF on %s\n" -msgstr "cmp: gặp kết thức táºp tin tại %s\n" +msgid "cmp: EOF on %s which is empty\n" +msgstr "cmp: gặp kết thức táºp tin trên %s cái mà trống rá»—ng\n" + +#: src/cmp.c:585 +#, c-format +msgid "cmp: EOF on %s after byte %s, line %s\n" +msgstr "cmp: gặp kết thức táºp tin trên %s sau byte %s, dòng %s\n" + +#: src/cmp.c:586 +#, c-format +msgid "cmp: EOF on %s after byte %s, in line %s\n" +msgstr "cmp: gặp kết thức táºp tin trên %s sau byte %s, ở dòng %s\n" + +#: src/cmp.c:592 +#, c-format +msgid "cmp: EOF on %s after byte %s\n" +msgstr "cmp: gặp kết thức táºp tin trên %s sau byte %s\n" # Tên há» #. This is a proper name. See the gettext manual, section Names. -#: src/diff.c:49 +#: src/diff.c:50 msgid "Paul Eggert" msgstr "Paul Eggert" # Tên há» #. This is a proper name. See the gettext manual, section Names. -#: src/diff.c:50 +#: src/diff.c:51 msgid "Mike Haertel" msgstr "Mike Haertel" # Tên há» #. This is a proper name. See the gettext manual, section Names. -#: src/diff.c:51 +#: src/diff.c:52 msgid "David Hayes" msgstr "David Hayes" # Tên há» #. This is a proper name. See the gettext manual, section Names. -#: src/diff.c:52 +#: src/diff.c:53 msgid "Richard Stallman" msgstr "Richard Stallman" # Tên há» #. This is a proper name. See the gettext manual, section Names. -#: src/diff.c:53 +#: src/diff.c:54 msgid "Len Tower" msgstr "Len Tower" -#: src/diff.c:351 +#: src/diff.c:353 #, c-format msgid "invalid context length '%s'" msgstr "Ä‘á»™ dà i ngữ cảnh không hợp lệ “%sâ€" -#: src/diff.c:434 +#: src/diff.c:436 #, c-format msgid "pagination not supported on this host" msgstr "máy chủ nà y không há»— trợ dà n trang" -#: src/diff.c:449 src/diff3.c:335 +#: src/diff.c:451 src/diff3.c:336 #, c-format msgid "too many file label options" msgstr "quá nhiá»u tùy chá»n nhãn táºp tin" -#: src/diff.c:526 +#: src/diff.c:528 #, c-format msgid "invalid width '%s'" msgstr "Ä‘á»™ rá»™ng không hợp lệ “%sâ€" -#: src/diff.c:530 +#: src/diff.c:532 msgid "conflicting width options" msgstr "nhiá»u tùy chá»n Ä‘á»™ rá»™ng xung Ä‘á»™t vá»›i nhau" -#: src/diff.c:555 +#: src/diff.c:557 #, c-format msgid "invalid horizon length '%s'" msgstr "Ä‘á»™ dà i chiá»u đứng không hợp lệ “%sâ€" -#: src/diff.c:611 +#: src/diff.c:613 #, c-format msgid "invalid tabsize '%s'" msgstr "cỡ ký tá»± tab không hợp lệ “%sâ€" -#: src/diff.c:615 +#: src/diff.c:617 msgid "conflicting tabsize options" msgstr "nhiá»u tùy chá»n cỡ ký tá»± tab xung Ä‘á»™t vá»›i nhau" -#: src/diff.c:770 +#: src/diff.c:772 msgid "--from-file and --to-file both specified" msgstr "" "ghi rõ cả hai tùy chá»n --from-file (từ táºp tin) và --to-file (và o táºp tin) " "Ä‘á»u" -#: src/diff.c:890 +#: src/diff.c:891 msgid " --normal output a normal diff (the default)" msgstr "" " --normal xuất ra định dạng diff thông thÆ°á»ng (mặc định)" -#: src/diff.c:891 +#: src/diff.c:892 msgid "-q, --brief report only when files differ" msgstr "" "-q, --brief chỉ báo cáo nếu những táºp tin khác vá»›i nhau" -#: src/diff.c:892 +#: src/diff.c:893 msgid "-s, --report-identical-files report when two files are the same" msgstr "-s, --report-identical-files báo cáo khi có hai táºp tin bằng nhau" -#: src/diff.c:893 +#: src/diff.c:894 msgid "" "-c, -C NUM, --context[=NUM] output NUM (default 3) lines of copied context" msgstr "" "-c, -C Sá», --context[=Sá»] xuất ra Sá» (mặc định là 3) dòng của ngữ cảnh" -#: src/diff.c:894 +#: src/diff.c:895 msgid "" "-u, -U NUM, --unified[=NUM] output NUM (default 3) lines of unified context" msgstr "" -"-u, -U Sá», --unified[=Sá»] xuất ra Sá» (mặc định là 3) dòng của ngữ cảnh " -"hợp nhất" +"-u, -U Sá», --unified[=Sá»] xuất ra Sá» (mặc định là 3) dòng của ngữ cảnh\n" +" hợp nhất" -#: src/diff.c:895 +#: src/diff.c:896 msgid "-e, --ed output an ed script" msgstr "-e, --ed xuất táºp lệnh loại ed" -#: src/diff.c:896 +#: src/diff.c:897 msgid "-n, --rcs output an RCS format diff" msgstr "" "-n, --rcs xuất dữ liệu khác biệt sá» dụng định dạng RCS" -#: src/diff.c:897 +#: src/diff.c:898 msgid "-y, --side-by-side output in two columns" -msgstr "-y, --side-by-side xuất ra theo Ä‘inh dạng hai cá»™t" +msgstr "-y, --side-by-side xuất ra theo định dạng hai cá»™t" -#: src/diff.c:898 +#: src/diff.c:899 msgid "" "-W, --width=NUM output at most NUM (default 130) print columns" msgstr "" "-W, --width=Sá» xuất tối Ä‘a Sá» cá»™t đã in ra (mặc định là 130)" -#: src/diff.c:899 +#: src/diff.c:900 msgid "" " --left-column output only the left column of common lines" msgstr "" -" --left-column kết xuất chỉ cá»™t bên trái của các dòng chung " -"nhau" +" --left-column kết xuất chỉ cá»™t bên trái của các dòng chung" -#: src/diff.c:900 +#: src/diff.c:901 msgid " --suppress-common-lines do not output common lines" msgstr " --suppress-common-lines không kết xuất các dòng chung nhau" -#: src/diff.c:902 +#: src/diff.c:903 msgid "-p, --show-c-function show which C function each change is in" msgstr "" -"-p, --show-c-function hiển thị cái mà từng hà m C thay đổi ở trong" +"-p, --show-c-function hiển thị cái mà từng hà m C thay đổi ở trong đó" -#: src/diff.c:903 +#: src/diff.c:904 msgid "-F, --show-function-line=RE show the most recent line matching RE" msgstr "-F, --show-function-line=RE hiển thị những dòng gần nhất khá»›p vá»›i RE" -#: src/diff.c:904 -#, fuzzy +#: src/diff.c:905 msgid "" " --label LABEL use LABEL instead of file name and timestamp\n" " (can be repeated)" msgstr "" -" --label NHÃN sá» dụng NHÃN thay vì tên táºp tin\n" +" --label NHÃN sá» dụng NHÃN thay vì tên táºp tin và dấu thá»i " +"gian\n" " (có thể được lặp lại)" -#: src/diff.c:907 +#: src/diff.c:908 msgid "-t, --expand-tabs expand tabs to spaces in output" msgstr "" -"-t, --expand-tabs mở rá»™ng ký tá»± tab ra ký tá»± khoảng cách khi kết " -"xuất" +"-t, --expand-tabs mở rá»™ng ký tá»± tab ra ký tá»± khoảng cách khi " +"kết\n" +" xuất" -#: src/diff.c:908 +#: src/diff.c:909 msgid "-T, --initial-tab make tabs line up by prepending a tab" msgstr "" "-T, --initial-tab sắp xếp tất cả ký tá»± tab bằng cách thêm\n" " má»™t tab và o trÆ°á»›c" -#: src/diff.c:909 +#: src/diff.c:910 msgid "" " --tabsize=NUM tab stops every NUM (default 8) print columns" msgstr "" " --tabsize=SỠđịnh khoảng cách tab sau má»—i Sá» cá»™t đã in ra\n" " (mặc định là 8)" -#: src/diff.c:910 +#: src/diff.c:911 msgid "" " --suppress-blank-empty suppress space or tab before empty output lines" msgstr "" -" --suppress-blank-empty thu hồi khoảng cách hay cá»™t tab đằng trÆ°á»›c " -"dòng kết xuất trống" +" --suppress-blank-empty thu hồi khoảng cách hay tab đằng trÆ°á»›c dòng " +"kết\n" +" xuất trống" -#: src/diff.c:911 +#: src/diff.c:912 msgid "-l, --paginate pass output through 'pr' to paginate it" msgstr "" "-l, --paginate chuyển dữ liệu kết xuất qua “pr†để dà n trang " "nó" -#: src/diff.c:913 +#: src/diff.c:914 msgid "" "-r, --recursive recursively compare any subdirectories found" msgstr "" "-r, --recursive so sánh đệ qui má»i thÆ° mục con đã tìm thấy" -#: src/diff.c:914 +#: src/diff.c:915 msgid " --no-dereference don't follow symbolic links" msgstr " --no-dereference không theo liên kết má»m" -#: src/diff.c:915 +#: src/diff.c:916 msgid "-N, --new-file treat absent files as empty" msgstr "-N --new-file coi táºp tin vắng mặt là trống" -#: src/diff.c:916 +#: src/diff.c:917 msgid " --unidirectional-new-file treat absent first files as empty" msgstr " --unidirectional-new-file coi táºp tin đầu mà vắng mặt là trống" -#: src/diff.c:917 +#: src/diff.c:918 msgid " --ignore-file-name-case ignore case when comparing file names" msgstr "" -" --ignore-file-name-case bá» qua chữ HOA/thÆ°á»ng khi so sánh nhiá»u tên táºp " -"tin" +" --ignore-file-name-case bá» qua chữ HOA/thÆ°á»ng khi so sánh\n" +" các tên táºp tin" -#: src/diff.c:918 +#: src/diff.c:919 msgid " --no-ignore-file-name-case consider case when comparing file names" msgstr "" -" --no-ignore-file-name-case so sánh chữ HOA/thÆ°á»ng khi so sánh tên táºp " -"tin" +" --no-ignore-file-name-case phân biệt HOA/thÆ°á»ng khi so sánh tên táºp tin" -#: src/diff.c:919 +#: src/diff.c:920 msgid "-x, --exclude=PAT exclude files that match PAT" msgstr "-x, --exclude=MẪU loại trừ các táºp tin khá»›p vá»›i MẪU ấy" -#: src/diff.c:920 +#: src/diff.c:921 msgid "" "-X, --exclude-from=FILE exclude files that match any pattern in FILE" msgstr "" "-X, --exclude-from=TẬP_TIN loại trừ má»i táºp tin khá»›p vá»›i bất cứ mẫu nà o " "trong TẬP TIN ấy" -#: src/diff.c:921 +#: src/diff.c:922 msgid "" "-S, --starting-file=FILE start with FILE when comparing directories" msgstr "" "-S, --starting-file=TẬP_TIN bắt đầu vá»›i TẬP TIN khi so sánh nhiá»u thÆ° mục" -#: src/diff.c:922 +#: src/diff.c:923 msgid "" " --from-file=FILE1 compare FILE1 to all operands;\n" " FILE1 can be a directory" @@ -924,7 +909,7 @@ msgstr "" " --from-file=TẬP_TIN1 so TẬP TIN 1 vá»›i tất cả toán hạng;\n" " TẬP TIN 1 có thể là thÆ° mục" -#: src/diff.c:924 +#: src/diff.c:925 msgid "" " --to-file=FILE2 compare all operands to FILE2;\n" " FILE2 can be a directory" @@ -932,76 +917,76 @@ msgstr "" " --to-file=TẬP_TIN2 So tất cả toán hạng vá»›i TẬP TIN 2;\n" " TẬP TIN 2 có thể là thÆ° mục" -#: src/diff.c:927 +#: src/diff.c:928 msgid "" "-i, --ignore-case ignore case differences in file contents" msgstr "" -"-i, --ignore-case không phân biệt chữ HOA/thÆ°á»ng trong ná»™i " -"dung táºp tin" +"-i, --ignore-case không phân biệt chữ HOA/thÆ°á»ng trong ná»™i\n" +" dung táºp tin" -#: src/diff.c:928 +#: src/diff.c:929 msgid "-E, --ignore-tab-expansion ignore changes due to tab expansion" msgstr "-E, --ignore-tab-expansion bá» qua má»i thay đổi do mở rá»™ng tab" -#: src/diff.c:929 +#: src/diff.c:930 msgid "-Z, --ignore-trailing-space ignore white space at line end" msgstr "-Z, --ignore-trailing-space bá» qua tất cả dấu cách ở cuối dòng" -#: src/diff.c:930 +#: src/diff.c:931 msgid "" "-b, --ignore-space-change ignore changes in the amount of white space" msgstr "" "-b, --ignore-space-change bá» qua thay đổi gây ra bởi nhóm dấu cách" -#: src/diff.c:931 +#: src/diff.c:932 msgid "-w, --ignore-all-space ignore all white space" msgstr "-w, --ignore-all-space bá» qua tất cả dấu cách" -#: src/diff.c:932 +#: src/diff.c:933 msgid "" "-B, --ignore-blank-lines ignore changes where lines are all blank" msgstr "-B, --ignore-blank-lines bá» qua thay đổi do dòng trống" -#: src/diff.c:933 +#: src/diff.c:934 msgid "-I, --ignore-matching-lines=RE ignore changes where all lines match RE" msgstr "" "-I, --ignore-matching-lines=RE bá» qua thay đổi do mà má»i dòng khá»›p vá»›i RE" -#: src/diff.c:935 +#: src/diff.c:936 msgid "-a, --text treat all files as text" msgstr "-a, --text xá» lý má»i táºp tin là văn bản thÆ°á»ng" -#: src/diff.c:936 +#: src/diff.c:937 msgid " --strip-trailing-cr strip trailing carriage return on input" msgstr "" " --strip-trailing-cr cắt bá» ký tá»± vỠđầu dòng (cr) theo sau khi gõ" -#: src/diff.c:938 +#: src/diff.c:939 msgid " --binary read and write data in binary mode" msgstr "" " --binary Ä‘á»c và ghi dữ liệu trong chế Ä‘á»™ nhị phân" -#: src/diff.c:941 +#: src/diff.c:942 msgid "" "-D, --ifdef=NAME output merged file with '#ifdef NAME' diffs" msgstr "" "-D, --ifdef=TÊN kết xuất táºp tin đã trá»™n vá»›i khác biệt " "“#ifdef TÊNâ€" -#: src/diff.c:942 +#: src/diff.c:943 msgid " --GTYPE-group-format=GFMT format GTYPE input groups with GFMT" msgstr " --GTYPE-group-format=GFMT định dạng nháºp GTYPE vá»›i GFMT " -#: src/diff.c:943 +#: src/diff.c:944 msgid " --line-format=LFMT format all input lines with LFMT" msgstr "" " --line-format=LFMT định dạng tất cảc các dòng và o vá»›i LFMT" -#: src/diff.c:944 +#: src/diff.c:945 msgid " --LTYPE-line-format=LFMT format LTYPE input lines with LFMT" msgstr " --LTYPE-line-format=LFMT định dạng nháºp LTYPE vá»›i LFMT" -#: src/diff.c:945 +#: src/diff.c:946 msgid "" " These format options provide fine-grained control over the output\n" " of diff, generalizing -D/--ifdef." @@ -1009,13 +994,13 @@ msgstr "" " NhÆ°ng tùy chá»n đó Ä‘iểu khiển kết xuất ra định dạng diff\n" " đẹp hÆ¡n, khái quát hóa -D/--ifdef." -#: src/diff.c:947 +#: src/diff.c:948 msgid " LTYPE is 'old', 'new', or 'unchanged'. GTYPE is LTYPE or 'changed'." msgstr "" " LTYPE là “cÅ©â€, “má»›iâ€, hoặc “chÆ°a thay đổiâ€. GTYPE là LTYPE hoặc “thay đổi " "rồiâ€." -#: src/diff.c:948 +#: src/diff.c:949 msgid "" " GFMT (only) may contain:\n" " %< lines from FILE1\n" @@ -1042,7 +1027,7 @@ msgstr "" " E F-1\n" " M L+1 %(A=B?T:E) nếu A bằng B thì T nếu không thì E" -#: src/diff.c:960 +#: src/diff.c:961 msgid "" " LFMT (only) may contain:\n" " %L contents of line\n" @@ -1054,7 +1039,7 @@ msgstr "" " %l ná»™i dung của dòng, loại trừ ký tá»± dòng má»›i nà o Ä‘i theo\n" " %[-][Ä_RỘNG][.[PREC]]{doxX}n đặc tả dạng printf cho số dòng đầu và o" -#: src/diff.c:964 +#: src/diff.c:965 msgid "" " Both GFMT and LFMT may contain:\n" " %% %\n" @@ -1068,152 +1053,149 @@ msgstr "" " %c'\\OOO' ký tá»± có mã bát phân OOO\n" " C ký tá»± C (các ký tá»± khác đại diện cho chÃnh chúng)" -#: src/diff.c:970 +#: src/diff.c:971 msgid "-d, --minimal try hard to find a smaller set of changes" msgstr "-d, --minimal cố tìm má»™t thay đổi nhá»" -#: src/diff.c:971 +#: src/diff.c:972 msgid " --horizon-lines=NUM keep NUM lines of the common prefix and suffix" msgstr " --horizon-lines=Sá» giữ Sá» dòng của tiá»n tố và háºu tố chung" -#: src/diff.c:972 +#: src/diff.c:973 msgid "" " --speed-large-files assume large files and many scattered small changes" msgstr "" " --speed-large-files giả định táºp tin lá»›n và nhiá»u thay đổi nhá» rải rác" -#: src/diff.c:973 -msgid "" -" --color[=WHEN] colorize the output; WHEN can be 'never', 'always'," -msgstr "" - #: src/diff.c:974 -#, fuzzy -msgid " or 'auto' (the default)" -msgstr "" -" --normal xuất ra định dạng diff thông thÆ°á»ng (mặc định)" - -#: src/diff.c:975 msgid "" -" --palette=PALETTE specify the colors to use when --color is active" +" --color[=WHEN] colorize the output; WHEN can be 'never', " +"'always',\n" +" or 'auto' (the default)" msgstr "" +" --color[=WHEN] tô mà u kết xuất; WHEN có thể là 'never', 'always',\n" +" hay 'auto' (mặc định)" #: src/diff.c:976 msgid "" -" PALETTE is a colon-separated list terminfo " -"capabilities" +" --palette=PALETTE the colors to use when --color is active; PALETTE " +"is\n" +" a colon-separated list of terminfo capabilities" msgstr "" +" --palette=PALETTE các mà u được dùng khi --color kÃch hoạt; PALETTE là " +"má»™t\n" +" danh sách terminfo capabilities ngăn cách bằng " +"dấu phẩy" -#: src/diff.c:978 +#: src/diff.c:979 msgid " --help display this help and exit" msgstr " --help hiển thị trợ giúp nà y rồi thoát" -#: src/diff.c:979 +#: src/diff.c:980 msgid "-v, --version output version information and exit" msgstr "-v, --version Ä‘Æ°a ra thông tin phiên bản rồi thoát" -#: src/diff.c:981 -#, fuzzy +#: src/diff.c:982 msgid "FILES are 'FILE1 FILE2' or 'DIR1 DIR2' or 'DIR FILE' or 'FILE DIR'." msgstr "" -"(CÃC) TẬP TIN là “TẬP_TIN1 TẬP_TIN2†hoặc “THƯ_MỤC1 THƯ_MỤC2†hoặc “THƯ_MỤC " -"TẬP_TIN...†hay “TẬP_TIN... THƯ_MỤCâ€." +"CÃC TẬP TIN là “TẬP_TIN1 TẬP_TIN2†hoặc “THƯ_MỤC1 THƯ_MỤC2†hoặc “THƯ_MỤC " +"TẬP_TIN†hay “TẬP_TIN THƯ_MỤCâ€." -#: src/diff.c:982 +#: src/diff.c:983 msgid "" "If --from-file or --to-file is given, there are no restrictions on FILE(s)." msgstr "" "Nếu Ä‘Æ°a ra tùy chá»n --from-file (từ táºp tin) hay --to-file (và o táºp tin) thì " "không có giá»›i hạn TẬP TIN." -#: src/diff.c:983 src/diff3.c:526 src/sdiff.c:219 +#: src/diff.c:984 src/diff3.c:528 src/sdiff.c:219 msgid "If a FILE is '-', read standard input." msgstr "Nếu TẬP-TIN là “-â€, thì Ä‘á»c từ đầu và o tiêu chuẩn." -#: src/diff.c:993 +#: src/diff.c:994 #, c-format msgid "Usage: %s [OPTION]... FILES\n" -msgstr "Cách dùng: %s [TÙY_CHỌN]... CÃC_TẬP_TIN\n" +msgstr "Cách dùng: %s [TÙY_CHỌN]… CÃC_TẬP_TIN\n" -#: src/diff.c:994 +#: src/diff.c:995 msgid "Compare FILES line by line." msgstr "So sánh các TẬP-TIN theo từng dòng." -#: src/diff.c:1028 +#: src/diff.c:1029 #, c-format msgid "conflicting %s option value '%s'" msgstr "tùy chá»n %s xung Ä‘á»™t, giá trị “%sâ€" -#: src/diff.c:1041 +#: src/diff.c:1042 #, c-format msgid "conflicting output style options" msgstr "nhiá»u tùy chá»n Ä‘iá»u khiển định dạng xuất xung Ä‘á»™t vá»›i nhau" -#: src/diff.c:1057 -#, fuzzy, c-format +#: src/diff.c:1058 +#, c-format msgid "invalid color '%s'" -msgstr "Ä‘á»™ rá»™ng không hợp lệ “%sâ€" +msgstr "mà u không hợp lệ “%sâ€" -#: src/diff.c:1113 src/diff.c:1323 +#: src/diff.c:1114 src/diff.c:1324 #, c-format msgid "Only in %s: %s\n" msgstr "Chỉ trong %s: %s\n" -#: src/diff.c:1247 +#: src/diff.c:1248 msgid "cannot compare '-' to a directory" msgstr "không thể so sánh “-†vá»›i má»™t thÆ° mục" -#: src/diff.c:1282 +#: src/diff.c:1283 msgid "-D option not supported with directories" msgstr "không há»— trợ tùy chá»n -D vá»›i thÆ° mục" -#: src/diff.c:1291 +#: src/diff.c:1292 #, c-format msgid "Common subdirectories: %s and %s\n" msgstr "ThÆ° mục con chung: %s và %s\n" -#: src/diff.c:1333 src/diff.c:1383 +#: src/diff.c:1334 src/diff.c:1384 #, c-format msgid "File %s is a %s while file %s is a %s\n" msgstr "Táºp tin %s là má»™t %s trong khi táºp tin %s là má»™t %s.\n" -#: src/diff.c:1369 +#: src/diff.c:1370 #, c-format msgid "Symbolic links %s and %s differ\n" msgstr "Hai liên kết má»m %s và %s là khác nhau\n" -#: src/diff.c:1456 +#: src/diff.c:1457 #, c-format msgid "Files %s and %s are identical\n" msgstr "Cả %s và %s là cùng má»™t táºp tin\n" # Tên há» #. This is a proper name. See the gettext manual, section Names. -#: src/diff3.c:41 +#: src/diff3.c:42 msgid "Randy Smith" msgstr "Randy Smith" -#: src/diff3.c:348 +#: src/diff3.c:351 #, c-format msgid "incompatible options" msgstr "nhiá»u tùy chá»n không tÆ°Æ¡ng thÃch vá»›i nhau" -#: src/diff3.c:388 +#: src/diff3.c:391 msgid "'-' specified for more than one input file" msgstr "đã chỉ ra “-†cho nhiá»u hÆ¡n má»™t táºp tin đầu và o" -#: src/diff3.c:439 src/diff3.c:1288 src/diff3.c:1692 src/diff3.c:1747 +#: src/diff3.c:442 src/diff3.c:1290 src/diff3.c:1693 src/diff3.c:1748 #: src/sdiff.c:307 src/sdiff.c:844 src/sdiff.c:855 msgid "read failed" msgstr "Ä‘á»c gặp lá»—i" -#: src/diff3.c:473 +#: src/diff3.c:475 msgid "-A, --show-all output all changes, bracketing conflicts" msgstr "" "-A, --show-all kết xuất tất cả thay đổi, đặt má»i xung Ä‘á»™t trong " "ngoặc Ä‘Æ¡n" -#: src/diff3.c:475 +#: src/diff3.c:477 msgid "" "-e, --ed output ed script incorporating changes\n" " from OLDFILE to YOURFILE into MYFILE" @@ -1222,12 +1204,12 @@ msgstr "" " từ TẬP_TIN_CŨ thà nh TẬP_TIN_CỦA_BẠN và o " "TẬP_TIN_TÔI." -#: src/diff3.c:477 +#: src/diff3.c:479 msgid "-E, --show-overlap like -e, but bracket conflicts" msgstr "" "-E, --show-overlap giống -e, nhÆ°ng đặt xung Ä‘á»™t trong ngoặc Ä‘Æ¡n" -#: src/diff3.c:478 +#: src/diff3.c:480 msgid "" "-3, --easy-only like -e, but incorporate only nonoverlapping " "changes" @@ -1235,24 +1217,24 @@ msgstr "" "-3, --easy-only giống -e, nhÆ°ng chỉ sát nháºp những thay đổi " "không chồng lấp" -#: src/diff3.c:479 +#: src/diff3.c:481 msgid "" "-x, --overlap-only like -e, but incorporate only overlapping changes" msgstr "" "-x, --overlap-only giống -e, nhÆ°ng chỉ sát nháºp những thay đổi bị " "chồng lấp" -#: src/diff3.c:480 +#: src/diff3.c:482 msgid "-X like -x, but bracket conflicts" msgstr "" "-X giống -x, nhÆ°ng đặt xung Ä‘á»™t trong ngoặc Ä‘Æ¡n" -#: src/diff3.c:481 +#: src/diff3.c:483 msgid "-i append 'w' and 'q' commands to ed scripts" msgstr "" "-i nối thêm hai lệnh “w†và “q†và o văn lệnh ed" -#: src/diff3.c:483 +#: src/diff3.c:485 msgid "" "-m, --merge output actual merged file, according to\n" " -A if no other options are given" @@ -1262,27 +1244,27 @@ msgstr "" " tùy chá»n -A nếu nhÆ° không có tùy chá»n khác " "được chỉ ra" -#: src/diff3.c:486 +#: src/diff3.c:488 msgid "-a, --text treat all files as text" msgstr "-a, --text coi má»i táºp tin là văn bản thÆ°á»ng" -#: src/diff3.c:487 +#: src/diff3.c:489 msgid " --strip-trailing-cr strip trailing carriage return on input" msgstr "" " --strip-trailing-cr cắt bá» ký tá»± vỠđầu dòng (cr) theo sau khi nháºp" -#: src/diff3.c:488 +#: src/diff3.c:490 msgid "-T, --initial-tab make tabs line up by prepending a tab" msgstr "" "-T, --initial-tab tạo khoảng tab cho dòng bằng cách thêm má»™t tab " "và o trÆ°á»›c" -#: src/diff3.c:489 +#: src/diff3.c:491 msgid " --diff-program=PROGRAM use PROGRAM to compare files" msgstr "" " --diff-program=CHÆ¯Æ NG_TRÃŒNH dùng CHÆ¯Æ NG_TRÃŒNH để so sánh các táºp tin" -#: src/diff3.c:490 +#: src/diff3.c:492 msgid "" "-L, --label=LABEL use LABEL instead of file name\n" " (can be repeated up to three times)" @@ -1290,24 +1272,24 @@ msgstr "" "-L, --label=NHÃN sá» dụng NHÃN thay vì tên táºp tin\n" " (có thể lặp lại đến ba lần)" -#: src/diff3.c:493 +#: src/diff3.c:495 msgid " --help display this help and exit" msgstr " --help hiển thị trợ giúp nà y rồi thoát" -#: src/diff3.c:494 +#: src/diff3.c:496 msgid "-v, --version output version information and exit" msgstr "-v, --version Ä‘Æ°a ra thông tin phiên bản rồi thoát" -#: src/diff3.c:503 +#: src/diff3.c:505 #, c-format msgid "Usage: %s [OPTION]... MYFILE OLDFILE YOURFILE\n" -msgstr "Cách dùng: %s [TÙY_CHỌN]... TẬP_TIN_TÔI TẬP_TIN_CŨ TẬP_TIN_BẠN\n" +msgstr "Cách dùng: %s [TÙY_CHỌN]… TẬP_TIN_TÔI TẬP_TIN_CŨ TẬP_TIN_BẠN\n" -#: src/diff3.c:505 +#: src/diff3.c:507 msgid "Compare three files line by line." msgstr "So sánh ba táºp tin từng dòng má»™t." -#: src/diff3.c:515 +#: src/diff3.c:517 msgid "" "\n" "The default output format is a somewhat human-readable representation of\n" @@ -1333,49 +1315,49 @@ msgstr "" "và kết xuất là táºp tin đã được trá»™n. Vá»›i kiểu đầu và o Ãt dùng, đây là cách\n" "hợp lý hÆ¡n sá» dụng ed.\n" -#: src/diff3.c:527 +#: src/diff3.c:529 msgid "Exit status is 0 if successful, 1 if conflicts, 2 if trouble." msgstr "" "Trạng thái thoát là số 0 nếu thà nh công, số 1 nếu có xung Ä‘á»™t nà o và số 2 " "nếu gặp lá»—i." -#: src/diff3.c:720 +#: src/diff3.c:722 msgid "internal error: screwup in format of diff blocks" msgstr "gặp lá»—i ná»™i bá»™: không định dạng khối khác biệt được." -#: src/diff3.c:1015 +#: src/diff3.c:1017 #, c-format msgid "%s: diff failed: " msgstr "%s: diff gặp lá»—i: " -#: src/diff3.c:1037 +#: src/diff3.c:1039 msgid "internal error: invalid diff type in process_diff" msgstr "" "gặp lá»—i ná»™i bá»™: loại khác biệt không hợp lệ trong process_diff (xá» lý khác " "biệt)" -#: src/diff3.c:1062 +#: src/diff3.c:1064 msgid "invalid diff format; invalid change separator" msgstr "khuôn dạng diff không hợp lệ; ký tá»± ngăn cách thay đổi không hợp lê" -#: src/diff3.c:1298 +#: src/diff3.c:1300 msgid "invalid diff format; incomplete last line" msgstr "khuôn dạng diff không hợp lệ; chÆ°a xong dòng cuối cùng" -#: src/diff3.c:1322 src/sdiff.c:275 src/util.c:970 +#: src/diff3.c:1324 src/sdiff.c:275 src/util.c:969 #, c-format msgid "subsidiary program '%s' could not be invoked" msgstr "không gá»i được chÆ°Æ¡ng trình phụ trợ “%sâ€" -#: src/diff3.c:1347 +#: src/diff3.c:1349 msgid "invalid diff format; incorrect leading line chars" msgstr "khuôn dạng khác biệt không hợp lệ; ký tá»± Ä‘i trÆ°á»›c dòng là không đúng" -#: src/diff3.c:1420 +#: src/diff3.c:1422 msgid "internal error: invalid diff type passed to output" msgstr "gặp lá»—i ná»™i bá»™: kiểu diff không hợp lệ được chuyển qua cho kết xuất" -#: src/diff3.c:1694 src/diff3.c:1751 +#: src/diff3.c:1695 src/diff3.c:1752 msgid "input file shrank" msgstr "táºp tin đầu và o co lại" @@ -1391,7 +1373,7 @@ msgstr "%s: vòng lặp thÆ° mục đệ quy" # Tên há» #. This is a proper name. See the gettext manual, section Names. -#: src/sdiff.c:42 +#: src/sdiff.c:43 msgid "Thomas Lord" msgstr "Thomas Lord" @@ -1446,8 +1428,7 @@ msgstr "-a, --text coi má»i táºp tin là văn bản thÆ°á»n msgid "" "-w, --width=NUM output at most NUM (default 130) print columns" msgstr "" -"-w, --width=Sá» kết xuất tối Ä‘a Sá» cá»™t đã in ra (mặc định là " -"130)" +"-w, --width=Sá» kết xuất nhiểu nhất là Sá» cá»™t (mặc định là 130)" #: src/sdiff.c:186 msgid "" @@ -1463,8 +1444,8 @@ msgstr "-s, --suppress-common-lines không kết xuất các dòng chung nhau" #: src/sdiff.c:189 msgid "-t, --expand-tabs expand tabs to spaces in output" msgstr "" -"-t, --expand-tabs mở rá»™ng ký tá»± tab ra ký tá»± khoảng trắng khi kết " -"xuất" +"-t, --expand-tabs khai triển ký tá»± tab thà nh các khoảng trắng\n" +" khi kết xuất" #: src/sdiff.c:190 msgid "" @@ -1500,11 +1481,11 @@ msgstr "-v, --version Ä‘Æ°a ra thông tin phiên bản rồi thoà #: src/sdiff.c:206 #, c-format msgid "Usage: %s [OPTION]... FILE1 FILE2\n" -msgstr "Cách dùng: %s [TÙY_CHỌN]... TẬP_TIN1 TẬP_TIN2\n" +msgstr "Cách dùng: %s [TÙY_CHỌN]… TẬP_TIN1 TẬP_TIN2\n" #: src/sdiff.c:208 msgid "Side-by-side merge of differences between FILE1 and FILE2." -msgstr "Hòa trá»™n những khác biệt TỆP_TIN1 VÀ TỆP_TIN2 cạnh nhau." +msgstr "Hòa trá»™n những khác biệt TẬP_TIN1 VÀ TẬP_TIN2 cạnh nhau." #: src/sdiff.c:329 msgid "cannot interactively merge standard input" @@ -1538,15 +1519,39 @@ msgstr "" "v:\tBao gồm dòng chung xuất má»™t cách chi tiết.\n" "q:\tThoát.\n" -#: src/util.c:663 -#, fuzzy, c-format +#: src/util.c:662 +#, c-format msgid "unrecognized prefix: %s" -msgstr "%s: không nháºn ra tùy chá»n “--%sâ€\n" +msgstr "không hiểu tiá»n tố: %s" -#: src/util.c:693 +#: src/util.c:692 #, c-format msgid "unparsable value for --palette" -msgstr "" +msgstr "không thể phân tÃch giá trị cho --palette" + +#~ msgid "%s: option '--%s' doesn't allow an argument\n" +#~ msgstr "%s: tùy chá»n “--%s†không cho phép đối số\n" + +#~ msgid "%s: unrecognized option '--%s'\n" +#~ msgstr "%s: không nháºn ra tùy chá»n “--%sâ€\n" + +#~ msgid "%s: option '-W %s' is ambiguous\n" +#~ msgstr "%s: tùy chá»n “-W %s†chÆ°a rõ rà ng\n" + +#~ msgid "%s: option '-W %s' doesn't allow an argument\n" +#~ msgstr "%s: tùy chá»n “-W %s†không cho phép đối số\n" + +#~ msgid "%s: option '-W %s' requires an argument\n" +#~ msgstr "%s: tùy chá»n “-W %s†yêu cầu má»™t đối số\n" + +#~ msgid " or 'auto' (the default)" +#~ msgstr " hay 'auto' (mặc định)" + +#~ msgid "" +#~ " --palette=PALETTE specify the colors to use when --color is active" +#~ msgstr "" +#~ " --palette=PALETTE chỉ định các mà u sẽ dùng khi --color được kÃch " +#~ "hoạt" #~ msgid "-i SKIP1:SKIP2 --ignore-initial=SKIP1:SKIP2" #~ msgstr "-i Sá»1:Sá»2 --ignore-initial=Sá»1:Sá»2" diff --git a/po/zh_CN.gmo b/po/zh_CN.gmo Binary files differindex db269e4..f0f643e 100644 --- a/po/zh_CN.gmo +++ b/po/zh_CN.gmo diff --git a/po/zh_CN.po b/po/zh_CN.po index f3b5066..55d35a9 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: diffutils 3.3-pre1\n" "Report-Msgid-Bugs-To: bug-diffutils@gnu.org\n" -"POT-Creation-Date: 2016-08-20 22:22-0700\n" +"POT-Creation-Date: 2017-05-21 13:26-0700\n" "PO-Revision-Date: 2016-02-17 19:23+0100\n" "Last-Translator: Mingye Wang (Arthur2e5) <arthur200126@gmail.com>\n" "Language-Team: Chinese (simplified) <i18n-zh@googlegroups.com>\n" @@ -17,32 +17,33 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"X-Bugs: Report translation errors to the Language-Team address.\n" "X-Generator: Poedit 1.8.7\n" -#: lib/argmatch.c:133 +#: lib/argmatch.c:134 #, fuzzy, c-format msgid "invalid argument %s for %s" msgstr "æ— æ•ˆçš„ %s%s å‚æ•° “%sâ€" -#: lib/argmatch.c:134 +#: lib/argmatch.c:135 #, c-format msgid "ambiguous argument %s for %s" msgstr "" -#: lib/argmatch.c:153 +#: lib/argmatch.c:154 #, fuzzy msgid "Valid arguments are:" msgstr "æ— æ•ˆçš„ %s%s å‚æ•° “%sâ€" -#: lib/c-stack.c:204 lib/c-stack.c:297 +#: lib/c-stack.c:203 lib/c-stack.c:296 msgid "program error" msgstr "程åºé”™è¯¯" -#: lib/c-stack.c:205 lib/c-stack.c:298 +#: lib/c-stack.c:204 lib/c-stack.c:297 msgid "stack overflow" msgstr "æ ˆæº¢å‡º" -#: lib/error.c:191 +#: lib/error.c:195 msgid "Unknown system error" msgstr "未知的系统错误" @@ -146,66 +147,41 @@ msgstr "" msgid "weird file" msgstr "奇怪的文件" -#: lib/getopt.c:575 lib/getopt.c:604 -#, c-format -msgid "%s: option '%s' is ambiguous; possibilities:" -msgstr "%s：选项 “%s†æ„义ä¸æ˜Žç¡®ï¼›å¯èƒ½æ€§å¦‚下：" - -#: lib/getopt.c:619 +#: lib/getopt.c:278 #, fuzzy, c-format -msgid "%s: option '%s' is ambiguous\n" +msgid "%s: option '%s%s' is ambiguous\n" msgstr "%s：选项 “-W %s†æ„义ä¸æ˜Žç¡®\n" -#: lib/getopt.c:654 lib/getopt.c:658 -#, c-format -msgid "%s: option '--%s' doesn't allow an argument\n" -msgstr "%s：选项 “--%s†ä¸æŽ¥å—å‚æ•°\n" +#: lib/getopt.c:284 +#, fuzzy, c-format +msgid "%s: option '%s%s' is ambiguous; possibilities:" +msgstr "%s：选项 “%s†æ„义ä¸æ˜Žç¡®ï¼›å¯èƒ½æ€§å¦‚下：" -#: lib/getopt.c:667 lib/getopt.c:672 -#, c-format -msgid "%s: option '%c%s' doesn't allow an argument\n" +#: lib/getopt.c:319 +#, fuzzy, c-format +msgid "%s: unrecognized option '%s%s'\n" +msgstr "%s：选项 “%c%sâ€ æ— æ³•è¯†åˆ«\n" + +#: lib/getopt.c:345 +#, fuzzy, c-format +msgid "%s: option '%s%s' doesn't allow an argument\n" msgstr "%s：选项 “%c%s†ä¸æŽ¥å—å‚æ•°\n" -#: lib/getopt.c:715 lib/getopt.c:734 -#, c-format -msgid "%s: option '--%s' requires an argument\n" +#: lib/getopt.c:360 +#, fuzzy, c-format +msgid "%s: option '%s%s' requires an argument\n" msgstr "%s：选项 “%s†需è¦ä¸€ä¸ªå‚æ•°\n" -#: lib/getopt.c:772 lib/getopt.c:775 -#, c-format -msgid "%s: unrecognized option '--%s'\n" -msgstr "%s：选项 “--%sâ€ æ— æ³•è¯†åˆ«\n" - -#: lib/getopt.c:783 lib/getopt.c:786 -#, c-format -msgid "%s: unrecognized option '%c%s'\n" -msgstr "%s：选项 “%c%sâ€ æ— æ³•è¯†åˆ«\n" - -#: lib/getopt.c:835 lib/getopt.c:838 +#: lib/getopt.c:621 #, c-format msgid "%s: invalid option -- '%c'\n" msgstr "%sï¼šæ— æ•ˆé€‰é¡¹ -- “%câ€\n" -#: lib/getopt.c:891 lib/getopt.c:908 lib/getopt.c:1118 lib/getopt.c:1136 +#: lib/getopt.c:636 lib/getopt.c:682 #, c-format msgid "%s: option requires an argument -- '%c'\n" msgstr "%s：选项需è¦ä¸€ä¸ªå‚æ•° -- “%câ€\n" -#: lib/getopt.c:964 lib/getopt.c:980 -#, c-format -msgid "%s: option '-W %s' is ambiguous\n" -msgstr "%s：选项 “-W %s†æ„义ä¸æ˜Žç¡®\n" - -#: lib/getopt.c:1004 lib/getopt.c:1022 -#, c-format -msgid "%s: option '-W %s' doesn't allow an argument\n" -msgstr "%s：选项 “-W %s†ä¸æŽ¥å—å‚æ•°\n" - -#: lib/getopt.c:1043 lib/getopt.c:1061 -#, c-format -msgid "%s: option '-W %s' requires an argument\n" -msgstr "%s：选项 “%s†需è¦ä¸€ä¸ªå‚æ•°\n" - #. TRANSLATORS: #. Get translations for open and closing quotation marks. #. The message catalog should translate "`" to a left @@ -227,11 +203,11 @@ msgstr "%s：选项 “%s†需è¦ä¸€ä¸ªå‚æ•°\n" #. If you don't know what to put here, please see #. <http://en.wikipedia.org/wiki/Quotation_marks_in_other_languages> #. and use glyphs suitable for your language. -#: lib/quotearg.c:347 +#: lib/quotearg.c:362 msgid "`" msgstr "“" -#: lib/quotearg.c:348 +#: lib/quotearg.c:363 msgid "'" msgstr "â€" @@ -524,7 +500,7 @@ msgstr "%s 主页: <http://www.gnu.org/software/%s/>\n" msgid "General help using GNU software: <http://www.gnu.org/gethelp/>\n" msgstr "使用 GNU 软件的通用帮助：<http://www.gnu.org/gethelp/>\n" -#: src/analyze.c:454 src/diff.c:1400 +#: src/analyze.c:454 src/diff.c:1401 #, c-format msgid "Files %s and %s differ\n" msgstr "文件 %s å’Œ %s ä¸åŒ\n" @@ -534,21 +510,21 @@ msgstr "文件 %s å’Œ %s ä¸åŒ\n" msgid "Binary files %s and %s differ\n" msgstr "二进制文件 %s å’Œ %s ä¸åŒ\n" -#: src/analyze.c:697 src/diff3.c:1463 src/util.c:1255 +#: src/analyze.c:706 src/diff3.c:1465 src/util.c:1254 msgid "No newline at end of file" msgstr "文件尾没有æ¢è¡Œç¬¦" #. This is a proper name. See the gettext manual, section Names. -#: src/cmp.c:43 +#: src/cmp.c:44 msgid "Torbjorn Granlund" msgstr "" #. This is a proper name. See the gettext manual, section Names. -#: src/cmp.c:44 +#: src/cmp.c:45 msgid "David MacKenzie" msgstr "" -#: src/cmp.c:118 src/diff.c:875 src/diff3.c:459 src/sdiff.c:158 +#: src/cmp.c:119 src/diff.c:877 src/diff3.c:462 src/sdiff.c:159 #, c-format msgid "Try '%s --help' for more information." msgstr "请å°è¯• “%s --helpâ€ï¼Œä»¥èŽ·å¾—更多信æ¯ã€‚" @@ -563,12 +539,12 @@ msgstr "æ— æ•ˆçš„ --ignore-initial 值 “%sâ€" msgid "options -l and -s are incompatible" msgstr "选项 -l å’Œ -s ä¸å…¼å®¹" -#: src/cmp.c:155 src/diff.c:884 src/diff3.c:467 src/sdiff.c:167 src/sdiff.c:315 -#: src/sdiff.c:322 src/sdiff.c:874 src/util.c:853 src/util.c:953 src/util.c:960 +#: src/cmp.c:155 src/diff.c:885 src/diff3.c:469 src/sdiff.c:167 src/sdiff.c:315 +#: src/sdiff.c:322 src/sdiff.c:874 src/util.c:852 src/util.c:952 src/util.c:959 msgid "write failed" msgstr "写入失败" -#: src/cmp.c:157 src/diff.c:886 src/diff.c:1465 src/diff3.c:469 src/sdiff.c:169 +#: src/cmp.c:157 src/diff.c:887 src/diff.c:1466 src/diff3.c:471 src/sdiff.c:169 msgid "standard output" msgstr "æ ‡å‡†è¾“å‡º" @@ -625,7 +601,7 @@ msgid "" "at the beginning of each file (zero by default)." msgstr "<è·³1> å’Œ <è·³2> 分别是æ¯ä¸ªæ–‡ä»¶è¦ç•¥è¿‡çš„å—节数。" -#: src/cmp.c:185 src/diff.c:996 src/diff3.c:507 src/sdiff.c:210 +#: src/cmp.c:185 src/diff.c:997 src/diff3.c:509 src/sdiff.c:210 msgid "" "Mandatory arguments to long options are mandatory for short options too.\n" msgstr "长选项的必需å‚数也是相应çŸé€‰é¡¹çš„必需å‚数。\n" @@ -645,7 +621,7 @@ msgstr "" msgid "If a FILE is '-' or missing, read standard input." msgstr "如果文件是 “-â€ æˆ–æ²¡ç»™å‡ºï¼Œåˆ™ä»Žæ ‡å‡†è¾“å…¥è¯»å…¥å†…å®¹ã€‚" -#: src/cmp.c:195 src/diff.c:984 src/sdiff.c:220 +#: src/cmp.c:195 src/diff.c:985 src/sdiff.c:220 msgid "Exit status is 0 if inputs are the same, 1 if different, 2 if trouble." msgstr "如果输入相åŒï¼Œåˆ™é€€å‡ºçŠ¶æ€ä¸º 0ï¼›1 表示输入ä¸åŒï¼›2 表示有错误产生。" @@ -654,155 +630,170 @@ msgstr "如果输入相åŒï¼Œåˆ™é€€å‡ºçŠ¶æ€ä¸º 0ï¼›1 表示输入ä¸åŒï¼›2 表 msgid "invalid --bytes value '%s'" msgstr "æ— æ•ˆçš„ --bytes 值 `%s'" -#: src/cmp.c:266 src/diff.c:793 src/diff3.c:353 src/sdiff.c:565 +#: src/cmp.c:266 src/diff.c:795 src/diff3.c:356 src/sdiff.c:565 #, c-format msgid "missing operand after '%s'" msgstr "æ“作数 “%s†åŽç¼ºå°‘å‚æ•°" -#: src/cmp.c:278 src/diff.c:795 src/diff3.c:355 src/sdiff.c:567 +#: src/cmp.c:278 src/diff.c:797 src/diff3.c:358 src/sdiff.c:567 #, c-format msgid "extra operand '%s'" msgstr "多余的æ“作数 “%sâ€" -#: src/cmp.c:494 +#: src/cmp.c:498 #, c-format msgid "%s %s differ: byte %s, line %s\n" msgstr "%s %s ä¸åŒï¼šç¬¬ %s å—节，第 %s è¡Œ\n" -#: src/cmp.c:510 +#: src/cmp.c:514 #, c-format msgid "%s %s differ: byte %s, line %s is %3o %s %3o %s\n" msgstr "%1$s %2$s ä¸åŒï¼šç¬¬ %4$s 行，第 %3$s å—节为 %5$3o %6$s %7$3o %8$s\n" -#: src/cmp.c:562 -#, c-format -msgid "cmp: EOF on %s\n" +#: src/cmp.c:571 +#, fuzzy, c-format +msgid "cmp: EOF on %s which is empty\n" +msgstr "cmp：%s 已结æŸ\n" + +#: src/cmp.c:585 +#, fuzzy, c-format +msgid "cmp: EOF on %s after byte %s, line %s\n" +msgstr "%s %s ä¸åŒï¼šç¬¬ %s å—节，第 %s è¡Œ\n" + +#: src/cmp.c:586 +#, fuzzy, c-format +msgid "cmp: EOF on %s after byte %s, in line %s\n" +msgstr "%s %s ä¸åŒï¼šç¬¬ %s å—节，第 %s è¡Œ\n" + +#: src/cmp.c:592 +#, fuzzy, c-format +msgid "cmp: EOF on %s after byte %s\n" msgstr "cmp：%s 已结æŸ\n" #. This is a proper name. See the gettext manual, section Names. -#: src/diff.c:49 +#: src/diff.c:50 msgid "Paul Eggert" msgstr "" #. This is a proper name. See the gettext manual, section Names. -#: src/diff.c:50 +#: src/diff.c:51 msgid "Mike Haertel" msgstr "" #. This is a proper name. See the gettext manual, section Names. -#: src/diff.c:51 +#: src/diff.c:52 msgid "David Hayes" msgstr "" #. This is a proper name. See the gettext manual, section Names. -#: src/diff.c:52 +#: src/diff.c:53 msgid "Richard Stallman" msgstr "ç†æŸ¥å¾·Â·æ–¯æ‰˜æ›¼" #. This is a proper name. See the gettext manual, section Names. -#: src/diff.c:53 +#: src/diff.c:54 msgid "Len Tower" msgstr "" -#: src/diff.c:351 +#: src/diff.c:353 #, c-format msgid "invalid context length '%s'" msgstr "æ— æ•ˆçš„ä¸Šä¸‹æ–‡è¡Œæ•° “%sâ€" -#: src/diff.c:434 +#: src/diff.c:436 #, c-format msgid "pagination not supported on this host" msgstr "æ¤ç³»ç»Ÿä¸æ”¯æŒåˆ†é¡µ" -#: src/diff.c:449 src/diff3.c:335 +#: src/diff.c:451 src/diff3.c:336 #, c-format msgid "too many file label options" msgstr "è¿‡å¤šçš„æ–‡ä»¶æ ‡å·é€‰é¡¹" -#: src/diff.c:526 +#: src/diff.c:528 #, c-format msgid "invalid width '%s'" msgstr "æ— æ•ˆçš„å®½åº¦ “%sâ€" -#: src/diff.c:530 +#: src/diff.c:532 msgid "conflicting width options" msgstr "宽度选项冲çª" -#: src/diff.c:555 +#: src/diff.c:557 #, c-format msgid "invalid horizon length '%s'" msgstr "æ— æ•ˆçš„æ°´å¹³é•¿åº¦ “%sâ€" -#: src/diff.c:611 +#: src/diff.c:613 #, c-format msgid "invalid tabsize '%s'" msgstr "æ— æ•ˆçš„åˆ¶è¡¨ç¬¦å®½åº¦ “%sâ€" -#: src/diff.c:615 +#: src/diff.c:617 msgid "conflicting tabsize options" msgstr "的制表符选项冲çª" -#: src/diff.c:770 +#: src/diff.c:772 msgid "--from-file and --to-file both specified" msgstr "åŒæ—¶æŒ‡å®šäº†é€‰é¡¹ --from-file å’Œ --to-file" -#: src/diff.c:890 +#: src/diff.c:891 msgid " --normal output a normal diff (the default)" msgstr " --normal 以æ£å¸¸çš„ diff æ–¹å¼è¾“出 (默认)" -#: src/diff.c:891 +#: src/diff.c:892 msgid "-q, --brief report only when files differ" msgstr "-q, --brief åªæœ‰åœ¨æ–‡ä»¶ä¸åŒæ—¶æŠ¥å‘Š" -#: src/diff.c:892 +#: src/diff.c:893 msgid "-s, --report-identical-files report when two files are the same" msgstr "-s, --report-identical-files å½“ä¸¤ä¸ªä¸€æ ·æ—¶ä»ç„¶æ˜¾ç¤ºç»“æžœ" -#: src/diff.c:893 +#: src/diff.c:894 msgid "" "-c, -C NUM, --context[=NUM] output NUM (default 3) lines of copied context" msgstr "" -#: src/diff.c:894 +#: src/diff.c:895 msgid "" "-u, -U NUM, --unified[=NUM] output NUM (default 3) lines of unified context" msgstr "-u, -U æ•°é‡, --unified[=æ•°é‡] 输出 <æ•°é‡>（默认为 3）行一致化上下文" -#: src/diff.c:895 +#: src/diff.c:896 msgid "-e, --ed output an ed script" msgstr "-e, --ed 以 ed script æ–¹å¼è¾“出" -#: src/diff.c:896 +#: src/diff.c:897 msgid "-n, --rcs output an RCS format diff" msgstr "-n, --rcs 以 RCS diff æ ¼å¼è¾“出" -#: src/diff.c:897 +#: src/diff.c:898 msgid "-y, --side-by-side output in two columns" msgstr "" -#: src/diff.c:898 +#: src/diff.c:899 msgid "" "-W, --width=NUM output at most NUM (default 130) print columns" msgstr "-W, --width=æ•°é‡ æ¯è¡Œæ˜¾ç¤ºæœ€å¤š <æ•°é‡>（默认 130）个å—符" -#: src/diff.c:899 +#: src/diff.c:900 msgid "" " --left-column output only the left column of common lines" msgstr " --left-column 当有两行相åŒæ—¶åªæ˜¾ç¤ºå·¦è¾¹æ 的一行" -#: src/diff.c:900 +#: src/diff.c:901 msgid " --suppress-common-lines do not output common lines" msgstr " --suppress-common-lines 当有两行相åŒæ—¶ä¸æ˜¾ç¤º" -#: src/diff.c:902 +#: src/diff.c:903 msgid "-p, --show-c-function show which C function each change is in" msgstr "" -#: src/diff.c:903 +#: src/diff.c:904 msgid "-F, --show-function-line=RE show the most recent line matching RE" msgstr "" -#: src/diff.c:904 +#: src/diff.c:905 #, fuzzy msgid "" " --label LABEL use LABEL instead of file name and timestamp\n" @@ -811,68 +802,68 @@ msgstr "" " --from-file=文件1 å°†<文件1>å’Œæ“作数ä¸çš„所有文件/目录作比较；\n" " <文件1>å¯ä»¥æ˜¯ç›®å½•" -#: src/diff.c:907 +#: src/diff.c:908 msgid "-t, --expand-tabs expand tabs to spaces in output" msgstr "-t, --expand-tabs 将输出ä¸çš„ tab 转æ¢æˆç©ºæ ¼" -#: src/diff.c:908 +#: src/diff.c:909 msgid "-T, --initial-tab make tabs line up by prepending a tab" msgstr "-T, --initial-tab æ¯è¡Œå…ˆåŠ 上 tab å—符，使 tab å—符å¯ä»¥å¯¹é½" -#: src/diff.c:909 +#: src/diff.c:910 msgid "" " --tabsize=NUM tab stops every NUM (default 8) print columns" msgstr " --tabsize=æ•°å— TAB æ ¼çš„å®½åº¦ï¼Œé»˜è®¤ä¸º 8 个打å°åˆ—宽" -#: src/diff.c:910 +#: src/diff.c:911 msgid "" " --suppress-blank-empty suppress space or tab before empty output lines" msgstr "" -#: src/diff.c:911 +#: src/diff.c:912 msgid "-l, --paginate pass output through 'pr' to paginate it" msgstr "-l, --paginate 将输出é€è‡³ “pr†指令æ¥åˆ†é¡µ" -#: src/diff.c:913 +#: src/diff.c:914 msgid "" "-r, --recursive recursively compare any subdirectories found" msgstr "-r, --recursive è¿žåŒæ‰€æœ‰å目录一起比较" -#: src/diff.c:914 +#: src/diff.c:915 msgid " --no-dereference don't follow symbolic links" msgstr "" -#: src/diff.c:915 +#: src/diff.c:916 msgid "-N, --new-file treat absent files as empty" msgstr "-N, --new-file ä¸å˜åœ¨çš„文件以空文件方å¼å¤„ç†" -#: src/diff.c:916 +#: src/diff.c:917 msgid " --unidirectional-new-file treat absent first files as empty" msgstr " --unidirectional-new-file 若第一文件ä¸å˜åœ¨ï¼Œä»¥ç©ºæ–‡ä»¶å¤„ç†" -#: src/diff.c:917 +#: src/diff.c:918 msgid " --ignore-file-name-case ignore case when comparing file names" msgstr " --ignore-file-name-case 忽略文件å大å°å†™çš„区别" -#: src/diff.c:918 +#: src/diff.c:919 msgid " --no-ignore-file-name-case consider case when comparing file names" msgstr " --no-ignore-file-name-case ä¸å¿½ç•¥æ–‡ä»¶å大å°å†™çš„区别" -#: src/diff.c:919 +#: src/diff.c:920 msgid "-x, --exclude=PAT exclude files that match PAT" msgstr "-x, --exclude=æ¨¡å¼ æŽ’é™¤åŒ¹é… <模å¼> 的文件" -#: src/diff.c:920 +#: src/diff.c:921 msgid "" "-X, --exclude-from=FILE exclude files that match any pattern in FILE" msgstr "-X, --exclude-from=文件 排除所有匹é…在<文件>ä¸åˆ—出的模å¼çš„文件" -#: src/diff.c:921 +#: src/diff.c:922 msgid "" "-S, --starting-file=FILE start with FILE when comparing directories" msgstr "-S, --starting-file=文件 当比较目录時，由<文件>开始比较" -#: src/diff.c:922 +#: src/diff.c:923 msgid "" " --from-file=FILE1 compare FILE1 to all operands;\n" " FILE1 can be a directory" @@ -880,7 +871,7 @@ msgstr "" " --from-file=文件1 å°†<文件1>å’Œæ“作数ä¸çš„所有文件/目录作比较；\n" " <文件1>å¯ä»¥æ˜¯ç›®å½•" -#: src/diff.c:924 +#: src/diff.c:925 msgid "" " --to-file=FILE2 compare all operands to FILE2;\n" " FILE2 can be a directory" @@ -888,82 +879,82 @@ msgstr "" " --to-file=文件2 å°†æ“作数ä¸çš„所有文件/目录和<文件2>作比较；\n" " <文件2>å¯ä»¥æ˜¯ç›®å½•" -#: src/diff.c:927 +#: src/diff.c:928 msgid "" "-i, --ignore-case ignore case differences in file contents" msgstr "-i, --ignore-case 忽略文件内容大å°å†™çš„区别" -#: src/diff.c:928 +#: src/diff.c:929 msgid "-E, --ignore-tab-expansion ignore changes due to tab expansion" msgstr "-E, --ignore-tab-expansion å¿½ç•¥ç”±åˆ¶è¡¨ç¬¦å®½åº¦é€ æˆçš„差异" -#: src/diff.c:929 +#: src/diff.c:930 msgid "-Z, --ignore-trailing-space ignore white space at line end" msgstr "-Z, --ignore-trailing-space 忽略æ¯è¡Œæœ«ç«¯çš„ç©ºæ ¼" -#: src/diff.c:930 +#: src/diff.c:931 msgid "" "-b, --ignore-space-change ignore changes in the amount of white space" msgstr "-b, --ignore-space-change å¿½ç•¥ç”±ç©ºæ ¼æ•°ä¸åŒé€ æˆçš„差异" -#: src/diff.c:931 +#: src/diff.c:932 msgid "-w, --ignore-all-space ignore all white space" msgstr "-w, --ignore-all-space å¿½ç•¥æ‰€æœ‰ç©ºæ ¼" -#: src/diff.c:932 +#: src/diff.c:933 msgid "" "-B, --ignore-blank-lines ignore changes where lines are all blank" msgstr "-B, --ignore-blank-lines å¿½ç•¥ä»»ä½•å› ç©ºè¡Œè€Œé€ æˆçš„差异" -#: src/diff.c:933 +#: src/diff.c:934 msgid "-I, --ignore-matching-lines=RE ignore changes where all lines match RE" msgstr "" "-I, --ignore-matching-lines=æ£åˆ™ è‹¥æŸè¡Œå®Œå…¨åŒ¹é… <æ£åˆ™>ï¼Œåˆ™å¿½ç•¥ç”±è¯¥è¡Œé€ æˆçš„å·®" "异" -#: src/diff.c:935 +#: src/diff.c:936 msgid "-a, --text treat all files as text" msgstr "-a, --text 所有文件都以文本方å¼å¤„ç†" -#: src/diff.c:936 +#: src/diff.c:937 msgid " --strip-trailing-cr strip trailing carriage return on input" msgstr " --strip-trailing-cr 去除输入内容æ¯è¡Œæœ«ç«¯çš„回车（CR）å—符" -#: src/diff.c:938 +#: src/diff.c:939 msgid " --binary read and write data in binary mode" msgstr " --binary 以二进制方å¼è¯»å†™æ•°æ®" -#: src/diff.c:941 +#: src/diff.c:942 msgid "" "-D, --ifdef=NAME output merged file with '#ifdef NAME' diffs" msgstr "" "-D, --ifdef=å称 输出的内容以 ‘#ifdef <å称>’ æ–¹å¼æ ‡æ˜Žå·®å¼‚" -#: src/diff.c:942 +#: src/diff.c:943 msgid " --GTYPE-group-format=GFMT format GTYPE input groups with GFMT" msgstr " --GTYPE-group-format=GFMT 以 GFMT æ ¼å¼å¤„ç† GTYPE 输入行组" -#: src/diff.c:943 +#: src/diff.c:944 msgid " --line-format=LFMT format all input lines with LFMT" msgstr " --line-format=LFMT 以 LFMT æ ¼å¼å¤„ç†æ¯ä¸€è¡Œèµ„æ–™" -#: src/diff.c:944 +#: src/diff.c:945 msgid " --LTYPE-line-format=LFMT format LTYPE input lines with LFMT" msgstr " --LTYPE-line-format=LFMT 以 LFMT æ ¼å¼å¤„ç† LTYPE 输入的行" -#: src/diff.c:945 +#: src/diff.c:946 msgid "" " These format options provide fine-grained control over the output\n" " of diff, generalizing -D/--ifdef." msgstr "" -#: src/diff.c:947 +#: src/diff.c:948 msgid " LTYPE is 'old', 'new', or 'unchanged'. GTYPE is LTYPE or 'changed'." msgstr "" " LTYPE å¯ä»¥æ˜¯ “oldâ€ã€â€œnew†或 “unchangedâ€ã€‚GTYPE å¯ä»¥æ˜¯ LTYPE 的选择\n" " 或是 “changedâ€ã€‚" -#: src/diff.c:948 +#: src/diff.c:949 msgid "" " GFMT (only) may contain:\n" " %< lines from FILE1\n" @@ -991,7 +982,7 @@ msgstr "" " M L+1\n" " %(A=B?T:E) 如果 A ç‰äºŽ B 那么 T å¦åˆ™ E" -#: src/diff.c:960 +#: src/diff.c:961 msgid "" " LFMT (only) may contain:\n" " %L contents of line\n" @@ -1003,7 +994,7 @@ msgstr "" " %l 该行的内容，但ä¸åŒ…括结æŸçš„æ¢è¡Œç¬¦\n" " %[-][宽度][.[精确度]]{doxX}n 以 printf æ ¼å¼è¡¨ç¤ºçš„输入行å·" -#: src/diff.c:964 +#: src/diff.c:965 msgid "" " Both GFMT and LFMT may contain:\n" " %% %\n" @@ -1017,145 +1008,138 @@ msgstr "" " %c'\\OOO' 八进制ç OOO 所代表的å—符\n" " C å—符 C（处上述转义外的其他å—符代表它们自身）" -#: src/diff.c:970 +#: src/diff.c:971 msgid "-d, --minimal try hard to find a smaller set of changes" msgstr "-d, --minimal å°½å¯èƒ½æ‰¾å‡ºæœ€å°çš„差异。" -#: src/diff.c:971 +#: src/diff.c:972 msgid " --horizon-lines=NUM keep NUM lines of the common prefix and suffix" msgstr " --horizon-lines=æ•°é‡ ä¿æŒ<æ•°é‡>行的一致å‰åŽç¼€" -#: src/diff.c:972 +#: src/diff.c:973 msgid "" " --speed-large-files assume large files and many scattered small changes" msgstr " --speed-large-files å‡è®¾æ–‡ä»¶å分大而且文件ä¸å«æœ‰è®¸å¤šå¾®å°çš„差异" -#: src/diff.c:973 -msgid "" -" --color[=WHEN] colorize the output; WHEN can be 'never', 'always'," -msgstr "" - #: src/diff.c:974 -#, fuzzy -msgid " or 'auto' (the default)" -msgstr " --normal 以æ£å¸¸çš„ diff æ–¹å¼è¾“出 (默认)" - -#: src/diff.c:975 msgid "" -" --palette=PALETTE specify the colors to use when --color is active" +" --color[=WHEN] colorize the output; WHEN can be 'never', " +"'always',\n" +" or 'auto' (the default)" msgstr "" #: src/diff.c:976 msgid "" -" PALETTE is a colon-separated list terminfo " -"capabilities" +" --palette=PALETTE the colors to use when --color is active; PALETTE " +"is\n" +" a colon-separated list of terminfo capabilities" msgstr "" -#: src/diff.c:978 +#: src/diff.c:979 msgid " --help display this help and exit" msgstr " --help 显示æ¤å¸®åŠ©ä¿¡æ¯å¹¶é€€å‡º" -#: src/diff.c:979 +#: src/diff.c:980 msgid "-v, --version output version information and exit" msgstr "-v, --version 输出版本信æ¯å¹¶é€€å‡º" -#: src/diff.c:981 +#: src/diff.c:982 #, fuzzy msgid "FILES are 'FILE1 FILE2' or 'DIR1 DIR2' or 'DIR FILE' or 'FILE DIR'." msgstr "" "<文件们> çš„æ ¼å¼å¯ä»¥æ˜¯â€˜æ–‡ä»¶1 文件2’ã€â€˜ç›®å½•1 目录2’ã€â€˜ç›®å½• 文件...’或\n" " ‘文件... 目录’。" -#: src/diff.c:982 +#: src/diff.c:983 msgid "" "If --from-file or --to-file is given, there are no restrictions on FILE(s)." msgstr "如果使用 --from-file 或 --to-file 选项，<文件å> çš„æ ¼å¼åˆ™ä¸å—é™åˆ¶ã€‚" -#: src/diff.c:983 src/diff3.c:526 src/sdiff.c:219 +#: src/diff.c:984 src/diff3.c:528 src/sdiff.c:219 msgid "If a FILE is '-', read standard input." msgstr "如果 FILE 是 “-â€ï¼Œåˆ™ç”±æ ‡å‡†è¾“入读å–内容。" -#: src/diff.c:993 +#: src/diff.c:994 #, c-format msgid "Usage: %s [OPTION]... FILES\n" msgstr "用法：%s [选项]... 文件们\n" -#: src/diff.c:994 +#: src/diff.c:995 msgid "Compare FILES line by line." msgstr "é€è¡Œæ¯”较<文件们>。" -#: src/diff.c:1028 +#: src/diff.c:1029 #, c-format msgid "conflicting %s option value '%s'" msgstr "互相冲çªçš„ %s 选项，å‚数值为 “%sâ€" -#: src/diff.c:1041 +#: src/diff.c:1042 #, c-format msgid "conflicting output style options" msgstr "互相冲çªçš„è¾“å‡ºé£Žæ ¼é€‰é¡¹ã€‚" -#: src/diff.c:1057 +#: src/diff.c:1058 #, fuzzy, c-format msgid "invalid color '%s'" msgstr "æ— æ•ˆçš„å®½åº¦ “%sâ€" -#: src/diff.c:1113 src/diff.c:1323 +#: src/diff.c:1114 src/diff.c:1324 #, c-format msgid "Only in %s: %s\n" msgstr "åªåœ¨ %s å˜åœ¨ï¼š%s\n" -#: src/diff.c:1247 +#: src/diff.c:1248 msgid "cannot compare '-' to a directory" msgstr "“-â€ æ— æ³•ä¸Žç›®å½•ä½œæ¯”è¾ƒ" -#: src/diff.c:1282 +#: src/diff.c:1283 msgid "-D option not supported with directories" msgstr "-D 选项ä¸æ”¯æŒç›®å½•ä½¿ç”¨" -#: src/diff.c:1291 +#: src/diff.c:1292 #, c-format msgid "Common subdirectories: %s and %s\n" msgstr "%s å’Œ %s 有共åŒçš„å目录\n" -#: src/diff.c:1333 src/diff.c:1383 +#: src/diff.c:1334 src/diff.c:1384 #, c-format msgid "File %s is a %s while file %s is a %s\n" msgstr "文件 %s 是%s而文件 %s 是%s\n" -#: src/diff.c:1369 +#: src/diff.c:1370 #, c-format msgid "Symbolic links %s and %s differ\n" msgstr "软链接 %s å’Œ %s ä¸åŒ\n" -#: src/diff.c:1456 +#: src/diff.c:1457 #, c-format msgid "Files %s and %s are identical\n" msgstr "檔案 %s å’Œ %s 相åŒ\n" #. This is a proper name. See the gettext manual, section Names. -#: src/diff3.c:41 +#: src/diff3.c:42 msgid "Randy Smith" msgstr "" -#: src/diff3.c:348 +#: src/diff3.c:351 #, c-format msgid "incompatible options" msgstr "ä¸å…¼å®¹çš„选项" -#: src/diff3.c:388 +#: src/diff3.c:391 msgid "'-' specified for more than one input file" msgstr "“-â€ä½œè¾“入文件ä¸å¯å¤šäºŽä¸€å¤„" -#: src/diff3.c:439 src/diff3.c:1288 src/diff3.c:1692 src/diff3.c:1747 +#: src/diff3.c:442 src/diff3.c:1290 src/diff3.c:1693 src/diff3.c:1748 #: src/sdiff.c:307 src/sdiff.c:844 src/sdiff.c:855 msgid "read failed" msgstr "读å–时失败" -#: src/diff3.c:473 +#: src/diff3.c:475 msgid "-A, --show-all output all changes, bracketing conflicts" msgstr "-A, --show-all 输出所有è¦æ›´æ”¹çš„部份，并括上互相冲çªçš„地方" -#: src/diff3.c:475 +#: src/diff3.c:477 msgid "" "-e, --ed output ed script incorporating changes\n" " from OLDFILE to YOURFILE into MYFILE" @@ -1164,76 +1148,76 @@ msgstr "" "å¯å°†æ¤\n" " 改å˜åº”用至 <我的文件> çš„ ed 脚本" -#: src/diff3.c:477 +#: src/diff3.c:479 msgid "-E, --show-overlap like -e, but bracket conflicts" msgstr "-E, --show-overlap 类似 -e，但括上互相冲çªçš„地方" -#: src/diff3.c:478 +#: src/diff3.c:480 msgid "" "-3, --easy-only like -e, but incorporate only nonoverlapping " "changes" msgstr "" "-3, --easy-only 类似 -e，但åªè¾“出未åˆå¹¶è€Œä¸”ä¸é‡å 的更改部份" -#: src/diff3.c:479 +#: src/diff3.c:481 msgid "" "-x, --overlap-only like -e, but incorporate only overlapping changes" msgstr "-x, --overlap-only 类似 -e，但åªè¾“出é‡å 的更改部份" -#: src/diff3.c:480 +#: src/diff3.c:482 msgid "-X like -x, but bracket conflicts" msgstr "-X 类似 -x，但括上互相冲çªçš„地方" -#: src/diff3.c:481 +#: src/diff3.c:483 msgid "-i append 'w' and 'q' commands to ed scripts" msgstr "-i 在 ed script ä¸é™„åŠ â€˜w’和‘q’命令" -#: src/diff3.c:483 +#: src/diff3.c:485 msgid "" "-m, --merge output actual merged file, according to\n" " -A if no other options are given" msgstr "" -#: src/diff3.c:486 +#: src/diff3.c:488 msgid "-a, --text treat all files as text" msgstr "-a --text 所有文件都以文本方å¼å¤„ç†" -#: src/diff3.c:487 +#: src/diff3.c:489 msgid " --strip-trailing-cr strip trailing carriage return on input" msgstr " --strip-trailing-cr 去除输入内容æ¯è¡Œæœ«ç«¯çš„回车（CR）å—符" -#: src/diff3.c:488 +#: src/diff3.c:490 msgid "-T, --initial-tab make tabs line up by prepending a tab" msgstr "-T --initial-tab æ¯è¡Œå…ˆåŠ 上 tab å—符，使 tab å—符å¯ä»¥å¯¹é½" -#: src/diff3.c:489 +#: src/diff3.c:491 msgid " --diff-program=PROGRAM use PROGRAM to compare files" msgstr " --diff-program=ç¨‹åº ç”¨<程åº>æ¥æ¯”较文件" -#: src/diff3.c:490 +#: src/diff3.c:492 msgid "" "-L, --label=LABEL use LABEL instead of file name\n" " (can be repeated up to three times)" msgstr "" -#: src/diff3.c:493 +#: src/diff3.c:495 msgid " --help display this help and exit" msgstr " --help 显示æ¤å¸®åŠ©ä¿¡æ¯å¹¶é€€å‡º" -#: src/diff3.c:494 +#: src/diff3.c:496 msgid "-v, --version output version information and exit" msgstr "-v, --version 输出版本信æ¯å¹¶é€€å‡º" -#: src/diff3.c:503 +#: src/diff3.c:505 #, c-format msgid "Usage: %s [OPTION]... MYFILE OLDFILE YOURFILE\n" msgstr "用法：%s [选项]... 我的文件 旧文件 ä½ çš„æ–‡ä»¶\n" -#: src/diff3.c:505 +#: src/diff3.c:507 msgid "Compare three files line by line." msgstr "é€è¡Œæ¯”较三个文件。" -#: src/diff3.c:515 +#: src/diff3.c:517 msgid "" "\n" "The default output format is a somewhat human-readable representation of\n" @@ -1247,45 +1231,45 @@ msgid "" "robust than using ed.\n" msgstr "" -#: src/diff3.c:527 +#: src/diff3.c:529 msgid "Exit status is 0 if successful, 1 if conflicts, 2 if trouble." msgstr "退出状æ€ä¸º 0 表示æˆåŠŸï¼Œ1 表示冲çªï¼Œ2 表示有错误å‘生。" -#: src/diff3.c:720 +#: src/diff3.c:722 msgid "internal error: screwup in format of diff blocks" msgstr "内部错误：diff åŒºæ®µçš„æ ¼å¼å‡ºé”™" -#: src/diff3.c:1015 +#: src/diff3.c:1017 #, c-format msgid "%s: diff failed: " msgstr "%s：diff 失败：" -#: src/diff3.c:1037 +#: src/diff3.c:1039 msgid "internal error: invalid diff type in process_diff" msgstr "内部错误：process_diff ä¸çš„ diff ç±»åž‹æ— æ•ˆ" -#: src/diff3.c:1062 +#: src/diff3.c:1064 msgid "invalid diff format; invalid change separator" msgstr "æ— æ•ˆçš„ diff æ ¼å¼ï¼›è¡¨ç¤ºå†…容改å˜çš„分隔å—ç¬¦ä¸²æ— æ•ˆ" -#: src/diff3.c:1298 +#: src/diff3.c:1300 msgid "invalid diff format; incomplete last line" msgstr "æ— æ•ˆçš„ diff æ ¼å¼ï¼›æœ€åŽä¸€è¡Œä¸å®Œæ•´" -#: src/diff3.c:1322 src/sdiff.c:275 src/util.c:970 +#: src/diff3.c:1324 src/sdiff.c:275 src/util.c:969 #, c-format msgid "subsidiary program '%s' could not be invoked" msgstr "æ— æ³•è°ƒç”¨è¾…åŠ©ç¨‹åº â€œ%sâ€" -#: src/diff3.c:1347 +#: src/diff3.c:1349 msgid "invalid diff format; incorrect leading line chars" msgstr "æ— æ•ˆçš„ diff æ ¼å¼ï¼›é”™è¯¯çš„è¡Œå‰å¯¼å—符" -#: src/diff3.c:1420 +#: src/diff3.c:1422 msgid "internal error: invalid diff type passed to output" msgstr "å†…éƒ¨é”™è¯¯ï¼šä¼ é€’ç»™è¾“å‡ºçš„ diff ç±»åž‹æ— æ•ˆ" -#: src/diff3.c:1694 src/diff3.c:1751 +#: src/diff3.c:1695 src/diff3.c:1752 msgid "input file shrank" msgstr "输入文件缩å°" @@ -1300,7 +1284,7 @@ msgid "%s: recursive directory loop" msgstr "%s：递归目录循环" #. This is a proper name. See the gettext manual, section Names. -#: src/sdiff.c:42 +#: src/sdiff.c:43 msgid "Thomas Lord" msgstr "" @@ -1435,16 +1419,35 @@ msgstr "" "v ï¼šåŠ ä¸Šä¸¤è¾¹ä¸€æ ·çš„è¡Œæ—¶ä¼šåœ¨è¾“å‡ºä¸Šæ˜¾ç¤ºã€‚\n" "q ：退出。\n" -#: src/util.c:663 +#: src/util.c:662 #, fuzzy, c-format msgid "unrecognized prefix: %s" msgstr "%s：选项 “--%sâ€ æ— æ³•è¯†åˆ«\n" -#: src/util.c:693 +#: src/util.c:692 #, c-format msgid "unparsable value for --palette" msgstr "" +#, fuzzy +#~ msgid " or 'auto' (the default)" +#~ msgstr " --normal 以æ£å¸¸çš„ diff æ–¹å¼è¾“出 (默认)" + +#~ 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' is ambiguous\n" +#~ msgstr "%s：选项 “-W %s†æ„义ä¸æ˜Žç¡®\n" + +#~ msgid "%s: option '-W %s' doesn't allow an argument\n" +#~ msgstr "%s：选项 “-W %s†ä¸æŽ¥å—å‚æ•°\n" + +#~ msgid "%s: option '-W %s' requires an argument\n" +#~ msgstr "%s：选项 “%s†需è¦ä¸€ä¸ªå‚æ•°\n" + #~ msgid "%s: illegal option -- %c\n" #~ msgstr "%s：éžæ³•é€‰é¡¹ -- %c\n" diff --git a/po/zh_TW.gmo b/po/zh_TW.gmo Binary files differindex c41f67f..0a2ace8 100644 --- a/po/zh_TW.gmo +++ b/po/zh_TW.gmo diff --git a/po/zh_TW.po b/po/zh_TW.po index 61b5dc2..f8649bb 100644 --- a/po/zh_TW.po +++ b/po/zh_TW.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: diffutils 2.8.7\n" "Report-Msgid-Bugs-To: bug-diffutils@gnu.org\n" -"POT-Creation-Date: 2016-08-20 22:22-0700\n" +"POT-Creation-Date: 2017-05-21 13:26-0700\n" "PO-Revision-Date: 2005-04-01 14:31+0800\n" "Last-Translator: Abel Cheung <maddog@linux.org.hk>\n" "Language-Team: Chinese (traditional) <zh-l10n@linux.org.tw>\n" @@ -14,31 +14,31 @@ msgstr "" "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" -#: lib/argmatch.c:133 -#, fuzzy, c-format +#: lib/argmatch.c:134 +#, c-format msgid "invalid argument %s for %s" -msgstr "無效的 --bytes 值 ‘%s’" +msgstr "" -#: lib/argmatch.c:134 +#: lib/argmatch.c:135 #, c-format msgid "ambiguous argument %s for %s" msgstr "" -#: lib/argmatch.c:153 -#, fuzzy +#: lib/argmatch.c:154 msgid "Valid arguments are:" -msgstr "無效的 --bytes 值 ‘%s’" +msgstr "" -#: lib/c-stack.c:204 lib/c-stack.c:297 +#: lib/c-stack.c:203 lib/c-stack.c:296 msgid "program error" msgstr "程å¼éŒ¯èª¤" -#: lib/c-stack.c:205 lib/c-stack.c:298 +#: lib/c-stack.c:204 lib/c-stack.c:297 msgid "stack overflow" msgstr "å †ç–Šæº¢ä½" -#: lib/error.c:191 +#: lib/error.c:195 msgid "Unknown system error" msgstr "ä¸æ˜Žçš„系統錯誤" @@ -142,66 +142,41 @@ msgstr "" msgid "weird file" msgstr "ä¸å°‹å¸¸çš„檔案" -#: lib/getopt.c:575 lib/getopt.c:604 +#: lib/getopt.c:278 #, fuzzy, c-format -msgid "%s: option '%s' is ambiguous; possibilities:" +msgid "%s: option '%s%s' is ambiguous\n" msgstr "%s：é¸é …‘%s’是ä¸æ˜Žç¢ºçš„\n" -#: lib/getopt.c:619 +#: lib/getopt.c:284 #, fuzzy, c-format -msgid "%s: option '%s' is ambiguous\n" -msgstr "%s：é¸é …‘-W %s’是ä¸æ˜Žç¢ºçš„\n" +msgid "%s: option '%s%s' is ambiguous; possibilities:" +msgstr "%s：é¸é …‘%s’是ä¸æ˜Žç¢ºçš„\n" -#: lib/getopt.c:654 lib/getopt.c:658 +#: lib/getopt.c:319 #, fuzzy, c-format -msgid "%s: option '--%s' doesn't allow an argument\n" -msgstr "%s：é¸é …‘--%s’ä¸å¯é…åˆåƒæ•¸ä½¿ç”¨\n" +msgid "%s: unrecognized option '%s%s'\n" +msgstr "%s：無法è˜åˆ¥çš„é¸é …‘%c%s’\n" -#: lib/getopt.c:667 lib/getopt.c:672 +#: lib/getopt.c:345 #, fuzzy, c-format -msgid "%s: option '%c%s' doesn't allow an argument\n" +msgid "%s: option '%s%s' doesn't allow an argument\n" msgstr "%s：é¸é …‘%c%s’ä¸å¯é…åˆåƒæ•¸ä½¿ç”¨\n" -#: lib/getopt.c:715 lib/getopt.c:734 +#: lib/getopt.c:360 #, fuzzy, c-format -msgid "%s: option '--%s' requires an argument\n" +msgid "%s: option '%s%s' requires an argument\n" msgstr "%s：é¸é …‘%s’需è¦åƒæ•¸\n" -#: lib/getopt.c:772 lib/getopt.c:775 -#, fuzzy, c-format -msgid "%s: unrecognized option '--%s'\n" -msgstr "%s：無法è˜åˆ¥çš„é¸é …‘--%s’\n" - -#: lib/getopt.c:783 lib/getopt.c:786 -#, fuzzy, c-format -msgid "%s: unrecognized option '%c%s'\n" -msgstr "%s：無法è˜åˆ¥çš„é¸é …‘%c%s’\n" - -#: lib/getopt.c:835 lib/getopt.c:838 +#: lib/getopt.c:621 #, fuzzy, c-format msgid "%s: invalid option -- '%c'\n" msgstr "%s：無效的é¸é … ─ %c\n" -#: lib/getopt.c:891 lib/getopt.c:908 lib/getopt.c:1118 lib/getopt.c:1136 +#: lib/getopt.c:636 lib/getopt.c:682 #, fuzzy, c-format msgid "%s: option requires an argument -- '%c'\n" msgstr "%s：é¸é …需è¦åƒæ•¸ ─ %c\n" -#: lib/getopt.c:964 lib/getopt.c:980 -#, fuzzy, c-format -msgid "%s: option '-W %s' is ambiguous\n" -msgstr "%s：é¸é …‘-W %s’是ä¸æ˜Žç¢ºçš„\n" - -#: lib/getopt.c:1004 lib/getopt.c:1022 -#, fuzzy, c-format -msgid "%s: option '-W %s' doesn't allow an argument\n" -msgstr "%s：é¸é …‘-W %s’ä¸å¯é…åˆåƒæ•¸ä½¿ç”¨\n" - -#: lib/getopt.c:1043 lib/getopt.c:1061 -#, fuzzy, c-format -msgid "%s: option '-W %s' requires an argument\n" -msgstr "%s：é¸é …‘%s’需è¦åƒæ•¸\n" - #. TRANSLATORS: #. Get translations for open and closing quotation marks. #. The message catalog should translate "`" to a left @@ -223,11 +198,11 @@ msgstr "%s：é¸é …‘%s’需è¦åƒæ•¸\n" #. If you don't know what to put here, please see #. <http://en.wikipedia.org/wiki/Quotation_marks_in_other_languages> #. and use glyphs suitable for your language. -#: lib/quotearg.c:347 +#: lib/quotearg.c:362 msgid "`" msgstr "" -#: lib/quotearg.c:348 +#: lib/quotearg.c:363 msgid "'" msgstr "" @@ -510,7 +485,7 @@ msgstr "" msgid "General help using GNU software: <http://www.gnu.org/gethelp/>\n" msgstr "" -#: src/analyze.c:454 src/diff.c:1400 +#: src/analyze.c:454 src/diff.c:1401 #, c-format msgid "Files %s and %s differ\n" msgstr "檔案 %s 與 %s ä¸åŒ\n" @@ -520,21 +495,21 @@ msgstr "檔案 %s 與 %s ä¸åŒ\n" msgid "Binary files %s and %s differ\n" msgstr "二元碼檔 %s 與 %s ä¸åŒ\n" -#: src/analyze.c:697 src/diff3.c:1463 src/util.c:1255 +#: src/analyze.c:706 src/diff3.c:1465 src/util.c:1254 msgid "No newline at end of file" msgstr "檔案末沒有 newline å—å…ƒ" #. This is a proper name. See the gettext manual, section Names. -#: src/cmp.c:43 +#: src/cmp.c:44 msgid "Torbjorn Granlund" msgstr "Torbjorn Granlund" #. This is a proper name. See the gettext manual, section Names. -#: src/cmp.c:44 +#: src/cmp.c:45 msgid "David MacKenzie" msgstr "" -#: src/cmp.c:118 src/diff.c:875 src/diff3.c:459 src/sdiff.c:158 +#: src/cmp.c:119 src/diff.c:877 src/diff3.c:462 src/sdiff.c:159 #, fuzzy, c-format msgid "Try '%s --help' for more information." msgstr "請嘗試‘%s --help’來ç²å–更多資訊。" @@ -549,12 +524,12 @@ msgstr "無效的 --ignore-initial 值 ‘%s’" msgid "options -l and -s are incompatible" msgstr "-l å’Œ -s é¸é …ä¸å…¼å®¹" -#: src/cmp.c:155 src/diff.c:884 src/diff3.c:467 src/sdiff.c:167 src/sdiff.c:315 -#: src/sdiff.c:322 src/sdiff.c:874 src/util.c:853 src/util.c:953 src/util.c:960 +#: src/cmp.c:155 src/diff.c:885 src/diff3.c:469 src/sdiff.c:167 src/sdiff.c:315 +#: src/sdiff.c:322 src/sdiff.c:874 src/util.c:852 src/util.c:952 src/util.c:959 msgid "write failed" msgstr "寫入失敗" -#: src/cmp.c:157 src/diff.c:886 src/diff.c:1465 src/diff3.c:469 src/sdiff.c:169 +#: src/cmp.c:157 src/diff.c:887 src/diff.c:1466 src/diff3.c:471 src/sdiff.c:169 msgid "standard output" msgstr "標準輸出" @@ -615,7 +590,7 @@ msgid "" "at the beginning of each file (zero by default)." msgstr "SKIP1 å’Œ SKIP2 是æ¯å€‹æª”案會略éŽçš„ä½å…ƒçµ„數目。" -#: src/cmp.c:185 src/diff.c:996 src/diff3.c:507 src/sdiff.c:210 +#: src/cmp.c:185 src/diff.c:997 src/diff3.c:509 src/sdiff.c:210 msgid "" "Mandatory arguments to long options are mandatory for short options too.\n" msgstr "" @@ -635,7 +610,7 @@ msgstr "" msgid "If a FILE is '-' or missing, read standard input." msgstr "如果檔案是‘-’或沒有指定，則由標準輸入讀入資料。" -#: src/cmp.c:195 src/diff.c:984 src/sdiff.c:220 +#: src/cmp.c:195 src/diff.c:985 src/sdiff.c:220 msgid "Exit status is 0 if inputs are the same, 1 if different, 2 if trouble." msgstr "如果兩邊內容一樣，回傳值是 0ï¼›1 代表兩邊內容ä¸ç›¸åŒï¼Œ2 代表有錯誤。" @@ -644,245 +619,258 @@ msgstr "如果兩邊內容一樣，回傳值是 0ï¼›1 代表兩邊內容ä¸ç›¸å msgid "invalid --bytes value '%s'" msgstr "無效的 --bytes 值 ‘%s’" -#: src/cmp.c:266 src/diff.c:793 src/diff3.c:353 src/sdiff.c:565 +#: src/cmp.c:266 src/diff.c:795 src/diff3.c:356 src/sdiff.c:565 #, fuzzy, c-format msgid "missing operand after '%s'" msgstr "‘%s’後缺少了åƒæ•¸" -#: src/cmp.c:278 src/diff.c:795 src/diff3.c:355 src/sdiff.c:567 +#: src/cmp.c:278 src/diff.c:797 src/diff3.c:358 src/sdiff.c:567 #, fuzzy, c-format msgid "extra operand '%s'" msgstr "多餘的åƒæ•¸â€˜%s’" -#: src/cmp.c:494 +#: src/cmp.c:498 #, c-format msgid "%s %s differ: byte %s, line %s\n" msgstr "%s %s ä¸åŒï¼šç¬¬ %s ä½å…ƒçµ„，第 %s è¡Œ\n" -#: src/cmp.c:510 +#: src/cmp.c:514 #, c-format msgid "%s %s differ: byte %s, line %s is %3o %s %3o %s\n" msgstr "%s %s ä¸åŒï¼šç¬¬ %s 行，第 %s ä½å…ƒçµ„為 %3o %s %3o %s\n" -#: src/cmp.c:562 -#, c-format -msgid "cmp: EOF on %s\n" +#: src/cmp.c:571 +#, fuzzy, c-format +msgid "cmp: EOF on %s which is empty\n" +msgstr "cmp：%s å·²çµæŸ\n" + +#: src/cmp.c:585 +#, fuzzy, c-format +msgid "cmp: EOF on %s after byte %s, line %s\n" +msgstr "%s %s ä¸åŒï¼šç¬¬ %s ä½å…ƒçµ„，第 %s è¡Œ\n" + +#: src/cmp.c:586 +#, fuzzy, c-format +msgid "cmp: EOF on %s after byte %s, in line %s\n" +msgstr "%s %s ä¸åŒï¼šç¬¬ %s ä½å…ƒçµ„，第 %s è¡Œ\n" + +#: src/cmp.c:592 +#, fuzzy, c-format +msgid "cmp: EOF on %s after byte %s\n" msgstr "cmp：%s å·²çµæŸ\n" #. This is a proper name. See the gettext manual, section Names. -#: src/diff.c:49 +#: src/diff.c:50 msgid "Paul Eggert" msgstr "" #. This is a proper name. See the gettext manual, section Names. -#: src/diff.c:50 +#: src/diff.c:51 msgid "Mike Haertel" msgstr "" #. This is a proper name. See the gettext manual, section Names. -#: src/diff.c:51 +#: src/diff.c:52 msgid "David Hayes" msgstr "" #. This is a proper name. See the gettext manual, section Names. -#: src/diff.c:52 +#: src/diff.c:53 msgid "Richard Stallman" msgstr "" #. This is a proper name. See the gettext manual, section Names. -#: src/diff.c:53 +#: src/diff.c:54 msgid "Len Tower" msgstr "" -#: src/diff.c:351 +#: src/diff.c:353 #, fuzzy, c-format msgid "invalid context length '%s'" msgstr "無效的上下文行數‘%s’" -#: src/diff.c:434 +#: src/diff.c:436 #, c-format msgid "pagination not supported on this host" msgstr "æ¤ç³»çµ±ä¸æ”¯æ´åˆ†é " -#: src/diff.c:449 src/diff3.c:335 +#: src/diff.c:451 src/diff3.c:336 #, c-format msgid "too many file label options" msgstr "太多有關檔案標籤的é¸é …" -#: src/diff.c:526 +#: src/diff.c:528 #, fuzzy, c-format msgid "invalid width '%s'" msgstr "無效的寬度‘%s’" -#: src/diff.c:530 +#: src/diff.c:532 msgid "conflicting width options" msgstr "出ç¾äº’相抵觸的寬度é¸é …" -#: src/diff.c:555 +#: src/diff.c:557 #, fuzzy, c-format msgid "invalid horizon length '%s'" msgstr "無效的水平長度 ‘%s’" -#: src/diff.c:611 +#: src/diff.c:613 #, fuzzy, c-format msgid "invalid tabsize '%s'" msgstr "無效的定ä½å—元寬度 ‘%s’" -#: src/diff.c:615 +#: src/diff.c:617 msgid "conflicting tabsize options" msgstr "出ç¾äº’相抵觸的定ä½å—元寬度é¸é …" -#: src/diff.c:770 +#: src/diff.c:772 msgid "--from-file and --to-file both specified" msgstr "åŒæ™‚指定了 --from-file åŠ --to-file é¸é …" -#: src/diff.c:890 +#: src/diff.c:891 #, fuzzy msgid " --normal output a normal diff (the default)" msgstr "--normal 以æ£å¸¸çš„ diff æ–¹å¼è¼¸å‡ºã€‚" -#: src/diff.c:891 +#: src/diff.c:892 #, fuzzy msgid "-q, --brief report only when files differ" msgstr "-q --brief åªé¡¯ç¤ºæª”案是å¦ä¸åŒã€‚" -#: src/diff.c:892 +#: src/diff.c:893 #, fuzzy msgid "-s, --report-identical-files report when two files are the same" msgstr "-s --report-identical-files 當兩個檔案一樣時ä»ç„¶é¡¯ç¤ºçµæžœã€‚" -#: src/diff.c:893 +#: src/diff.c:894 msgid "" "-c, -C NUM, --context[=NUM] output NUM (default 3) lines of copied context" msgstr "" -#: src/diff.c:894 +#: src/diff.c:895 #, fuzzy msgid "" "-u, -U NUM, --unified[=NUM] output NUM (default 3) lines of unified context" msgstr "-w NUM --width=NUM æ¯è¡Œé¡¯ç¤ºæœ€å¤š NUM（é è¨ 130）個å—元。" -#: src/diff.c:895 +#: src/diff.c:896 #, fuzzy msgid "-e, --ed output an ed script" msgstr "-e --ed 以 ed script æ–¹å¼è¼¸å‡ºã€‚" -#: src/diff.c:896 +#: src/diff.c:897 #, fuzzy msgid "-n, --rcs output an RCS format diff" msgstr "-n --rcs 以 RCS diff æ ¼å¼è¼¸å‡ºã€‚" -#: src/diff.c:897 +#: src/diff.c:898 msgid "-y, --side-by-side output in two columns" msgstr "" -#: src/diff.c:898 +#: src/diff.c:899 #, fuzzy msgid "" "-W, --width=NUM output at most NUM (default 130) print columns" msgstr "-w NUM --width=NUM æ¯è¡Œé¡¯ç¤ºæœ€å¤š NUM（é è¨ 130）個å—元。" -#: src/diff.c:899 +#: src/diff.c:900 #, fuzzy msgid "" " --left-column output only the left column of common lines" msgstr "-l --left-column 當有兩行相åŒæ™‚åªé¡¯ç¤ºå·¦é‚Šçš„一行。" -#: src/diff.c:900 +#: src/diff.c:901 #, fuzzy msgid " --suppress-common-lines do not output common lines" msgstr "-s --suppress-common-lines 當有兩行相åŒæ™‚ä¸æœƒé¡¯ç¤ºã€‚" -#: src/diff.c:902 +#: src/diff.c:903 msgid "-p, --show-c-function show which C function each change is in" msgstr "" -#: src/diff.c:903 +#: src/diff.c:904 msgid "-F, --show-function-line=RE show the most recent line matching RE" msgstr "" -#: src/diff.c:904 -#, fuzzy +#: src/diff.c:905 msgid "" " --label LABEL use LABEL instead of file name and timestamp\n" " (can be repeated)" msgstr "" -"--from-file=FILE1 å°‡ FILE1 å’Œåƒæ•¸ä¸çš„所有檔案/目錄作比較。FILE1 å¯ä»¥æ˜¯ç›®éŒ„。" -#: src/diff.c:907 +#: src/diff.c:908 #, fuzzy msgid "-t, --expand-tabs expand tabs to spaces in output" msgstr "-t --expand-tabs 將輸出ä¸çš„ tab æ›æˆç©ºæ ¼ã€‚" -#: src/diff.c:908 +#: src/diff.c:909 #, fuzzy msgid "-T, --initial-tab make tabs line up by prepending a tab" msgstr "-T --initial-tab æ¯è¡Œå…ˆåŠ 上 tab å—元，使 tab å—å…ƒå¯ä»¥å°é½Šã€‚" -#: src/diff.c:909 +#: src/diff.c:910 #, fuzzy msgid "" " --tabsize=NUM tab stops every NUM (default 8) print columns" msgstr "--tabsize=NUM 定ä½å—å…ƒ (tab) 的寬度，é è¨ç‚º 8 å€‹ç©ºæ ¼ã€‚" -#: src/diff.c:910 +#: src/diff.c:911 msgid "" " --suppress-blank-empty suppress space or tab before empty output lines" msgstr "" -#: src/diff.c:911 +#: src/diff.c:912 #, fuzzy msgid "-l, --paginate pass output through 'pr' to paginate it" msgstr "-l --paginate 將輸出é€è‡³â€˜pr’指令來分é 。" -#: src/diff.c:913 +#: src/diff.c:914 #, fuzzy msgid "" "-r, --recursive recursively compare any subdirectories found" msgstr "-r --recursive 連åŒæ‰€æœ‰å‰¯ç›®éŒ„一起比較。" -#: src/diff.c:914 +#: src/diff.c:915 msgid " --no-dereference don't follow symbolic links" msgstr "" -#: src/diff.c:915 +#: src/diff.c:916 #, fuzzy msgid "-N, --new-file treat absent files as empty" msgstr "-N --new-file ä¸å˜åœ¨çš„檔案以空白檔案方å¼è™•ç†ã€‚" -#: src/diff.c:916 +#: src/diff.c:917 #, fuzzy msgid " --unidirectional-new-file treat absent first files as empty" msgstr "--unidirectional-new-file 若第一個檔案ä¸å˜åœ¨ï¼Œä»¥ç©ºç™½æª”案處ç†ã€‚" -#: src/diff.c:917 +#: src/diff.c:918 #, fuzzy msgid " --ignore-file-name-case ignore case when comparing file names" msgstr "--ignore-file-name-case 當比較檔案å稱時ä¸åˆ†è¾¨å¤§å°å¯«ã€‚" -#: src/diff.c:918 +#: src/diff.c:919 #, fuzzy msgid " --no-ignore-file-name-case consider case when comparing file names" msgstr "--no-ignore-file-name-case 當比較檔案å稱時會分辨大å°å¯«ã€‚" -#: src/diff.c:919 +#: src/diff.c:920 #, fuzzy msgid "-x, --exclude=PAT exclude files that match PAT" msgstr "-x PAT --exclude=PAT 排除樣å¼ç‚º PAT 的檔案。" -#: src/diff.c:920 +#: src/diff.c:921 #, fuzzy msgid "" "-X, --exclude-from=FILE exclude files that match any pattern in FILE" msgstr "-X FILE --exclude-from=FILE 排除所有在 FILE ä¸åˆ—出的樣å¼çš„檔案。" -#: src/diff.c:921 +#: src/diff.c:922 #, fuzzy msgid "" "-S, --starting-file=FILE start with FILE when comparing directories" msgstr "-S FILE --starting-file=FILE 當比較目錄時，由 FILE 開始比較。" -#: src/diff.c:922 +#: src/diff.c:923 #, fuzzy msgid "" " --from-file=FILE1 compare FILE1 to all operands;\n" @@ -890,7 +878,7 @@ msgid "" msgstr "" "--from-file=FILE1 å°‡ FILE1 å’Œåƒæ•¸ä¸çš„所有檔案/目錄作比較。FILE1 å¯ä»¥æ˜¯ç›®éŒ„。" -#: src/diff.c:924 +#: src/diff.c:925 #, fuzzy msgid "" " --to-file=FILE2 compare all operands to FILE2;\n" @@ -898,97 +886,97 @@ msgid "" msgstr "" "--to-file=FILE2 å°‡åƒæ•¸ä¸çš„所有檔案/目錄和 FILE2 作比較。FILE2 å¯ä»¥æ˜¯ç›®éŒ„。" -#: src/diff.c:927 +#: src/diff.c:928 #, fuzzy msgid "" "-i, --ignore-case ignore case differences in file contents" msgstr "-i --ignore-case ä¸åˆ†è¾¨æª”案內容ä¸çš„大å°å¯«ã€‚" -#: src/diff.c:928 +#: src/diff.c:929 #, fuzzy msgid "-E, --ignore-tab-expansion ignore changes due to tab expansion" msgstr "-E --ignore-tab-expansion å¿½ç•¥å› å°‡ tab 轉æ›ç‚ºç©ºæ ¼è€Œé€ æˆçš„差異。" -#: src/diff.c:929 +#: src/diff.c:930 #, fuzzy msgid "-Z, --ignore-trailing-space ignore white space at line end" msgstr "-w --ignore-all-space 忽略所有空白å—元。" -#: src/diff.c:930 +#: src/diff.c:931 #, fuzzy msgid "" "-b, --ignore-space-change ignore changes in the amount of white space" msgstr "-b --ignore-space-change å¿½ç•¥å› ç©ºç™½å—元數目ä¸åŒè€Œé€ æˆçš„差異。" -#: src/diff.c:931 +#: src/diff.c:932 #, fuzzy msgid "-w, --ignore-all-space ignore all white space" msgstr "-w --ignore-all-space 忽略所有空白å—元。" -#: src/diff.c:932 +#: src/diff.c:933 #, fuzzy msgid "" "-B, --ignore-blank-lines ignore changes where lines are all blank" msgstr "-B --ignore-blank-lines å¿½ç•¥ä»»ä½•å› ç©ºè¡Œè€Œé€ æˆçš„差異。" -#: src/diff.c:933 +#: src/diff.c:934 #, fuzzy msgid "-I, --ignore-matching-lines=RE ignore changes where all lines match RE" msgstr "" "-I RE --ignore-matching-lines=RE 忽略任何符åˆæŒ‡å®šçš„<æ£è¦è¡¨ç¤ºå¼>的地方。" -#: src/diff.c:935 +#: src/diff.c:936 #, fuzzy msgid "-a, --text treat all files as text" msgstr "-a --text 所有檔案都以文å—檔方å¼è™•ç†ã€‚" -#: src/diff.c:936 +#: src/diff.c:937 #, fuzzy msgid " --strip-trailing-cr strip trailing carriage return on input" msgstr "--strip-trailing-cr 去除輸入資料æ¯è¡Œæœ«ç«¯çš„ carriage return å—元。" -#: src/diff.c:938 +#: src/diff.c:939 #, fuzzy msgid " --binary read and write data in binary mode" msgstr "--binary 以二元碼檔模å¼è®€å¯«è³‡æ–™ã€‚" -#: src/diff.c:941 +#: src/diff.c:942 #, fuzzy msgid "" "-D, --ifdef=NAME output merged file with '#ifdef NAME' diffs" msgstr "-D NAME --ifdef=NAME 輸出的資料以‘#ifdef NAME’方å¼æ¨™æ˜Žå·®ç•°ã€‚" -#: src/diff.c:942 +#: src/diff.c:943 #, fuzzy msgid " --GTYPE-group-format=GFMT format GTYPE input groups with GFMT" msgstr "" "--GTYPE-group-format=GFMT 效果類似，但會以 GFMT æ ¼å¼è™•ç† GTYPE 輸入行組。" -#: src/diff.c:943 +#: src/diff.c:944 #, fuzzy msgid " --line-format=LFMT format all input lines with LFMT" msgstr "--line-format=LFMT 效果類似，但會以 LFMT æ ¼å¼è™•ç†æ¯ä¸€è¡Œè³‡æ–™ã€‚" -#: src/diff.c:944 +#: src/diff.c:945 #, fuzzy msgid " --LTYPE-line-format=LFMT format LTYPE input lines with LFMT" msgstr "" "--LTYPE-line-format=LFMT 效果類似，但會以 LFMT æ ¼å¼è™•ç† LTYPE 輸入行組。" -#: src/diff.c:945 +#: src/diff.c:946 msgid "" " These format options provide fine-grained control over the output\n" " of diff, generalizing -D/--ifdef." msgstr "" -#: src/diff.c:947 +#: src/diff.c:948 #, fuzzy msgid " LTYPE is 'old', 'new', or 'unchanged'. GTYPE is LTYPE or 'changed'." msgstr "" " LTYPE å¯ä»¥æ˜¯â€˜old’ã€â€˜new’或‘unchanged’。GTYPE å¯ä»¥æ˜¯ LTYPE çš„é¸æ“‡\n" " 或是‘changed’。" -#: src/diff.c:948 +#: src/diff.c:949 #, fuzzy msgid "" " GFMT (only) may contain:\n" @@ -1016,7 +1004,7 @@ msgstr "" " E F-1\n" " M L+1" -#: src/diff.c:960 +#: src/diff.c:961 #, fuzzy msgid "" " LFMT (only) may contain:\n" @@ -1029,7 +1017,7 @@ msgstr "" " %l 該行的內容，但ä¸åŒ…括çµæŸçš„ newline å—å…ƒ\n" " %[-][寬度][.[精確度]]{doxX}n 以 printf æ ¼å¼è¡¨ç¤ºçš„輸入資料行號" -#: src/diff.c:964 +#: src/diff.c:965 #, fuzzy msgid "" " Both GFMT and LFMT may contain:\n" @@ -1043,156 +1031,149 @@ msgstr "" " %c'C' å—å…ƒ C\n" " %c'\\OOO' 八進ä½æ•¸å— OOO 所代表的å—å…ƒ" -#: src/diff.c:970 +#: src/diff.c:971 #, fuzzy msgid "-d, --minimal try hard to find a smaller set of changes" msgstr "-d --minimal 盡å¯èƒ½æ‰¾å‡ºæœ€å°çš„差異。" -#: src/diff.c:971 +#: src/diff.c:972 #, fuzzy msgid " --horizon-lines=NUM keep NUM lines of the common prefix and suffix" msgstr "--horizon-lines=NUM (æ¤é¸é …ä¸ä½œè™•ç†)" -#: src/diff.c:972 +#: src/diff.c:973 #, fuzzy msgid "" " --speed-large-files assume large files and many scattered small changes" msgstr "-H --speed-large-files å‡è¨æª”案å分大而且當ä¸å«æœ‰è¨±å¤šäº›å¾®çš„差異。" -#: src/diff.c:973 -msgid "" -" --color[=WHEN] colorize the output; WHEN can be 'never', 'always'," -msgstr "" - #: src/diff.c:974 -#, fuzzy -msgid " or 'auto' (the default)" -msgstr "--normal 以æ£å¸¸çš„ diff æ–¹å¼è¼¸å‡ºã€‚" - -#: src/diff.c:975 msgid "" -" --palette=PALETTE specify the colors to use when --color is active" +" --color[=WHEN] colorize the output; WHEN can be 'never', " +"'always',\n" +" or 'auto' (the default)" msgstr "" #: src/diff.c:976 msgid "" -" PALETTE is a colon-separated list terminfo " -"capabilities" +" --palette=PALETTE the colors to use when --color is active; PALETTE " +"is\n" +" a colon-separated list of terminfo capabilities" msgstr "" -#: src/diff.c:978 +#: src/diff.c:979 msgid " --help display this help and exit" msgstr "" -#: src/diff.c:979 +#: src/diff.c:980 #, fuzzy msgid "-v, --version output version information and exit" msgstr "-v --version 顯示版本資訊。" -#: src/diff.c:981 +#: src/diff.c:982 #, fuzzy msgid "FILES are 'FILE1 FILE2' or 'DIR1 DIR2' or 'DIR FILE' or 'FILE DIR'." msgstr "" "FILES çš„æ ¼å¼å¯ä»¥æ˜¯â€˜FILE1 FILE2’ã€â€˜DIR1 DIR2’ã€â€˜DIR FILE...’或\n" " ‘FILE... DIR’。" -#: src/diff.c:982 +#: src/diff.c:983 #, fuzzy msgid "" "If --from-file or --to-file is given, there are no restrictions on FILE(s)." msgstr "如果使用 --from-file 或 --to-file é¸é …，FILES çš„æ ¼å¼å‰‡ä¸å—é™åˆ¶ã€‚" -#: src/diff.c:983 src/diff3.c:526 src/sdiff.c:219 +#: src/diff.c:984 src/diff3.c:528 src/sdiff.c:219 #, fuzzy msgid "If a FILE is '-', read standard input." msgstr "如果 FILE 是‘-’，則由標準輸入讀å–資料。" # It is intentional *not* to translate FILES -- maddog -#: src/diff.c:993 +#: src/diff.c:994 #, c-format msgid "Usage: %s [OPTION]... FILES\n" msgstr "用法：%s [é¸é …]... FILES\n" -#: src/diff.c:994 +#: src/diff.c:995 #, fuzzy msgid "Compare FILES line by line." msgstr "比較兩個檔案的æ¯ä¸€è¡Œã€‚" -#: src/diff.c:1028 +#: src/diff.c:1029 #, fuzzy, c-format msgid "conflicting %s option value '%s'" msgstr "互相矛盾的 %s é¸é …，åƒæ•¸å€¼ç‚ºâ€˜%s’" -#: src/diff.c:1041 +#: src/diff.c:1042 #, c-format msgid "conflicting output style options" msgstr "互相矛盾的輸出模å¼é¸é …" -#: src/diff.c:1057 +#: src/diff.c:1058 #, fuzzy, c-format msgid "invalid color '%s'" -msgstr "無效的寬度‘%s’" +msgstr "無效的上下文行數‘%s’" -#: src/diff.c:1113 src/diff.c:1323 +#: src/diff.c:1114 src/diff.c:1324 #, c-format msgid "Only in %s: %s\n" msgstr "åªåœ¨ %s å˜åœ¨ï¼š%s\n" -#: src/diff.c:1247 +#: src/diff.c:1248 #, fuzzy msgid "cannot compare '-' to a directory" msgstr "‘-’無法與目錄作比較" -#: src/diff.c:1282 +#: src/diff.c:1283 msgid "-D option not supported with directories" msgstr "-D é¸é …ä¸å¯é…åˆç›®éŒ„使用" -#: src/diff.c:1291 +#: src/diff.c:1292 #, c-format msgid "Common subdirectories: %s and %s\n" msgstr "%s å’Œ %s 有共åŒçš„副目錄\n" -#: src/diff.c:1333 src/diff.c:1383 +#: src/diff.c:1334 src/diff.c:1384 #, c-format msgid "File %s is a %s while file %s is a %s\n" msgstr "檔案 %s 是%s而檔案 %s 是%s\n" -#: src/diff.c:1369 +#: src/diff.c:1370 #, fuzzy, c-format msgid "Symbolic links %s and %s differ\n" msgstr "檔案 %s 與 %s ä¸åŒ\n" -#: src/diff.c:1456 +#: src/diff.c:1457 #, c-format msgid "Files %s and %s are identical\n" msgstr "檔案 %s å’Œ %s 相åŒ\n" #. This is a proper name. See the gettext manual, section Names. -#: src/diff3.c:41 +#: src/diff3.c:42 msgid "Randy Smith" msgstr "" -#: src/diff3.c:348 +#: src/diff3.c:351 #, c-format msgid "incompatible options" msgstr "ä¸å…¼å®¹çš„é¸é …" -#: src/diff3.c:388 +#: src/diff3.c:391 #, fuzzy msgid "'-' specified for more than one input file" msgstr "輸入檔‘-’ä¸å¯å¤šæ–¼ä¸€å€‹" -#: src/diff3.c:439 src/diff3.c:1288 src/diff3.c:1692 src/diff3.c:1747 +#: src/diff3.c:442 src/diff3.c:1290 src/diff3.c:1693 src/diff3.c:1748 #: src/sdiff.c:307 src/sdiff.c:844 src/sdiff.c:855 msgid "read failed" msgstr "讀å–資料失敗" -#: src/diff3.c:473 +#: src/diff3.c:475 #, fuzzy msgid "-A, --show-all output all changes, bracketing conflicts" msgstr "-A --show-all 顯示所有è¦æ›´æ”¹çš„部份，並括上互相抵觸的地方。" -#: src/diff3.c:475 +#: src/diff3.c:477 #, fuzzy msgid "" "-e, --ed output ed script incorporating changes\n" @@ -1201,84 +1182,84 @@ msgstr "" "-e --ed å–出由 OLDFILE 至 YOURFILE 的更改部份，並顯示å¯å°‡æ¤\n" " 部份套用至 MYFILE çš„ ed script。" -#: src/diff3.c:477 +#: src/diff3.c:479 #, fuzzy msgid "-E, --show-overlap like -e, but bracket conflicts" msgstr "-E --show-overlap 顯示未åˆä½µçš„更改部份，並括上互相抵觸的地方。" -#: src/diff3.c:478 +#: src/diff3.c:480 #, fuzzy msgid "" "-3, --easy-only like -e, but incorporate only nonoverlapping " "changes" msgstr "-3 --easy-only 顯示未åˆä½µè€Œä¸”ä¸é‡ç–Šçš„更改部份。" -#: src/diff3.c:479 +#: src/diff3.c:481 #, fuzzy msgid "" "-x, --overlap-only like -e, but incorporate only overlapping changes" msgstr "-x --overlap-only åªé¡¯ç¤ºé‡ç–Šçš„更改部份。" -#: src/diff3.c:480 +#: src/diff3.c:482 msgid "-X like -x, but bracket conflicts" msgstr "" -#: src/diff3.c:481 +#: src/diff3.c:483 #, fuzzy msgid "-i append 'w' and 'q' commands to ed scripts" msgstr "-i 在 ed script ä¸é™„åŠ â€˜w’和‘q’指令。" -#: src/diff3.c:483 +#: src/diff3.c:485 msgid "" "-m, --merge output actual merged file, according to\n" " -A if no other options are given" msgstr "" -#: src/diff3.c:486 +#: src/diff3.c:488 #, fuzzy msgid "-a, --text treat all files as text" msgstr "-a --text 所有檔案都以文å—檔方å¼è™•ç†ã€‚" -#: src/diff3.c:487 +#: src/diff3.c:489 #, fuzzy msgid " --strip-trailing-cr strip trailing carriage return on input" msgstr "--strip-trailing-cr 去除輸入資料æ¯è¡Œæœ«ç«¯çš„ carriage return å—元。" -#: src/diff3.c:488 +#: src/diff3.c:490 #, fuzzy msgid "-T, --initial-tab make tabs line up by prepending a tab" msgstr "-T --initial-tab æ¯è¡Œå…ˆåŠ 上 tab å—元，使 tab å—å…ƒå¯ä»¥å°é½Šã€‚" -#: src/diff3.c:489 +#: src/diff3.c:491 #, fuzzy msgid " --diff-program=PROGRAM use PROGRAM to compare files" msgstr "--diff-program=ç¨‹å¼ ä½¿ç”¨<程å¼>來比較檔案。" -#: src/diff3.c:490 +#: src/diff3.c:492 msgid "" "-L, --label=LABEL use LABEL instead of file name\n" " (can be repeated up to three times)" msgstr "" -#: src/diff3.c:493 +#: src/diff3.c:495 msgid " --help display this help and exit" msgstr "" -#: src/diff3.c:494 +#: src/diff3.c:496 #, fuzzy msgid "-v, --version output version information and exit" msgstr "-v --version 顯示版本資訊。" -#: src/diff3.c:503 +#: src/diff3.c:505 #, c-format msgid "Usage: %s [OPTION]... MYFILE OLDFILE YOURFILE\n" msgstr "用法：%s [é¸é …]... MYFILE OLDFILE YOURFILE\n" -#: src/diff3.c:505 +#: src/diff3.c:507 msgid "Compare three files line by line." msgstr "比較三個檔案的æ¯ä¸€è¡Œã€‚" -#: src/diff3.c:515 +#: src/diff3.c:517 msgid "" "\n" "The default output format is a somewhat human-readable representation of\n" @@ -1292,45 +1273,45 @@ msgid "" "robust than using ed.\n" msgstr "" -#: src/diff3.c:527 +#: src/diff3.c:529 msgid "Exit status is 0 if successful, 1 if conflicts, 2 if trouble." msgstr "回傳值是 0 的話代表指令æˆåŠŸåŸ·è¡Œï¼Œ1 代表內容有è¡çªï¼Œ2 代表有錯誤。" -#: src/diff3.c:720 +#: src/diff3.c:722 msgid "internal error: screwup in format of diff blocks" msgstr "內部錯誤：diff å€æ®µçš„æ ¼å¼å‡ºéŒ¯" -#: src/diff3.c:1015 +#: src/diff3.c:1017 #, c-format msgid "%s: diff failed: " msgstr "%s：diff 失敗：" -#: src/diff3.c:1037 +#: src/diff3.c:1039 msgid "internal error: invalid diff type in process_diff" msgstr "內部錯誤：process_diff ä¸çš„ diff 類型無效" -#: src/diff3.c:1062 +#: src/diff3.c:1064 msgid "invalid diff format; invalid change separator" msgstr "無效的 diff æ ¼å¼ï¼›è¡¨ç¤ºè³‡æ–™è®Šæ›´çš„分隔å—串無效" -#: src/diff3.c:1298 +#: src/diff3.c:1300 msgid "invalid diff format; incomplete last line" msgstr "無效的 diff æ ¼å¼ï¼›æœ€å¾Œä¸€è¡Œä¸å®Œæ•´" -#: src/diff3.c:1322 src/sdiff.c:275 src/util.c:970 +#: src/diff3.c:1324 src/sdiff.c:275 src/util.c:969 #, fuzzy, c-format msgid "subsidiary program '%s' could not be invoked" msgstr "åç¨‹å¼ â€˜%s’ 無法執行" -#: src/diff3.c:1347 +#: src/diff3.c:1349 msgid "invalid diff format; incorrect leading line chars" msgstr "diff æ ¼å¼ç„¡æ•ˆï¼›æŸè¡Œçš„第一個å—å…ƒä¸æ£ç¢º" -#: src/diff3.c:1420 +#: src/diff3.c:1422 msgid "internal error: invalid diff type passed to output" msgstr "內部錯誤：準備輸出的 diff 資料類型無效" -#: src/diff3.c:1694 src/diff3.c:1751 +#: src/diff3.c:1695 src/diff3.c:1752 msgid "input file shrank" msgstr "輸入檔縮å°" @@ -1345,7 +1326,7 @@ msgid "%s: recursive directory loop" msgstr "" #. This is a proper name. See the gettext manual, section Names. -#: src/sdiff.c:42 +#: src/sdiff.c:43 msgid "Thomas Lord" msgstr "" @@ -1499,16 +1480,36 @@ msgstr "" "v ：\tåŠ ä¸Šå…©é‚Šä¸€æ¨£çš„è¡Œçµ„æ™‚æœƒåœ¨ç•«é¢é¡¯ç¤ºã€‚\n" "q ：\t離開。\n" -#: src/util.c:663 +#: src/util.c:662 #, fuzzy, c-format msgid "unrecognized prefix: %s" msgstr "%s：無法è˜åˆ¥çš„é¸é …‘--%s’\n" -#: src/util.c:693 +#: src/util.c:692 #, c-format msgid "unparsable value for --palette" msgstr "" +#, fuzzy +#~ msgid "%s: option '--%s' doesn't allow an argument\n" +#~ msgstr "%s：é¸é …‘--%s’ä¸å¯é…åˆåƒæ•¸ä½¿ç”¨\n" + +#, fuzzy +#~ msgid "%s: unrecognized option '--%s'\n" +#~ msgstr "%s：無法è˜åˆ¥çš„é¸é …‘--%s’\n" + +#, fuzzy +#~ msgid "%s: option '-W %s' is ambiguous\n" +#~ msgstr "%s：é¸é …‘-W %s’是ä¸æ˜Žç¢ºçš„\n" + +#, fuzzy +#~ msgid "%s: option '-W %s' doesn't allow an argument\n" +#~ msgstr "%s：é¸é …‘-W %s’ä¸å¯é…åˆåƒæ•¸ä½¿ç”¨\n" + +#, fuzzy +#~ msgid "%s: option '-W %s' requires an argument\n" +#~ msgstr "%s：é¸é …‘%s’需è¦åƒæ•¸\n" + #~ msgid "%s: illegal option -- %c\n" #~ msgstr "%s：ä¸åˆæ³•çš„é¸é … ─ %c\n" diff --git a/src/Makefile.am b/src/Makefile.am index 167f7fd..50acad9 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,6 +1,6 @@ # Automakefile for GNU diffutils programs. -# Copyright (C) 2001-2002, 2006, 2009-2013, 2015-2016 Free Software Foundation, +# Copyright (C) 2001-2002, 2006, 2009-2013, 2015-2017 Free Software Foundation, # Inc. # This program is free software: you can redistribute it and/or modify @@ -43,7 +43,10 @@ sdiff_SOURCES = sdiff.c diff_SOURCES = \ analyze.c context.c diff.c dir.c ed.c ifdef.c io.c \ normal.c side.c util.c -noinst_HEADERS = diff.h system.h +noinst_HEADERS = \ + die.h \ + diff.h \ + system.h MOSTLYCLEANFILES = paths.h paths.ht diff --git a/src/Makefile.in b/src/Makefile.in index a0f1c99..d853afd 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -16,7 +16,7 @@ # Automakefile for GNU diffutils programs. -# Copyright (C) 2001-2002, 2006, 2009-2013, 2015-2016 Free Software Foundation, +# Copyright (C) 2001-2002, 2006, 2009-2013, 2015-2017 Free Software Foundation, # Inc. # This program is free software: you can redistribute it and/or modify @@ -114,10 +114,11 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \ $(top_srcdir)/m4/absolute-header.m4 $(top_srcdir)/m4/alloca.m4 \ $(top_srcdir)/m4/arpa_inet_h.m4 $(top_srcdir)/m4/btowc.m4 \ - $(top_srcdir)/m4/c-stack.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/dirname.m4 \ + $(top_srcdir)/m4/builtin-expect.m4 $(top_srcdir)/m4/c-stack.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/dirname.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 \ @@ -130,7 +131,8 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \ $(top_srcdir)/m4/freopen.m4 $(top_srcdir)/m4/fstat.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/gettext.m4 \ + $(top_srcdir)/m4/getpagesize.m4 \ + $(top_srcdir)/m4/getprogname.m4 $(top_srcdir)/m4/gettext.m4 \ $(top_srcdir)/m4/gettime.m4 $(top_srcdir)/m4/gettimeofday.m4 \ $(top_srcdir)/m4/glibc21.m4 $(top_srcdir)/m4/gnu-make.m4 \ $(top_srcdir)/m4/gnulib-common.m4 \ @@ -147,17 +149,19 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \ $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \ $(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libsigsegv.m4 \ $(top_srcdir)/m4/libunistring-base.m4 \ - $(top_srcdir)/m4/localcharset.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/longlong.m4 \ - $(top_srcdir)/m4/lstat.m4 $(top_srcdir)/m4/malloc.m4 \ - $(top_srcdir)/m4/malloca.m4 $(top_srcdir)/m4/manywarnings.m4 \ - $(top_srcdir)/m4/mbchar.m4 $(top_srcdir)/m4/mbiter.m4 \ - $(top_srcdir)/m4/mbrtowc.m4 $(top_srcdir)/m4/mbsinit.m4 \ - $(top_srcdir)/m4/mbslen.m4 $(top_srcdir)/m4/mbsrtowcs.m4 \ - $(top_srcdir)/m4/mbstate_t.m4 $(top_srcdir)/m4/mbtowc.m4 \ - $(top_srcdir)/m4/memchr.m4 $(top_srcdir)/m4/mkstemp.m4 \ + $(top_srcdir)/m4/limits-h.m4 $(top_srcdir)/m4/localcharset.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/localtime-buffer.m4 \ + $(top_srcdir)/m4/longlong.m4 $(top_srcdir)/m4/lstat.m4 \ + $(top_srcdir)/m4/malloc.m4 $(top_srcdir)/m4/malloca.m4 \ + $(top_srcdir)/m4/manywarnings.m4 $(top_srcdir)/m4/mbchar.m4 \ + $(top_srcdir)/m4/mbiter.m4 $(top_srcdir)/m4/mbrtowc.m4 \ + $(top_srcdir)/m4/mbsinit.m4 $(top_srcdir)/m4/mbslen.m4 \ + $(top_srcdir)/m4/mbsrtowcs.m4 $(top_srcdir)/m4/mbstate_t.m4 \ + $(top_srcdir)/m4/mbtowc.m4 $(top_srcdir)/m4/memchr.m4 \ + $(top_srcdir)/m4/minmax.m4 $(top_srcdir)/m4/mkstemp.m4 \ $(top_srcdir)/m4/mktime.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 \ @@ -199,9 +203,10 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \ $(top_srcdir)/m4/time_h.m4 $(top_srcdir)/m4/time_r.m4 \ $(top_srcdir)/m4/time_rz.m4 $(top_srcdir)/m4/timegm.m4 \ $(top_srcdir)/m4/timespec.m4 $(top_srcdir)/m4/tm_gmtoff.m4 \ - $(top_srcdir)/m4/unistd_h.m4 $(top_srcdir)/m4/unlocked-io.m4 \ - $(top_srcdir)/m4/vararrays.m4 $(top_srcdir)/m4/vasnprintf.m4 \ - $(top_srcdir)/m4/vasprintf.m4 $(top_srcdir)/m4/version-etc.m4 \ + $(top_srcdir)/m4/tzset.m4 $(top_srcdir)/m4/unistd_h.m4 \ + $(top_srcdir)/m4/unlocked-io.m4 $(top_srcdir)/m4/vararrays.m4 \ + $(top_srcdir)/m4/vasnprintf.m4 $(top_srcdir)/m4/vasprintf.m4 \ + $(top_srcdir)/m4/version-etc.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 \ @@ -356,6 +361,7 @@ ERRNO_H = @ERRNO_H@ EXEEXT = @EXEEXT@ FLOAT_H = @FLOAT_H@ FNMATCH_H = @FNMATCH_H@ +GETOPT_CDEFS_H = @GETOPT_CDEFS_H@ GETOPT_H = @GETOPT_H@ GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@ GLIBC21 = @GLIBC21@ @@ -372,6 +378,7 @@ GNULIB_CHDIR = @GNULIB_CHDIR@ GNULIB_CHOWN = @GNULIB_CHOWN@ GNULIB_CLOSE = @GNULIB_CLOSE@ GNULIB_CONNECT = @GNULIB_CONNECT@ +GNULIB_CTIME = @GNULIB_CTIME@ GNULIB_DPRINTF = @GNULIB_DPRINTF@ GNULIB_DUP = @GNULIB_DUP@ GNULIB_DUP2 = @GNULIB_DUP2@ @@ -450,6 +457,7 @@ GNULIB_LINK = @GNULIB_LINK@ GNULIB_LINKAT = @GNULIB_LINKAT@ GNULIB_LISTEN = @GNULIB_LISTEN@ GNULIB_LOCALECONV = @GNULIB_LOCALECONV@ +GNULIB_LOCALTIME = @GNULIB_LOCALTIME@ GNULIB_LSEEK = @GNULIB_LSEEK@ GNULIB_LSTAT = @GNULIB_LSTAT@ GNULIB_MALLOC_POSIX = @GNULIB_MALLOC_POSIX@ @@ -495,6 +503,8 @@ GNULIB_OBSTACK_PRINTF = @GNULIB_OBSTACK_PRINTF@ GNULIB_OBSTACK_PRINTF_POSIX = @GNULIB_OBSTACK_PRINTF_POSIX@ GNULIB_OPEN = @GNULIB_OPEN@ GNULIB_OPENAT = @GNULIB_OPENAT@ +GNULIB_OVERRIDES_STRUCT_STAT = @GNULIB_OVERRIDES_STRUCT_STAT@ +GNULIB_OVERRIDES_WINT_T = @GNULIB_OVERRIDES_WINT_T@ GNULIB_PCLOSE = @GNULIB_PCLOSE@ GNULIB_PERROR = @GNULIB_PERROR@ GNULIB_PIPE = @GNULIB_PIPE@ @@ -557,6 +567,7 @@ GNULIB_STRCHRNUL = @GNULIB_STRCHRNUL@ GNULIB_STRDUP = @GNULIB_STRDUP@ GNULIB_STRERROR = @GNULIB_STRERROR@ GNULIB_STRERROR_R = @GNULIB_STRERROR_R@ +GNULIB_STRFTIME = @GNULIB_STRFTIME@ GNULIB_STRNCAT = @GNULIB_STRNCAT@ GNULIB_STRNDUP = @GNULIB_STRNDUP@ GNULIB_STRNLEN = @GNULIB_STRNLEN@ @@ -580,7 +591,9 @@ GNULIB_TIME_R = @GNULIB_TIME_R@ GNULIB_TIME_RZ = @GNULIB_TIME_RZ@ GNULIB_TMPFILE = @GNULIB_TMPFILE@ GNULIB_TOWCTRANS = @GNULIB_TOWCTRANS@ +GNULIB_TRUNCATE = @GNULIB_TRUNCATE@ GNULIB_TTYNAME_R = @GNULIB_TTYNAME_R@ +GNULIB_TZSET = @GNULIB_TZSET@ GNULIB_UNISTD_H_NONBLOCKING = @GNULIB_UNISTD_H_NONBLOCKING@ GNULIB_UNISTD_H_SIGPIPE = @GNULIB_UNISTD_H_SIGPIPE@ GNULIB_UNLINK = @GNULIB_UNLINK@ @@ -612,6 +625,7 @@ GNULIB_WCSCOLL = @GNULIB_WCSCOLL@ GNULIB_WCSCPY = @GNULIB_WCSCPY@ GNULIB_WCSCSPN = @GNULIB_WCSCSPN@ GNULIB_WCSDUP = @GNULIB_WCSDUP@ +GNULIB_WCSFTIME = @GNULIB_WCSFTIME@ GNULIB_WCSLEN = @GNULIB_WCSLEN@ GNULIB_WCSNCASECMP = @GNULIB_WCSNCASECMP@ GNULIB_WCSNCAT = @GNULIB_WCSNCAT@ @@ -644,8 +658,10 @@ HAVE_ACCEPT4 = @HAVE_ACCEPT4@ HAVE_ARPA_INET_H = @HAVE_ARPA_INET_H@ HAVE_ATOLL = @HAVE_ATOLL@ HAVE_BTOWC = @HAVE_BTOWC@ +HAVE_C99_STDINT_H = @HAVE_C99_STDINT_H@ HAVE_CANONICALIZE_FILE_NAME = @HAVE_CANONICALIZE_FILE_NAME@ HAVE_CHOWN = @HAVE_CHOWN@ +HAVE_CRTDEFS_H = @HAVE_CRTDEFS_H@ HAVE_DECL_ENVIRON = @HAVE_DECL_ENVIRON@ HAVE_DECL_FCHDIR = @HAVE_DECL_FCHDIR@ HAVE_DECL_FDATASYNC = @HAVE_DECL_FDATASYNC@ @@ -656,6 +672,7 @@ HAVE_DECL_GETDELIM = @HAVE_DECL_GETDELIM@ HAVE_DECL_GETDOMAINNAME = @HAVE_DECL_GETDOMAINNAME@ HAVE_DECL_GETLINE = @HAVE_DECL_GETLINE@ HAVE_DECL_GETLOADAVG = @HAVE_DECL_GETLOADAVG@ +HAVE_DECL_GETLOGIN = @HAVE_DECL_GETLOGIN@ HAVE_DECL_GETLOGIN_R = @HAVE_DECL_GETLOGIN_R@ HAVE_DECL_GETPAGESIZE = @HAVE_DECL_GETPAGESIZE@ HAVE_DECL_GETUSERSHELL = @HAVE_DECL_GETUSERSHELL@ @@ -768,6 +785,7 @@ HAVE_PTHREAD_SIGMASK = @HAVE_PTHREAD_SIGMASK@ HAVE_PTSNAME = @HAVE_PTSNAME@ HAVE_PTSNAME_R = @HAVE_PTSNAME_R@ HAVE_PWRITE = @HAVE_PWRITE@ +HAVE_QSORT_R = @HAVE_QSORT_R@ HAVE_RAISE = @HAVE_RAISE@ HAVE_RANDOM = @HAVE_RANDOM@ HAVE_RANDOM_H = @HAVE_RANDOM_H@ @@ -812,6 +830,7 @@ HAVE_STRVERSCMP = @HAVE_STRVERSCMP@ HAVE_SYMLINK = @HAVE_SYMLINK@ HAVE_SYMLINKAT = @HAVE_SYMLINKAT@ HAVE_SYS_BITYPES_H = @HAVE_SYS_BITYPES_H@ +HAVE_SYS_CDEFS_H = @HAVE_SYS_CDEFS_H@ HAVE_SYS_INTTYPES_H = @HAVE_SYS_INTTYPES_H@ HAVE_SYS_IOCTL_H = @HAVE_SYS_IOCTL_H@ HAVE_SYS_LOADAVG_H = @HAVE_SYS_LOADAVG_H@ @@ -823,7 +842,9 @@ HAVE_SYS_TYPES_H = @HAVE_SYS_TYPES_H@ HAVE_SYS_UIO_H = @HAVE_SYS_UIO_H@ HAVE_TIMEGM = @HAVE_TIMEGM@ HAVE_TIMEZONE_T = @HAVE_TIMEZONE_T@ +HAVE_TRUNCATE = @HAVE_TRUNCATE@ HAVE_TYPE_VOLATILE_SIG_ATOMIC_T = @HAVE_TYPE_VOLATILE_SIG_ATOMIC_T@ +HAVE_TZSET = @HAVE_TZSET@ HAVE_UNISTD_H = @HAVE_UNISTD_H@ HAVE_UNLINKAT = @HAVE_UNLINKAT@ HAVE_UNLOCKPT = @HAVE_UNLOCKPT@ @@ -845,6 +866,7 @@ HAVE_WCSCOLL = @HAVE_WCSCOLL@ HAVE_WCSCPY = @HAVE_WCSCPY@ HAVE_WCSCSPN = @HAVE_WCSCSPN@ HAVE_WCSDUP = @HAVE_WCSDUP@ +HAVE_WCSFTIME = @HAVE_WCSFTIME@ HAVE_WCSLEN = @HAVE_WCSLEN@ HAVE_WCSNCASECMP = @HAVE_WCSNCASECMP@ HAVE_WCSNCAT = @HAVE_WCSNCAT@ @@ -907,6 +929,7 @@ LIBUNISTRING_UNIWIDTH_H = @LIBUNISTRING_UNIWIDTH_H@ LIB_CLOCK_GETTIME = @LIB_CLOCK_GETTIME@ LIB_NANOSLEEP = @LIB_NANOSLEEP@ LIB_SELECT = @LIB_SELECT@ +LIMITS_H = @LIMITS_H@ LOCALCHARSET_TESTS_ENVIRONMENT = @LOCALCHARSET_TESTS_ENVIRONMENT@ LOCALE_FR = @LOCALE_FR@ LOCALE_FR_UTF8 = @LOCALE_FR_UTF8@ @@ -934,6 +957,7 @@ NEXT_AS_FIRST_DIRECTIVE_GETOPT_H = @NEXT_AS_FIRST_DIRECTIVE_GETOPT_H@ NEXT_AS_FIRST_DIRECTIVE_ICONV_H = @NEXT_AS_FIRST_DIRECTIVE_ICONV_H@ NEXT_AS_FIRST_DIRECTIVE_INTTYPES_H = @NEXT_AS_FIRST_DIRECTIVE_INTTYPES_H@ NEXT_AS_FIRST_DIRECTIVE_LANGINFO_H = @NEXT_AS_FIRST_DIRECTIVE_LANGINFO_H@ +NEXT_AS_FIRST_DIRECTIVE_LIMITS_H = @NEXT_AS_FIRST_DIRECTIVE_LIMITS_H@ NEXT_AS_FIRST_DIRECTIVE_LOCALE_H = @NEXT_AS_FIRST_DIRECTIVE_LOCALE_H@ NEXT_AS_FIRST_DIRECTIVE_NETINET_IN_H = @NEXT_AS_FIRST_DIRECTIVE_NETINET_IN_H@ NEXT_AS_FIRST_DIRECTIVE_SIGNAL_H = @NEXT_AS_FIRST_DIRECTIVE_SIGNAL_H@ @@ -964,6 +988,7 @@ NEXT_GETOPT_H = @NEXT_GETOPT_H@ NEXT_ICONV_H = @NEXT_ICONV_H@ NEXT_INTTYPES_H = @NEXT_INTTYPES_H@ NEXT_LANGINFO_H = @NEXT_LANGINFO_H@ +NEXT_LIMITS_H = @NEXT_LIMITS_H@ NEXT_LOCALE_H = @NEXT_LOCALE_H@ NEXT_NETINET_IN_H = @NEXT_NETINET_IN_H@ NEXT_SIGNAL_H = @NEXT_SIGNAL_H@ @@ -1009,6 +1034,7 @@ REPLACE_CALLOC = @REPLACE_CALLOC@ REPLACE_CANONICALIZE_FILE_NAME = @REPLACE_CANONICALIZE_FILE_NAME@ REPLACE_CHOWN = @REPLACE_CHOWN@ REPLACE_CLOSE = @REPLACE_CLOSE@ +REPLACE_CTIME = @REPLACE_CTIME@ REPLACE_DPRINTF = @REPLACE_DPRINTF@ REPLACE_DUP = @REPLACE_DUP@ REPLACE_DUP2 = @REPLACE_DUP2@ @@ -1116,6 +1142,7 @@ REPLACE_STRCHRNUL = @REPLACE_STRCHRNUL@ REPLACE_STRDUP = @REPLACE_STRDUP@ REPLACE_STRERROR = @REPLACE_STRERROR@ REPLACE_STRERROR_R = @REPLACE_STRERROR_R@ +REPLACE_STRFTIME = @REPLACE_STRFTIME@ REPLACE_STRNCAT = @REPLACE_STRNCAT@ REPLACE_STRNDUP = @REPLACE_STRNDUP@ REPLACE_STRNLEN = @REPLACE_STRNLEN@ @@ -1132,7 +1159,9 @@ REPLACE_SYMLINKAT = @REPLACE_SYMLINKAT@ REPLACE_TIMEGM = @REPLACE_TIMEGM@ REPLACE_TMPFILE = @REPLACE_TMPFILE@ REPLACE_TOWLOWER = @REPLACE_TOWLOWER@ +REPLACE_TRUNCATE = @REPLACE_TRUNCATE@ REPLACE_TTYNAME_R = @REPLACE_TTYNAME_R@ +REPLACE_TZSET = @REPLACE_TZSET@ REPLACE_UNLINK = @REPLACE_UNLINK@ REPLACE_UNLINKAT = @REPLACE_UNLINKAT@ REPLACE_UNSETENV = @REPLACE_UNSETENV@ @@ -1145,6 +1174,7 @@ REPLACE_VPRINTF = @REPLACE_VPRINTF@ REPLACE_VSNPRINTF = @REPLACE_VSNPRINTF@ REPLACE_VSPRINTF = @REPLACE_VSPRINTF@ REPLACE_WCRTOMB = @REPLACE_WCRTOMB@ +REPLACE_WCSFTIME = @REPLACE_WCSFTIME@ REPLACE_WCSNRTOMBS = @REPLACE_WCSNRTOMBS@ REPLACE_WCSRTOMBS = @REPLACE_WCSRTOMBS@ REPLACE_WCSWIDTH = @REPLACE_WCSWIDTH@ @@ -1181,6 +1211,8 @@ WCHAR_T_SUFFIX = @WCHAR_T_SUFFIX@ WERROR_CFLAGS = @WERROR_CFLAGS@ WINDOWS_64_BIT_OFF_T = @WINDOWS_64_BIT_OFF_T@ WINDOWS_64_BIT_ST_SIZE = @WINDOWS_64_BIT_ST_SIZE@ +WINDOWS_STAT_INODES = @WINDOWS_STAT_INODES@ +WINDOWS_STAT_TIMESPEC = @WINDOWS_STAT_TIMESPEC@ WINT_T_SUFFIX = @WINT_T_SUFFIX@ XGETTEXT = @XGETTEXT@ XGETTEXT_015 = @XGETTEXT_015@ @@ -1190,7 +1222,6 @@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ abs_top_srcdir = @abs_top_srcdir@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ am__include = @am__include@ am__quote = @am__quote@ @@ -1265,7 +1296,11 @@ diff_SOURCES = \ analyze.c context.c diff.c dir.c ed.c ifdef.c io.c \ normal.c side.c util.c -noinst_HEADERS = diff.h system.h +noinst_HEADERS = \ + die.h \ + diff.h \ + system.h + MOSTLYCLEANFILES = paths.h paths.ht gdiff = `echo diff|sed '$(transform)'` BUILT_SOURCES = paths.h version.c version.h diff --git a/src/analyze.c b/src/analyze.c index 3981872..403ae73 100644 --- a/src/analyze.c +++ b/src/analyze.c @@ -1,7 +1,7 @@ /* Analyze file differences for GNU DIFF. Copyright (C) 1988-1989, 1992-1995, 1998, 2001-2002, 2004, 2006-2007, - 2009-2013, 2015-2016 Free Software Foundation, Inc. + 2009-2013, 2015-2017 Free Software Foundation, Inc. This file is part of GNU DIFF. @@ -534,6 +534,7 @@ diff_2_files (struct comparison *cmp) { struct context ctxt; lin diags; + lin too_expensive; /* Allocate vectors for the results of comparison: a flag for each line of each file, saying whether that line @@ -565,11 +566,19 @@ diff_2_files (struct comparison *cmp) ctxt.heuristic = speed_large_files; + /* Set TOO_EXPENSIVE to be the approximate square root of the + input size, bounded below by 4096. 4096 seems to be good for + circa-2016 CPUs; see Bug#16848 and Bug#24715. */ + too_expensive = 1; + for (; diags != 0; diags >>= 2) + too_expensive <<= 1; + ctxt.too_expensive = MAX (4096, too_expensive); + files[0] = cmp->file[0]; files[1] = cmp->file[1]; compareseq (0, cmp->file[0].nondiscarded_lines, - 0, cmp->file[1].nondiscarded_lines, &ctxt); + 0, cmp->file[1].nondiscarded_lines, minimal, &ctxt); free (ctxt.fdiag - (cmp->file[1].nondiscarded_lines + 1)); @@ -1,7 +1,7 @@ /* cmp - compare two files byte by byte Copyright (C) 1990-1996, 1998, 2001-2002, 2004, 2006-2007, 2009-2013, - 2015-2016 Free Software Foundation, Inc. + 2015-2017 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -23,6 +23,7 @@ #include <c-stack.h> #include <cmpbuf.h> +#include "die.h" #include <error.h> #include <exitfail.h> #include <file-type.h> @@ -114,9 +115,8 @@ try_help (char const *reason_msgid, char const *operand) { if (reason_msgid) error (0, 0, _(reason_msgid), operand); - error (EXIT_TROUBLE, 0, + die (EXIT_TROUBLE, 0, _("Try '%s --help' for more information."), program_name); - abort (); } static char const valid_suffixes[] = "kKMGTPEZY0"; @@ -152,9 +152,9 @@ static void check_stdout (void) { if (ferror (stdout)) - error (EXIT_TROUBLE, 0, "%s", _("write failed")); + die (EXIT_TROUBLE, 0, "%s", _("write failed")); else if (fclose (stdout) != 0) - error (EXIT_TROUBLE, errno, "%s", _("standard output")); + die (EXIT_TROUBLE, errno, "%s", _("standard output")); } static char const * const option_help_msgid[] = { @@ -303,7 +303,7 @@ main (int argc, char **argv) if (file_desc[f1] < 0 && comparison_type == type_status) exit (EXIT_TROUBLE); else - error (EXIT_TROUBLE, errno, "%s", file[f1]); + die (EXIT_TROUBLE, errno, "%s", file[f1]); } } @@ -363,7 +363,7 @@ main (int argc, char **argv) for (f = 0; f < 2; f++) if (close (file_desc[f]) != 0) - error (EXIT_TROUBLE, errno, "%s", file[f]); + die (EXIT_TROUBLE, errno, "%s", file[f]); if (exit_status != EXIT_SUCCESS && comparison_type < type_no_stdout) check_stdout (); exit (exit_status); @@ -378,6 +378,7 @@ main (int argc, char **argv) static int cmp (void) { + bool at_line_start = true; off_t line_number = 1; /* Line number (1...) of difference. */ off_t byte_number = 1; /* Byte number (1...) of difference. */ uintmax_t remaining = bytes; /* Remaining number of bytes to compare. */ @@ -421,7 +422,7 @@ cmp (void) if (r != bytes_to_read) { if (r == SIZE_MAX) - error (EXIT_TROUBLE, errno, "%s", file[f]); + die (EXIT_TROUBLE, errno, "%s", file[f]); break; } ig -= r; @@ -443,10 +444,10 @@ cmp (void) read0 = block_read (file_desc[0], buf0, bytes_to_read); if (read0 == SIZE_MAX) - error (EXIT_TROUBLE, errno, "%s", file[0]); + die (EXIT_TROUBLE, errno, "%s", file[0]); read1 = block_read (file_desc[1], buf1, bytes_to_read); if (read1 == SIZE_MAX) - error (EXIT_TROUBLE, errno, "%s", file[1]); + die (EXIT_TROUBLE, errno, "%s", file[1]); smaller = MIN (read0, read1); @@ -463,8 +464,11 @@ cmp (void) } byte_number += first_diff; - if (comparison_type == type_first_diff) - line_number += count_newlines (buf0, first_diff); + if (comparison_type == type_first_diff && first_diff != 0) + { + line_number += count_newlines (buf0, first_diff); + at_line_start = buf0[first_diff - 1] == '\n'; + } if (first_diff < smaller) { @@ -478,9 +482,9 @@ cmp (void) char const *line_num = offtostr (line_number, line_buf); if (!opt_print_bytes) { - /* See POSIX 1003.1-2001 for this format. This - message is used only in the POSIX locale, so it - need not be translated. */ + /* See POSIX for this format. This message is + used only in the POSIX locale, so it need not + be translated. */ static char const char_message[] = "%s %s differ: char %s, line %s\n"; @@ -510,9 +514,9 @@ cmp (void) printf (_("%s %s differ: byte %s, line %s is %3o %s %3o %s\n"), file[0], file[1], byte_num, line_num, c0, s0, c1, s1); - } + } } - /* Fall through. */ + FALLTHROUGH; case type_status: return EXIT_FAILURE; @@ -527,7 +531,7 @@ cmp (void) char const *byte_num = offtostr (byte_number, byte_buf); if (!opt_print_bytes) { - /* See POSIX 1003.1-2001 for this format. */ + /* See POSIX for this format. */ printf ("%*s %3o %3o\n", offset_width, byte_num, c0, c1); } @@ -558,8 +562,36 @@ cmp (void) { if (differing <= 0 && comparison_type != type_status) { - /* See POSIX 1003.1-2001 for this format. */ - fprintf (stderr, _("cmp: EOF on %s\n"), file[read1 < read0]); + char const *shorter_file = file[read1 < read0]; + + /* POSIX says that each of these format strings must be + "cmp: EOF on %s", optionally followed by a blank and + extra text sans newline, then terminated by "\n". */ + if (byte_number == 1) + fprintf (stderr, _("cmp: EOF on %s which is empty\n"), + shorter_file); + else + { + char byte_buf[INT_BUFSIZE_BOUND (off_t)]; + char const *byte_num = offtostr (byte_number - 1, byte_buf); + + if (comparison_type == type_first_diff) + { + char line_buf[INT_BUFSIZE_BOUND (off_t)]; + char const *line_num + = offtostr (line_number - at_line_start, line_buf); + fprintf (stderr, + (at_line_start + ? _("cmp: EOF on %s after byte %s, line %s\n") + : _("cmp: EOF on %s after byte %s," + " in line %s\n")), + shorter_file, byte_num, line_num); + } + else + fprintf (stderr, + _("cmp: EOF on %s after byte %s\n"), + shorter_file, byte_num); + } } return EXIT_FAILURE; diff --git a/src/context.c b/src/context.c index 1a92a60..e96007d 100644 --- a/src/context.c +++ b/src/context.c @@ -1,7 +1,7 @@ /* Context-format output routines for GNU DIFF. Copyright (C) 1988-1989, 1991-1995, 1998, 2001-2002, 2004, 2006, 2009-2013, - 2015-2016 Free Software Foundation, Inc. + 2015-2017 Free Software Foundation, Inc. This file is part of GNU DIFF. @@ -126,7 +126,7 @@ print_context_script (struct change *script, bool unidiff) static void print_context_number_range (struct file_data const *file, lin a, lin b) { - long int trans_a, trans_b; + printint trans_a, trans_b; translate_range (file, a, b, &trans_a, &trans_b); /* We can have B <= A in the case of a range of no lines. @@ -139,9 +139,9 @@ print_context_number_range (struct file_data const *file, lin a, lin b) specification. */ if (trans_b <= trans_a) - fprintf (outfile, "%ld", trans_b); + fprintf (outfile, "%"pI"d", trans_b); else - fprintf (outfile, "%ld,%ld", trans_a, trans_b); + fprintf (outfile, "%"pI"d,%"pI"d", trans_a, trans_b); } /* Print FUNCTION in a context header. */ @@ -299,7 +299,7 @@ pr_context_hunk (struct change *hunk) static void print_unidiff_number_range (struct file_data const *file, lin a, lin b) { - long int trans_a, trans_b; + printint trans_a, trans_b; translate_range (file, a, b, &trans_a, &trans_b); /* We can have B < A in the case of a range of no lines. @@ -307,9 +307,9 @@ print_unidiff_number_range (struct file_data const *file, lin a, lin b) which is B. It would be more logical to print A, but 'patch' expects B in order to detect diffs against empty files. */ if (trans_b <= trans_a) - fprintf (outfile, trans_b < trans_a ? "%ld,0" : "%ld", trans_b); + fprintf (outfile, trans_b < trans_a ? "%"pI"d,0" : "%"pI"d", trans_b); else - fprintf (outfile, "%ld,%ld", trans_a, trans_b - trans_a + 1); + fprintf (outfile, "%"pI"d,%"pI"d", trans_a, trans_b - trans_a + 1); } /* Print a portion of an edit script in unidiff format. diff --git a/src/die.h b/src/die.h new file mode 100644 index 0000000..8835d80 --- /dev/null +++ b/src/die.h @@ -0,0 +1,31 @@ +/* Report an error and exit. + Copyright 2016-2017 Free Software Foundation, Inc. + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 3, or (at your option) + any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA + 02110-1301, USA. */ + +#ifndef DIE_H +# define DIE_H + +# include <error.h> +# include <stdbool.h> +# include <verify.h> + +/* Like 'error (STATUS, ...)', except STATUS must be a nonzero constant. + This may pacify the compiler or help it generate better code. */ +# define die(status, ...) \ + verify_expr (status, (error (status, __VA_ARGS__), assume (false))) + +#endif /* DIE_H */ @@ -1,7 +1,7 @@ /* diff - compare files line by line Copyright (C) 1988-1989, 1992-1994, 1996, 1998, 2001-2002, 2004, 2006-2007, - 2009-2013, 2015-2016 Free Software Foundation, Inc. + 2009-2013, 2015-2017 Free Software Foundation, Inc. This file is part of GNU DIFF. @@ -20,6 +20,7 @@ #define GDIFF_MAIN #include "diff.h" +#include "die.h" #include <assert.h> #include "paths.h" #include <c-stack.h> @@ -295,6 +296,7 @@ main (int argc, char **argv) ignore_regexp_list.buf = &ignore_regexp; re_set_syntax (RE_SYNTAX_GREP | RE_NO_POSIX_BACKTRACKING); excluded = new_exclude (); + presume_output_tty = false; /* Decode the options. */ @@ -816,7 +818,7 @@ add_regexp (struct regexp_list *reglist, char const *pattern) char const *m = re_compile_pattern (pattern, patlen, reglist->buf); if (m != 0) - error (0, 0, "%s: %s", pattern, m); + error (EXIT_TROUBLE, 0, "%s: %s", pattern, m); else { char *regexps = reglist->regexps; @@ -862,7 +864,7 @@ summarize_regexp_list (struct regexp_list *reglist) char const *m = re_compile_pattern (reglist->regexps, reglist->len, reglist->buf); if (m) - error (EXIT_TROUBLE, 0, "%s: %s", reglist->regexps, m); + die (EXIT_TROUBLE, 0, "%s: %s", reglist->regexps, m); } } } @@ -872,9 +874,8 @@ try_help (char const *reason_msgid, char const *operand) { if (reason_msgid) error (0, 0, _(reason_msgid), operand); - error (EXIT_TROUBLE, 0, _("Try '%s --help' for more information."), + die (EXIT_TROUBLE, 0, _("Try '%s --help' for more information."), program_name); - abort (); } static void @@ -970,10 +971,10 @@ static char const * const option_help_msgid[] = { N_("-d, --minimal try hard to find a smaller set of changes"), N_(" --horizon-lines=NUM keep NUM lines of the common prefix and suffix"), N_(" --speed-large-files assume large files and many scattered small changes"), - N_(" --color[=WHEN] colorize the output; WHEN can be 'never', 'always',"), - N_(" or 'auto' (the default)"), - N_(" --palette=PALETTE specify the colors to use when --color is active"), - N_(" PALETTE is a colon-separated list terminfo capabilities"), + N_(" --color[=WHEN] colorize the output; WHEN can be 'never', 'always',\n" + " or 'auto' (the default)"), + N_(" --palette=PALETTE the colors to use when --color is active; PALETTE is\n" + " a colon-separated list of terminfo capabilities"), "", N_(" --help display this help and exit"), N_("-v, --version output version information and exit"), @@ -1,7 +1,7 @@ /* Shared definitions for GNU DIFF Copyright (C) 1988-1989, 1991-1995, 1998, 2001-2002, 2004, 2009-2013, - 2015-2016 Free Software Foundation, Inc. + 2015-2017 Free Software Foundation, Inc. This file is part of GNU DIFF. @@ -406,7 +406,7 @@ extern void print_script (struct change *, struct change * (*) (struct change *) void (*) (struct change *)); extern void setup_output (char const *, char const *, bool); extern void translate_range (struct file_data const *, lin, lin, - long int *, long int *); + printint *, printint *); enum color_context { diff --git a/src/diff3.c b/src/diff3.c index b80aeb3..5f3c7cb 100644 --- a/src/diff3.c +++ b/src/diff3.c @@ -1,7 +1,7 @@ /* diff3 - compare three files line by line Copyright (C) 1988-1989, 1992-1996, 1998, 2001-2002, 2004, 2006, 2009-2013, - 2015-2016 Free Software Foundation, Inc. + 2015-2017 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -24,6 +24,7 @@ #include <c-stack.h> #include <cmpbuf.h> +#include "die.h" #include <error.h> #include <exitfail.h> #include <file-type.h> @@ -300,10 +301,10 @@ main (int argc, char **argv) break; case 'X': overlap_only = true; - /* Fall through. */ + FALLTHROUGH; case 'E': flagging = true; - /* Fall through. */ + FALLTHROUGH; case 'e': incompat++; break; @@ -338,7 +339,9 @@ main (int argc, char **argv) } } - edscript = incompat & ~merge; /* -AeExX3 without -m implies ed script. */ + /* -AeExX3 without -m implies ed script. */ + edscript = incompat & ~(int) merge; + show_2nd |= ~incompat & merge; /* -m without -AeExX3 implies -A. */ flagging |= ~incompat & merge; @@ -401,7 +404,7 @@ main (int argc, char **argv) if (stat (file[i], &statb) < 0) perror_with_exit (file[i]); else if (S_ISDIR (statb.st_mode)) - error (EXIT_TROUBLE, EISDIR, "%s", file[i]); + die (EXIT_TROUBLE, EISDIR, "%s", file[i]); } #ifdef SIGCHLD @@ -455,9 +458,8 @@ try_help (char const *reason_msgid, char const *operand) { if (reason_msgid) error (0, 0, _(reason_msgid), operand); - error (EXIT_TROUBLE, 0, + die (EXIT_TROUBLE, 0, _("Try '%s --help' for more information."), program_name); - abort (); } static void @@ -1317,7 +1319,7 @@ read_diff (char const *filea, status = ! werrno && WIFEXITED (wstatus) ? WEXITSTATUS (wstatus) : INT_MAX; if (EXIT_TROUBLE <= status) - error (EXIT_TROUBLE, werrno, + die (EXIT_TROUBLE, werrno, _(status == 126 ? "subsidiary program '%s' could not be invoked" : status == 127 @@ -1428,20 +1430,20 @@ output_diff3 (FILE *outputfile, struct diff3_block *diff, int realfile = mapping[i]; lin lowt = D_LOWLINE (ptr, realfile); lin hight = D_HIGHLINE (ptr, realfile); - long int llowt = lowt; - long int lhight = hight; + printint llowt = lowt; + printint lhight = hight; fprintf (outputfile, "%d:", i + 1); switch (lowt - hight) { case 1: - fprintf (outputfile, "%lda\n", llowt - 1); + fprintf (outputfile, "%"pI"da\n", llowt - 1); break; case 0: - fprintf (outputfile, "%ldc\n", llowt); + fprintf (outputfile, "%"pI"dc\n", llowt); break; default: - fprintf (outputfile, "%ld,%ldc\n", llowt, lhight); + fprintf (outputfile, "%"pI"d,%"pI"dc\n", llowt, lhight); break; } @@ -1495,19 +1497,18 @@ dotlines (FILE *outputfile, struct diff3_block *b, int filenum) /* Output to OUTPUTFILE a '.' line. If LEADING_DOT is true, also output a command that removes initial '.'s starting with line START - and continuing for NUM lines. (START is long int, not lin, for - convenience with printf %ld formats.) */ + and continuing for NUM lines. */ static void -undotlines (FILE *outputfile, bool leading_dot, long int start, lin num) +undotlines (FILE *outputfile, bool leading_dot, printint start, printint num) { fputs (".\n", outputfile); if (leading_dot) { if (num == 1) - fprintf (outputfile, "%lds/^\\.//\n", start); + fprintf (outputfile, "%"pI"ds/^\\.//\n", start); else - fprintf (outputfile, "%ld,%lds/^\\.//\n", start, start + num - 1); + fprintf (outputfile, "%"pI"d,%"pI"ds/^\\.//\n", start, start + num - 1); } } @@ -1548,7 +1549,7 @@ output_diff3_edscript (FILE *outputfile, struct diff3_block *diff, ? DIFF_ALL : DIFF_1ST + rev_mapping[b->correspond - DIFF_1ST]); - long int low0, high0; + printint low0, high0; /* If we aren't supposed to do this output block, skip it. */ switch (type) @@ -1569,7 +1570,7 @@ output_diff3_edscript (FILE *outputfile, struct diff3_block *diff, /* Mark end of conflict. */ - fprintf (outputfile, "%lda\n", high0); + fprintf (outputfile, "%"pI"da\n", high0); leading_dot = false; if (type == DIFF_ALL) { @@ -1591,7 +1592,7 @@ output_diff3_edscript (FILE *outputfile, struct diff3_block *diff, /* Mark start of conflict. */ - fprintf (outputfile, "%lda\n<<<<<<< %s\n", low0 - 1, + fprintf (outputfile, "%"pI"da\n<<<<<<< %s\n", low0 - 1, type == DIFF_ALL ? file0 : file1); leading_dot = false; if (type == DIFF_2ND) @@ -1607,9 +1608,9 @@ output_diff3_edscript (FILE *outputfile, struct diff3_block *diff, /* Write out a delete */ { if (low0 == high0) - fprintf (outputfile, "%ldd\n", low0); + fprintf (outputfile, "%"pI"dd\n", low0); else - fprintf (outputfile, "%ld,%ldd\n", low0, high0); + fprintf (outputfile, "%"pI"d,%"pI"dd\n", low0, high0); } else /* Write out an add or change */ @@ -1617,13 +1618,13 @@ output_diff3_edscript (FILE *outputfile, struct diff3_block *diff, switch (high0 - low0) { case -1: - fprintf (outputfile, "%lda\n", high0); + fprintf (outputfile, "%"pI"da\n", high0); break; case 0: - fprintf (outputfile, "%ldc\n", high0); + fprintf (outputfile, "%"pI"dc\n", high0); break; default: - fprintf (outputfile, "%ld,%ldc\n", low0, high0); + fprintf (outputfile, "%"pI"d,%"pI"dc\n", low0, high0); break; } @@ -1775,17 +1776,15 @@ reverse_diff3_blocklist (struct diff3_block *diff) return prev; } - + static void fatal (char const *msgid) { - error (EXIT_TROUBLE, 0, "%s", _(msgid)); - abort (); + die (EXIT_TROUBLE, 0, "%s", _(msgid)); } static void perror_with_exit (char const *string) { - error (EXIT_TROUBLE, errno, "%s", string); - abort (); + die (EXIT_TROUBLE, errno, "%s", string); } @@ -1,7 +1,7 @@ /* Read, sort and compare two directories. Used for GNU DIFF. Copyright (C) 1988-1989, 1992-1995, 1998, 2001-2002, 2004, 2006-2007, - 2009-2013, 2015-2016 Free Software Foundation, Inc. + 2009-2013, 2015-2017 Free Software Foundation, Inc. This file is part of GNU DIFF. @@ -1,7 +1,7 @@ /* Output routines for ed-script format. Copyright (C) 1988-1989, 1991-1993, 1995, 1998, 2001, 2004, 2006, 2009-2013, - 2015-2016 Free Software Foundation, Inc. + 2015-2017 Free Software Foundation, Inc. This file is part of GNU DIFF. @@ -144,7 +144,7 @@ static void print_rcs_hunk (struct change *hunk) { lin i, f0, l0, f1, l1; - long int tf0, tl0, tf1, tl1; + printint tf0, tl0, tf1, tl1; /* Determine range of line numbers involved in each file. */ enum changes changes = analyze_hunk (hunk, &f0, &l0, &f1, &l1); @@ -159,14 +159,16 @@ print_rcs_hunk (struct change *hunk) { /* For deletion, print just the starting line number from file 0 and the number of lines deleted. */ - fprintf (outfile, "d%ld %ld\n", tf0, tf0 <= tl0 ? tl0 - tf0 + 1 : 1); + fprintf (outfile, "d%"pI"d %"pI"d\n", tf0, + tf0 <= tl0 ? tl0 - tf0 + 1 : 1); } if (changes & NEW) { /* Take last-line-number from file 0 and # lines from file 1. */ translate_range (&files[1], f1, l1, &tf1, &tl1); - fprintf (outfile, "a%ld %ld\n", tl0, tf1 <= tl1 ? tl1 - tf1 + 1 : 1); + fprintf (outfile, "a%"pI"d %"pI"d\n", tl0, + tf1 <= tl1 ? tl1 - tf1 + 1 : 1); /* Print the inserted lines. */ for (i = f1; i <= l1; i++) diff --git a/src/ifdef.c b/src/ifdef.c index b8b084f..c7dae8d 100644 --- a/src/ifdef.c +++ b/src/ifdef.c @@ -1,6 +1,6 @@ /* #ifdef-format output routines for GNU DIFF. - Copyright (C) 1989, 1991-1994, 2001-2002, 2004, 2006, 2009-2013, 2015-2016 + Copyright (C) 1989, 1991-1994, 2001-2002, 2004, 2006, 2009-2013, 2015-2017 Free Software Foundation, Inc. This file is part of GNU DIFF. @@ -357,21 +357,22 @@ do_printf_spec (FILE *out, char const *spec, if (out) { - /* For example, if the spec is "%3xn", use the printf + /* For example, if the spec is "%3xn" and pI is "l", use the printf format spec "%3lx". Here the spec prefix is "%3". */ - long int long_value = value; + printint print_value = value; size_t spec_prefix_len = f - spec - 2; -#if HAVE_C_VARARRAYS - char format[spec_prefix_len + 3]; + size_t pI_len = sizeof pI - 1; +#if 0 + char format[spec_prefix_len + pI_len + 2]; #else - char *format = xmalloc (spec_prefix_len + 3); + char *format = xmalloc (spec_prefix_len + pI_len + 2); #endif - char *p = format + spec_prefix_len; + char *p = format + spec_prefix_len + pI_len; memcpy (format, spec, spec_prefix_len); - *p++ = 'l'; + memcpy (format + spec_prefix_len, pI, pI_len); *p++ = c; *p = '\0'; - fprintf (out, format, long_value); + fprintf (out, format, print_value); #if ! HAVE_C_VARARRAYS free (format); #endif @@ -1,7 +1,7 @@ /* File I/O for GNU DIFF. Copyright (C) 1988-1989, 1992-1995, 1998, 2001-2002, 2004, 2006, 2009-2013, - 2015-2016 Free Software Foundation, Inc. + 2015-2017 Free Software Foundation, Inc. This file is part of GNU DIFF. diff --git a/src/normal.c b/src/normal.c index 852a767..0f809da 100644 --- a/src/normal.c +++ b/src/normal.c @@ -1,6 +1,6 @@ /* Normal-format output routines for GNU DIFF. - Copyright (C) 1988-1989, 1993, 1995, 1998, 2001, 2006, 2009-2013, 2015-2016 + Copyright (C) 1988-1989, 1993, 1995, 1998, 2001, 2006, 2009-2013, 2015-2017 Free Software Foundation, Inc. This file is part of GNU DIFF. diff --git a/src/sdiff.c b/src/sdiff.c index 22d6e5b..1ae3dcb 100644 --- a/src/sdiff.c +++ b/src/sdiff.c @@ -1,7 +1,7 @@ /* sdiff - side-by-side merge of file differences Copyright (C) 1992-1996, 1998, 2001-2002, 2004, 2006-2007, 2009-2013, - 2015-2016 Free Software Foundation, Inc. + 2015-2017 Free Software Foundation, Inc. This file is part of GNU DIFF. @@ -26,6 +26,7 @@ #include <c-stack.h> #include <dirname.h> +#include "die.h" #include <error.h> #include <exitfail.h> #include <file-type.h> @@ -155,9 +156,8 @@ try_help (char const *reason_msgid, char const *operand) { if (reason_msgid) error (0, 0, _(reason_msgid), operand); - error (EXIT_TROUBLE, 0, _("Try '%s --help' for more information."), + die (EXIT_TROUBLE, 0, _("Try '%s --help' for more information."), program_name); - abort (); } static void @@ -918,10 +918,10 @@ edit (struct line_filter *left, char const *lname, lin lline, lin llen, cmd0 = 'q'; break; } - /* Fall through. */ + FALLTHROUGH; default: flush_line (); - /* Fall through. */ + FALLTHROUGH; case '\n': give_help (); continue; @@ -967,14 +967,14 @@ edit (struct line_filter *left, char const *lname, lin lline, lin llen, case 'd': if (llen) { + printint l1 = lline; + printint l2 = lline + llen - 1; if (llen == 1) - fprintf (tmp, "--- %s %ld\n", lname, (long int) lline); + fprintf (tmp, "--- %s %"pI"d\n", lname, l1); else - fprintf (tmp, "--- %s %ld,%ld\n", lname, - (long int) lline, - (long int) (lline + llen - 1)); + fprintf (tmp, "--- %s %"pI"d,%"pI"d\n", lname, l1, l2); } - /* Fall through. */ + FALLTHROUGH; case '1': case 'b': case 'l': lf_copy (left, llen, tmp); break; @@ -989,14 +989,14 @@ edit (struct line_filter *left, char const *lname, lin lline, lin llen, case 'd': if (rlen) { + printint l1 = rline; + printint l2 = rline + rlen - 1; if (rlen == 1) - fprintf (tmp, "+++ %s %ld\n", rname, (long int) rline); + fprintf (tmp, "+++ %s %"pI"d\n", rname, l1); else - fprintf (tmp, "+++ %s %ld,%ld\n", rname, - (long int) rline, - (long int) (rline + rlen - 1)); + fprintf (tmp, "+++ %s %"pI"d,%"pI"d\n", rname, l1, l2); } - /* Fall through. */ + FALLTHROUGH; case '2': case 'b': case 'r': lf_copy (right, rlen, tmp); break; @@ -1,6 +1,6 @@ /* sdiff-format output routines for GNU DIFF. - Copyright (C) 1991-1993, 1998, 2001-2002, 2004, 2009-2013, 2015-2016 Free + Copyright (C) 1991-1993, 1998, 2001-2002, 2004, 2009-2013, 2015-2017 Free Software Foundation, Inc. This file is part of GNU DIFF. @@ -150,7 +150,7 @@ print_half_line (char const *const *line, size_t indent, size_t out_bound) break; } } - /* Fall through. */ + FALLTHROUGH; case '\f': case '\v': if (in_position < out_bound) @@ -260,9 +260,9 @@ print_sdiff_common_lines (lin limit0, lin limit1) { if (sdiff_merge_assist) { - long int len0 = limit0 - i0; - long int len1 = limit1 - i1; - fprintf (outfile, "i%ld,%ld\n", len0, len1); + printint len0 = limit0 - i0; + printint len1 = limit1 - i1; + fprintf (outfile, "i%"pI"d,%"pI"d\n", len0, len1); } if (!left_column) @@ -302,9 +302,9 @@ print_sdiff_hunk (struct change *hunk) if (sdiff_merge_assist) { - long int len0 = last0 - first0 + 1; - long int len1 = last1 - first1 + 1; - fprintf (outfile, "c%ld,%ld\n", len0, len1); + printint len0 = last0 - first0 + 1; + printint len1 = last1 - first1 + 1; + fprintf (outfile, "c%"pI"d,%"pI"d\n", len0, len1); } /* Print "xxx | xxx " lines. */ diff --git a/src/system.h b/src/system.h index be1c0bd..a8936ba 100644 --- a/src/system.h +++ b/src/system.h @@ -1,7 +1,7 @@ /* System dependent declarations. Copyright (C) 1988-1989, 1992-1995, 1998, 2001-2002, 2004, 2006, 2009-2013, - 2015-2016 Free Software Foundation, Inc. + 2015-2017 Free Software Foundation, Inc. This file is part of GNU DIFF. @@ -127,14 +127,32 @@ int strcasecmp (char const *, char const *); # define word size_t #endif -/* The integer type of a line number. Since files are read into main - memory, ptrdiff_t should be wide enough. */ +/* The signed integer type of a line number. Since files are read + into main memory, ptrdiff_t should be wide enough. */ typedef ptrdiff_t lin; #define LIN_MAX PTRDIFF_MAX + +/* The signed integer type for printing line numbers, and its printf + length modifier. This is not simply ptrdiff_t, to cater to older + and/or nonstandard C libraries where "l" works but "ll" and "t" do + not, or where 'long' is too narrow and "ll" works but "t" does not. */ + +#if LIN_MAX <= LONG_MAX +typedef long int printint; +# define pI "l" +#elif LIN_MAX <= LLONG_MAX +typedef long long int printint; +# define pI "ll" +#else +typedef ptrdiff_t printint; +# define pI "t" +#endif + verify (TYPE_SIGNED (lin)); -verify (sizeof (ptrdiff_t) <= sizeof (lin)); -verify (sizeof (lin) <= sizeof (long int)); +verify (TYPE_SIGNED (printint)); +verify (LIN_MAX == TYPE_MAXIMUM (lin)); +verify (LIN_MAX <= TYPE_MAXIMUM (printint)); /* Limit so that 2 * CONTEXT + 1 does not overflow. */ @@ -212,3 +230,11 @@ verify (sizeof (lin) <= sizeof (long int)); #endif #define STREQ(a, b) (strcmp (a, b) == 0) + +#ifndef FALLTHROUGH +# if __GNUC__ < 7 +# define FALLTHROUGH ((void) 0) +# else +# define FALLTHROUGH __attribute__ ((__fallthrough__)) +# endif +#endif @@ -1,7 +1,7 @@ /* Support routines for GNU DIFF. Copyright (C) 1988-1989, 1992-1995, 1998, 2001-2002, 2004, 2006, 2009-2013, - 2015-2016 Free Software Foundation, Inc. + 2015-2017 Free Software Foundation, Inc. This file is part of GNU DIFF. @@ -20,6 +20,7 @@ #include "diff.h" #include "argmatch.h" +#include "die.h" #include <dirname.h> #include <error.h> #include <system-quote.h> @@ -77,8 +78,7 @@ pfatal_with_name (char const *name) { int e = errno; print_message_queue (); - error (EXIT_TROUBLE, e, "%s", name); - abort (); + die (EXIT_TROUBLE, e, "%s", name); } /* Print an error message containing MSGID, then exit. */ @@ -87,8 +87,7 @@ void fatal (char const *msgid) { print_message_queue (); - error (EXIT_TROUBLE, 0, "%s", _(msgid)); - abort (); + die (EXIT_TROUBLE, 0, "%s", _(msgid)); } /* Like printf, except if -l in effect then save the message and print later. @@ -383,7 +382,7 @@ get_funky_string (char **dest, const char **src, bool equals_end, state = ST_END; /* End */ break; } - /* else fall through */ + FALLTHROUGH; default: *(q++) = *(p++); ++count; @@ -965,7 +964,7 @@ finish_output (void) ? WEXITSTATUS (wstatus) : INT_MAX); if (status) - error (EXIT_TROUBLE, werrno, + die (EXIT_TROUBLE, werrno, _(status == 126 ? "subsidiary program '%s' could not be invoked" : status == 127 @@ -1090,7 +1089,7 @@ lines_differ (char const *s1, char const *s2) } if (ignore_white_space == IGNORE_TRAILING_SPACE) break; - /* Fall through. */ + FALLTHROUGH; case IGNORE_TAB_EXPANSION: if ((c1 == ' ' && c2 == '\t') || (c1 == '\t' && c2 == ' ')) @@ -1401,13 +1400,13 @@ translate_line_number (struct file_data const *file, lin i) } /* Translate a line number range. This is always done for printing, - so for convenience translate to long int rather than lin, so that the - caller can use printf with "%ld" without casting. */ + so for convenience translate to printint rather than lin, so that the + caller can use printf with "%"pI"d" without casting. */ void translate_range (struct file_data const *file, lin a, lin b, - long int *aptr, long int *bptr) + printint *aptr, printint *bptr) { *aptr = translate_line_number (file, a - 1) + 1; *bptr = translate_line_number (file, b + 1) - 1; @@ -1422,16 +1421,16 @@ translate_range (struct file_data const *file, void print_number_range (char sepchar, struct file_data *file, lin a, lin b) { - long int trans_a, trans_b; + printint trans_a, trans_b; translate_range (file, a, b, &trans_a, &trans_b); /* Note: we can have B < A in the case of a range of no lines. In this case, we should print the line number before the range, which is B. */ if (trans_b > trans_a) - fprintf (outfile, "%ld%c%ld", trans_a, sepchar, trans_b); + fprintf (outfile, "%"pI"d%c%"pI"d", trans_a, sepchar, trans_b); else - fprintf (outfile, "%ld", trans_b); + fprintf (outfile, "%"pI"d", trans_b); } /* Look at a hunk of edit script and report the range of lines in each file @@ -1565,11 +1564,11 @@ debug_script (struct change *sp) for (; sp; sp = sp->link) { - long int line0 = sp->line0; - long int line1 = sp->line1; - long int deleted = sp->deleted; - long int inserted = sp->inserted; - fprintf (stderr, "%3ld %3ld delete %ld insert %ld\n", + printint line0 = sp->line0; + printint line1 = sp->line1; + printint deleted = sp->deleted; + printint inserted = sp->inserted; + fprintf (stderr, "%3"pI"d %3"pI"d delete %"pI"d insert %"pI"d\n", line0, line1, deleted, inserted); } diff --git a/tests/Makefile.am b/tests/Makefile.am index 66e25a5..6668863 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -5,10 +5,12 @@ TESTS = \ bignum \ binary \ brief-vs-stat-zero-kernel-lies \ + cmp \ colliding-file-names \ diff3 \ excess-slash \ help-version \ + invalid-re \ function-line-vs-leading-space \ ignore-matching-lines \ label-vs-func \ diff --git a/tests/Makefile.in b/tests/Makefile.in index ee17a5f..0f9bf8d 100644 --- a/tests/Makefile.in +++ b/tests/Makefile.in @@ -93,10 +93,11 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \ $(top_srcdir)/m4/absolute-header.m4 $(top_srcdir)/m4/alloca.m4 \ $(top_srcdir)/m4/arpa_inet_h.m4 $(top_srcdir)/m4/btowc.m4 \ - $(top_srcdir)/m4/c-stack.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/dirname.m4 \ + $(top_srcdir)/m4/builtin-expect.m4 $(top_srcdir)/m4/c-stack.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/dirname.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,7 +110,8 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \ $(top_srcdir)/m4/freopen.m4 $(top_srcdir)/m4/fstat.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/gettext.m4 \ + $(top_srcdir)/m4/getpagesize.m4 \ + $(top_srcdir)/m4/getprogname.m4 $(top_srcdir)/m4/gettext.m4 \ $(top_srcdir)/m4/gettime.m4 $(top_srcdir)/m4/gettimeofday.m4 \ $(top_srcdir)/m4/glibc21.m4 $(top_srcdir)/m4/gnu-make.m4 \ $(top_srcdir)/m4/gnulib-common.m4 \ @@ -126,17 +128,19 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \ $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \ $(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libsigsegv.m4 \ $(top_srcdir)/m4/libunistring-base.m4 \ - $(top_srcdir)/m4/localcharset.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/longlong.m4 \ - $(top_srcdir)/m4/lstat.m4 $(top_srcdir)/m4/malloc.m4 \ - $(top_srcdir)/m4/malloca.m4 $(top_srcdir)/m4/manywarnings.m4 \ - $(top_srcdir)/m4/mbchar.m4 $(top_srcdir)/m4/mbiter.m4 \ - $(top_srcdir)/m4/mbrtowc.m4 $(top_srcdir)/m4/mbsinit.m4 \ - $(top_srcdir)/m4/mbslen.m4 $(top_srcdir)/m4/mbsrtowcs.m4 \ - $(top_srcdir)/m4/mbstate_t.m4 $(top_srcdir)/m4/mbtowc.m4 \ - $(top_srcdir)/m4/memchr.m4 $(top_srcdir)/m4/mkstemp.m4 \ + $(top_srcdir)/m4/limits-h.m4 $(top_srcdir)/m4/localcharset.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/localtime-buffer.m4 \ + $(top_srcdir)/m4/longlong.m4 $(top_srcdir)/m4/lstat.m4 \ + $(top_srcdir)/m4/malloc.m4 $(top_srcdir)/m4/malloca.m4 \ + $(top_srcdir)/m4/manywarnings.m4 $(top_srcdir)/m4/mbchar.m4 \ + $(top_srcdir)/m4/mbiter.m4 $(top_srcdir)/m4/mbrtowc.m4 \ + $(top_srcdir)/m4/mbsinit.m4 $(top_srcdir)/m4/mbslen.m4 \ + $(top_srcdir)/m4/mbsrtowcs.m4 $(top_srcdir)/m4/mbstate_t.m4 \ + $(top_srcdir)/m4/mbtowc.m4 $(top_srcdir)/m4/memchr.m4 \ + $(top_srcdir)/m4/minmax.m4 $(top_srcdir)/m4/mkstemp.m4 \ $(top_srcdir)/m4/mktime.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 \ @@ -178,9 +182,10 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \ $(top_srcdir)/m4/time_h.m4 $(top_srcdir)/m4/time_r.m4 \ $(top_srcdir)/m4/time_rz.m4 $(top_srcdir)/m4/timegm.m4 \ $(top_srcdir)/m4/timespec.m4 $(top_srcdir)/m4/tm_gmtoff.m4 \ - $(top_srcdir)/m4/unistd_h.m4 $(top_srcdir)/m4/unlocked-io.m4 \ - $(top_srcdir)/m4/vararrays.m4 $(top_srcdir)/m4/vasnprintf.m4 \ - $(top_srcdir)/m4/vasprintf.m4 $(top_srcdir)/m4/version-etc.m4 \ + $(top_srcdir)/m4/tzset.m4 $(top_srcdir)/m4/unistd_h.m4 \ + $(top_srcdir)/m4/unlocked-io.m4 $(top_srcdir)/m4/vararrays.m4 \ + $(top_srcdir)/m4/vasnprintf.m4 $(top_srcdir)/m4/vasprintf.m4 \ + $(top_srcdir)/m4/version-etc.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 \ @@ -464,6 +469,7 @@ ERRNO_H = @ERRNO_H@ EXEEXT = @EXEEXT@ FLOAT_H = @FLOAT_H@ FNMATCH_H = @FNMATCH_H@ +GETOPT_CDEFS_H = @GETOPT_CDEFS_H@ GETOPT_H = @GETOPT_H@ GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@ GLIBC21 = @GLIBC21@ @@ -480,6 +486,7 @@ GNULIB_CHDIR = @GNULIB_CHDIR@ GNULIB_CHOWN = @GNULIB_CHOWN@ GNULIB_CLOSE = @GNULIB_CLOSE@ GNULIB_CONNECT = @GNULIB_CONNECT@ +GNULIB_CTIME = @GNULIB_CTIME@ GNULIB_DPRINTF = @GNULIB_DPRINTF@ GNULIB_DUP = @GNULIB_DUP@ GNULIB_DUP2 = @GNULIB_DUP2@ @@ -558,6 +565,7 @@ GNULIB_LINK = @GNULIB_LINK@ GNULIB_LINKAT = @GNULIB_LINKAT@ GNULIB_LISTEN = @GNULIB_LISTEN@ GNULIB_LOCALECONV = @GNULIB_LOCALECONV@ +GNULIB_LOCALTIME = @GNULIB_LOCALTIME@ GNULIB_LSEEK = @GNULIB_LSEEK@ GNULIB_LSTAT = @GNULIB_LSTAT@ GNULIB_MALLOC_POSIX = @GNULIB_MALLOC_POSIX@ @@ -603,6 +611,8 @@ GNULIB_OBSTACK_PRINTF = @GNULIB_OBSTACK_PRINTF@ GNULIB_OBSTACK_PRINTF_POSIX = @GNULIB_OBSTACK_PRINTF_POSIX@ GNULIB_OPEN = @GNULIB_OPEN@ GNULIB_OPENAT = @GNULIB_OPENAT@ +GNULIB_OVERRIDES_STRUCT_STAT = @GNULIB_OVERRIDES_STRUCT_STAT@ +GNULIB_OVERRIDES_WINT_T = @GNULIB_OVERRIDES_WINT_T@ GNULIB_PCLOSE = @GNULIB_PCLOSE@ GNULIB_PERROR = @GNULIB_PERROR@ GNULIB_PIPE = @GNULIB_PIPE@ @@ -665,6 +675,7 @@ GNULIB_STRCHRNUL = @GNULIB_STRCHRNUL@ GNULIB_STRDUP = @GNULIB_STRDUP@ GNULIB_STRERROR = @GNULIB_STRERROR@ GNULIB_STRERROR_R = @GNULIB_STRERROR_R@ +GNULIB_STRFTIME = @GNULIB_STRFTIME@ GNULIB_STRNCAT = @GNULIB_STRNCAT@ GNULIB_STRNDUP = @GNULIB_STRNDUP@ GNULIB_STRNLEN = @GNULIB_STRNLEN@ @@ -688,7 +699,9 @@ GNULIB_TIME_R = @GNULIB_TIME_R@ GNULIB_TIME_RZ = @GNULIB_TIME_RZ@ GNULIB_TMPFILE = @GNULIB_TMPFILE@ GNULIB_TOWCTRANS = @GNULIB_TOWCTRANS@ +GNULIB_TRUNCATE = @GNULIB_TRUNCATE@ GNULIB_TTYNAME_R = @GNULIB_TTYNAME_R@ +GNULIB_TZSET = @GNULIB_TZSET@ GNULIB_UNISTD_H_NONBLOCKING = @GNULIB_UNISTD_H_NONBLOCKING@ GNULIB_UNISTD_H_SIGPIPE = @GNULIB_UNISTD_H_SIGPIPE@ GNULIB_UNLINK = @GNULIB_UNLINK@ @@ -720,6 +733,7 @@ GNULIB_WCSCOLL = @GNULIB_WCSCOLL@ GNULIB_WCSCPY = @GNULIB_WCSCPY@ GNULIB_WCSCSPN = @GNULIB_WCSCSPN@ GNULIB_WCSDUP = @GNULIB_WCSDUP@ +GNULIB_WCSFTIME = @GNULIB_WCSFTIME@ GNULIB_WCSLEN = @GNULIB_WCSLEN@ GNULIB_WCSNCASECMP = @GNULIB_WCSNCASECMP@ GNULIB_WCSNCAT = @GNULIB_WCSNCAT@ @@ -752,8 +766,10 @@ HAVE_ACCEPT4 = @HAVE_ACCEPT4@ HAVE_ARPA_INET_H = @HAVE_ARPA_INET_H@ HAVE_ATOLL = @HAVE_ATOLL@ HAVE_BTOWC = @HAVE_BTOWC@ +HAVE_C99_STDINT_H = @HAVE_C99_STDINT_H@ HAVE_CANONICALIZE_FILE_NAME = @HAVE_CANONICALIZE_FILE_NAME@ HAVE_CHOWN = @HAVE_CHOWN@ +HAVE_CRTDEFS_H = @HAVE_CRTDEFS_H@ HAVE_DECL_ENVIRON = @HAVE_DECL_ENVIRON@ HAVE_DECL_FCHDIR = @HAVE_DECL_FCHDIR@ HAVE_DECL_FDATASYNC = @HAVE_DECL_FDATASYNC@ @@ -764,6 +780,7 @@ HAVE_DECL_GETDELIM = @HAVE_DECL_GETDELIM@ HAVE_DECL_GETDOMAINNAME = @HAVE_DECL_GETDOMAINNAME@ HAVE_DECL_GETLINE = @HAVE_DECL_GETLINE@ HAVE_DECL_GETLOADAVG = @HAVE_DECL_GETLOADAVG@ +HAVE_DECL_GETLOGIN = @HAVE_DECL_GETLOGIN@ HAVE_DECL_GETLOGIN_R = @HAVE_DECL_GETLOGIN_R@ HAVE_DECL_GETPAGESIZE = @HAVE_DECL_GETPAGESIZE@ HAVE_DECL_GETUSERSHELL = @HAVE_DECL_GETUSERSHELL@ @@ -876,6 +893,7 @@ HAVE_PTHREAD_SIGMASK = @HAVE_PTHREAD_SIGMASK@ HAVE_PTSNAME = @HAVE_PTSNAME@ HAVE_PTSNAME_R = @HAVE_PTSNAME_R@ HAVE_PWRITE = @HAVE_PWRITE@ +HAVE_QSORT_R = @HAVE_QSORT_R@ HAVE_RAISE = @HAVE_RAISE@ HAVE_RANDOM = @HAVE_RANDOM@ HAVE_RANDOM_H = @HAVE_RANDOM_H@ @@ -920,6 +938,7 @@ HAVE_STRVERSCMP = @HAVE_STRVERSCMP@ HAVE_SYMLINK = @HAVE_SYMLINK@ HAVE_SYMLINKAT = @HAVE_SYMLINKAT@ HAVE_SYS_BITYPES_H = @HAVE_SYS_BITYPES_H@ +HAVE_SYS_CDEFS_H = @HAVE_SYS_CDEFS_H@ HAVE_SYS_INTTYPES_H = @HAVE_SYS_INTTYPES_H@ HAVE_SYS_IOCTL_H = @HAVE_SYS_IOCTL_H@ HAVE_SYS_LOADAVG_H = @HAVE_SYS_LOADAVG_H@ @@ -931,7 +950,9 @@ HAVE_SYS_TYPES_H = @HAVE_SYS_TYPES_H@ HAVE_SYS_UIO_H = @HAVE_SYS_UIO_H@ HAVE_TIMEGM = @HAVE_TIMEGM@ HAVE_TIMEZONE_T = @HAVE_TIMEZONE_T@ +HAVE_TRUNCATE = @HAVE_TRUNCATE@ HAVE_TYPE_VOLATILE_SIG_ATOMIC_T = @HAVE_TYPE_VOLATILE_SIG_ATOMIC_T@ +HAVE_TZSET = @HAVE_TZSET@ HAVE_UNISTD_H = @HAVE_UNISTD_H@ HAVE_UNLINKAT = @HAVE_UNLINKAT@ HAVE_UNLOCKPT = @HAVE_UNLOCKPT@ @@ -953,6 +974,7 @@ HAVE_WCSCOLL = @HAVE_WCSCOLL@ HAVE_WCSCPY = @HAVE_WCSCPY@ HAVE_WCSCSPN = @HAVE_WCSCSPN@ HAVE_WCSDUP = @HAVE_WCSDUP@ +HAVE_WCSFTIME = @HAVE_WCSFTIME@ HAVE_WCSLEN = @HAVE_WCSLEN@ HAVE_WCSNCASECMP = @HAVE_WCSNCASECMP@ HAVE_WCSNCAT = @HAVE_WCSNCAT@ @@ -1015,6 +1037,7 @@ LIBUNISTRING_UNIWIDTH_H = @LIBUNISTRING_UNIWIDTH_H@ LIB_CLOCK_GETTIME = @LIB_CLOCK_GETTIME@ LIB_NANOSLEEP = @LIB_NANOSLEEP@ LIB_SELECT = @LIB_SELECT@ +LIMITS_H = @LIMITS_H@ LOCALCHARSET_TESTS_ENVIRONMENT = @LOCALCHARSET_TESTS_ENVIRONMENT@ LOCALE_FR = @LOCALE_FR@ LOCALE_FR_UTF8 = @LOCALE_FR_UTF8@ @@ -1042,6 +1065,7 @@ NEXT_AS_FIRST_DIRECTIVE_GETOPT_H = @NEXT_AS_FIRST_DIRECTIVE_GETOPT_H@ NEXT_AS_FIRST_DIRECTIVE_ICONV_H = @NEXT_AS_FIRST_DIRECTIVE_ICONV_H@ NEXT_AS_FIRST_DIRECTIVE_INTTYPES_H = @NEXT_AS_FIRST_DIRECTIVE_INTTYPES_H@ NEXT_AS_FIRST_DIRECTIVE_LANGINFO_H = @NEXT_AS_FIRST_DIRECTIVE_LANGINFO_H@ +NEXT_AS_FIRST_DIRECTIVE_LIMITS_H = @NEXT_AS_FIRST_DIRECTIVE_LIMITS_H@ NEXT_AS_FIRST_DIRECTIVE_LOCALE_H = @NEXT_AS_FIRST_DIRECTIVE_LOCALE_H@ NEXT_AS_FIRST_DIRECTIVE_NETINET_IN_H = @NEXT_AS_FIRST_DIRECTIVE_NETINET_IN_H@ NEXT_AS_FIRST_DIRECTIVE_SIGNAL_H = @NEXT_AS_FIRST_DIRECTIVE_SIGNAL_H@ @@ -1072,6 +1096,7 @@ NEXT_GETOPT_H = @NEXT_GETOPT_H@ NEXT_ICONV_H = @NEXT_ICONV_H@ NEXT_INTTYPES_H = @NEXT_INTTYPES_H@ NEXT_LANGINFO_H = @NEXT_LANGINFO_H@ +NEXT_LIMITS_H = @NEXT_LIMITS_H@ NEXT_LOCALE_H = @NEXT_LOCALE_H@ NEXT_NETINET_IN_H = @NEXT_NETINET_IN_H@ NEXT_SIGNAL_H = @NEXT_SIGNAL_H@ @@ -1117,6 +1142,7 @@ REPLACE_CALLOC = @REPLACE_CALLOC@ REPLACE_CANONICALIZE_FILE_NAME = @REPLACE_CANONICALIZE_FILE_NAME@ REPLACE_CHOWN = @REPLACE_CHOWN@ REPLACE_CLOSE = @REPLACE_CLOSE@ +REPLACE_CTIME = @REPLACE_CTIME@ REPLACE_DPRINTF = @REPLACE_DPRINTF@ REPLACE_DUP = @REPLACE_DUP@ REPLACE_DUP2 = @REPLACE_DUP2@ @@ -1224,6 +1250,7 @@ REPLACE_STRCHRNUL = @REPLACE_STRCHRNUL@ REPLACE_STRDUP = @REPLACE_STRDUP@ REPLACE_STRERROR = @REPLACE_STRERROR@ REPLACE_STRERROR_R = @REPLACE_STRERROR_R@ +REPLACE_STRFTIME = @REPLACE_STRFTIME@ REPLACE_STRNCAT = @REPLACE_STRNCAT@ REPLACE_STRNDUP = @REPLACE_STRNDUP@ REPLACE_STRNLEN = @REPLACE_STRNLEN@ @@ -1240,7 +1267,9 @@ REPLACE_SYMLINKAT = @REPLACE_SYMLINKAT@ REPLACE_TIMEGM = @REPLACE_TIMEGM@ REPLACE_TMPFILE = @REPLACE_TMPFILE@ REPLACE_TOWLOWER = @REPLACE_TOWLOWER@ +REPLACE_TRUNCATE = @REPLACE_TRUNCATE@ REPLACE_TTYNAME_R = @REPLACE_TTYNAME_R@ +REPLACE_TZSET = @REPLACE_TZSET@ REPLACE_UNLINK = @REPLACE_UNLINK@ REPLACE_UNLINKAT = @REPLACE_UNLINKAT@ REPLACE_UNSETENV = @REPLACE_UNSETENV@ @@ -1253,6 +1282,7 @@ REPLACE_VPRINTF = @REPLACE_VPRINTF@ REPLACE_VSNPRINTF = @REPLACE_VSNPRINTF@ REPLACE_VSPRINTF = @REPLACE_VSPRINTF@ REPLACE_WCRTOMB = @REPLACE_WCRTOMB@ +REPLACE_WCSFTIME = @REPLACE_WCSFTIME@ REPLACE_WCSNRTOMBS = @REPLACE_WCSNRTOMBS@ REPLACE_WCSRTOMBS = @REPLACE_WCSRTOMBS@ REPLACE_WCSWIDTH = @REPLACE_WCSWIDTH@ @@ -1289,6 +1319,8 @@ WCHAR_T_SUFFIX = @WCHAR_T_SUFFIX@ WERROR_CFLAGS = @WERROR_CFLAGS@ WINDOWS_64_BIT_OFF_T = @WINDOWS_64_BIT_OFF_T@ WINDOWS_64_BIT_ST_SIZE = @WINDOWS_64_BIT_ST_SIZE@ +WINDOWS_STAT_INODES = @WINDOWS_STAT_INODES@ +WINDOWS_STAT_TIMESPEC = @WINDOWS_STAT_TIMESPEC@ WINT_T_SUFFIX = @WINT_T_SUFFIX@ XGETTEXT = @XGETTEXT@ XGETTEXT_015 = @XGETTEXT_015@ @@ -1298,7 +1330,6 @@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ abs_top_srcdir = @abs_top_srcdir@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ am__include = @am__include@ am__quote = @am__quote@ @@ -1356,10 +1387,12 @@ TESTS = \ bignum \ binary \ brief-vs-stat-zero-kernel-lies \ + cmp \ colliding-file-names \ diff3 \ excess-slash \ help-version \ + invalid-re \ function-line-vs-leading-space \ ignore-matching-lines \ label-vs-func \ @@ -1648,6 +1681,13 @@ brief-vs-stat-zero-kernel-lies.log: brief-vs-stat-zero-kernel-lies --log-file $$b.log --trs-file $$b.trs \ $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ "$$tst" $(AM_TESTS_FD_REDIRECT) +cmp.log: cmp + @p='cmp'; \ + b='cmp'; \ + $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ + --log-file $$b.log --trs-file $$b.trs \ + $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ + "$$tst" $(AM_TESTS_FD_REDIRECT) colliding-file-names.log: colliding-file-names @p='colliding-file-names'; \ b='colliding-file-names'; \ @@ -1676,6 +1716,13 @@ help-version.log: help-version --log-file $$b.log --trs-file $$b.trs \ $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ "$$tst" $(AM_TESTS_FD_REDIRECT) +invalid-re.log: invalid-re + @p='invalid-re'; \ + b='invalid-re'; \ + $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ + --log-file $$b.log --trs-file $$b.trs \ + $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ + "$$tst" $(AM_TESTS_FD_REDIRECT) function-line-vs-leading-space.log: function-line-vs-leading-space @p='function-line-vs-leading-space'; \ b='function-line-vs-leading-space'; \ diff --git a/tests/basic b/tests/basic index 45b9c9c..161262d 100755 --- a/tests/basic +++ b/tests/basic @@ -33,7 +33,7 @@ EOF echo a > a echo b > b for opt in '' -u -c; do - diff $opt a b > out 2> err; test $? = 1 || fail=1 + returns_ 1 diff $opt a b > out 2> err || fail=1 # Remove date and time. sed -e 's/^\([-+*][-+*][-+*] [^ ]*\) .*/\1/' out > k; mv k out compare exp-$(echo $opt|tr ' ' _) out || fail=1 diff --git a/tests/binary b/tests/binary index 0110f6e..36fbe2d 100755 --- a/tests/binary +++ b/tests/binary @@ -7,10 +7,8 @@ printf 'Binary files - and /dev/null differ\n' > out-exp || fail_ setup fail=0 -printf '\0'|diff - /dev/null > out 2> err - # diff must exit with status 1, stdout as above, and no stderr. -test $? = 1 || fail=1 +printf '\0'| returns_ 1 diff - /dev/null > out 2> err || fail=1 compare out-exp out || fail=1 compare /dev/null err || fail=1 diff --git a/tests/brief-vs-stat-zero-kernel-lies b/tests/brief-vs-stat-zero-kernel-lies index 7b043db..82b33e6 100755 --- a/tests/brief-vs-stat-zero-kernel-lies +++ b/tests/brief-vs-stat-zero-kernel-lies @@ -10,7 +10,7 @@ fail=0 # Skip the test unless we have an appropriate file. boot=/proc/cmdline -test -f $boot || skip_ no $boot file +test -r $boot || skip_ no $boot file sz=$(stat --format %s $boot) || skip_ stat --format %s does not work test $sz = 0 || skip_ $boot has nonzero size diff --git a/tests/cmp b/tests/cmp new file mode 100755 index 0000000..082a931 --- /dev/null +++ b/tests/cmp @@ -0,0 +1,211 @@ +#!/bin/sh +# Test 'cmp'. + +# Copyright 2017 Free Software Foundation, Inc. + +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. + +# You should have received a copy of the GNU General Public License +# along with this program. If not, see <http://www.gnu.org/licenses/>. + +. "${srcdir=.}/init.sh"; path_prepend_ ../src + +fail=0 + +cat <<'EOF' > exp || fail=1 +cmp a a +0 +cmp a b +a b differ: char 1, line 1 +1 +cmp a c +cmp: EOF on c which is empty +1 +cmp a d +cmp: d: No such file or directory +2 +cmp b a +b a differ: char 1, line 1 +1 +cmp b b +0 +cmp b c +cmp: EOF on c which is empty +1 +cmp b d +cmp: d: No such file or directory +2 +cmp c a +cmp: EOF on c which is empty +1 +cmp c b +cmp: EOF on c which is empty +1 +cmp c c +0 +cmp c d +cmp: d: No such file or directory +2 +cmp d a +cmp: d: No such file or directory +2 +cmp d b +cmp: d: No such file or directory +2 +cmp d c +cmp: d: No such file or directory +2 +cmp d d +cmp: d: No such file or directory +2 +cmp -l a a +0 +cmp -l a b +1 141 142 +1 +cmp -l a c +cmp: EOF on c which is empty +1 +cmp -l a d +cmp: d: No such file or directory +2 +cmp -l b a +1 142 141 +1 +cmp -l b b +0 +cmp -l b c +cmp: EOF on c which is empty +1 +cmp -l b d +cmp: d: No such file or directory +2 +cmp -l c a +cmp: EOF on c which is empty +1 +cmp -l c b +cmp: EOF on c which is empty +1 +cmp -l c c +0 +cmp -l c d +cmp: d: No such file or directory +2 +cmp -l d a +cmp: d: No such file or directory +2 +cmp -l d b +cmp: d: No such file or directory +2 +cmp -l d c +cmp: d: No such file or directory +2 +cmp -l d d +cmp: d: No such file or directory +2 +cmp -s a a +0 +cmp -s a b +1 +cmp -s a c +1 +cmp -s a d +2 +cmp -s b a +1 +cmp -s b b +0 +cmp -s b c +1 +cmp -s b d +2 +cmp -s c a +1 +cmp -s c b +1 +cmp -s c c +0 +cmp -s c d +2 +cmp -s d a +2 +cmp -s d b +2 +cmp -s d c +2 +cmp -s d d +2 +EOF + +echo a >a +echo b >b +: >c +rm -f d + +for option in '' -l -s; do + for i in a b c d; do + for j in a b c d; do + echo cmp $option $i $j + cmp $option $i $j >stdout 2>stderr + status=$? + cat stderr stdout + echo $status + done + done +done >out + +compare exp out || fail=1 + +cat <<'EOF' > exp1 || fail=1 +cmp a0 a1 +cmp: EOF on a0 which is empty +1 +cmp a1 a2 +cmp: EOF on a1 after byte 2, line 1 +1 +cmp a2 a3 +cmp: EOF on a2 after byte 5, in line 2 +1 +cmp -l a0 a1 +cmp: EOF on a0 which is empty +1 +cmp -l a1 a2 +cmp: EOF on a1 after byte 2 +1 +cmp -l a2 a3 +cmp: EOF on a2 after byte 5 +1 +cmp -s a0 a1 +1 +cmp -s a1 a2 +1 +cmp -s a2 a3 +1 +EOF + +printf '' >a0 +printf '1\n' >a1 +printf '1\nfoo' >a2 +printf '1\nfoolery\n' >a3 + +for option in '' -l -s; do + for files in 'a0 a1' 'a1 a2' 'a2 a3'; do + echo cmp $option $files + cmp $option $files >stdout 2>stderr + status=$? + cat stderr stdout + echo $status + done +done >out1 + +compare exp1 out1 || fail=1 + +Exit $fail diff --git a/tests/colors b/tests/colors index 8651a5b..9c7021c 100755 --- a/tests/colors +++ b/tests/colors @@ -81,44 +81,38 @@ $ad> b$rs rs=0 hd=1 ad=32 de=31 ln=36 -diff --color=auto a b > out -test $? = 1 || fail=1 +returns_ 1 diff --color=auto a b > out || fail=1 gen_exp_default > exp || framework_failure_ compare exp out || fail=1 -TERM=dumb diff ---presume-output-tty --color=auto a b > out -test $? = 1 || fail=1 +returns_ 1 env TERM=dumb diff ---presume-output-tty --color=auto a b > out \ + || fail=1 gen_exp_default > exp || framework_failure_ compare exp out || fail=1 -diff --color=never a b > out -test $? = 1 || fail=1 +returns_ 1 diff --color=never a b > out || fail=1 gen_exp_default > exp || framework_failure_ compare exp out || fail=1 -diff a b > out -test $? = 1 || fail=1 +returns_ 1 diff a b > out || fail=1 gen_exp_default > exp || framework_failure_ compare exp out || fail=1 -diff --color=always a b > out -test $? = 1 || fail=1 +returns_ 1 diff --color=always a b > out || fail=1 gen_exp_default_colors > exp || framework_failure_ compare exp out || fail=1 -diff -u --color=always a b > out -test $? = 1 || fail=1 +returns_ 1 diff -u --color=always a b > out || fail=1 gen_exp_u > exp || framework_failure_ compare exp out || fail=1 -diff -c --color=always a b > out -test $? = 1 || fail=1 +returns_ 1 diff -c --color=always a b > out || fail=1 gen_exp_c > exp || framework_failure_ compare exp out || fail=1 rs=0 hd=33 ad=34 de=35 ln=36 -diff -u --color=always --palette="rs=0:hd=33:ad=34:de=35:ln=36" a b > out -test $? = 1 || fail=1 +returns_ 1 diff -u --color=always \ + --palette="rs=0:hd=33:ad=34:de=35:ln=36" a b > out || fail=1 gen_exp_u > exp || framework_failure_ compare exp out || fail=1 diff --git a/tests/envvar-check b/tests/envvar-check index 3debef7..e602485 100644 --- a/tests/envvar-check +++ b/tests/envvar-check @@ -1,7 +1,7 @@ # -*- sh -*- # Check environment variables for sane values while testing. -# Copyright (C) 2000-2016 Free Software Foundation, Inc. +# Copyright (C) 2000-2017 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests/filename-quoting b/tests/filename-quoting index e3e9193..2e75a03 100755 --- a/tests/filename-quoting +++ b/tests/filename-quoting @@ -32,7 +32,7 @@ EOF mkdir a b echo space > "b/ " || fail=1 for opt in '' -u -c; do - diff -N -r $opt a b > out 2> err; test $? = 1 || fail=1 + returns_ 1 diff -N -r $opt a b > out 2> err || fail=1 # Remove date and time. sed -e 's/^\([-+*][-+*][-+*] [^ ]*\) .*/\1/' out > k; mv k out compare exp-$(echo $opt|tr ' ' _) out || fail=1 @@ -53,7 +53,7 @@ x01=$(printf '\001') echo tab > "a/$tab" || fail=1 echo one > "b/$x01" || fail=1 -diff -u "a/$tab" "b/$x01" > out 2> err; test $? = 1 || fail=1 +returns_ 1 diff -u "a/$tab" "b/$x01" > out 2> err || fail=1 # Remove date and time. sed -e 's/^\([-+*][-+*][-+*] [^ ]*\) .*/\1/' out > k; mv k out compare exp out || fail=1 diff --git a/tests/function-line-vs-leading-space b/tests/function-line-vs-leading-space index 572427c..d67eaf4 100755 --- a/tests/function-line-vs-leading-space +++ b/tests/function-line-vs-leading-space @@ -52,8 +52,8 @@ EOF fail=0 -diff -u -F '^[[:space:]]*\(function\|procedure\)' in in2 > out 2> err -test $? = 1 || fail=1 +returns_ 1 diff -u -F '^[[:space:]]*\(function\|procedure\)' in in2 \ + > out 2> err || fail=1 sed -n '3,$p' out > k && mv k out || fail=1 diff --git a/tests/help-version b/tests/help-version index 339ece7..c3a91b3 100755 --- a/tests/help-version +++ b/tests/help-version @@ -2,7 +2,7 @@ # Make sure all these programs work properly # when invoked with --help or --version. -# Copyright (C) 2000-2013, 2015-2016 Free Software Foundation, Inc. +# Copyright (C) 2000-2013, 2015-2017 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests/ignore-matching-lines b/tests/ignore-matching-lines index 5db9ba3..1b3259f 100755 --- a/tests/ignore-matching-lines +++ b/tests/ignore-matching-lines @@ -39,8 +39,7 @@ cat <<'EOF' >exp +7 EOF -diff -u --ignore-matching-lines 3 a b >out 2>err -test $? = 1 || fail=1 +returns_ 1 diff -u --ignore-matching-lines 3 a b >out 2>err || fail=1 sed 1,2d out >outtail || framework_failure+ compare exp outtail || fail=1 diff --git a/tests/init.sh b/tests/init.sh index 97e4e4b..584194f 100644 --- a/tests/init.sh +++ b/tests/init.sh @@ -1,6 +1,6 @@ # source this file; set up for tests -# Copyright (C) 2009-2016 Free Software Foundation, Inc. +# Copyright (C) 2009-2017 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -45,6 +45,9 @@ # Running a single test, with verbose output: # $ make check TESTS=test-foo.sh VERBOSE=yes # +# Running a single test, keeping the temporary directory: +# $ make check TESTS=test-foo.sh KEEP=yes +# # Running a single test, with single-stepping: # 1. Go into a sub-shell: # $ bash @@ -128,6 +131,13 @@ else fi # We require $(...) support unconditionally. +# We require non-surprising "local" semantics (this eliminates dash). +# This takes the admittedly draconian step of eliminating dash, because the +# assignment tab=$(printf '\t') works fine, yet preceding it with "local " +# transforms it into an assignment that sets the variable to the empty string. +# That is too counter-intuitive, and can lead to subtle run-time malfunction. +# The example below is less subtle in that with dash, it evokes the run-time +# exception "dash: 1: local: 1: bad variable name". # We require a few additional shell features only when $EXEEXT is nonempty, # in order to support automatic $EXEEXT emulation: # - hyphen-containing alias names @@ -151,6 +161,7 @@ fi gl_shell_test_script_=' test $(echo y) = y || exit 1 f_local_() { local v=1; }; f_local_ || exit 1 +f_dash_local_fail_() { local t=$(printf " 1"); }; f_dash_local_fail_ score_=10 if test "$VERBOSE" = yes; then test -n "$( (exec 3>&1; set -x; P=1 true 2>&3) 2> /dev/null)" && score_=9 @@ -287,50 +298,24 @@ compare_dev_null_ () return 2 } -if diff_out_=`exec 2>/dev/null; diff -u "$0" "$0" < /dev/null` \ - && diff -u Makefile "$0" 2>/dev/null | grep '^[+]#!' >/dev/null; then - # diff accepts the -u option and does not (like AIX 7 'diff') produce an - # extra space on column 1 of every content line. - if test -z "$diff_out_"; then - compare_ () { diff -u "$@"; } - else - compare_ () - { - if diff -u "$@" > diff.out; then - # No differences were found, but Solaris 'diff' produces output - # "No differences encountered". Hide this output. - rm -f diff.out - true - else - cat diff.out - rm -f diff.out - false - fi - } - fi -elif - for diff_opt_ in -U3 -c '' no; do - test "$diff_opt_" = no && break - diff_out_=`exec 2>/dev/null; diff $diff_opt_ "$0" "$0" </dev/null` && break - done - test "$diff_opt_" != no -then +for diff_opt_ in -u -U3 -c '' no; do + test "$diff_opt_" != no && + diff_out_=`exec 2>/dev/null; diff $diff_opt_ "$0" "$0" < /dev/null` && + break +done +if test "$diff_opt_" != no; then if test -z "$diff_out_"; then compare_ () { diff $diff_opt_ "$@"; } else compare_ () { - if diff $diff_opt_ "$@" > diff.out; then - # No differences were found, but AIX and HP-UX 'diff' produce output - # "No differences encountered" or "There are no differences between the - # files.". Hide this output. - rm -f diff.out - true - else - cat diff.out - rm -f diff.out - false - fi + # If no differences were found, AIX and HP-UX 'diff' produce output + # like "No differences encountered". Hide this output. + diff $diff_opt_ "$@" > diff.out + diff_status_=$? + test $diff_status_ -eq 0 || cat diff.out || diff_status_=2 + rm -f diff.out || diff_status_=2 + return $diff_status_ } fi elif cmp -s /dev/null /dev/null 2>/dev/null; then @@ -367,11 +352,15 @@ remove_tmp_ () { __st=$? cleanup_ - # cd out of the directory we're about to remove - cd "$initial_cwd_" || cd / || cd /tmp - chmod -R u+rwx "$test_dir_" - # If removal fails and exit status was to be 0, then change it to 1. - rm -rf "$test_dir_" || { test $__st = 0 && __st=1; } + if test "$KEEP" = yes; then + echo "Not removing temporary directory $test_dir_" + else + # cd out of the directory we're about to remove + cd "$initial_cwd_" || cd / || cd /tmp + chmod -R u+rwx "$test_dir_" + # If removal fails and exit status was to be 0, then change it to 1. + rm -rf "$test_dir_" || { test $__st = 0 && __st=1; } + fi exit $__st } diff --git a/tests/invalid-re b/tests/invalid-re new file mode 100755 index 0000000..0732a1f --- /dev/null +++ b/tests/invalid-re @@ -0,0 +1,18 @@ +#!/bin/sh +# Ensure we diagnose and fail upon first invalid -I regex. + +. "${srcdir=.}/init.sh"; path_prepend_ ../src + +fail=0 + +echo > a || framework_failure_ +echo b > b || framework_failure_ +echo 'diff: \: Trailing backslash' > exp-err || framework_failure_ + +# This must fail with an exit status of 2: +returns_ 2 diff -Ix -I\\ a b > out 2> err || fail=1 + +compare /dev/null out || fail=1 +compare exp-err err || fail=1 + +Exit $fail diff --git a/tests/label-vs-func b/tests/label-vs-func index 2de61f7..4b4c9b7 100755 --- a/tests/label-vs-func +++ b/tests/label-vs-func @@ -19,7 +19,7 @@ label: EOF sed s/1/2/ a > b || fail=1 -diff -p -u0 a b > out 2> err; test $? = 1 || fail=1 +returns_ 1 diff -p -u0 a b > out 2> err || fail=1 tail -3 out > k && mv k out || fail=1 diff --git a/tests/new-file b/tests/new-file index af7cc4c..4400051 100755 --- a/tests/new-file +++ b/tests/new-file @@ -10,29 +10,32 @@ echo a > a || fail=1 echo '0a1 > a' > exp || fail=1 -diff -N - a <&- > out; test $? = 1 || fail=1 +returns_ 1 diff -N - a <&- > out || fail=1 compare exp out || fail=1 -diff --unidirectional-new-file - a <&- > out; test $? = 1 || fail=1 +returns_ 1 diff --unidirectional-new-file - a <&- > out || fail=1 compare exp out || fail=1 -diff -N b - < a > out; test $? = 1 || fail=1 +returns_ 1 diff -N b - < a > out || fail=1 compare exp out || fail=1 -diff --unidirectional-new-file b - < a > out; test $? = 1 || fail=1 +returns_ 1 diff --unidirectional-new-file b - < a > out || fail=1 compare exp out || fail=1 echo '1d0 < a' > exp || fail=1 -diff -N a - <&- > out; test $? = 1 || fail=1 +returns_ 1 diff -N a - <&- > out || fail=1 compare exp out || fail=1 -diff --unidirectional-new-file a - <&- > out; test $? = 2 || fail=1 +# With closed standard input, require an exit status of 2 +# and empty stdout. +returns_ 2 diff --unidirectional-new-file a - <&- > out || fail=1 +compare /dev/null out || fail=1 -diff -N - b < a > out; test $? = 1 || fail=1 +returns_ 1 diff -N - b < a > out || fail=1 compare exp out || fail=1 -diff --unidirectional-new-file - b < a > out; test $? = 2 || fail=1 +returns_ 2 diff --unidirectional-new-file - b < a > out || fail=1 Exit $fail diff --git a/tests/no-dereference b/tests/no-dereference index 1426beb..3f67bd2 100644 --- a/tests/no-dereference +++ b/tests/no-dereference @@ -14,8 +14,7 @@ ln -s regular3 symlink3 # Non-recursive comparisons. # Test case 3: Compare regular file with regular file. -diff --no-dereference regular1 regular2 > out -test $? = 1 || fail=1 +returns_ 1 diff --no-dereference regular1 regular2 > out || fail=1 cat <<EOF > expected || framework_failure_ 1c1 < Simple contents @@ -25,30 +24,26 @@ EOF compare expected out || fail=1 # Test case 4: Compare regular file with symbolic link. -diff --no-dereference regular1 symlink1 > out -test $? = 1 || fail=1 +returns_ 1 diff --no-dereference regular1 symlink1 > out || fail=1 cat <<EOF > expected || framework_failure_ File regular1 is a regular file while file symlink1 is a symbolic link EOF compare expected out || fail=1 # Test case 5: Compare symbolic link with regular file. -diff --no-dereference symlink1 regular1 > out -test $? = 1 || fail=1 +returns_ 1 diff --no-dereference symlink1 regular1 > out || fail=1 cat <<EOF > expected || framework_failure_ File symlink1 is a symbolic link while file regular1 is a regular file EOF compare expected out || fail=1 # Test case 6: Compare symbolic links with same value. -diff --no-dereference symlink1 symlink1bis > out -test $? = 0 || fail=1 +diff --no-dereference symlink1 symlink1bis > out || fail=1 compare /dev/null out || fail=1 # Test case 7: Compare symbolic links with different value and different target # contents. -diff --no-dereference symlink1 symlink2 > out -test $? = 1 || fail=1 +returns_ 1 diff --no-dereference symlink1 symlink2 > out || fail=1 cat <<EOF > expected || framework_failure_ Symbolic links symlink1 and symlink2 differ EOF @@ -56,8 +51,7 @@ compare expected out || fail=1 # Test case 8: Compare symbolic links with different value and same target # contents. -diff --no-dereference symlink2 symlink3 > out -test $? = 1 || fail=1 +returns_ 1 diff --no-dereference symlink2 symlink3 > out || fail=1 cat <<EOF > expected || framework_failure_ Symbolic links symlink2 and symlink3 differ EOF @@ -70,8 +64,7 @@ mkdir subdir1a mkdir subdir1b ln -s nonexistent subdir1a/foo ln -s ../regular1 subdir1a/bar -diff -r --no-dereference subdir1a subdir1b > out -test $? = 1 || fail=1 +returns_ 1 diff -r --no-dereference subdir1a subdir1b > out || fail=1 cat <<EOF > expected || framework_failure_ Only in subdir1a: bar Only in subdir1a: foo @@ -83,8 +76,7 @@ mkdir subdir2a mkdir subdir2b ln -s nonexistent subdir2b/foo ln -s ../regular1 subdir2b/bar -diff -r --no-dereference subdir2a subdir2b > out -test $? = 1 || fail=1 +returns_ 1 diff -r --no-dereference subdir2a subdir2b > out || fail=1 cat <<EOF > expected || framework_failure_ Only in subdir2b: bar Only in subdir2b: foo @@ -96,8 +88,7 @@ mkdir subdir3a mkdir subdir3b cp regular1 subdir3a/foo cp regular2 subdir3b/foo -diff -r --no-dereference subdir3a subdir3b > out -test $? = 1 || fail=1 +returns_ 1 diff -r --no-dereference subdir3a subdir3b > out || fail=1 cat <<EOF > expected || framework_failure_ diff -r --no-dereference subdir3a/foo subdir3b/foo 1c1 @@ -112,8 +103,7 @@ mkdir subdir4a mkdir subdir4b cp regular1 subdir4a/foo ln -s ../regular1 subdir4b/foo -diff -r --no-dereference subdir4a subdir4b > out -test $? = 1 || fail=1 +returns_ 1 diff -r --no-dereference subdir4a subdir4b > out || fail=1 cat <<EOF > expected || framework_failure_ File subdir4a/foo is a regular file while file subdir4b/foo is a symbolic link EOF @@ -124,8 +114,7 @@ mkdir subdir5a mkdir subdir5b ln -s ../regular1 subdir5a/foo cp regular1 subdir5b/foo -diff -r --no-dereference subdir5a subdir5b > out -test $? = 1 || fail=1 +returns_ 1 diff -r --no-dereference subdir5a subdir5b > out || fail=1 cat <<EOF > expected || framework_failure_ File subdir5a/foo is a symbolic link while file subdir5b/foo is a regular file EOF @@ -136,8 +125,7 @@ mkdir subdir6a mkdir subdir6b ln -s ../regular1 subdir6a/foo ln -s ../regular1 subdir6b/foo -diff -r --no-dereference subdir6a subdir6b > out -test $? = 0 || fail=1 +diff -r --no-dereference subdir6a subdir6b > out || fail=1 compare /dev/null out || fail=1 # Test case 7: Compare symbolic links with different value and different target @@ -146,8 +134,7 @@ mkdir subdir7a mkdir subdir7b ln -s ../regular1 subdir7a/foo ln -s ../regular2 subdir7b/foo -diff -r --no-dereference subdir7a subdir7b > out -test $? = 1 || fail=1 +returns_ 1 diff -r --no-dereference subdir7a subdir7b > out || fail=1 cat <<EOF > expected || framework_failure_ Symbolic links subdir7a/foo and subdir7b/foo differ EOF @@ -159,8 +146,7 @@ mkdir subdir8a mkdir subdir8b ln -s ../regular2 subdir8a/foo ln -s ../regular3 subdir8b/foo -diff -r --no-dereference subdir8a subdir8b > out -test $? = 1 || fail=1 +returns_ 1 diff -r --no-dereference subdir8a subdir8b > out || fail=1 cat <<EOF > expected || framework_failure_ Symbolic links subdir8a/foo and subdir8b/foo differ EOF diff --git a/tests/no-newline-at-eof b/tests/no-newline-at-eof index f503718..5f00003 100755 --- a/tests/no-newline-at-eof +++ b/tests/no-newline-at-eof @@ -31,8 +31,7 @@ fail=0 # So we don't have to record trailing blanks in expected output above. opt=--suppress-blank-empty -diff $opt -U1 a b > out 2> err -test $? = 1 || fail=1 +returns_ 1 diff $opt -U1 a b > out 2> err || fail=1 sed -n '/^@@/,$p' out > k && mv k out || fail=1 compare exp out || fail=1 @@ -42,8 +41,7 @@ compare /dev/null err || fail=1 # Repeat, but with a newline at the end of "a". echo >> a -diff $opt -U1 a b > out 2> err -test $? = 1 || fail=1 +returns_ 1 diff $opt -U1 a b > out 2> err || fail=1 sed -n '/^@@/,$p' out > k && mv k out || fail=1 compare exp2 out || fail=1 @@ -53,7 +51,6 @@ compare /dev/null err || fail=1 # Test for Bug#18402. printf a > a printf b > b -diff -B a b > out 2>err -test $? = 1 || fail=1 +returns_ 1 diff -B a b > out 2>err || fail=1 Exit $fail diff --git a/tests/stdin b/tests/stdin index 295e98d..94b7542 100755 --- a/tests/stdin +++ b/tests/stdin @@ -16,7 +16,7 @@ EOF echo a > a echo b > b -diff -u - b < a > out 2> err; test $? = 1 || fail=1 +returns_ 1 diff -u - b < a > out 2> err || fail=1 # Remove date and time. sed -e 's/^\([-+*][-+*][-+*] [^ ]*\) .*/\1/' out > k; mv k out compare exp out || fail=1 |