Author: baggins Date: Thu Mar 19 15:14:09 2009 GMT Module: SOURCES Tag: HEAD ---- Log message: - getsubopt() for dietlibc (ripped from uClibc)
---- Files affected: SOURCES: dietlibc-getsubopt.patch (NONE -> 1.1) (NEW) ---- Diffs: ================================================================ Index: SOURCES/dietlibc-getsubopt.patch diff -u /dev/null SOURCES/dietlibc-getsubopt.patch:1.1 --- /dev/null Thu Mar 19 16:14:10 2009 +++ SOURCES/dietlibc-getsubopt.patch Thu Mar 19 16:14:03 2009 @@ -0,0 +1,95 @@ +--- dietlibc-0.31/include/stdlib.h~ 2009-03-19 14:33:16.000000000 +0100 ++++ dietlibc-0.31/include/stdlib.h 2009-03-19 14:46:17.000000000 +0100 +@@ -81,6 +81,16 @@ + long int labs(long int i) __THROW __attribute__((__const__)); + __extension__ long long int llabs(long long int i) __THROW __attribute__((__const__)); + ++#ifdef __USE_XOPEN_EXTENDED ++/* Parse comma separated suboption from *OPTIONP and match against ++ strings in TOKENS. If found return index and set *VALUEP to ++ optional value introduced by an equal sign. If the suboption is ++ not part of TOKENS return in *VALUEP beginning of unknown ++ suboption. On exit *OPTIONP is set to the beginning of the next ++ token or at the terminating NUL character. */ ++extern int getsubopt (char **optionp, char *const *tokens, char **valuep) __THROW; ++#endif ++ + #ifdef _XOPEN_SOURCE + int grantpt (int fd) __THROW; + int unlockpt (int fd) __THROW; +--- /dev/null 2009-03-05 20:33:59.000000000 +0100 ++++ dietlibc-0.31/lib/getsubopt.c 2009-03-19 14:55:18.000000000 +0100 +@@ -0,0 +1,73 @@ ++/* Parse comma separate list into words. ++ Copyright (C) 1996, 1997, 1999, 2004 Free Software Foundation, Inc. ++ This file is part of the GNU C Library. ++ Contributed by Ulrich Drepper <[email protected]>, 1996. ++ ++ The GNU C Library is free software; you can redistribute it and/or ++ modify it under the terms of the GNU Lesser General Public ++ License as published by the Free Software Foundation; either ++ version 2.1 of the License, or (at your option) any later version. ++ ++ The GNU C Library 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 ++ Lesser General Public License for more details. ++ ++ You should have received a copy of the GNU Lesser General Public ++ License along with the GNU C Library; if not, write to the Free ++ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA ++ 02111-1307 USA. */ ++ ++#include <stdlib.h> ++#include <string.h> ++ ++/* Parse comma separated suboption from *OPTIONP and match against ++ strings in TOKENS. If found return index and set *VALUEP to ++ optional value introduced by an equal sign. If the suboption is ++ not part of TOKENS return in *VALUEP beginning of unknown ++ suboption. On exit *OPTIONP is set to the beginning of the next ++ token or at the terminating NUL character. */ ++int ++getsubopt (char **optionp, char *const *tokens, char **valuep) ++{ ++ char *endp, *vstart; ++ int cnt; ++ ++ if (**optionp == '\0') ++ return -1; ++ ++ /* Find end of next token. */ ++ endp = strchr (*optionp, ','); ++ if (endp == NULL) ++ endp = strchr (*optionp, '\0'); ++ ++ /* Find start of value. */ ++ vstart = memchr (*optionp, '=', endp - *optionp); ++ if (vstart == NULL) ++ vstart = endp; ++ ++ /* Try to match the characters between *OPTIONP and VSTART against ++ one of the TOKENS. */ ++ for (cnt = 0; tokens[cnt] != NULL; ++cnt) ++ if (strncmp (*optionp, tokens[cnt], vstart - *optionp) == 0 ++ && tokens[cnt][vstart - *optionp] == '\0') ++ { ++ /* We found the current option in TOKENS. */ ++ *valuep = vstart != endp ? vstart + 1 : NULL; ++ ++ if (*endp != '\0') ++ *endp++ = '\0'; ++ *optionp = endp; ++ ++ return cnt; ++ } ++ ++ /* The current suboption does not match any option. */ ++ *valuep = *optionp; ++ ++ if (*endp != '\0') ++ *endp++ = '\0'; ++ *optionp = endp; ++ ++ return -1; ++} ================================================================ _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
