bug-gnulib
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

new module 'btowc'


From: Bruno Haible
Subject: new module 'btowc'
Date: Thu, 18 Dec 2008 00:22:27 +0100
User-agent: KMail/1.9.9

The next ISO C 99 multibyte/widechar function is btowc.

2008-12-17  Bruno Haible  <address@hidden>

        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.

================================ lib/btowc.c ================================
/* Convert unibyte character to wide character.
   Copyright (C) 2008 Free Software Foundation, Inc.
   Written by Bruno Haible <address@hidden>, 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;
}
================================ m4/btowc.m4 ================================
# 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], [
  :
])
=============================== modules/btowc ===============================
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

=============================================================================
--- lib/wchar.in.h.orig 2008-12-18 00:15:34.000000000 +0100
+++ lib/wchar.in.h      2008-12-18 00:05:22.000000000 +0100
@@ -71,6 +71,20 @@
 #endif
 
 
+/* Convert a single-byte character to a wide character.  */
+#if @GNULIB_BTOWC@
+# if address@hidden@
+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 address@hidden@
--- m4/wchar.m4.orig    2008-12-18 00:15:34.000000000 +0100
+++ m4/wchar.m4 2008-12-18 00:05:22.000000000 +0100
@@ -7,7 +7,7 @@
 
 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_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])
--- modules/wchar.orig  2008-12-18 00:15:34.000000000 +0100
+++ modules/wchar       2008-12-18 00:05:22.000000000 +0100
@@ -25,9 +25,11 @@
              -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' \
--- doc/posix-functions/btowc.texi.orig 2008-12-18 00:15:34.000000000 +0100
+++ doc/posix-functions/btowc.texi      2008-12-18 00:05:22.000000000 +0100
@@ -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
address@hidden
+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.
address@hidden
 On Windows platforms, @code{wchar_t} is a 16-bit type and therefore cannot
 accommodate all Unicode characters.
 @end itemize




reply via email to

[Prev in Thread] Current Thread [Next in Thread]