New module 'btowc'.

diff --git a/ChangeLog b/ChangeLog
index 7b07b947ee3c59a25a58286c7ec84d0c4969693a..a9ee10ae24984ef3171a167acc046cc89fd899cb 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2008-12-17  Bruno Haible  <bruno@clisp.org>
+
+       New module 'btowc'.
+       * lib/wchar.in.h (btowc): New declaration.
+       * lib/btowc.c: New file.
+       * m4/btowc.m4: New file.
+       * modules/btowc: New file.
+       * m4/wchar.m4 (gl_WCHAR_H_DEFAULTS): Initialize GNULIB_BTOWC and
+       HAVE_BTOWC.
+       * modules/wchar (Makefile.am): Substitute GNULIB_BTOWC and HAVE_BTOWC.
+       * doc/posix-functions/btowc.texi: Document the new module.
+
 2008-12-17  Bruno Haible  <bruno@clisp.org>
 
        New module 'mbsinit'.

diff --git a/doc/posix-functions/btowc.texi b/doc/posix-functions/btowc.texi
index 07f31cc19ec452167523ef65babe24232958dde4..816fabc58dd303bb752a60704aec8237440afee7 100644 (file)
--- a/doc/posix-functions/btowc.texi
+++ b/doc/posix-functions/btowc.texi
@@ -4,18 +4,18 @@
 
 POSIX specification: @url{http://www.opengroup.org/onlinepubs/9699919799/functions/btowc.html}
 
-Gnulib module: ---
+Gnulib module: btowc
 
 Portability problems fixed by Gnulib:
 @itemize
+@item
+This function is missing on some platforms:
+HP-UX 11, IRIX 5.3, Solaris 2.6, mingw, Interix 3.5.
 @end itemize
 
 Portability problems not fixed by Gnulib:
 @itemize
 @item
-This function is missing on some platforms:
-HP-UX 11, IRIX 5.3, Solaris 2.6, mingw, Interix 3.5.
-@item
 On Windows platforms, @code{wchar_t} is a 16-bit type and therefore cannot
 accommodate all Unicode characters.
 @end itemize

diff --git a/lib/btowc.c b/lib/btowc.c
new file mode 100644 (file)
index 0000000..7f3b966
--- /dev/null
+++ b/lib/btowc.c
@@ -0,0 +1,38 @@
+/* Convert unibyte character to wide character.
+   Copyright (C) 2008 Free Software Foundation, Inc.
+   Written by Bruno Haible <bruno@clisp.org>, 2008.
+
+   This program is free software: you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+
+#include <config.h>
+
+/* Specification.  */
+#include <wchar.h>
+
+#include <stdio.h>
+
+wint_t
+btowc (int c)
+{
+  if (c != EOF)
+    {
+      char buf[1];
+      wchar_t wc;
+
+      buf[0] = c;
+      if (mbtowc (&wc, buf, 1) >= 0)
+       return wc;
+    }
+  return WEOF;
+}

diff --git a/lib/wchar.in.h b/lib/wchar.in.h
index f1bf174651c0b2d961a9f88e94e4140c93836c29..445530d4b712b981d03d4d18f84a24c6b48d977c 100644 (file)
--- a/lib/wchar.in.h
+++ b/lib/wchar.in.h
@@ -71,6 +71,20 @@ extern "C" {
 #endif
 
 
+/* Convert a single-byte character to a wide character.  */
+#if @GNULIB_BTOWC@
+# if !@HAVE_BTOWC@
+extern wint_t btowc (int c);
+# endif
+#elif defined GNULIB_POSIXCHECK
+# undef btowc
+# define btowc(c) \
+    (GL_LINK_WARNING ("btowc is unportable - " \
+                      "use gnulib module btowc for portability"), \
+     btowc (c))
+#endif
+
+
 /* Test whether *PS is in the initial state.  */
 #if @GNULIB_MBSINIT@
 # if !@HAVE_MBSINIT@

diff --git a/m4/btowc.m4 b/m4/btowc.m4
new file mode 100644 (file)
index 0000000..98849d6
--- /dev/null
+++ b/m4/btowc.m4
@@ -0,0 +1,22 @@
+# btowc.m4 serial 1
+dnl Copyright (C) 2008 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
+
+AC_DEFUN([gl_FUNC_BTOWC],
+[
+  AC_REQUIRE([gl_WCHAR_H_DEFAULTS])
+
+  AC_CHECK_FUNCS_ONCE([btowc])
+  if test $ac_cv_func_btowc = no; then
+    HAVE_BTOWC=0
+    AC_LIBOBJ([btowc])
+    gl_PREREQ_BTOWC
+  fi
+])
+
+# Prerequisites of lib/btowc.c.
+AC_DEFUN([gl_PREREQ_BTOWC], [
+  :
+])

diff --git a/m4/wchar.m4 b/m4/wchar.m4
index 809402ef65a5997bdc3d54de28269fe10043267f..0f562822d6dccbe9eec3fab0adda73de95bce59c 100644 (file)
--- a/m4/wchar.m4
+++ b/m4/wchar.m4
@@ -7,7 +7,7 @@ dnl with or without modifications, as long as this notice is preserved.
 
 dnl Written by Eric Blake.
 
-# wchar.m4 serial 7
+# wchar.m4 serial 8
 
 AC_DEFUN([gl_WCHAR_H],
 [
@@ -61,9 +61,11 @@ AC_DEFUN([gl_WCHAR_MODULE_INDICATOR],
 
 AC_DEFUN([gl_WCHAR_H_DEFAULTS],
 [
+  GNULIB_BTOWC=0;   AC_SUBST([GNULIB_BTOWC])
   GNULIB_MBSINIT=0; AC_SUBST([GNULIB_MBSINIT])
   GNULIB_WCWIDTH=0; AC_SUBST([GNULIB_WCWIDTH])
   dnl Assume proper GNU behavior unless another module says otherwise.
+  HAVE_BTOWC=1;        AC_SUBST([HAVE_BTOWC])
   HAVE_MBSINIT=1;      AC_SUBST([HAVE_MBSINIT])
   HAVE_DECL_WCWIDTH=1; AC_SUBST([HAVE_DECL_WCWIDTH])
   REPLACE_WCWIDTH=0;   AC_SUBST([REPLACE_WCWIDTH])

diff --git a/modules/btowc b/modules/btowc
new file mode 100644 (file)
index 0000000..f905b60
--- /dev/null
+++ b/modules/btowc
@@ -0,0 +1,25 @@
+Description:
+btowc() function: convert unibyte character to wide character.
+
+Files:
+lib/btowc.c
+m4/btowc.m4
+
+Depends-on:
+wchar
+
+configure.ac:
+gl_FUNC_BTOWC
+gl_WCHAR_MODULE_INDICATOR([btowc])
+
+Makefile.am:
+
+Include:
+<wchar.h>
+
+License:
+LGPL
+
+Maintainer:
+Bruno Haible
+

diff --git a/modules/wchar b/modules/wchar
index 7b220025370d0db183aa1c9a9f2dc534fdc11d81..3f60ceaeec89f4050572114b8e451540cef35bb6 100644 (file)
--- a/modules/wchar
+++ b/modules/wchar
@@ -25,9 +25,11 @@ wchar.h: wchar.in.h
              -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
              -e 's|@''NEXT_WCHAR_H''@|$(NEXT_WCHAR_H)|g' \
              -e 's/@''HAVE_WCHAR_H''@/$(HAVE_WCHAR_H)/g' \
+             -e 's|@''GNULIB_BTOWC''@|$(GNULIB_BTOWC)|g' \
              -e 's|@''GNULIB_MBSINIT''@|$(GNULIB_MBSINIT)|g' \
              -e 's|@''GNULIB_WCWIDTH''@|$(GNULIB_WCWIDTH)|g' \
              -e 's/@''HAVE_WINT_T''@/$(HAVE_WINT_T)/g' \
+             -e 's|@''HAVE_BTOWC''@|$(HAVE_BTOWC)|g' \
              -e 's|@''HAVE_MBSINIT''@|$(HAVE_MBSINIT)|g' \
              -e 's|@''HAVE_DECL_WCWIDTH''@|$(HAVE_DECL_WCWIDTH)|g' \
              -e 's|@''REPLACE_WCWIDTH''@|$(REPLACE_WCWIDTH)|g' \