This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "GNU libidn".
http://git.savannah.gnu.org/cgit/libidn.git/commit/?id=0f783ca3e6208d9376a459c38c03e96642624d02 The branch, master has been updated via 0f783ca3e6208d9376a459c38c03e96642624d02 (commit) via 131d644e144785cb55a15b972c36b3d2b806e35b (commit) via ec40414b2a34b755875521187b651cb28a17a3e4 (commit) via 3a9bd21218008449af8149c6a9c9e381a700154f (commit) via 7fdebae753a11792f5e9331e444d9f8fb6558c1c (commit) via 8ff8393639b59c449dbb5c6a98f368f282863407 (commit) via b6328673ffa11bca2af5ae1edf2cf6f3f8d0c27a (commit) via ea4888ae7c9a105d7c9647e69a77cd2452224fa3 (commit) via 07bb66ac2c5408d3223c2cd570790af93af22116 (commit) via 8a5b2f099fa6c4beb4cfd27954bfbc64e84b423d (commit) via 08b900ec8f81ce19ec3a2909735ad0cfcbe51a79 (commit) via e1efbdfe36ccc54fff32fbbf94576729223ad71d (commit) via 302eaa428be82050babbcba7cb461b048c505a29 (commit) via 02a71a850ae585bd558e6b9008b53e6f39cb2879 (commit) from 288ad20256081e4571c64136b5c40618f8fc561d (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 0f783ca3e6208d9376a459c38c03e96642624d02 Author: Simon Josefsson <[email protected]> Date: Wed Jul 10 13:46:09 2013 +0200 Version 1.28. commit 131d644e144785cb55a15b972c36b3d2b806e35b Author: Simon Josefsson <[email protected]> Date: Wed Jul 10 13:42:17 2013 +0200 Java doc fix. commit ec40414b2a34b755875521187b651cb28a17a3e4 Author: Simon Josefsson <[email protected]> Date: Wed Jul 10 10:55:42 2013 +0200 Fix last commit. commit 3a9bd21218008449af8149c6a9c9e381a700154f Author: Simon Josefsson <[email protected]> Date: Wed Jul 10 10:54:10 2013 +0200 Add. commit 7fdebae753a11792f5e9331e444d9f8fb6558c1c Author: Simon Josefsson <[email protected]> Date: Wed Jul 10 10:53:42 2013 +0200 Fix -a and -u logic mixup. commit 8ff8393639b59c449dbb5c6a98f368f282863407 Author: Simon Josefsson <[email protected]> Date: Wed Jul 10 10:44:43 2013 +0200 Ignore more. commit b6328673ffa11bca2af5ae1edf2cf6f3f8d0c27a Author: Simon Josefsson <[email protected]> Date: Wed Jul 10 10:44:36 2013 +0200 Sync with TP. commit ea4888ae7c9a105d7c9647e69a77cd2452224fa3 Author: Simon Josefsson <[email protected]> Date: Tue Jul 9 21:51:50 2013 +0200 Update gnulib files. commit 07bb66ac2c5408d3223c2cd570790af93af22116 Author: Simon Josefsson <[email protected]> Date: Tue Jul 9 21:45:46 2013 +0200 Add all classes. commit 8a5b2f099fa6c4beb4cfd27954bfbc64e84b423d Author: Simon Josefsson <[email protected]> Date: Tue Jul 9 21:44:58 2013 +0200 Ignore more. commit 08b900ec8f81ce19ec3a2909735ad0cfcbe51a79 Author: Simon Josefsson <[email protected]> Date: Mon Jul 8 11:58:17 2013 +0200 Bump gettext to 0.18.3 to work better with modern automake. commit e1efbdfe36ccc54fff32fbbf94576729223ad71d Author: Simon Josefsson <[email protected]> Date: Mon Jul 8 11:50:28 2013 +0200 Fix for recent automake. commit 302eaa428be82050babbcba7cb461b048c505a29 Author: Simon Josefsson <[email protected]> Date: Mon Jul 8 11:49:06 2013 +0200 Add. commit 02a71a850ae585bd558e6b9008b53e6f39cb2879 Author: Simon Josefsson <[email protected]> Date: Mon Jul 8 11:48:41 2013 +0200 Update gnulib files. ----------------------------------------------------------------------- Summary of changes: .gitignore | 8 +++ NEWS | 6 ++- cfg.mk | 2 - configure.ac | 3 +- doc/libidn.texi | 22 ++++---- gl/m4/extern-inline.m4 | 17 +++---- gl/msvc-inval.c | 6 +- gl/verify.h | 112 ++++++++++++++++++++------------------ gltests/getcwd-lgpl.c | 1 + gltests/ignore-value.h | 13 +++-- java/Makefile.am | 8 +++ java/src/util/java/TestIDNA.java | 20 ++++---- lib/gl/m4/extern-inline.m4 | 17 +++---- lib/gltests/verify.h | 112 ++++++++++++++++++++------------------ po/vi.po.in | 57 ++++++++++---------- 15 files changed, 218 insertions(+), 186 deletions(-) diff --git a/.gitignore b/.gitignore index df80f7a..197b072 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,7 @@ *.gcda *.gcno +*.log +*.trs *~ ABOUT-NLS ChangeLog @@ -8,6 +10,7 @@ Makefile Makefile.in aclocal.m4 autom4te.cache/ +build-aux/ar-lib build-aux/compile build-aux/config.guess build-aux/config.sub @@ -16,6 +19,7 @@ build-aux/install-sh build-aux/ltmain.sh build-aux/mdate-sh build-aux/missing +build-aux/test-driver build-aux/texinfo.tex config.h config.h.in @@ -74,6 +78,8 @@ doc/libidn.log doc/libidn.pdf doc/libidn.pg doc/libidn.ps +doc/libidn.t2d/ +doc/libidn.t2p/ doc/libidn.toc doc/libidn.tp doc/libidn.vr @@ -198,6 +204,8 @@ gltests/test-fwrite gltests/test-fwrite.o gltests/test-getcwd-lgpl gltests/test-getcwd-lgpl.o +gltests/test-getdtablesize +gltests/test-getdtablesize.o gltests/test-getopt gltests/test-getopt.o gltests/test-ignore-value diff --git a/NEWS b/NEWS index 2101b03..c70d16a 100644 --- a/NEWS +++ b/NEWS @@ -2,11 +2,15 @@ Libidn NEWS -- History of user-visible changes. -*- outline -*- Copyright (C) 2002-2013 Simon Josefsson See the end for copying conditions. -* Version 1.28 (unreleased) [stable] +* Version 1.28 (released 2013-07-10) [stable] ** idn: Don't crash when string conversion from UTF-8 to locale fails. Reported by Jeffrey Frey <[email protected]>. +** java: Fix build failures. + +** java: TestIDNA -a and -u logic was reversed, now fixed. + ** API and ABI is backwards compatible with the previous version. * Version 1.27 (released 2013-06-05) [stable] diff --git a/cfg.mk b/cfg.mk index d34d7d3..731125c 100644 --- a/cfg.mk +++ b/cfg.mk @@ -46,10 +46,8 @@ autoreconf: doc/Makefile.gdoc for f in po/*.po.in; do \ cp $$f `echo $$f | sed 's/.in//'`; \ done - mv build-aux/config.rpath build-aux/config.rpath- touch ChangeLog test -f ./configure || autoreconf --install - mv build-aux/config.rpath- build-aux/config.rpath update-po: refresh-po for f in `ls po/*.po | grep -v quot.po`; do \ diff --git a/configure.ac b/configure.ac index b253c85..d922c3f 100644 --- a/configure.ac +++ b/configure.ac @@ -45,13 +45,14 @@ AC_SUBST(DLL_VERSION) # the Ubuntu 8.04 LTS is still shipping a libtool version that doesn't # have it. AC_LIBTOOL_WIN32_DLL +m4_ifdef([AM_PROG_AR], [AM_PROG_AR]) AC_PROG_LIBTOOL # Checks for programs. AM_MISSING_PROG(PERL, perl, $missing_dir) AM_MISSING_PROG(HELP2MAN, help2man, $missing_dir) AM_GNU_GETTEXT(external) -AM_GNU_GETTEXT_VERSION(0.18.1) +AM_GNU_GETTEXT_VERSION(0.18.3) AM_ICONV AM_PATH_LISPDIR diff --git a/doc/libidn.texi b/doc/libidn.texi index 37ded9b..57b2750 100644 --- a/doc/libidn.texi +++ b/doc/libidn.texi @@ -1745,8 +1745,10 @@ pending. The Java library, if Libidn has been built with Java support (@pxref{Downloading and Installing}), will be placed in -@file{java/libidn-@value{VERSION}.jar}. The source code is located in -@file{java/gnu/inet/encoding/}. +@file{java/libidn-@value{VERSION}.jar}. The source code is below +@file{java/} in Maven directory layout, and there is a Maven +@file{pom.xml} build script as well. Source code files are in +@file{java/src/main/java/gnu/inet/encoding/}. @section Overview @@ -1764,9 +1766,9 @@ gnu.inet.encoding.IDNA.toUnicode("xn--blds-6qa.xn--zg-xka"); @section Miscellaneous Programs -The @file{misc/} directory contains several programs that are related -to the Java part of GNU Libidn, but that don't need to be included in -the main source tree. +The @file{java/src/util/java/} directory contains several programs that +are related to the Java part of GNU Libidn, but that don't need to be +included in the main source tree or the JAR file. @subsection GenerateRFC3454 @@ -1815,10 +1817,10 @@ The test vectors can be found at the Libidn homepage, To test the transformation manually, use: @example -$ java -cp .:../libidn.jar TestIDNA -a <string to test> +$ java -cp .:/usr/share/java/libidn.jar TestIDNA -a <string to test> Input: <string to test> Output: <toASCII(string to test)> -$ java -cp .:../libidn.jar TestIDNA -u <string to test> +$ java -cp .:/usr/share/java/libidn.jar TestIDNA -u <string to test> Input: <string to test> Output: <toUnicode(string to test)> @end example @@ -1826,7 +1828,7 @@ Output: <toUnicode(string to test)> To test against draft-josefsson-idn-test-vectors.html, use: @example -$ java -cp .:../libidn.jar TestIDNA -t +$ java -cp .:/usr/share/java/libidn/libidn.jar TestIDNA -t No errors detected! @end example @@ -1838,7 +1840,7 @@ or against the NormalizationTest.txt file from the Unicode data files. To test the normalization manually, use: @example -$ java -cp .:../libidn.jar TestNFKC <string to test> +$ java -cp .:/usr/share/java/libidn.jar TestNFKC <string to test> Input: <string to test> Output: <nfkc version of the string to test> @end example @@ -1846,7 +1848,7 @@ Output: <nfkc version of the string to test> To test against NormalizationTest.txt: @example -$ java -cp .:../libidn.jar TestNFKC +$ java -cp .:/usr/share/java/libidn.jar TestNFKC No errors detected! @end example diff --git a/gl/m4/extern-inline.m4 b/gl/m4/extern-inline.m4 index 94b46dd..c4c5e7f 100644 --- a/gl/m4/extern-inline.m4 +++ b/gl/m4/extern-inline.m4 @@ -8,15 +8,7 @@ dnl with or without modifications, as long as this notice is preserved. AC_DEFUN([gl_EXTERN_INLINE], [ AH_VERBATIM([extern_inline], -[/* _GL_INLINE is a portable alternative to ISO C99 plain 'inline'. - _GL_EXTERN_INLINE is a portable alternative to 'extern inline'. - _GL_INLINE_HEADER_BEGIN contains useful stuff to put - in an include file, before uses of _GL_INLINE. - It suppresses GCC's bogus "no previous prototype for 'FOO'" diagnostic, - when FOO is an inline function in the header; see - <http://gcc.gnu.org/bugzilla/show_bug.cgi?id=54113>. - _GL_INLINE_HEADER_END contains useful stuff to put - in the same include file, after uses of _GL_INLINE. +[/* Please see the Gnulib manual for how to use these macros. Suppress extern inline with HP-UX cc, as it appears to be broken; see <http://lists.gnu.org/archive/html/bug-texinfo/2013-02/msg00030.html>. @@ -39,7 +31,8 @@ AC_DEFUN([gl_EXTERN_INLINE], && !defined __APPLE__) # define _GL_INLINE inline # define _GL_EXTERN_INLINE extern inline -#elif 2 < __GNUC__ + (7 <= __GNUC_MINOR__) && !defined __APPLE__ +#elif (2 < __GNUC__ + (7 <= __GNUC_MINOR__) && !defined __STRICT_ANSI__ \ + && !defined __APPLE__) # if __GNUC_GNU_INLINE__ /* __gnu_inline__ suppresses a GCC 4.2 diagnostic. */ # define _GL_INLINE extern inline __attribute__ ((__gnu_inline__)) @@ -59,6 +52,10 @@ AC_DEFUN([gl_EXTERN_INLINE], # define _GL_INLINE_HEADER_CONST_PRAGMA \ _Pragma ("GCC diagnostic ignored \"-Wsuggest-attribute=const\"") # endif + /* Suppress GCC's bogus "no previous prototype for 'FOO'" + and "no previous declaration for 'FOO'" diagnostics, + when FOO is an inline function in the header; see + <http://gcc.gnu.org/bugzilla/show_bug.cgi?id=54113>. */ # define _GL_INLINE_HEADER_BEGIN \ _Pragma ("GCC diagnostic push") \ _Pragma ("GCC diagnostic ignored \"-Wmissing-prototypes\"") \ diff --git a/gl/msvc-inval.c b/gl/msvc-inval.c index 72a6b6e..396031e 100644 --- a/gl/msvc-inval.c +++ b/gl/msvc-inval.c @@ -28,7 +28,7 @@ # if MSVC_INVALID_PARAMETER_HANDLING == DEFAULT_HANDLING -static void cdecl +static void __cdecl gl_msvc_invalid_parameter_handler (const wchar_t *expression, const wchar_t *function, const wchar_t *file, @@ -45,7 +45,7 @@ gl_msvc_invalid_parameter_handler (const wchar_t *expression, # if defined _MSC_VER -static void cdecl +static void __cdecl gl_msvc_invalid_parameter_handler (const wchar_t *expression, const wchar_t *function, const wchar_t *file, @@ -94,7 +94,7 @@ gl_msvc_inval_current (void) } } -static void cdecl +static void __cdecl gl_msvc_invalid_parameter_handler (const wchar_t *expression, const wchar_t *function, const wchar_t *file, diff --git a/gl/verify.h b/gl/verify.h index 03492ef..d42d075 100644 --- a/gl/verify.h +++ b/gl/verify.h @@ -18,7 +18,7 @@ /* Written by Paul Eggert, Bruno Haible, and Jim Meyering. */ #ifndef _GL_VERIFY_H -# define _GL_VERIFY_H +#define _GL_VERIFY_H /* Define _GL_HAVE__STATIC_ASSERT to 1 if _Static_assert works as per C11. @@ -31,16 +31,24 @@ Use this only with GCC. If we were willing to slow 'configure' down we could also use it with other compilers, but since this affects only the quality of diagnostics, why bother? */ -# if (4 < __GNUC__ + (6 <= __GNUC_MINOR__) \ - && (201112L <= __STDC_VERSION__ || !defined __STRICT_ANSI__) \ - && !defined __cplusplus) -# define _GL_HAVE__STATIC_ASSERT 1 -# endif +#if (4 < __GNUC__ + (6 <= __GNUC_MINOR__) \ + && (201112L <= __STDC_VERSION__ || !defined __STRICT_ANSI__) \ + && !defined __cplusplus) +# define _GL_HAVE__STATIC_ASSERT 1 +#endif /* The condition (99 < __GNUC__) is temporary, until we know about the first G++ release that supports static_assert. */ -# if (99 < __GNUC__) && defined __cplusplus -# define _GL_HAVE_STATIC_ASSERT 1 -# endif +#if (99 < __GNUC__) && defined __cplusplus +# define _GL_HAVE_STATIC_ASSERT 1 +#endif + +/* FreeBSD 9.1 <sys/cdefs.h>, included by <stddef.h> and lots of other + system headers, defines a conflicting _Static_assert that is no + better than ours; override it. */ +#ifndef _GL_HAVE_STATIC_ASSERT +# include <stddef.h> +# undef _Static_assert +#endif /* Each of these macros verifies that its argument R is nonzero. To be portable, R should be an integer constant expression. Unlike @@ -143,50 +151,50 @@ Use a template type to work around the problem. */ /* Concatenate two preprocessor tokens. */ -# define _GL_CONCAT(x, y) _GL_CONCAT0 (x, y) -# define _GL_CONCAT0(x, y) x##y +#define _GL_CONCAT(x, y) _GL_CONCAT0 (x, y) +#define _GL_CONCAT0(x, y) x##y /* _GL_COUNTER is an integer, preferably one that changes each time we use it. Use __COUNTER__ if it works, falling back on __LINE__ otherwise. __LINE__ isn't perfect, but it's better than a constant. */ -# if defined __COUNTER__ && __COUNTER__ != __COUNTER__ -# define _GL_COUNTER __COUNTER__ -# else -# define _GL_COUNTER __LINE__ -# endif +#if defined __COUNTER__ && __COUNTER__ != __COUNTER__ +# define _GL_COUNTER __COUNTER__ +#else +# define _GL_COUNTER __LINE__ +#endif /* Generate a symbol with the given prefix, making it unique if possible. */ -# define _GL_GENSYM(prefix) _GL_CONCAT (prefix, _GL_COUNTER) +#define _GL_GENSYM(prefix) _GL_CONCAT (prefix, _GL_COUNTER) /* Verify requirement R at compile-time, as an integer constant expression that returns 1. If R is false, fail at compile-time, preferably with a diagnostic that includes the string-literal DIAGNOSTIC. */ -# define _GL_VERIFY_TRUE(R, DIAGNOSTIC) \ - (!!sizeof (_GL_VERIFY_TYPE (R, DIAGNOSTIC))) +#define _GL_VERIFY_TRUE(R, DIAGNOSTIC) \ + (!!sizeof (_GL_VERIFY_TYPE (R, DIAGNOSTIC))) -# ifdef __cplusplus -# if !GNULIB_defined_struct__gl_verify_type +#ifdef __cplusplus +# if !GNULIB_defined_struct__gl_verify_type template <int w> struct _gl_verify_type { unsigned int _gl_verify_error_if_negative: w; }; -# define GNULIB_defined_struct__gl_verify_type 1 -# endif -# define _GL_VERIFY_TYPE(R, DIAGNOSTIC) \ - _gl_verify_type<(R) ? 1 : -1> -# elif defined _GL_HAVE__STATIC_ASSERT -# define _GL_VERIFY_TYPE(R, DIAGNOSTIC) \ - struct { \ - _Static_assert (R, DIAGNOSTIC); \ - int _gl_dummy; \ - } -# else -# define _GL_VERIFY_TYPE(R, DIAGNOSTIC) \ - struct { unsigned int _gl_verify_error_if_negative: (R) ? 1 : -1; } +# define GNULIB_defined_struct__gl_verify_type 1 # endif +# define _GL_VERIFY_TYPE(R, DIAGNOSTIC) \ + _gl_verify_type<(R) ? 1 : -1> +#elif defined _GL_HAVE__STATIC_ASSERT +# define _GL_VERIFY_TYPE(R, DIAGNOSTIC) \ + struct { \ + _Static_assert (R, DIAGNOSTIC); \ + int _gl_dummy; \ + } +#else +# define _GL_VERIFY_TYPE(R, DIAGNOSTIC) \ + struct { unsigned int _gl_verify_error_if_negative: (R) ? 1 : -1; } +#endif /* Verify requirement R at compile-time, as a declaration without a trailing ';'. If R is false, fail at compile-time, preferably @@ -195,23 +203,23 @@ template <int w> Unfortunately, unlike C11, this implementation must appear as an ordinary declaration, and cannot appear inside struct { ... }. */ -# ifdef _GL_HAVE__STATIC_ASSERT -# define _GL_VERIFY _Static_assert -# else -# define _GL_VERIFY(R, DIAGNOSTIC) \ - extern int (*_GL_GENSYM (_gl_verify_function) (void)) \ - [_GL_VERIFY_TRUE (R, DIAGNOSTIC)] -# endif +#ifdef _GL_HAVE__STATIC_ASSERT +# define _GL_VERIFY _Static_assert +#else +# define _GL_VERIFY(R, DIAGNOSTIC) \ + extern int (*_GL_GENSYM (_gl_verify_function) (void)) \ + [_GL_VERIFY_TRUE (R, DIAGNOSTIC)] +#endif /* _GL_STATIC_ASSERT_H is defined if this code is copied into assert.h. */ -# ifdef _GL_STATIC_ASSERT_H -# if !defined _GL_HAVE__STATIC_ASSERT && !defined _Static_assert -# define _Static_assert(R, DIAGNOSTIC) _GL_VERIFY (R, DIAGNOSTIC) -# endif -# if !defined _GL_HAVE_STATIC_ASSERT && !defined static_assert -# define static_assert _Static_assert /* C11 requires this #define. */ -# endif +#ifdef _GL_STATIC_ASSERT_H +# if !defined _GL_HAVE__STATIC_ASSERT && !defined _Static_assert +# define _Static_assert(R, DIAGNOSTIC) _GL_VERIFY (R, DIAGNOSTIC) +# endif +# if !defined _GL_HAVE_STATIC_ASSERT && !defined static_assert +# define static_assert _Static_assert /* C11 requires this #define. */ # endif +#endif /* @assert.h omit start@ */ @@ -229,18 +237,18 @@ template <int w> verify_true is obsolescent; please use verify_expr instead. */ -# define verify_true(R) _GL_VERIFY_TRUE (R, "verify_true (" #R ")") +#define verify_true(R) _GL_VERIFY_TRUE (R, "verify_true (" #R ")") /* Verify requirement R at compile-time. Return the value of the expression E. */ -# define verify_expr(R, E) \ - (_GL_VERIFY_TRUE (R, "verify_expr (" #R ", " #E ")") ? (E) : (E)) +#define verify_expr(R, E) \ + (_GL_VERIFY_TRUE (R, "verify_expr (" #R ", " #E ")") ? (E) : (E)) /* Verify requirement R at compile-time, as a declaration without a trailing ';'. */ -# define verify(R) _GL_VERIFY (R, "verify (" #R ")") +#define verify(R) _GL_VERIFY (R, "verify (" #R ")") /* @assert.h omit end@ */ diff --git a/gltests/getcwd-lgpl.c b/gltests/getcwd-lgpl.c index d550f35..cebe8f7 100644 --- a/gltests/getcwd-lgpl.c +++ b/gltests/getcwd-lgpl.c @@ -20,6 +20,7 @@ #include <unistd.h> #include <errno.h> +#include <stdlib.h> #include <string.h> #if GNULIB_GETCWD diff --git a/gltests/ignore-value.h b/gltests/ignore-value.h index 63ecde8..ebd6bf4 100644 --- a/gltests/ignore-value.h +++ b/gltests/ignore-value.h @@ -33,15 +33,16 @@ declared with attribute warn_unused_result". */ #ifndef _GL_IGNORE_VALUE_H -# define _GL_IGNORE_VALUE_H +#define _GL_IGNORE_VALUE_H /* The __attribute__((__warn_unused_result__)) feature is available in gcc versions 3.4 and newer, while the typeof feature has been available since 2.7 at least. */ -# if __GNUC__ < 3 || (__GNUC__ == 3 && __GNUC_MINOR__ < 4) -# define ignore_value(x) ((void) (x)) -# else -# define ignore_value(x) (({ __typeof__ (x) __x = (x); (void) __x; })) -# endif +#if 3 < __GNUC__ + (4 <= __GNUC_MINOR__) +# define ignore_value(x) \ + (__extension__ ({ __typeof__ (x) __x = (x); (void) __x; })) +#else +# define ignore_value(x) ((void) (x)) +#endif #endif diff --git a/java/Makefile.am b/java/Makefile.am index 6d3f78c..c8374d7 100644 --- a/java/Makefile.am +++ b/java/Makefile.am @@ -47,8 +47,16 @@ libidn-$(VERSION).jar: -C $(builddir)/src/main/java \ gnu/inet/encoding/PunycodeException.class \ -C $(builddir)/src/main/java \ + gnu/inet/encoding/RangeSet\$$1.class \ + -C $(builddir)/src/main/java \ + gnu/inet/encoding/RangeSet\$$Builder.class \ + -C $(builddir)/src/main/java \ gnu/inet/encoding/RangeSet.class \ -C $(builddir)/src/main/java \ + gnu/inet/encoding/RangeSet\$$Range.class \ + -C $(builddir)/src/main/java \ + gnu/inet/encoding/RangeSet\$$RangeContainsComparator.class \ + -C $(builddir)/src/main/java \ gnu/inet/encoding/RFC3454.class \ -C $(builddir)/src/main/java \ gnu/inet/encoding/Stringprep.class \ diff --git a/java/src/util/java/TestIDNA.java b/java/src/util/java/TestIDNA.java index 5c01c74..906bcc4 100644 --- a/java/src/util/java/TestIDNA.java +++ b/java/src/util/java/TestIDNA.java @@ -66,15 +66,15 @@ public class TestIDNA if (args.length == 2) { if (args[0].equals("-u")) { - try { System.out.println("Input: "+args[1]); - System.out.println("Output: "+IDNA.toASCII(args[1])); - } catch (IDNAException e) { - System.out.println(e); - } + System.out.println("Output: "+IDNA.toUnicode(args[1])); } else if (args[0].equals("-a")) { - System.out.println("Input: "+args[1]); - System.out.println("Output: "+IDNA.toUnicode(args[1])); + try { + System.out.println("Input: "+args[1]); + System.out.println("Output: "+IDNA.toASCII(args[1])); + } catch (IDNAException e) { + System.out.println(e); + } } else { usage(); } @@ -111,7 +111,7 @@ public class TestIDNA // Empty line (before "out:") } else if (l.startsWith("out: ")) { out = l.substring(5).trim(); - + try { String ascii = IDNA.toASCII(input.toString()); if (ascii.equals(out)) { @@ -126,7 +126,7 @@ public class TestIDNA } catch (IDNAException e) { System.out.println(" exception thrown ("+e+")"); } - + state = STATE_SCAN; } else { StringTokenizer tok = new StringTokenizer(l.trim(), " "); @@ -143,7 +143,7 @@ public class TestIDNA break; } } - + System.out.println("No errors detected!"); } else { usage(); diff --git a/lib/gl/m4/extern-inline.m4 b/lib/gl/m4/extern-inline.m4 index 94b46dd..c4c5e7f 100644 --- a/lib/gl/m4/extern-inline.m4 +++ b/lib/gl/m4/extern-inline.m4 @@ -8,15 +8,7 @@ dnl with or without modifications, as long as this notice is preserved. AC_DEFUN([gl_EXTERN_INLINE], [ AH_VERBATIM([extern_inline], -[/* _GL_INLINE is a portable alternative to ISO C99 plain 'inline'. - _GL_EXTERN_INLINE is a portable alternative to 'extern inline'. - _GL_INLINE_HEADER_BEGIN contains useful stuff to put - in an include file, before uses of _GL_INLINE. - It suppresses GCC's bogus "no previous prototype for 'FOO'" diagnostic, - when FOO is an inline function in the header; see - <http://gcc.gnu.org/bugzilla/show_bug.cgi?id=54113>. - _GL_INLINE_HEADER_END contains useful stuff to put - in the same include file, after uses of _GL_INLINE. +[/* Please see the Gnulib manual for how to use these macros. Suppress extern inline with HP-UX cc, as it appears to be broken; see <http://lists.gnu.org/archive/html/bug-texinfo/2013-02/msg00030.html>. @@ -39,7 +31,8 @@ AC_DEFUN([gl_EXTERN_INLINE], && !defined __APPLE__) # define _GL_INLINE inline # define _GL_EXTERN_INLINE extern inline -#elif 2 < __GNUC__ + (7 <= __GNUC_MINOR__) && !defined __APPLE__ +#elif (2 < __GNUC__ + (7 <= __GNUC_MINOR__) && !defined __STRICT_ANSI__ \ + && !defined __APPLE__) # if __GNUC_GNU_INLINE__ /* __gnu_inline__ suppresses a GCC 4.2 diagnostic. */ # define _GL_INLINE extern inline __attribute__ ((__gnu_inline__)) @@ -59,6 +52,10 @@ AC_DEFUN([gl_EXTERN_INLINE], # define _GL_INLINE_HEADER_CONST_PRAGMA \ _Pragma ("GCC diagnostic ignored \"-Wsuggest-attribute=const\"") # endif + /* Suppress GCC's bogus "no previous prototype for 'FOO'" + and "no previous declaration for 'FOO'" diagnostics, + when FOO is an inline function in the header; see + <http://gcc.gnu.org/bugzilla/show_bug.cgi?id=54113>. */ # define _GL_INLINE_HEADER_BEGIN \ _Pragma ("GCC diagnostic push") \ _Pragma ("GCC diagnostic ignored \"-Wmissing-prototypes\"") \ diff --git a/lib/gltests/verify.h b/lib/gltests/verify.h index 03492ef..d42d075 100644 --- a/lib/gltests/verify.h +++ b/lib/gltests/verify.h @@ -18,7 +18,7 @@ /* Written by Paul Eggert, Bruno Haible, and Jim Meyering. */ #ifndef _GL_VERIFY_H -# define _GL_VERIFY_H +#define _GL_VERIFY_H /* Define _GL_HAVE__STATIC_ASSERT to 1 if _Static_assert works as per C11. @@ -31,16 +31,24 @@ Use this only with GCC. If we were willing to slow 'configure' down we could also use it with other compilers, but since this affects only the quality of diagnostics, why bother? */ -# if (4 < __GNUC__ + (6 <= __GNUC_MINOR__) \ - && (201112L <= __STDC_VERSION__ || !defined __STRICT_ANSI__) \ - && !defined __cplusplus) -# define _GL_HAVE__STATIC_ASSERT 1 -# endif +#if (4 < __GNUC__ + (6 <= __GNUC_MINOR__) \ + && (201112L <= __STDC_VERSION__ || !defined __STRICT_ANSI__) \ + && !defined __cplusplus) +# define _GL_HAVE__STATIC_ASSERT 1 +#endif /* The condition (99 < __GNUC__) is temporary, until we know about the first G++ release that supports static_assert. */ -# if (99 < __GNUC__) && defined __cplusplus -# define _GL_HAVE_STATIC_ASSERT 1 -# endif +#if (99 < __GNUC__) && defined __cplusplus +# define _GL_HAVE_STATIC_ASSERT 1 +#endif + +/* FreeBSD 9.1 <sys/cdefs.h>, included by <stddef.h> and lots of other + system headers, defines a conflicting _Static_assert that is no + better than ours; override it. */ +#ifndef _GL_HAVE_STATIC_ASSERT +# include <stddef.h> +# undef _Static_assert +#endif /* Each of these macros verifies that its argument R is nonzero. To be portable, R should be an integer constant expression. Unlike @@ -143,50 +151,50 @@ Use a template type to work around the problem. */ /* Concatenate two preprocessor tokens. */ -# define _GL_CONCAT(x, y) _GL_CONCAT0 (x, y) -# define _GL_CONCAT0(x, y) x##y +#define _GL_CONCAT(x, y) _GL_CONCAT0 (x, y) +#define _GL_CONCAT0(x, y) x##y /* _GL_COUNTER is an integer, preferably one that changes each time we use it. Use __COUNTER__ if it works, falling back on __LINE__ otherwise. __LINE__ isn't perfect, but it's better than a constant. */ -# if defined __COUNTER__ && __COUNTER__ != __COUNTER__ -# define _GL_COUNTER __COUNTER__ -# else -# define _GL_COUNTER __LINE__ -# endif +#if defined __COUNTER__ && __COUNTER__ != __COUNTER__ +# define _GL_COUNTER __COUNTER__ +#else +# define _GL_COUNTER __LINE__ +#endif /* Generate a symbol with the given prefix, making it unique if possible. */ -# define _GL_GENSYM(prefix) _GL_CONCAT (prefix, _GL_COUNTER) +#define _GL_GENSYM(prefix) _GL_CONCAT (prefix, _GL_COUNTER) /* Verify requirement R at compile-time, as an integer constant expression that returns 1. If R is false, fail at compile-time, preferably with a diagnostic that includes the string-literal DIAGNOSTIC. */ -# define _GL_VERIFY_TRUE(R, DIAGNOSTIC) \ - (!!sizeof (_GL_VERIFY_TYPE (R, DIAGNOSTIC))) +#define _GL_VERIFY_TRUE(R, DIAGNOSTIC) \ + (!!sizeof (_GL_VERIFY_TYPE (R, DIAGNOSTIC))) -# ifdef __cplusplus -# if !GNULIB_defined_struct__gl_verify_type +#ifdef __cplusplus +# if !GNULIB_defined_struct__gl_verify_type template <int w> struct _gl_verify_type { unsigned int _gl_verify_error_if_negative: w; }; -# define GNULIB_defined_struct__gl_verify_type 1 -# endif -# define _GL_VERIFY_TYPE(R, DIAGNOSTIC) \ - _gl_verify_type<(R) ? 1 : -1> -# elif defined _GL_HAVE__STATIC_ASSERT -# define _GL_VERIFY_TYPE(R, DIAGNOSTIC) \ - struct { \ - _Static_assert (R, DIAGNOSTIC); \ - int _gl_dummy; \ - } -# else -# define _GL_VERIFY_TYPE(R, DIAGNOSTIC) \ - struct { unsigned int _gl_verify_error_if_negative: (R) ? 1 : -1; } +# define GNULIB_defined_struct__gl_verify_type 1 # endif +# define _GL_VERIFY_TYPE(R, DIAGNOSTIC) \ + _gl_verify_type<(R) ? 1 : -1> +#elif defined _GL_HAVE__STATIC_ASSERT +# define _GL_VERIFY_TYPE(R, DIAGNOSTIC) \ + struct { \ + _Static_assert (R, DIAGNOSTIC); \ + int _gl_dummy; \ + } +#else +# define _GL_VERIFY_TYPE(R, DIAGNOSTIC) \ + struct { unsigned int _gl_verify_error_if_negative: (R) ? 1 : -1; } +#endif /* Verify requirement R at compile-time, as a declaration without a trailing ';'. If R is false, fail at compile-time, preferably @@ -195,23 +203,23 @@ template <int w> Unfortunately, unlike C11, this implementation must appear as an ordinary declaration, and cannot appear inside struct { ... }. */ -# ifdef _GL_HAVE__STATIC_ASSERT -# define _GL_VERIFY _Static_assert -# else -# define _GL_VERIFY(R, DIAGNOSTIC) \ - extern int (*_GL_GENSYM (_gl_verify_function) (void)) \ - [_GL_VERIFY_TRUE (R, DIAGNOSTIC)] -# endif +#ifdef _GL_HAVE__STATIC_ASSERT +# define _GL_VERIFY _Static_assert +#else +# define _GL_VERIFY(R, DIAGNOSTIC) \ + extern int (*_GL_GENSYM (_gl_verify_function) (void)) \ + [_GL_VERIFY_TRUE (R, DIAGNOSTIC)] +#endif /* _GL_STATIC_ASSERT_H is defined if this code is copied into assert.h. */ -# ifdef _GL_STATIC_ASSERT_H -# if !defined _GL_HAVE__STATIC_ASSERT && !defined _Static_assert -# define _Static_assert(R, DIAGNOSTIC) _GL_VERIFY (R, DIAGNOSTIC) -# endif -# if !defined _GL_HAVE_STATIC_ASSERT && !defined static_assert -# define static_assert _Static_assert /* C11 requires this #define. */ -# endif +#ifdef _GL_STATIC_ASSERT_H +# if !defined _GL_HAVE__STATIC_ASSERT && !defined _Static_assert +# define _Static_assert(R, DIAGNOSTIC) _GL_VERIFY (R, DIAGNOSTIC) +# endif +# if !defined _GL_HAVE_STATIC_ASSERT && !defined static_assert +# define static_assert _Static_assert /* C11 requires this #define. */ # endif +#endif /* @assert.h omit start@ */ @@ -229,18 +237,18 @@ template <int w> verify_true is obsolescent; please use verify_expr instead. */ -# define verify_true(R) _GL_VERIFY_TRUE (R, "verify_true (" #R ")") +#define verify_true(R) _GL_VERIFY_TRUE (R, "verify_true (" #R ")") /* Verify requirement R at compile-time. Return the value of the expression E. */ -# define verify_expr(R, E) \ - (_GL_VERIFY_TRUE (R, "verify_expr (" #R ", " #E ")") ? (E) : (E)) +#define verify_expr(R, E) \ + (_GL_VERIFY_TRUE (R, "verify_expr (" #R ", " #E ")") ? (E) : (E)) /* Verify requirement R at compile-time, as a declaration without a trailing ';'. */ -# define verify(R) _GL_VERIFY (R, "verify (" #R ")") +#define verify(R) _GL_VERIFY (R, "verify (" #R ")") /* @assert.h omit end@ */ diff --git a/po/vi.po.in b/po/vi.po.in index fff7280..32f72b1 100644 --- a/po/vi.po.in +++ b/po/vi.po.in @@ -1,26 +1,24 @@ # Vietnamese Translation for LibIDN -# Copyright © 2012 Free Software Foundation, Inc. +# Copyright © 2013 Free Software Foundation, Inc. # This file is distributed under the same license as the libidn package. # Clytie Siddall <[email protected]>, 2005-2008. -# Trần Ngá»c Quân <[email protected]>, 2012. +# Trần Ngá»c Quân <[email protected]>, 2012-2013. # msgid "" msgstr "" -"Project-Id-Version: libidn-1.25\n" +"Project-Id-Version: libidn-1.27\n" "Report-Msgid-Bugs-To: [email protected]\n" -"POT-Creation-Date: 2012-05-23 10:37+0200\n" -"PO-Revision-Date: 2012-05-26 08:08+0700\n" +"POT-Creation-Date: 2013-06-05 21:59+0200\n" +"PO-Revision-Date: 2013-06-10 09:07+0700\n" "Last-Translator: Trần Ngá»c Quân <[email protected]>\n" "Language-Team: Vietnamese <[email protected]>\n" -"Language: \n" +"Language: vi_VN\n" "MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=utf-8\n" +"Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -"X-Generator: LocFactoryEditor 1.7b3\n" -"X-Poedit-Language: Vietnamese\n" -"X-Poedit-Country: VIET NAM\n" -"X-Poedit-SourceCharset: utf-8\n" +"X-Generator: Poedit 1.5.5\n" +"X-Poedit-SourceCharset: UTF-8\n" #: lib/strerror-idna.c:82 lib/strerror-pr29.c:66 lib/strerror-punycode.c:66 #: lib/strerror-stringprep.c:86 lib/strerror-tld.c:68 @@ -29,11 +27,11 @@ msgstr "Thà nh công" #: lib/strerror-idna.c:86 lib/strerror-pr29.c:74 msgid "String preparation failed" -msgstr "Lá»i chuẩn bá» chuá»i" +msgstr "Chuẩn bá» chuá»i gặp lá»i" #: lib/strerror-idna.c:90 msgid "Punycode failed" -msgstr "Lá»i punycode (mã yếu Äuá»i)" +msgstr "punycode (mã yếu Äuá»i) gặp lá»i" #: lib/strerror-idna.c:94 msgid "Non-digit/letter/hyphen in input" @@ -57,7 +55,7 @@ msgstr "Chuá»i không tránh nhân lên dÆ°á»i ToASCII" #: lib/strerror-idna.c:114 msgid "Input already contain ACE prefix (`xn--')" -msgstr "Dữ liá»u nháºp Äã chứa tiá»n tá» ACE (`xn--')" +msgstr "Dữ liá»u nháºp Äã sẵn chứa tiá»n tá» ACE (`xn--')" #: lib/strerror-idna.c:118 lib/strerror-tld.c:84 msgid "System iconv failed" @@ -78,7 +76,7 @@ msgstr "Lá»i không rõ" #: lib/strerror-pr29.c:70 msgid "String not idempotent under Unicode NFKC normalization" -msgstr "Chuá»i không phải tránh nhân lên dÆ°á»i sá»± tiêu chuẩn hoá NFKC Unicode" +msgstr "Chuá»i không không thay Äá»i giá trá» (sau khi tá»± nó nhân lên) dÆ°á»i sá»± tiêu chuẩn hoá NFKC Unicode" #: lib/strerror-punycode.c:70 msgid "Invalid input" @@ -86,7 +84,7 @@ msgstr "Dữ liá»u nháºp không hợp lá»" #: lib/strerror-punycode.c:74 lib/strerror-stringprep.c:110 msgid "Output would exceed the buffer space provided" -msgstr "Dữ liá»u xuất sẽ vượt quá sức chứa Äá»m Äã cung cấp" +msgstr "Dữ liá»u xuất sẽ vượt quá dung lượng bá» nhá» Äá»m Äã cung cấp" #: lib/strerror-punycode.c:78 msgid "String size limit exceeded" @@ -94,7 +92,7 @@ msgstr "Giá»i hạn kÃch cỡ chuá»i bá» vượt quá" #: lib/strerror-stringprep.c:90 msgid "Forbidden unassigned code points in input" -msgstr "Dữ liá»u nháºp chứa mã Äiá»m không Äược gán cấm" +msgstr "Cấm gán Äiá»m mã trong dữ liá»u nháºp" #: lib/strerror-stringprep.c:94 msgid "Prohibited code points in input" @@ -106,7 +104,7 @@ msgstr "Dữ liá»u nháºp chứa tà i sản hai hÆ°á»ng xung Äá»t" #: lib/strerror-stringprep.c:102 msgid "Malformed bidirectional string" -msgstr "Chuá»i hai hÆ°á»ng dạng sai" +msgstr "Chuá»i thuáºn nghá»ch có dạng sai" #: lib/strerror-stringprep.c:106 msgid "Prohibited bidirectional code points in input" @@ -114,7 +112,7 @@ msgstr "Dữ liá»u nháºp chứa Äiá»m mã hai hÆ°á»ng cấm" #: lib/strerror-stringprep.c:114 msgid "Error in stringprep profile definition" -msgstr "Lá»i trong lá»i Äá»nh nghÄ©a há» sÆ¡ stringprep (chuẩn bá» chuá»i)" +msgstr "Lá»i trong Äá»nh nghÄ©a há» sÆ¡ stringprep (chuẩn bá» chuá»i)" #: lib/strerror-stringprep.c:118 msgid "Flag conflict with profile" @@ -143,18 +141,18 @@ msgstr "Không tìm thấy miá»n cấp Äầu trong dữ liá»u nháºp" #: src/idn.c:65 #, c-format msgid "Try `%s --help' for more information.\n" -msgstr "Thá» lá»nh \"%s --help\" Äá» xem thêm thông tin.\n" +msgstr "Thá» lá»nh `%s --help' Äá» xem thêm thông tin.\n" #: src/idn.c:69 #, c-format msgid "Usage: %s [OPTION]... [STRINGS]...\n" -msgstr "Sá» dụng: %s [TÃY_CHá»N]... [CHUá»I]...\n" +msgstr "Cách dùng: %s [TÃY_CHá»N]... [CHUá»I]...\n" #: src/idn.c:72 msgid "" "Internationalized Domain Name (IDN) convert STRINGS, or standard input.\n" "\n" -msgstr "Chuyá»n Äá»i các chuá»i sang IDN (tên miá»n Äã quá»c tế hoá), hoặc Äầu và o tiêu chuẩn.\n" +msgstr "Chuyá»n Äá»i các CHUá»I sang IDN (tên miá»n Äã quá»c tế hoá), hay Äầu và o tiêu chuẩn.\n" #: src/idn.c:76 msgid "" @@ -176,17 +174,18 @@ msgstr "" "Bạn cÅ©ng có thá» ghi Äè lên bá» ký tá»± nà y bằng cách Äặt biến môi trÆ°á»ng\n" "CHARSET.\n" "\n" -"Äá» xá» lý má»t chuá»i bắt Äầu vá»i \"-\", v.d. \"-foo\", dùng \"--\" Äá» ngụ ý kết thúc các tham sá», nhÆ° trong \"idn --quiet -a -- -foo\".\n" +"Äá» xá» lý má»t chuá»i bắt Äầu vá»i \"-\", v.d. \"-foo\", dùng \"--\" Äá»\n" +"Äá» ra tÃn hiá»u kết thúc Äá»i sá», nhÆ° trong \"idn --quiet -a -- -foo\".\n" "\n" -"Má»i Äá»i sá» bắt buá»c phải sá» dụng vá»i tùy chá»n dà i cÅ©ng bắt buá»c vá»i tùy chá»n ngắn.\n" +"Má»i Äá»i sá» bắt buá»c phải sá» dụng vá»i tùy chá»n dà i thì cÅ©ng cÅ©ng bắt buá»c vá»i tùy chá»n ngắn.\n" #: src/idn.c:88 msgid "" " -h, --help Print help and exit\n" " -V, --version Print version and exit\n" msgstr "" -" -h, --help In ra trợ giúp, rá»i thoát\n" -" -V, --version In ra sá» thứ tá»± phiên bản, rá»i thoát\n" +" -h, --help In ra trợ giúp rá»i thoát\n" +" -V, --version In ra sá» thứ tá»± phiên bản rá»i thoát\n" #: src/idn.c:92 msgid "" @@ -215,8 +214,8 @@ msgid "" " --no-tld Don't check string for TLD specific rules\n" " Only for --idna-to-ascii and --idna-to-unicode\n" msgstr "" -" -t, --no-tld Không kiá»m tra chuá»i cho quy tắc Äặc trÆ°ng TLD\n" -" Chá» dà nh cho \"--idna-to-ascii\" và \"--idna-to-unicode\"\n" +" -t, --no-tld Không kiá»m tra chuá»i cho quy tắc Äặc trÆ°ng TLD\n" +" Chá» dà nh cho \"--idna-to-ascii\" và \"--idna-to-unicode\"\n" #: src/idn.c:107 msgid " -n, --nfkc Normalize string according to Unicode v3.2 NFKC\n" @@ -229,7 +228,7 @@ msgid "" " `iSCSI', `Nodeprep', `Resourceprep', \n" " `trace', `SASLprep'\n" msgstr "" -" -p, --profile=CHUá»I Dùng há» sÆ¡ stringprep Äã ghi rõ thay và o Äó\n" +" -p, --profile=CHUá»I Dùng há» sÆ¡ stringprep Äã chá» Äá»nh thay và o Äó\n" " Các há» sÆ¡ stringprep hợp lá»: `Nameprep',\n" " `iSCSI', `Nodeprep', `Resourceprep', \n" " `trace', `SASLprep'\n" hooks/post-receive -- GNU libidn
_______________________________________________ Libidn-commit mailing list [email protected] https://lists.gnu.org/mailman/listinfo/libidn-commit
