From 53a0d02424cfcde73015ce469bd01a5bc51ed337 Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Tue, 9 Jan 2007 14:10:14 +0000 Subject: [PATCH] New modules 'unistr/u8-strnlen', 'unistr/u16-strnlen', 'unistr/u32-strnlen'. --- lib/unistr/u-strnlen.h | 28 +++++++++++++++++++++++ lib/unistr/u16-strnlen.c | 27 ++++++++++++++++++++++ lib/unistr/u32-strnlen.c | 27 ++++++++++++++++++++++ lib/unistr/u8-strnlen.c | 46 ++++++++++++++++++++++++++++++++++++++ modules/unistr/u16-strnlen | 24 ++++++++++++++++++++ modules/unistr/u32-strnlen | 24 ++++++++++++++++++++ modules/unistr/u8-strnlen | 24 ++++++++++++++++++++ 7 files changed, 200 insertions(+) create mode 100644 lib/unistr/u-strnlen.h create mode 100644 lib/unistr/u16-strnlen.c create mode 100644 lib/unistr/u32-strnlen.c create mode 100644 lib/unistr/u8-strnlen.c create mode 100644 modules/unistr/u16-strnlen create mode 100644 modules/unistr/u32-strnlen create mode 100644 modules/unistr/u8-strnlen diff --git a/lib/unistr/u-strnlen.h b/lib/unistr/u-strnlen.h new file mode 100644 index 0000000000..b7e68b26d0 --- /dev/null +++ b/lib/unistr/u-strnlen.h @@ -0,0 +1,28 @@ +/* Determine bounded length of UTF-8/UTF-16/UTF-32 string. + Copyright (C) 1999, 2002, 2006 Free Software Foundation, Inc. + Written by Bruno Haible , 2002. + + This program 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, 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 + Library General Public License for more details. + + You should have received a copy of the GNU Library General Public + License along with this program; if not, write to the Free Software + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, + USA. */ + +size_t +FUNC (const UNIT *s, size_t maxlen) +{ + const UNIT *ptr; + + for (ptr = s; maxlen > 0 && *ptr != 0; ptr++, maxlen--) + ; + return ptr - s; +} diff --git a/lib/unistr/u16-strnlen.c b/lib/unistr/u16-strnlen.c new file mode 100644 index 0000000000..0fc7bfec95 --- /dev/null +++ b/lib/unistr/u16-strnlen.c @@ -0,0 +1,27 @@ +/* Determine bounded length of UTF-16 string. + Copyright (C) 1999, 2002, 2006 Free Software Foundation, Inc. + Written by Bruno Haible , 2002. + + This program 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, 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 + Library General Public License for more details. + + You should have received a copy of the GNU Library General Public + License along with this program; if not, write to the Free Software + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, + USA. */ + +#include + +/* Specification. */ +#include "unistr.h" + +#define FUNC u16_strnlen +#define UNIT uint16_t +#include "u-strnlen.h" diff --git a/lib/unistr/u32-strnlen.c b/lib/unistr/u32-strnlen.c new file mode 100644 index 0000000000..13db8336e2 --- /dev/null +++ b/lib/unistr/u32-strnlen.c @@ -0,0 +1,27 @@ +/* Determine bounded length of UTF-32 string. + Copyright (C) 1999, 2002, 2006 Free Software Foundation, Inc. + Written by Bruno Haible , 2002. + + This program 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, 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 + Library General Public License for more details. + + You should have received a copy of the GNU Library General Public + License along with this program; if not, write to the Free Software + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, + USA. */ + +#include + +/* Specification. */ +#include "unistr.h" + +#define FUNC u32_strnlen +#define UNIT uint32_t +#include "u-strnlen.h" diff --git a/lib/unistr/u8-strnlen.c b/lib/unistr/u8-strnlen.c new file mode 100644 index 0000000000..34ee1f0630 --- /dev/null +++ b/lib/unistr/u8-strnlen.c @@ -0,0 +1,46 @@ +/* Determine bounded length of UTF-8 string. + Copyright (C) 1999, 2002, 2006 Free Software Foundation, Inc. + Written by Bruno Haible , 2002. + + This program 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, 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 + Library General Public License for more details. + + You should have received a copy of the GNU Library General Public + License along with this program; if not, write to the Free Software + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, + USA. */ + +/* Ensure strnlen() gets declared. */ +#ifndef _GNU_SOURCE +# define _GNU_SOURCE 1 +#endif + +#include + +/* Specification. */ +#include "unistr.h" + +#if __GLIBC__ >= 2 + +# include + +size_t +u8_strnlen (const uint8_t *s, size_t maxlen) +{ + return strnlen ((const char *) s, maxlen); +} + +#else + +# define FUNC u8_strnlen +# define UNIT uint8_t +# include "u-strnlen.h" + +#endif diff --git a/modules/unistr/u16-strnlen b/modules/unistr/u16-strnlen new file mode 100644 index 0000000000..d285f3b79f --- /dev/null +++ b/modules/unistr/u16-strnlen @@ -0,0 +1,24 @@ +Description: +Determine bounded length of UTF-16 string. + +Files: +lib/unistr/u16-strnlen.c +lib/unistr/u-strnlen.h + +Depends-on: +unistr/base + +configure.ac: + +Makefile.am: +lib_SOURCES += unistr/u16-strnlen.c + +Include: +"unistr.h" + +License: +LGPL + +Maintainer: +Bruno Haible + diff --git a/modules/unistr/u32-strnlen b/modules/unistr/u32-strnlen new file mode 100644 index 0000000000..8e72ba9660 --- /dev/null +++ b/modules/unistr/u32-strnlen @@ -0,0 +1,24 @@ +Description: +Determine bounded length of UTF-32 string. + +Files: +lib/unistr/u32-strnlen.c +lib/unistr/u-strnlen.h + +Depends-on: +unistr/base + +configure.ac: + +Makefile.am: +lib_SOURCES += unistr/u32-strnlen.c + +Include: +"unistr.h" + +License: +LGPL + +Maintainer: +Bruno Haible + diff --git a/modules/unistr/u8-strnlen b/modules/unistr/u8-strnlen new file mode 100644 index 0000000000..d3fa3732b3 --- /dev/null +++ b/modules/unistr/u8-strnlen @@ -0,0 +1,24 @@ +Description: +Determine bounded length of UTF-8 string. + +Files: +lib/unistr/u8-strnlen.c +lib/unistr/u-strnlen.h + +Depends-on: +unistr/base + +configure.ac: + +Makefile.am: +lib_SOURCES += unistr/u8-strnlen.c + +Include: +"unistr.h" + +License: +LGPL + +Maintainer: +Bruno Haible + -- 2.30.2