From 60478656fad8d8a487e9bc52d025f69767c3262b Mon Sep 17 00:00:00 2001 From: Roland McGrath Date: Sun, 17 Sep 1995 20:23:15 +0000 Subject: Sat Sep 16 17:47:19 1995 Ulrich Drepper * elf/elf.h (AT_GID): Fix typo: Read -> Real. * misc/efgvt_r.c: New file. Reentrant version of [efg]cvt functions. * misc/efgcvt.c: Rewrite to use reentrant functions. * misc/hsearch_r.c: New file. Reentrant version of functions from hsearch family. * misc/hsearch.c, misc/tsearch.c: New files. * misc/Makefile (routines): Add efgcvt_r, hsearch_r, hsearch, tsearch. * posix/unistd.h (ttyname_r): Add prototype for new function. * stdlib/drand48_r.c, stdlib/erand48_r.c, stdlib/jrand48_r.c, stdlib/lrand48_r.c, stdlib/mrand48_r.c, stdlib/nrand48_r.c, stdlib/seed48_r.c, stdlib/srand48_r.c, stdlib/lcong48_r.c, stdlib/drand48-iter.c: New files implementing reentrant versions of functions from drand48 family. * stdlib/seed48.c, stdlib/drand48.c, stdlib/erand48.c, stdlib/jrand48.c, stdlib/lrand48.c, stdlib/mrand48.c, stdlib/nrand48.c, stdlib/srand48.c, stdlib/lcong48.c: Rewrite to use reentrant versions. * stdlib/a64l.c, stdlib/l64a.c: New files. Implement a64l() and l64a() functions from SysV library. * stdlib/Makefile (routines): Add drand48_r, erand48_r, lrand48_r, nrand48_r, mrand48_r, jrand48_r, srand48_r, seed48_r, lcong48_r, drand48-iter, a64l, l64a. * stdlib/stdlib.h: Declare them. * stdlib/random_r.c: New file. Reentrant version of functions from random family. * stdlib/stdlib.h: Declare them. * stdlib/random.c: Rewrite to use reentrant functions. * string/strerror_r.c: New file. Reentrant version. * string/strerror.c: Change for new _strerror_internal form. * string/Makefile (routines): Add strerror_r. * sysdeps/generic/dl-sysdep.c (_dl_sysdep_start): Set default value of user_entry to `_start'. Close AT_ENTRY case with `break'. * sysdeps/generic/strstr.c: New and much faster implementation by Stephen R. van den Berg. * sysdeps/generic/_strerror.c: _strerror_internal now takes three argument and has and explicit buffer length. * sysdeps/mach/_strerror.c: Change for new interface with three arguments. * stdio/perror.c, stdio/vfprintf.c: Callers changed. * sysdeps/mach/hurd/ttyname_r.c: New file. Reentrant version. * sysdeps/posix/ttyname_r.c: New file. Reentrant version. * sysdeps/stub/ttyname_r: New file. Define as dummy function. * sysdeps/posix/utimes.c: Include for prototype. (utimes): First parameter to utime must be file, not path. * sysdeps/posix/sysconf.c (__sysconf): Test for CLK_TCK in case _SC_CLK_TCK and return it when available. Test for STREAM_MAX in case _SC_STREAM_MAX and return it when available. Add case for _SC_2_LOCALEDEF which is now available. * posix/sys/types.h [__USE_SVID] (key_t): New type. * sysvipc/Makefile, sysvipc/ftok.c, sysvipc/sys/ipc.h, sysvipc/sys/msg.h, sysvipc/sys/sem.h, sysvipc/sys/shm.h, sysdeps/stub/sys/msq_buf.h, sysdeps/stub/sys/sem_buf.h, sysdeps/stub/sys/shm_buf.h, sysdeps/stub/sys/ipc_buf.h, sysdeps/stub/semctl.c, sysdeps/stub/semget.c, sysdeps/stub/semop.c, sysdeps/stub/shmat.c, sysdeps/stub/shmctl.c, sysdeps/stub/shmdt.c, sysdeps/stub/shmget.c, sysdeps/stub/msgctl.c, sysdeps/stub/msgget.c, sysdeps/stub/msgrcv.c, sysdeps/stub/msgsnd.c: New files. Add implementation of System V IPC. --- sysdeps/posix/sysconf.c | 15 ++++++++ sysdeps/posix/ttyname_r.c | 91 +++++++++++++++++++++++++++++++++++++++++++++++ sysdeps/posix/utimes.c | 3 +- 3 files changed, 108 insertions(+), 1 deletion(-) create mode 100644 sysdeps/posix/ttyname_r.c (limited to 'sysdeps/posix') diff --git a/sysdeps/posix/sysconf.c b/sysdeps/posix/sysconf.c index 7f4fbb7261..485f9b3df4 100644 --- a/sysdeps/posix/sysconf.c +++ b/sysdeps/posix/sysconf.c @@ -52,7 +52,11 @@ DEFUN(__sysconf, (name), int name) #endif case _SC_CLK_TCK: +#ifdef CLK_TCK + return CLK_TCK; +#else return 60; +#endif case _SC_NGROUPS_MAX: #ifdef NGROUPS_MAX @@ -65,7 +69,11 @@ DEFUN(__sysconf, (name), int name) return __getdtablesize (); case _SC_STREAM_MAX: +#ifdef STREAM_MAX + return STREAM_MAX; +#else return FOPEN_MAX; +#endif case _SC_TZNAME_MAX: return __tzname_max (); @@ -171,6 +179,13 @@ DEFUN(__sysconf, (name), int name) return -1; #endif + case _SC_2_LOCALEDEF: +#ifdef _POSIX2_LOCALEDEF + return _POSIX2_LOCALEDEF; +#else + return -1; +#endif + case _SC_2_SW_DEV: #ifdef _POSIX2_SW_DEV return _POSIX2_SW_DEV; diff --git a/sysdeps/posix/ttyname_r.c b/sysdeps/posix/ttyname_r.c new file mode 100644 index 0000000000..e225da2be2 --- /dev/null +++ b/sysdeps/posix/ttyname_r.c @@ -0,0 +1,91 @@ +/* Copyright (C) 1991, 1992, 1993, 1995 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., 675 Mass Ave, +Cambridge, MA 02139, USA. */ + +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#ifndef MIN +# define MIN(a, b) ((a) < (b) ? (a) : (b)) +#endif + +/* Store at most BUFLEN character of the pathname of the terminal FD is + open on in BUF. Return 0 on success, -1 otherwise. */ +int +ttyname_r (fd, buf, buflen) + int fd; + char *buf; + int buflen; +{ + static const char dev[] = "/dev"; + struct stat st; + dev_t mydev; + ino_t myino; + DIR *dirstream; + struct dirent *d; + int save = errno; + + /* Test for the absolute minimal size. This makes life easier inside + the loop. */ + if (buflen < sizeof (dev) + 2) + { + errno = EINVAL; + return -1; + } + + if (fstat (fd, &st) < 0) + return -1; + mydev = st.st_dev; + myino = st.st_ino; + + dirstream = opendir (dev); + if (dirstream == NULL) + return -1; + + /* Prepare the result buffer. */ + memcpy (buf, dev, sizeof (dev)); + buf[sizeof (dev)] = '/'; + buflen -= sizeof (dev) + 1; + + while ((d = readdir (dirstream)) != NULL) + if (d->d_fileno == myino) + { + char *cp; + + cp = stpncpy (&buf[sizeof (dev) + 1], d->d_name, + MIN (d->d_namlen + 1, buflen)); + cp[0] = '\0'; + + if (stat (buf, &st) == 0 && st.st_dev == mydev) + { + (void) closedir (dirstream); + errno = save; + return 0; + } + } + + (void) closedir (dirstream); + errno = save; + return -1; +} diff --git a/sysdeps/posix/utimes.c b/sysdeps/posix/utimes.c index ca542c68b1..2c92803cbc 100644 --- a/sysdeps/posix/utimes.c +++ b/sysdeps/posix/utimes.c @@ -16,6 +16,7 @@ License along with the GNU C Library; see the file COPYING.LIB. If not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ +#include #include #include #include @@ -36,7 +37,7 @@ __utimes (const char *file, struct timeval tvp[2]) else times = NULL; - return utime (path, times); + return utime (file, times); } weak_alias (__utimes, utimes) -- cgit 1.4.1