diff options
Diffstat (limited to 'stdlib')
| -rw-r--r-- | stdlib/Makefile | 2 | ||||
| -rw-r--r-- | stdlib/getsubopt.c | 77 | ||||
| -rw-r--r-- | stdlib/random.c | 2 | ||||
| -rw-r--r-- | stdlib/stdlib.h | 27 |
4 files changed, 106 insertions, 2 deletions
diff --git a/stdlib/Makefile b/stdlib/Makefile index aa072082cc..66f28ffe5c 100644 --- a/stdlib/Makefile +++ b/stdlib/Makefile @@ -42,7 +42,7 @@ routines := \ strtof strtod strtold \ system canonicalize \ a64l l64a \ - rpmatch strfmon + rpmatch strfmon getsubopt distribute := exit.h grouping.h tests := tst-strtol tst-strtod testmb testrand testsort testdiv \ diff --git a/stdlib/getsubopt.c b/stdlib/getsubopt.c new file mode 100644 index 0000000000..f5ecea4faa --- /dev/null +++ b/stdlib/getsubopt.c @@ -0,0 +1,77 @@ +/* getsubopt -- parse comma separate list into words +Copyright (C) 1996 Free Software Foundation, Inc. +This file is part of the GNU C Library. +Contributed by Ulrich Drepper <drepper@cygnus.com>, 1996. + +The GNU C Library 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 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 +Library General Public License for more details. + +You should have received a copy of the GNU Library General Public +License along with the GNU C Library; see the file COPYING.LIB. 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 + otken or at the terminating NUL character. */ +int +getsubopt (optionp, tokens, valuep) + char **optionp; + const 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 (memcmp (*optionp, tokens[cnt], vstart - *optionp) == 0 + && tokens[cnt][vstart - *optionp] == '\0') + { + /* We found the current option in TOKENS. */ + *valuep = vstart != endp ? vstart : 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; +} diff --git a/stdlib/random.c b/stdlib/random.c index 0ab8f05e5f..6d2ee85f3e 100644 --- a/stdlib/random.c +++ b/stdlib/random.c @@ -239,7 +239,7 @@ weak_alias (__setstate, setstate) rear pointers can't wrap on the same call by not testing the rear pointer if the front one has wrapped. Returns a 31-bit random number. */ -int +int32_t __random () { int32_t retval; diff --git a/stdlib/stdlib.h b/stdlib/stdlib.h index 1feedcfae3..5e7f8386b8 100644 --- a/stdlib/stdlib.h +++ b/stdlib/stdlib.h @@ -469,12 +469,27 @@ char *fcvt __P ((double __value, int __ndigit, int *__decpt, int *sign)); be written to BUF. */ char *gcvt __P ((double __value, int __ndigit, char *__buf)); +/* Long double versions of above functions. */ +char *qecvt __P ((__long_double_t __value, int __ndigit, int *__decpt, + int *sign)); +char *qfcvt __P ((__long_double_t __value, int __ndigit, int *__decpt, + int *sign)); +char *qgcvt __P ((__long_double_t __value, int __ndigit, char *__buf)); + + +#ifdef __USE_REENTRANT /* Reentrant version of the functions above which provide their own buffers. */ int ecvt_r __P ((double __value, int __ndigit, int *__decpt, int *sign, char *__buf, size_t __len)); int fcvt_r __P ((double __value, int __ndigit, int *__decpt, int *sign, char *__buf, size_t __len)); + +int qecvt_r __P ((__long_double_t __value, int __ndigit, int *__decpt, + int *sign, char *__buf, size_t __len)); +int qfcvt_r __P ((__long_double_t __value, int __ndigit, int *__decpt, + int *sign, char *__buf, size_t __len)); +#endif #endif @@ -509,6 +524,18 @@ extern int rpmatch __P ((__const char *__response)); #endif +#ifdef __USE_MISC +/* 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 + otken or at the terminating NUL character. */ +extern int getsubopt __P ((char **__optionp, __const char *__const *__tokens, + char **__valuep)); +#endif + + __END_DECLS #endif /* stdlib.h */ |