mirror of
https://gitlab.freedesktop.org/libbsd/libbsd.git
synced 2025-01-23 18:42:30 +01:00
Add stringlist module from NetBSD
This commit is contained in:
Guillem Jover
parent
e8f9300355
commit
36aca8c06e
7
COPYING
7
COPYING
@ -207,11 +207,13 @@ The rest of the licenses apply to code and/or man pages.
|
||||
|
||||
--
|
||||
|
||||
Copyright © 1997-2000, 2002, 2008 The NetBSD Foundation, Inc.
|
||||
Copyright © 1994, 1997-2000, 2002, 2008 The NetBSD Foundation, Inc.
|
||||
All rights reserved.
|
||||
|
||||
Some code was contributed to The NetBSD Foundation by Allen Briggs.
|
||||
|
||||
Some code was contributed to The NetBSD Foundation by Luke Mewburn.
|
||||
|
||||
Some code is derived from software contributed to The NetBSD Foundation
|
||||
by Jason R. Thorpe of the Numerical Aerospace Simulation Facility,
|
||||
NASA Ames Research Center, by Luke Mewburn and by Tomas Svensson.
|
||||
@ -220,6 +222,9 @@ The rest of the licenses apply to code and/or man pages.
|
||||
by Julio M. Merino Vidal, developed as part of Google's Summer of Code
|
||||
2005 program.
|
||||
|
||||
Some code is derived from software contributed to The NetBSD Foundation
|
||||
by Christos Zoulas.
|
||||
|
||||
Redistribution and use in source and binary forms, with or without
|
||||
modification, are permitted provided that the following conditions
|
||||
are met:
|
||||
|
||||
@ -19,6 +19,7 @@ nobase_include_HEADERS = \
|
||||
bsd/stdio.h \
|
||||
bsd/stdlib.h \
|
||||
bsd/string.h \
|
||||
bsd/stringlist.h \
|
||||
bsd/timeconv.h \
|
||||
bsd/unistd.h \
|
||||
bsd/vis.h \
|
||||
|
||||
54
include/bsd/stringlist.h
Normal file
54
include/bsd/stringlist.h
Normal file
@ -0,0 +1,54 @@
|
||||
/* $NetBSD: stringlist.h,v 1.6 2006/07/27 15:37:19 christos Exp $ */
|
||||
|
||||
/*-
|
||||
* Copyright (c) 1994 The NetBSD Foundation, Inc.
|
||||
* All rights reserved.
|
||||
*
|
||||
* This code is derived from software contributed to The NetBSD Foundation
|
||||
* by Christos Zoulas.
|
||||
*
|
||||
* Redistribution and use in source and binary forms, with or without
|
||||
* modification, are permitted provided that the following conditions
|
||||
* are met:
|
||||
* 1. Redistributions of source code must retain the above copyright
|
||||
* notice, this list of conditions and the following disclaimer.
|
||||
* 2. Redistributions in binary form must reproduce the above copyright
|
||||
* notice, this list of conditions and the following disclaimer in the
|
||||
* documentation and/or other materials provided with the distribution.
|
||||
*
|
||||
* THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
|
||||
* ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
|
||||
* TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
|
||||
* PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
|
||||
* BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
|
||||
* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
|
||||
* SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
|
||||
* INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
|
||||
* CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
|
||||
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
|
||||
* POSSIBILITY OF SUCH DAMAGE.
|
||||
*/
|
||||
|
||||
#ifndef _STRINGLIST_H
|
||||
#define _STRINGLIST_H
|
||||
#include <sys/cdefs.h>
|
||||
#include <sys/types.h>
|
||||
|
||||
/*
|
||||
* Simple string list
|
||||
*/
|
||||
typedef struct _stringlist {
|
||||
char **sl_str;
|
||||
size_t sl_max;
|
||||
size_t sl_cur;
|
||||
} StringList;
|
||||
|
||||
__BEGIN_DECLS
|
||||
StringList *sl_init(void);
|
||||
int sl_add(StringList *, char *);
|
||||
void sl_free(StringList *, int);
|
||||
char *sl_find(StringList *, const char *);
|
||||
int sl_delete(StringList *, const char *, int);
|
||||
__END_DECLS
|
||||
|
||||
#endif /* _STRINGLIST_H */
|
||||
@ -47,6 +47,7 @@ dist_man_MANS = \
|
||||
setproctitle.3 \
|
||||
setprogname.3 \
|
||||
sradixsort.3 \
|
||||
stringlist.3 \
|
||||
strlcat.3 \
|
||||
strlcpy.3 \
|
||||
strnstr.3 \
|
||||
|
||||
147
man/stringlist.3
Normal file
147
man/stringlist.3
Normal file
@ -0,0 +1,147 @@
|
||||
.\" $NetBSD: stringlist.3,v 1.15 2010/05/06 09:46:49 jruoho Exp $
|
||||
.\"
|
||||
.\" Copyright (c) 1997, 1999 The NetBSD Foundation, Inc.
|
||||
.\" All rights reserved.
|
||||
.\"
|
||||
.\" This file was contributed to The NetBSD Foundation by Luke Mewburn.
|
||||
.\"
|
||||
.\" Redistribution and use in source and binary forms, with or without
|
||||
.\" modification, are permitted provided that the following conditions
|
||||
.\" are met:
|
||||
.\" 1. Redistributions of source code must retain the above copyright
|
||||
.\" notice, this list of conditions and the following disclaimer.
|
||||
.\" 2. Redistributions in binary form must reproduce the above copyright
|
||||
.\" notice, this list of conditions and the following disclaimer in the
|
||||
.\" documentation and/or other materials provided with the distribution.
|
||||
.\"
|
||||
.\" THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
|
||||
.\" ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
|
||||
.\" TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
|
||||
.\" PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
|
||||
.\" BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
|
||||
.\" CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
|
||||
.\" SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
|
||||
.\" INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
|
||||
.\" CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
|
||||
.\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
|
||||
.\" POSSIBILITY OF SUCH DAMAGE.
|
||||
.\"
|
||||
.Dd May 6, 2010
|
||||
.Dt STRINGLIST 3
|
||||
.Os
|
||||
.Sh NAME
|
||||
.Nm stringlist ,
|
||||
.Nm sl_init ,
|
||||
.Nm sl_add ,
|
||||
.Nm sl_free ,
|
||||
.Nm sl_find ,
|
||||
.Nm sl_delete
|
||||
.Nd stringlist manipulation functions
|
||||
.Sh LIBRARY
|
||||
.ds str-Lb-libbsd Utility functions from BSD systems (libbsd, \-lbsd)
|
||||
.Lb libbsd
|
||||
.Sh SYNOPSIS
|
||||
.In bsd/stringlist.h
|
||||
.Ft StringList *
|
||||
.Fn sl_init "void"
|
||||
.Ft int
|
||||
.Fn sl_add "StringList *sl" "char *item"
|
||||
.Ft void
|
||||
.Fn sl_free "StringList *sl" "int freeall"
|
||||
.Ft char *
|
||||
.Fn sl_find "StringList *sl" "const char *item"
|
||||
.Ft int
|
||||
.Fn sl_delete "StringList *sl" "const char *item" "int freeit"
|
||||
.Sh DESCRIPTION
|
||||
The
|
||||
.Nm
|
||||
functions manipulate stringlists, which are lists of
|
||||
strings that extend automatically if necessary.
|
||||
.Pp
|
||||
The
|
||||
.Ar StringList
|
||||
structure has the following definition:
|
||||
.Bd -literal -offset indent
|
||||
typedef struct _stringlist {
|
||||
char **sl_str;
|
||||
size_t sl_max;
|
||||
size_t sl_cur;
|
||||
} StringList;
|
||||
.Ed
|
||||
.Pp
|
||||
where:
|
||||
.Bl -tag -width "sl_str" -offset indent
|
||||
.It Ar sl_str
|
||||
is a pointer to the base of the array containing the list,
|
||||
.It Ar sl_max
|
||||
is the size of
|
||||
.Ar sl_str ,
|
||||
and
|
||||
.It Ar sl_cur
|
||||
is the offset in
|
||||
.Ar sl_str
|
||||
of the current element.
|
||||
.El
|
||||
.Pp
|
||||
The following stringlist manipulation functions are available:
|
||||
.Bl -tag -width "sl_delete()" -offset 2n
|
||||
.It Fn sl_init
|
||||
Create a stringlist.
|
||||
Returns a pointer to a
|
||||
.Ar StringList ,
|
||||
or
|
||||
.Dv NULL
|
||||
in case of failure.
|
||||
.It Fn sl_free
|
||||
Releases memory occupied by
|
||||
.Ar sl
|
||||
and the
|
||||
.Ar sl-\*[Gt]sl_str
|
||||
array.
|
||||
If
|
||||
.Ar freeall
|
||||
is non-zero, then each of the items within
|
||||
.Ar sl-\*[Gt]sl_str
|
||||
is released as well.
|
||||
.It Fn sl_add
|
||||
Add
|
||||
.Ar item
|
||||
to
|
||||
.Ar sl-\*[Gt]sl_str
|
||||
at
|
||||
.Ar sl-\*[Gt]sl_cur ,
|
||||
extending the size of
|
||||
.Ar sl-\*[Gt]sl_str .
|
||||
Returns zero upon success, \-1 upon failure.
|
||||
.It Fn sl_find
|
||||
Find
|
||||
.Ar item
|
||||
in
|
||||
.Ar sl ,
|
||||
returning
|
||||
.Dv NULL
|
||||
if it's not found.
|
||||
.It Fn sl_delete
|
||||
Remove
|
||||
.Ar item
|
||||
from the list.
|
||||
If
|
||||
.Ar freeit
|
||||
is non-zero, the string is freed.
|
||||
Returns
|
||||
.Dv 0
|
||||
if the name is found
|
||||
and
|
||||
.Dv \-1
|
||||
if the name is not found.
|
||||
.El
|
||||
.Sh SEE ALSO
|
||||
.Xr free 3 ,
|
||||
.Xr malloc 3
|
||||
.Sh HISTORY
|
||||
The
|
||||
.Nm
|
||||
functions appeared in
|
||||
.Fx 2.2.6
|
||||
and
|
||||
.Nx 1.3 .
|
||||
@ -71,6 +71,7 @@ libbsd_la_SOURCES = \
|
||||
setproctitle.c \
|
||||
strlcat.c \
|
||||
strlcpy.c \
|
||||
stringlist.c \
|
||||
strmode.c \
|
||||
strnstr.c \
|
||||
strtonum.c \
|
||||
|
||||
@ -116,6 +116,11 @@ LIBBSD_0.7 {
|
||||
|
||||
funopen;
|
||||
|
||||
sl_init;
|
||||
sl_add;
|
||||
sl_free;
|
||||
sl_find;
|
||||
|
||||
_time32_to_time;
|
||||
_time_to_time32;
|
||||
_time64_to_time;
|
||||
|
||||
155
src/stringlist.c
Normal file
155
src/stringlist.c
Normal file
@ -0,0 +1,155 @@
|
||||
/* $NetBSD: stringlist.c,v 1.12 2007/05/09 17:10:29 christos Exp $ */
|
||||
|
||||
/*-
|
||||
* Copyright (c) 1994, 1999 The NetBSD Foundation, Inc.
|
||||
* All rights reserved.
|
||||
*
|
||||
* This code is derived from software contributed to The NetBSD Foundation
|
||||
* by Christos Zoulas.
|
||||
*
|
||||
* Redistribution and use in source and binary forms, with or without
|
||||
* modification, are permitted provided that the following conditions
|
||||
* are met:
|
||||
* 1. Redistributions of source code must retain the above copyright
|
||||
* notice, this list of conditions and the following disclaimer.
|
||||
* 2. Redistributions in binary form must reproduce the above copyright
|
||||
* notice, this list of conditions and the following disclaimer in the
|
||||
* documentation and/or other materials provided with the distribution.
|
||||
*
|
||||
* THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
|
||||
* ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
|
||||
* TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
|
||||
* PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
|
||||
* BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
|
||||
* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
|
||||
* SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
|
||||
* INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
|
||||
* CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
|
||||
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
|
||||
* POSSIBILITY OF SUCH DAMAGE.
|
||||
*/
|
||||
|
||||
#include <sys/cdefs.h>
|
||||
#if defined(LIBC_SCCS) && !defined(lint)
|
||||
__RCSID("$NetBSD: stringlist.c,v 1.12 2007/05/09 17:10:29 christos Exp $");
|
||||
#endif /* LIBC_SCCS and not lint */
|
||||
|
||||
#include <assert.h>
|
||||
#include <err.h>
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
#include <string.h>
|
||||
#include <stringlist.h>
|
||||
|
||||
#define _DIAGASSERT(t)
|
||||
|
||||
#ifdef __weak_alias
|
||||
__weak_alias(sl_add,_sl_add)
|
||||
__weak_alias(sl_find,_sl_find)
|
||||
__weak_alias(sl_free,_sl_free)
|
||||
__weak_alias(sl_init,_sl_init)
|
||||
__weak_alias(sl_delete,_sl_delete)
|
||||
#endif
|
||||
|
||||
#define _SL_CHUNKSIZE 20
|
||||
|
||||
/*
|
||||
* sl_init(): Initialize a string list
|
||||
*/
|
||||
StringList *
|
||||
sl_init(void)
|
||||
{
|
||||
StringList *sl;
|
||||
|
||||
sl = malloc(sizeof(StringList));
|
||||
if (sl == NULL)
|
||||
return NULL;
|
||||
|
||||
sl->sl_cur = 0;
|
||||
sl->sl_max = _SL_CHUNKSIZE;
|
||||
sl->sl_str = malloc(sl->sl_max * sizeof(char *));
|
||||
if (sl->sl_str == NULL) {
|
||||
free(sl);
|
||||
sl = NULL;
|
||||
}
|
||||
return sl;
|
||||
}
|
||||
|
||||
|
||||
/*
|
||||
* sl_add(): Add an item to the string list
|
||||
*/
|
||||
int
|
||||
sl_add(StringList *sl, char *name)
|
||||
{
|
||||
|
||||
_DIAGASSERT(sl != NULL);
|
||||
|
||||
if (sl->sl_cur == sl->sl_max - 1) {
|
||||
char **new;
|
||||
|
||||
new = realloc(sl->sl_str,
|
||||
(sl->sl_max + _SL_CHUNKSIZE) * sizeof(char *));
|
||||
if (new == NULL)
|
||||
return -1;
|
||||
sl->sl_max += _SL_CHUNKSIZE;
|
||||
sl->sl_str = new;
|
||||
}
|
||||
sl->sl_str[sl->sl_cur++] = name;
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
||||
/*
|
||||
* sl_free(): Free a stringlist
|
||||
*/
|
||||
void
|
||||
sl_free(StringList *sl, int all)
|
||||
{
|
||||
size_t i;
|
||||
|
||||
if (sl == NULL)
|
||||
return;
|
||||
if (sl->sl_str) {
|
||||
if (all)
|
||||
for (i = 0; i < sl->sl_cur; i++)
|
||||
free(sl->sl_str[i]);
|
||||
free(sl->sl_str);
|
||||
}
|
||||
free(sl);
|
||||
}
|
||||
|
||||
|
||||
/*
|
||||
* sl_find(): Find a name in the string list
|
||||
*/
|
||||
char *
|
||||
sl_find(StringList *sl, const char *name)
|
||||
{
|
||||
size_t i;
|
||||
|
||||
_DIAGASSERT(sl != NULL);
|
||||
|
||||
for (i = 0; i < sl->sl_cur; i++)
|
||||
if (strcmp(sl->sl_str[i], name) == 0)
|
||||
return sl->sl_str[i];
|
||||
|
||||
return NULL;
|
||||
}
|
||||
|
||||
int
|
||||
sl_delete(StringList *sl, const char *name, int all)
|
||||
{
|
||||
size_t i, j;
|
||||
|
||||
for (i = 0; i < sl->sl_cur; i++)
|
||||
if (strcmp(sl->sl_str[i], name) == 0) {
|
||||
if (all)
|
||||
free(sl->sl_str[i]);
|
||||
for (j = i + 1; j < sl->sl_cur; j++)
|
||||
sl->sl_str[j - 1] = sl->sl_str[j];
|
||||
sl->sl_str[--sl->sl_cur] = NULL;
|
||||
return 0;
|
||||
}
|
||||
return -1;
|
||||
}
|
||||
Loading…
x
Reference in New Issue
Block a user