upstream-mirrors/gnulib
1
0
Fork 0
mirror of https://https.git.savannah.gnu.org/git/gnulib.git synced 2026-09-01 02:34:55 +00:00
Code Activity

New module 'wcsncmp'.

Browse Source 
* modules/wcsncmp: New file.
* lib/wchar.in.h (wcsncmp): New declaration.
* lib/wcsncmp.c: New file.
* lib/wcsncmp-impl.h: New file, from libutf8 with modifications.
* m4/wcsncmp.m4: New file.
* m4/wchar_h.m4 (gl_WCHAR_H): Test whether wcsncmp is declared.
(gl_WCHAR_H_DEFAULTS): Initialize GNULIB_WCSNCMP, HAVE_WCSNCMP.
* modules/wchar (Makefile.am): Substitute GNULIB_WCSNCMP, HAVE_WCSNCMP.
* tests/test-wchar-c++.cc: Test the declaration of wcsncmp.
* doc/posix-functions/wcsncmp.texi: Mention the new module.
This commit is contained in:
Bruno Haible
2011-02-06 04:47:49 +01:00
parent be86abb4e6
commit d0e37c5d24
10 changed files with 151 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ChangeLog
+14
View File
@@ -1,3 +1,17 @@
2011-02-05 Bruno Haible <bruno@clisp.org>
New module 'wcsncmp'.
* modules/wcsncmp: New file.
* lib/wchar.in.h (wcsncmp): New declaration.
* lib/wcsncmp.c: New file.
* lib/wcsncmp-impl.h: New file, from libutf8 with modifications.
* m4/wcsncmp.m4: New file.
* m4/wchar_h.m4 (gl_WCHAR_H): Test whether wcsncmp is declared.
(gl_WCHAR_H_DEFAULTS): Initialize GNULIB_WCSNCMP, HAVE_WCSNCMP.
* modules/wchar (Makefile.am): Substitute GNULIB_WCSNCMP, HAVE_WCSNCMP.
* tests/test-wchar-c++.cc: Test the declaration of wcsncmp.
* doc/posix-functions/wcsncmp.texi: Mention the new module.
2011-02-05 Bruno Haible <bruno@clisp.org>
New module 'wcscmp'.
doc/posix-functions/wcsncmp.texi
+4 -4
View File
@@ -4,18 +4,18 @@
POSIX specification:@* @url{http://www.opengroup.org/onlinepubs/9699919799/functions/wcsncmp.html}
Gnulib module: ---
Gnulib module: wcsncmp
Portability problems fixed by Gnulib:
@itemize
@item
This function is missing on some platforms:
IRIX 5.3, Solaris 2.5.1.
@end itemize
Portability problems not fixed by Gnulib:
@itemize
@item
This function is missing on some platforms:
IRIX 5.3, Solaris 2.5.1.
@item
On AIX and Windows platforms, @code{wchar_t} is a 16-bit type and therefore cannot
accommodate all Unicode characters.
@end itemize
lib/wchar.in.h
+18
View File
@@ -668,6 +668,24 @@ _GL_WARN_ON_USE (wcscmp, "wcscmp is unportable - "
#endif
/* Compare no more than N wide characters of S1 and S2. */
#if @GNULIB_WCSNCMP@
# if !@HAVE_WCSNCMP@
_GL_FUNCDECL_SYS (wcsncmp, int,
(const wchar_t *s1, const wchar_t *s2, size_t n));
# endif
_GL_CXXALIAS_SYS (wcsncmp, int,
(const wchar_t *s1, const wchar_t *s2, size_t n));
_GL_CXXALIASWARN (wcsncmp);
#elif defined GNULIB_POSIXCHECK
# undef wcsncmp
# if HAVE_RAW_DECL_WCSNCMP
_GL_WARN_ON_USE (wcsncmp, "wcsncmp is unportable - "
"use gnulib module wcsncmp for portability");
# endif
#endif
#endif /* _GL_WCHAR_H */
#endif /* _GL_WCHAR_H */
#endif
lib/wcsncmp-impl.h
+36
View File
@@ -0,0 +1,36 @@
/* Compare two wide strings.
Copyright (C) 1999, 2011 Free Software Foundation, Inc.
Written by Bruno Haible <bruno@clisp.org>, 1999.
This 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/>. */
int
wcsncmp (const wchar_t *s1, const wchar_t *s2, size_t n)
{
for (; n > 0;)
{
wchar_t wc1 = *s1++;
wchar_t wc2 = *s2++;
if (wc1 != (wchar_t)'\0' && wc1 == wc2)
{
n--;
continue;
}
/* Note that wc1 and wc2 each have at most 31 bits. */
return (int)wc1 - (int)wc2;
/* > 0 if wc1 > wc2, < 0 if wc1 < wc2,
= 0 if wc1 and wc2 are both '\0'. */
}
return 0;
}
lib/wcsncmp.c
+23
View File
@@ -0,0 +1,23 @@
/* Compare two wide strings.
Copyright (C) 2011 Free Software Foundation, Inc.
Written by Bruno Haible <bruno@clisp.org>, 2011.
This 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 "wcsncmp-impl.h"
m4/wchar_h.m4
+3
View File
@@ -52,6 +52,7 @@ AC_DEFUN([gl_WCHAR_H],
[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
])
])
@@ -160,6 +161,7 @@ AC_DEFUN([gl_WCHAR_H_DEFAULTS],
GNULIB_WCSCAT=0; AC_SUBST([GNULIB_WCSCAT])
GNULIB_WCSNCAT=0; AC_SUBST([GNULIB_WCSNCAT])
GNULIB_WCSCMP=0; AC_SUBST([GNULIB_WCSCMP])
GNULIB_WCSNCMP=0; AC_SUBST([GNULIB_WCSNCMP])
dnl Assume proper GNU behavior unless another module says otherwise.
HAVE_BTOWC=1; AC_SUBST([HAVE_BTOWC])
HAVE_MBSINIT=1; AC_SUBST([HAVE_MBSINIT])
@@ -184,6 +186,7 @@ AC_DEFUN([gl_WCHAR_H_DEFAULTS],
HAVE_WCSCAT=1; AC_SUBST([HAVE_WCSCAT])
HAVE_WCSNCAT=1; AC_SUBST([HAVE_WCSNCAT])
HAVE_WCSCMP=1; AC_SUBST([HAVE_WCSCMP])
HAVE_WCSNCMP=1; AC_SUBST([HAVE_WCSNCMP])
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])
m4/wcsncmp.m4
+15
View File
@@ -0,0 +1,15 @@
# wcsncmp.m4 serial 1
dnl Copyright (C) 2011 Free Software Foundation, Inc.
dnl This file is free software; the Free 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_WCSNCMP],
[
AC_REQUIRE([gl_WCHAR_H_DEFAULTS])
AC_CHECK_FUNCS_ONCE([wcsncmp])
if test $ac_cv_func_wcsncmp = no; then
HAVE_WCSNCMP=0
AC_LIBOBJ([wcsncmp])
fi
])
modules/wchar
+2
View File
@@ -55,6 +55,7 @@ wchar.h: wchar.in.h $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H)
-e 's|@''GNULIB_WCSCAT''@|$(GNULIB_WCSCAT)|g' \
-e 's|@''GNULIB_WCSNCAT''@|$(GNULIB_WCSNCAT)|g' \
-e 's|@''GNULIB_WCSCMP''@|$(GNULIB_WCSCMP)|g' \
-e 's|@''GNULIB_WCSNCMP''@|$(GNULIB_WCSNCMP)|g' \
-e 's|@''HAVE_WINT_T''@|$(HAVE_WINT_T)|g' \
-e 's|@''HAVE_BTOWC''@|$(HAVE_BTOWC)|g' \
-e 's|@''HAVE_MBSINIT''@|$(HAVE_MBSINIT)|g' \
@@ -79,6 +80,7 @@ wchar.h: wchar.in.h $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H)
-e 's|@''HAVE_WCSCAT''@|$(HAVE_WCSCAT)|g' \
-e 's|@''HAVE_WCSNCAT''@|$(HAVE_WCSNCAT)|g' \
-e 's|@''HAVE_WCSCMP''@|$(HAVE_WCSCMP)|g' \
-e 's|@''HAVE_WCSNCMP''@|$(HAVE_WCSNCMP)|g' \
-e 's|@''HAVE_DECL_WCTOB''@|$(HAVE_DECL_WCTOB)|g' \
-e 's|@''HAVE_DECL_WCWIDTH''@|$(HAVE_DECL_WCWIDTH)|g' \
-e 's|@''REPLACE_MBSTATE_T''@|$(REPLACE_MBSTATE_T)|g' \
modules/wcsncmp
+31
View File
@@ -0,0 +1,31 @@
Description:
wcsncmp() function: compare two wide strings.
Status:
obsolete
Notice:
This module is obsolete.
Files:
lib/wcsncmp.c
lib/wcsncmp-impl.h
m4/wcsncmp.m4
Depends-on:
wchar
configure.ac:
gl_FUNC_WCSNCMP
gl_WCHAR_MODULE_INDICATOR([wcsncmp])
Makefile.am:
Include:
<wchar.h>
License:
LGPL
Maintainer:
Bruno Haible
tests/test-wchar-c++.cc
+5
View File
@@ -143,6 +143,11 @@ SIGNATURE_CHECK (GNULIB_NAMESPACE::wcscmp, int,
(const wchar_t *, const wchar_t *));
#endif
#if GNULIB_TEST_WCSNCMP
SIGNATURE_CHECK (GNULIB_NAMESPACE::wcsncmp, int,
(const wchar_t *, const wchar_t *, size_t));
#endif
int
main ()