From 2064087b5f1a0a3a189fcd6a3012376f5545be31 Mon Sep 17 00:00:00 2001 From: Roland McGrath Date: Sun, 14 Jul 1996 06:04:09 +0000 Subject: Sun Jul 14 01:51:39 1996 Roland McGrath * manual/Makefile (glibc-targets): Variable and targets removed. Sat Jul 13 23:50:17 1996 Roland McGrath * 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 * 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 * 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 * 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 * 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 * sysdeps/unix/sysv/linux/syscalls.list: Mark bdflush as EXTRA syscall. Fri Jul 5 18:44:55 1996 David Mosberger-Tang * 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 * socket/sys/socket.h (struct osockaddr): New type. Sat Jul 13 03:50:53 1996 Ulrich Drepper * 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 * stdlib/Makefile (routines): Add getsubopt. * stdlib/stdlib.h: Add prototype for getsubopt. * stdlib/getsubopt.c: New file. Implement getsubopt function to handle suboption parsing. --- misc/Makefile | 2 +- misc/efgcvt.c | 23 ++++++++++++++++------- misc/efgcvt_r.c | 38 +++++++++++++++++++++++++++----------- misc/mntent.c | 11 +++++++---- misc/qefgcvt.c | 26 ++++++++++++++++++++++++++ misc/qefgcvt_r.c | 26 ++++++++++++++++++++++++++ 6 files changed, 103 insertions(+), 23 deletions(-) create mode 100644 misc/qefgcvt.c create mode 100644 misc/qefgcvt_r.c (limited to 'misc') diff --git a/misc/Makefile b/misc/Makefile index 4ffad986ab..01e223836f 100644 --- a/misc/Makefile +++ b/misc/Makefile @@ -52,7 +52,7 @@ routines := brk sbrk sstk ioctl \ insremque getttyent getusershell getpass ttyslot \ syslog syscall daemon \ mmap munmap mprotect msync madvise \ - efgcvt efgcvt_r \ + efgcvt efgcvt_r qefgcvt qefgcvt_r \ hsearch hsearch_r tsearch lsearch \ err error aux := init-misc diff --git a/misc/efgcvt.c b/misc/efgcvt.c index e8a05176e6..73be3e1c5c 100644 --- a/misc/efgcvt.c +++ b/misc/efgcvt.c @@ -21,11 +21,20 @@ Cambridge, MA 02139, USA. */ #include #include +#ifndef FLOAT_TYPE +#define FLOAT_TYPE double +#define FUNC_PREFIX +#define FLOAT_FMT_FLAG #define MAXDIG (DBL_DIG + DBL_MAX_10_EXP) +#endif + +#define APPEND(a, b) APPEND2 (a, b) +#define APPEND2(a, b) a##b + char * -fcvt (value, ndigit, decpt, sign) - double value; +APPEND (FUNC_PREFIX, fcvt) (value, ndigit, decpt, sign) + FLOAT_TYPE value; int ndigit, *decpt, *sign; { static char buf[MAXDIG]; @@ -36,8 +45,8 @@ fcvt (value, ndigit, decpt, sign) } char * -ecvt (value, ndigit, decpt, sign) - double value; +APPEND (FUNC_PREFIX, ecvt) (value, ndigit, decpt, sign) + FLOAT_TYPE value; int ndigit, *decpt, *sign; { static char buf[MAXDIG]; @@ -48,11 +57,11 @@ ecvt (value, ndigit, decpt, sign) } char * -gcvt (value, ndigit, buf) - double value; +APPEND (FUNC_PREFIX, gcvt) (value, ndigit, buf) + FLOAT_TYPE value; int ndigit; char *buf; { - sprintf (buf, "%.*g", ndigit, value); + sprintf (buf, "%.*" FLOAT_FMT_FLAG "g", ndigit, value); return buf; } diff --git a/misc/efgcvt_r.c b/misc/efgcvt_r.c index 6a65583a6a..cbd5c271ba 100644 --- a/misc/efgcvt_r.c +++ b/misc/efgcvt_r.c @@ -1,5 +1,5 @@ /* [efg]cvt -- compatibility functions for floating point formatting, - reentrent versions. + reentrant versions. Copyright (C) 1995, 1996 Free Software Foundation, Inc. This file is part of the GNU C Library. @@ -25,9 +25,24 @@ Boston, MA 02111-1307, USA. */ #include #include +#ifndef FLOAT_TYPE +#define FLOAT_TYPE double +#define FUNC_PREFIX +#define FLOAT_FMT_FLAG +#define FLOAT_NAME_EXT +#endif + +#define APPEND(a, b) APPEND2 (a, b) +#define APPEND2(a, b) a##b + +#define FLOOR APPEND(floor, FLOAT_NAME_EXT) +#define FABS APPEND(fabs, FLOAT_NAME_EXT) +#define LOG10 APPEND(log10, FLOAT_NAME_EXT) + + int -fcvt_r (value, ndigit, decpt, sign, buf, len) - double value; +APPEND (FUNC_PREFIX, fcvt_r) (value, ndigit, decpt, sign, buf, len) + FLOAT_TYPE value; int ndigit, *decpt, *sign; char *buf; size_t len; @@ -44,7 +59,7 @@ fcvt_r (value, ndigit, decpt, sign, buf, len) if (*sign) value = - value; - n = snprintf (buf, len, "%.*f", ndigit, value); + n = snprintf (buf, len, "%.*" FLOAT_FMT_FLAG "f", ndigit, value); if (n < 0) return -1; @@ -60,33 +75,34 @@ fcvt_r (value, ndigit, decpt, sign, buf, len) return 0; } -weak_extern (floor) weak_extern (log10) weak_extern (fabs) +#define weak_extern2(name) weak_extern (name) +weak_extern2 (FLOOR) weak_extern2 (LOG10) weak_extern2 (FABS) int -ecvt_r (value, ndigit, decpt, sign, buf, len) - double value; +APPEND (FUNC_PREFIX, ecvt_r) (value, ndigit, decpt, sign, buf, len) + FLOAT_TYPE value; int ndigit, *decpt, *sign; char *buf; size_t len; { - double (*log10_function) (double) = &log10; + FLOAT_TYPE (*log10_function) (FLOAT_TYPE) = &LOG10; if (log10_function) { /* Use the reasonable code if -lm is included. */ - ndigit -= (int) floor (log10 (fabs (value))); + ndigit -= (int) FLOOR (LOG10 (FABS (value))); if (ndigit < 0) ndigit = 0; } else { /* Slow code that doesn't require -lm functions. */ - double d; + FLOAT_TYPE d; for (d = value < 0.0 ? - value : value; ndigit > 0 && d >= 10.0; d *= 0.1) --ndigit; } - return fcvt_r (value, ndigit, decpt, sign, buf, len); + return APPEND (FUNC_PREFIX, fcvt_r) (value, ndigit, decpt, sign, buf, len); } diff --git a/misc/mntent.c b/misc/mntent.c index 6cf74c2160..0aa1fb8cde 100644 --- a/misc/mntent.c +++ b/misc/mntent.c @@ -34,9 +34,9 @@ setmntent (const char *file, const char *mode) int endmntent (FILE *stream) { - if (fclose (stream) != 0) - return 0; - return 1; + if (stream) /* SunOS 4.x allows for NULL stream */ + fclose (stream); + return 1; /* SunOS 4.x says to always return 1 */ } @@ -92,6 +92,9 @@ getmntent (FILE *stream) int addmntent (FILE *stream, const struct mntent *mnt) { + if (fseek (stream, 0, SEEK_END)) + return 1; + return (fprintf (stream, "%s %s %s %s %d %d\n", mnt->mnt_fsname, mnt->mnt_dir, @@ -99,7 +102,7 @@ addmntent (FILE *stream, const struct mntent *mnt) mnt->mnt_opts, mnt->mnt_freq, mnt->mnt_passno) - < 0 ? -1 : 0); + < 0 ? 1 : 0); } /* Search MNT->mnt_opts for an option matching OPT. diff --git a/misc/qefgcvt.c b/misc/qefgcvt.c new file mode 100644 index 0000000000..2015fb8d4f --- /dev/null +++ b/misc/qefgcvt.c @@ -0,0 +1,26 @@ +/* q[efg]cvt -- compatibility functions for floating point formatting, + long double version. +Copyright (C) 1996 Free Software Foundation, Inc. +This file is part of the GNU C Library. + +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. */ + +#define FLOAT_TYPE long double +#define FUNC_PREFIX q +#define FLOAT_FMT_FLAG "L" +#define MAXDIG (LDBL_DIG + LDBL_MAX_10_EXP) + +#include "efgcvt.c" diff --git a/misc/qefgcvt_r.c b/misc/qefgcvt_r.c new file mode 100644 index 0000000000..67cf44880c --- /dev/null +++ b/misc/qefgcvt_r.c @@ -0,0 +1,26 @@ +/* [efg]cvt -- compatibility functions for floating point formatting, + reentrant, long double versions. +Copyright (C) 1996 Free Software Foundation, Inc. +This file is part of the GNU C Library. + +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. */ + +#define FLOAT_TYPE long double +#define FUNC_PREFIX q +#define FLOAT_FMT_FLAG "L" +#define FLOAT_NAME_EXT l + +#include "efgcvt_r.c" -- cgit 1.4.1