diff options
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | wcsmbs/Makefile | 2 | ||||
| -rw-r--r-- | wcsmbs/tst-wcsnlen.c | 51 | ||||
| -rw-r--r-- | wcsmbs/wcsnlen.c | 3 |
4 files changed, 61 insertions, 2 deletions
@@ -1,3 +1,10 @@ +1999-08-15 Ulrich Drepper <drepper@cygnus.com> + + * wcsmbs/wcsnlen.c: Correct decrement maxlen. + + * wcsmbs/Makefile (tests): Add tst-wcsnlen. + * wcsmbs/tst-wcsnlen.c: New file. + 1999-08-16 Andreas Jaeger <aj@arthur.rhein-neckar.de> * libio/ioputs.c (_IO_puts): Add missing brace. diff --git a/wcsmbs/Makefile b/wcsmbs/Makefile index f1dc651..7ca2800 100644 --- a/wcsmbs/Makefile +++ b/wcsmbs/Makefile @@ -39,7 +39,7 @@ routines := wcscat wcschr wcscmp wcscpy wcscspn wcsdup wcslen wcsncat \ wcscasecmp wcsncase wcscasecmp_l wcsncase_l \ wcsmbsload -tests := tst-wcstof wcsmbs-tst1 +tests := tst-wcstof wcsmbs-tst1 tst-wcsnlen include ../Rules diff --git a/wcsmbs/tst-wcsnlen.c b/wcsmbs/tst-wcsnlen.c new file mode 100644 index 0000000..48d177e --- /dev/null +++ b/wcsmbs/tst-wcsnlen.c @@ -0,0 +1,51 @@ +/* Copyright (C) 1999 Free Software Foundation, Inc. + This file is part of the GNU C Library. + Contributed by Ulrich Drepper <drepper@cygnus.com>, 1999. + + The GNU C Library is free software; you can redistribute it and/or + modify it under the terms of the GNU Library General Public License as + published by the Free Software Foundation; either version 2 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 + Library General Public License for more details. + + You should have received a copy of the GNU Library General Public + License along with the GNU C Library; see the file COPYING.LIB. If not, + write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, + Boston, MA 02111-1307, USA. */ + +#include <stdio.h> +#include <wchar.h> + +#define TEST(Str, Max, Exp) \ + n = wcsnlen (L##Str, Max); \ + if (n != Exp) \ + { \ + result = 1; \ + printf ("wcsnlen (L\"%s\", %d) = %d, not %d\n", Str, Max, n, Exp); \ + } + +int +main (void) +{ + int result = 0; + int n; + + TEST ("0123456789", 0, 0); + TEST ("0123456789", 1, 1); + TEST ("0123456789", 2, 2); + TEST ("0123456789", 3, 3); + TEST ("0123456789", 4, 4); + TEST ("0123456789", 5, 5); + TEST ("0123456789", 6, 6); + TEST ("0123456789", 7, 7); + TEST ("0123456789", 8, 8); + TEST ("0123456789", 9, 9); + + TEST ("01234", 9, 5); + + return result; +} diff --git a/wcsmbs/wcsnlen.c b/wcsmbs/wcsnlen.c index 5264a66..0696f40 100644 --- a/wcsmbs/wcsnlen.c +++ b/wcsmbs/wcsnlen.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1998 Free Software Foundation, Inc. +/* Copyright (C) 1998, 1999 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998. @@ -37,6 +37,7 @@ __wcsnlen (s, maxlen) if (s[++len] == L'\0' || --maxlen == 0) return len; ++len; + --maxlen; } return len; |