mirror of
git://git.sv.gnu.org/findutils.git
synced 2026-01-29 20:58:59 +01:00
fce1865424
* lib/splitstring.c: New file; defines splitstring(), which will non-destructively locate character-separated fields in a string. * lib/splitstring.h: New file; declares splitstring. * lib/test_splitstring.c: New file; unit test for splitstring.c. * lib/nextelem.c: Delete (obsoleted by splitstring.c). * lib/nextelem.h: Delete (obsoleted by splitstring.h). * lib/Makefile.am (libfind_a_SOURCES): Add splitstring.c, splitstring.c. Remove nextelem.c, nextelem.h. (check_PROGRAMS): Add test_splitstring. (TESTS): Add test_splitstring. (test_splitstring_SOURCES): Sources for the test_splitstring unit test. * locate/locate.c: Include splitstring.h rather than nextelem.h. (dolocate): Use splitstring rather than next_element. In places where we need a nul-terminated string, use strndup() to create it. Convert some space-tab sequences to regular spacing. * find/parser.c: Include splitstring.h rather than nextelem.h. (check_path_safety): Use splitstring rather than next_element. * import-gnulib.config (modules): Depend on the module strndup. * cfg.mk: Exempt lib/test_splitstring.c from calling bindtextdomain or set_program_name.
61 lines
1.5 KiB
C
61 lines
1.5 KiB
C
/* splitstring.c -- split a const string into fields.
|
|
Copyright (C) 2011 Free Software Foundation, Inc.
|
|
|
|
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/>.
|
|
*/
|
|
/*
|
|
* Written by James Youngman.
|
|
*/
|
|
|
|
#include <config.h>
|
|
#include <stdbool.h>
|
|
#include <string.h>
|
|
|
|
#include "splitstring.h"
|
|
|
|
static size_t
|
|
field_length (const char *str, const char *separators)
|
|
{
|
|
/* if there are no separators, the whole input is one field. */
|
|
if (*separators)
|
|
{
|
|
const char *end = strpbrk (str, separators);
|
|
if (end)
|
|
return end - str;
|
|
}
|
|
return strlen (str);
|
|
}
|
|
|
|
|
|
bool
|
|
splitstring(const char *s, const char *separators, bool first,
|
|
size_t *pos, size_t *len)
|
|
{
|
|
if (first)
|
|
{
|
|
*pos = 0u;
|
|
*len = 0u;
|
|
}
|
|
else
|
|
{
|
|
*pos += *len; /* advance to the next field. */
|
|
if (s[*pos])
|
|
++*pos; /* skip the separator */
|
|
else
|
|
return false; /* we reached the end. */
|
|
}
|
|
*len = field_length (&s[*pos], separators);
|
|
return true;
|
|
}
|