diff options
author | Roland McGrath <roland@gnu.org> | 1996-07-14 06:04:09 +0000 |
---|---|---|
committer | Roland McGrath <roland@gnu.org> | 1996-07-14 06:04:09 +0000 |
commit | 2064087b5f1a0a3a189fcd6a3012376f5545be31 (patch) | |
tree | 6f02a4e4364004352f2d785146b5dc12444e83b9 /stdlib | |
parent | 842907c6f8e6022f443175072e65bc516eb0973b (diff) | |
download | glibc-2064087b5f1a0a3a189fcd6a3012376f5545be31.tar.gz glibc-2064087b5f1a0a3a189fcd6a3012376f5545be31.tar.xz glibc-2064087b5f1a0a3a189fcd6a3012376f5545be31.zip |
Sun Jul 14 01:51:39 1996 Roland McGrath <roland@delasyd.gnu.ai.mit.edu> cvs/libc-960714
* manual/Makefile (glibc-targets): Variable and targets removed. Sat Jul 13 23:50:17 1996 Roland McGrath <roland@delasyd.gnu.ai.mit.edu> * manual/Makefile (lib): New phony target. Depend on stamp files. ($(objpfx)stamp%-$(subdir)): New rule to create them when necessary. 1996-07-13 Paul Eggert <eggert@twinsun.com> * time/strftime.c (strftime): Use space padding for %e, %k, %l, to match Emacs format-time-string specification. (DO_NUMBER_SPACEPAD): Renamed from DO_NUMBER_NOPAD. Sat Jul 13 20:17:38 1996 Roland McGrath <roland@delasyd.gnu.ai.mit.edu> * elf/dl-deps.c (_dl_map_object_deps): Take new args PRELOADS and NPRELOADS, vector of `struct link_map *'s; add them to the searchlist between MAP and its deps. * elf/link.h: Fix decl. * elf/rtld.c (dl_main): If not secure, parse LD_PRELOAD for colon-separated list of names, map those and pass vector of ptrs as PRELOADS list to _dl_map_object_deps. * elf/dl-runtime.c (_dl_object_relocation_scope): Pass new args to _dl_map_object_deps with empty preload list. * elf/dl-open.c (_dl_open): Likewise. * sysdeps/mach/hurd/dl-sysdep.c (_dl_sysdep_open_zero_fill): Function removed. (__mmap): Pass MACH_PORT_NULL for memobj port when (flags & MAP_ANON). * sysdeps/generic/dl-sysdep.c (_dl_sysdep_open_zero_fill): Conditionalize defn on [! MAP_ANON]. * elf/dl-minimal.c (malloc): Conditionalize use of _dl_zerofd on [! MAP_ANON]. * elf/rtld.c (dl_main): Likewise. * elf/dl-load.c (_dl_zerofd): Conditionalize defn on [! MAP_ANON]. (_dl_map_object_from_fd): Conditionalize initialization of _dl_zerofd. * elf/dl-fini.c (_dl_fini): Skip finalizer for executable itself. Sat Jul 13 02:47:53 1996 David Mosberger-Tang <davidm@azstarnet.com> * stdlib/random.c (__random): Declare as int32_t to be in sync with declaration. * socket/Makefile (headers): Add socketbits.h. * misc/mntent.c (endmntent): Allow for NULL stream. SunOS does it that way. * grp/initgroups.c (initgroups): Add groups that user is a member of, not the ones he is _not_ a member of. * nss/nsswitch.c (known_compare): Make known_compare() a static instead of a local function. The latter are difficult to debug and slow to execute on certain platforms. * sysdeps/posix/ttyname_r.c (ttyname_r): Use sizeof (dev) - 1 in place of sizeof (dev). The size of a literal string includes the NUL byte. * sysdeps/unix/getlogin.c (getlogin): Initialize ut_fd with -1. Thu Jul 11 16:59:10 1996 David Mosberger-Tang <davidm@azstarnet.com> * misc/mntent.c (addmntent): Seek to end of file before writing entry. Return 1 on error, not -1. Tue Jul 9 19:08:05 1996 David Mosberger-Tang <davidm@azstarnet.com> * sysdeps/unix/sysv/linux/syscalls.list: Mark bdflush as EXTRA syscall. Fri Jul 5 18:44:55 1996 David Mosberger-Tang <davidm@azstarnet.com> * sysdeps/unix/sysv/linux/alpha/ioperm.c (port_to_cpu_addr): Size shift amount for Jensen must be 5 not 4. Sat Jul 13 20:04:28 1996 Roland McGrath <roland@delasyd.gnu.ai.mit.edu> * socket/sys/socket.h (struct osockaddr): New type. Sat Jul 13 03:50:53 1996 Ulrich Drepper <drepper@cygnus.com> * misc/Makefile (routines): Add qefgcvt and qefgcvt_r. * misc/efgcvt.c, misc/efgcvt_r.c: Change code so that the `double' and `long double' versions can be generated. * misc/qefgcvt.c, misc/qefgcvt_r.c: New files. Define macros so that included efgcvt{,_r}.c file generate `long double' versions. * stdlib/stdlib.h: Add prototypes for q[efg]cvt() and q[ef]cvt_r() functions. * manual/startup.texi: Document new getsubopt function. * manual/examples/subopt.c: New example program for documenting getsubopt function. Fri Jul 12 23:58:37 1996 Ulrich Drepper <drepper@cygnus.com> * stdlib/Makefile (routines): Add getsubopt. * stdlib/stdlib.h: Add prototype for getsubopt. * stdlib/getsubopt.c: New file. Implement getsubopt function to handle suboption parsing.
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 */ |