From 2ab91a62459231f30626fabdc1003eb52b302894 Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Tue, 16 Aug 2005 12:12:13 +0000 Subject: [PATCH] New module 'strnlen1'. --- ChangeLog | 5 +++++ MODULES.html.sh | 1 + lib/ChangeLog | 5 +++++ lib/strnlen1.c | 39 +++++++++++++++++++++++++++++++++++++++ lib/strnlen1.h | 41 +++++++++++++++++++++++++++++++++++++++++ modules/strnlen1 | 24 ++++++++++++++++++++++++ 6 files changed, 115 insertions(+) create mode 100644 lib/strnlen1.c create mode 100644 lib/strnlen1.h create mode 100644 modules/strnlen1 diff --git a/ChangeLog b/ChangeLog index bc1e665253..5fac83ca71 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2005-08-16 Bruno Haible + + * modules/strnlen1: New file. + * MODULES.html.sh (String handling): Add strnlen1. + 2005-08-16 Bruno Haible * modules/mbfile: New file. diff --git a/MODULES.html.sh b/MODULES.html.sh index 772abdc9ee..99b7b2a74c 100755 --- a/MODULES.html.sh +++ b/MODULES.html.sh @@ -1520,6 +1520,7 @@ func_all_modules () func_module strchrnul func_module strdup func_module strnlen + func_module strnlen1 func_module strndup func_module strsep #func_module fstrcmp diff --git a/lib/ChangeLog b/lib/ChangeLog index 7bb0f61dbe..992ce4e369 100644 --- a/lib/ChangeLog +++ b/lib/ChangeLog @@ -1,3 +1,8 @@ +2005-08-16 Bruno Haible + + * strnlen1.h: New file. + * strnlen1.c: New file. + 2005-08-16 Bruno Haible * mbfile.h: New file. diff --git a/lib/strnlen1.c b/lib/strnlen1.c new file mode 100644 index 0000000000..6cc2da8dfe --- /dev/null +++ b/lib/strnlen1.c @@ -0,0 +1,39 @@ +/* Find the length of STRING + 1, but scan at most MAXLEN bytes. + Copyright (C) 2005 Free Software Foundation, Inc. + + 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. */ + +#if HAVE_CONFIG_H +# include +#endif + +/* Specification. */ +#include "strnlen1.h" + +#include + +/* Find the length of STRING + 1, but scan at most MAXLEN bytes. + If no '\0' terminator is found in that many characters, return MAXLEN. */ +/* This is the same as strnlen (string, maxlen - 1) + 1. */ +size_t +strnlen1 (const char *string, size_t maxlen) +{ + const char *end = memchr (string, '\0', maxlen); + if (end != NULL) + return end - string + 1; + else + return maxlen; +} diff --git a/lib/strnlen1.h b/lib/strnlen1.h new file mode 100644 index 0000000000..4f913ffe8f --- /dev/null +++ b/lib/strnlen1.h @@ -0,0 +1,41 @@ +/* Find the length of STRING + 1, but scan at most MAXLEN bytes. + Copyright (C) 2005 Free Software Foundation, Inc. + + 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. */ + +#ifndef _STRNLEN1_H +#define _STRNLEN1_H + +#include + + +#ifdef __cplusplus +extern "C" { +#endif + + +/* Find the length of STRING + 1, but scan at most MAXLEN bytes. + If no '\0' terminator is found in that many characters, return MAXLEN. */ +/* This is the same as strnlen (string, maxlen - 1) + 1. */ +extern size_t strnlen1 (const char *string, size_t maxlen); + + +#ifdef __cplusplus +} +#endif + + +#endif /* _STRNLEN1_H */ diff --git a/modules/strnlen1 b/modules/strnlen1 new file mode 100644 index 0000000000..d6874ee149 --- /dev/null +++ b/modules/strnlen1 @@ -0,0 +1,24 @@ +Description: +Quick string length estimation. + +Files: +lib/strnlen1.h +lib/strnlen1.c + +Depends-on: +memchr + +configure.ac: + +Makefile.am: +lib_SOURCES += strnlen1.h strnlen1.c + +Include: +"strnlen1.h" + +License: +LGPL + +Maintainer: +Bruno Haible + -- 2.30.2