Skip to content

Commit

Permalink
strsep: Copy from netbsd.
Browse files Browse the repository at this point in the history
Windows does not have a strsep.

Signed-off-by: Gurucharan Shetty <[email protected]>
Acked-by: Ben Pfaff <[email protected]>
  • Loading branch information
shettyg committed Mar 17, 2014
1 parent 31b97ff commit f062911
Show file tree
Hide file tree
Showing 5 changed files with 79 additions and 1 deletion.
1 change: 1 addition & 0 deletions COPYING
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ The following files are licensed under the 2-clause BSD license.
The following files are licensed under the 3-clause BSD-license
include/windows/netinet/icmp6.h
include/windows/netinet/ip6.h
lib/strsep.c

Files under the xenserver directory are licensed on a file-by-file
basis. Refer to each file for details.
Expand Down
3 changes: 2 additions & 1 deletion debian/copyright.in
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ Upstream Copyright Holders:
Copyright (C) 2000-2003 Geoffrey Wossum ([email protected])
Copyright (C) 2000 The NetBSD Foundation, Inc.
Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
Copyright (c) 1982, 1986, 1993 The Regents of the University of California.
Copyright (c) 1982, 1986, 1990, 1993 The Regents of the University of California.

License:

Expand Down Expand Up @@ -90,6 +90,7 @@ License:

include/windows/netinet/icmp6.h
include/windows/netinet/ip6.h
lib/strsep.c

* The following components are dual-licensed under the
GNU General Public License version 2 and the Apache License Version 2.0.
Expand Down
2 changes: 2 additions & 0 deletions include/windows/windefs.h
Original file line number Diff line number Diff line change
Expand Up @@ -37,4 +37,6 @@

typedef int pid_t;

char *strsep(char **stringp, const char *delim);

#endif /* windefs.h */
1 change: 1 addition & 0 deletions lib/automake.mk
Original file line number Diff line number Diff line change
Expand Up @@ -244,6 +244,7 @@ lib_libopenvswitch_la_SOURCES += \
lib/getrusage-windows.c \
lib/latch-windows.c \
lib/route-table-stub.c \
lib/strsep.c \
lib/stream-fd-windows.c
else
lib_libopenvswitch_la_SOURCES += \
Expand Down
73 changes: 73 additions & 0 deletions lib/strsep.c
Original file line number Diff line number Diff line change
@@ -0,0 +1,73 @@
/*-
* Copyright (c) 1990, 1993
* The Regents of the University of California. All rights reserved.
*
* 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.
* 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE REGENTS 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 REGENTS 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 <config.h>
#include "util.h"

/*
* Get next token from string *stringp, where tokens are possibly-empty
* strings separated by characters from delim.
*
* Writes NULs into the string at *stringp to end tokens.
* delim need not remain constant from call to call.
* On return, *stringp points past the last NUL written (if there might
* be further tokens), or is NULL (if there are definitely no more tokens).
*
* If *stringp is NULL, strsep returns NULL.
*/
#define _DIAGASSERT(q) ovs_assert(q)
char *
strsep(char **stringp, const char *delim)
{
char *s;
const char *spanp;
int c, sc;
char *tok;

_DIAGASSERT(stringp != NULL);
_DIAGASSERT(delim != NULL);

if ((s = *stringp) == NULL)
return (NULL);
for (tok = s;;) {
c = *s++;
spanp = delim;
do {
if ((sc = *spanp++) == c) {
if (c == 0)
s = NULL;
else
s[-1] = 0;
*stringp = s;
return (tok);
}
} while (sc != 0);
}
/* NOTREACHED */
}

0 comments on commit f062911

Please sign in to comment.