aboutsummaryrefslogtreecommitdiff
path: root/io
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>1996-12-07 03:30:25 +0000
committerUlrich Drepper <drepper@redhat.com>1996-12-07 03:30:25 +0000
commita18f587da5a0a91bcd1307ed0f122ca2ce994c15 (patch)
tree174cca5dd1f842dff255d6491ff6677ac7772eab /io
parent6b612c67093292a99a336fae38e459ee00927d0f (diff)
downloadglibc-a18f587da5a0a91bcd1307ed0f122ca2ce994c15.zip
glibc-a18f587da5a0a91bcd1307ed0f122ca2ce994c15.tar.gz
glibc-a18f587da5a0a91bcd1307ed0f122ca2ce994c15.tar.bz2
update from main archive 961206
Sat Dec 7 03:24:36 1996 Ulrich Drepper <drepper@cygnus.com> * configure.in: Discard error message from test in test for bash-2.0. * io/getpw.c: Don't apply getcwd on user supplied buffer. Instead always use temporary buffer and only copy the result. Patch by HJ Lu. * stdlib/canonicalize.c: Likewise. * libio/fileops.c: Change comments according to libg++2.8b5. * libio/iosetvbuf.c: Follow change in libg++-2.8b5 to clear unbuffered flag. Reported by HJ Lu. * manual/nss.texi: Correct prototypes. * misc/syslog.c: Make reentrant. Catch SIGPIPE signal to prevent crash if syslog daemon is restarted. * stdlib/rand_r.c: New file. Implementation of POSIX.2 function rand_r. * stdlib/Makefile (routines): Add rand_r. * sysdeps/stub/libc-lock.h: Define __libc_lock_trylock and __libc_mutex_lock. * configure.in: Add --disable-sanity-check option. * sysdeps/unix/sysv/linux/configure.in: If linuxthreads or des-crypt are not available and --disbale-sanity-check is not given abort with a message. Thu Dec 5 19:19:53 1996 Richard Henderson <rth@tamu.edu> * posix/glob.c: Tests against STDC_HEADERS should also test __GNU_LIBRARY__. Thu Dec 5 16:20:55 1996 Ulrich Drepper <drepper@cygnus.com> * misc/err.c (vwarn): Set errno again before using %m format. Thu Dec 5 10:14:05 1996 Andreas Jaeger <aj@arthur.pfalz.de> * grp/grp.h: Add declaration of __getgrent_r. * io/fts.c (fts_build): Remove "register" from variables dirbuf and dp since their address is needed. * sysdeps/posix/getcwd.c (__getcwd): Remove "register" from variable d since d's address is needed. * misc/tst-dirname.c (main): Provide prototype. * misc/ioctltst.c (main): Dito. * Makefile: Add gnu/lib-names.h to install-others before including Makerules. Wed Dec 4 16:00:09 1996 Ulrich Drepper <drepper@cygnus.com> * sysdeps/unix/sysv/linux/sys/socketvar.h: New file. Simply use <sys/socket.h>. * sysdeps/unix/sysv/linux/Dist: Add sys/socketvar.h. * sysdeps/unix/sysv/linux/Makefile [$(subdir)=inet)]: Add sys/socketvar.h to sysdep_headers. since the value might be outside the range of the `long int'.
Diffstat (limited to 'io')
-rw-r--r--io/fts.c2
-rw-r--r--io/getwd.c30
2 files changed, 16 insertions, 16 deletions
diff --git a/io/fts.c b/io/fts.c
index cfc8fa6..2a7100e 100644
--- a/io/fts.c
+++ b/io/fts.c
@@ -570,7 +570,7 @@ fts_build(sp, type)
register FTS *sp;
int type;
{
- register struct dirent dirbuf, *dp;
+ struct dirent dirbuf, *dp;
register FTSENT *p, *head;
register int nitems;
FTSENT *cur, *tail;
diff --git a/io/getwd.c b/io/getwd.c
index 4488cef..510a681 100644
--- a/io/getwd.c
+++ b/io/getwd.c
@@ -1,4 +1,5 @@
-/* Copyright (C) 1991, 1992, 1996 Free Software Foundation, Inc.
+/* Obsolete function to get current working directory.
+ Copyright (C) 1991, 1992, 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
@@ -21,19 +22,15 @@
#include <string.h>
#include <unistd.h>
-/* Put the absolute pathname of the current working direction in BUF.
- If successful, return BUF. If not, put an error message in
- BUF and return NULL. BUF should be at least PATH_MAX bytes long. */
+
char *
getwd (buf)
char *buf;
{
#ifndef PATH_MAX
#define PATH_MAX 1024
- char fetchbuf[PATH_MAX];
-#else
-#define fetchbuf buf
#endif
+ char tmpbuf[PATH_MAX];
if (buf == NULL)
{
@@ -41,18 +38,21 @@ getwd (buf)
return NULL;
}
- if (getcwd (fetchbuf, PATH_MAX) == NULL)
+ if (getcwd (tmpbuf, LOCAL_PATH_MAX) == NULL)
{
-#if defined HAVE_STRERROR_R || defined _LIBC
- __strerror_r (errno, buf, PATH_MAX);
-#else
- strncpy (buf, strerror (errno), PATH_MAX);
-#endif
+ /* We use 1024 here since it should really be enough and because
+ this is a save value. */
+ __strerror_r (errno, buf, 1024);
return NULL;
}
- if (fetchbuf != buf)
- strcpy (buf, fetchbuf);
+ /* This is completely unsafe. Nobody can say how big the user
+ provided buffer is. Perhaps the application and the libc
+ disagree about the value of PATH_MAX. */
+ strcpy (buf, tmpbuf);
return buf;
}
+
+link_warning (getwd,
+ "the `getwd' function is dangerous and should not be used.")