aboutsummaryrefslogtreecommitdiff
path: root/io
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>1998-08-09 17:39:48 +0000
committerUlrich Drepper <drepper@redhat.com>1998-08-09 17:39:48 +0000
commitbdbf022df8d6df07ae7c69b7e386278e27804e58 (patch)
tree0022dc1ab91d8469229566153fabe35c9b6c8978 /io
parentcf0fd0161c73af42b7755043fa9a2a0ac0177a08 (diff)
downloadglibc-bdbf022df8d6df07ae7c69b7e386278e27804e58.zip
glibc-bdbf022df8d6df07ae7c69b7e386278e27804e58.tar.gz
glibc-bdbf022df8d6df07ae7c69b7e386278e27804e58.tar.bz2
Update.
1998-08-09 09:40 Ulrich Drepper <drepper@cygnus.com> * nss/nss_files/files-XXX.c (internal_getent): In case of an read error do not trust errno value, set it to ENOENT. * db2/db_185.h: Move __ prototypes into include/* header. * dirent/dirent.h: Likewise. * elf/dlfcn.h: Likewise. * gmon/sys/gmon.h: Likewise. * grp/grp.h: Likewise. * intl/libintl.h: Likewise. * io/fcntl.h: Likewise. * io/sys/stat.h: Likewise. * io/sys/statfs.h: Likewise. * io/sys/statvfs.h: Likewise. * libio/stdio.h: Likewise. * login/utmp.h: Likewise. * misc/mntent.h: Likewise. * misc/search.h: Likewise. * misc/sys/file.h: Likewise. * misc/sys/ioctl.h: Likewise. * misc/sys/select.h: Likewise. * misc/sys/uio.h: Likewise. * misc/sys/ustat.h: Likewise. * posix/unistd.h: Likewise. * posix/sys/times.h: Likewise. * posix/sys/wait.h: Likewise. * pwd/pwd.h: Likewise. * resource/ulimit.h: Likewise. * resource/sys/resource.h: Likewise. * setjmp/setjmp.h: Likewise. * shadow/shadow.h: Likewise. * signal/signal.h: Likewise. * socket/sys/socket.h: Likewise. * stdlib/alloca.h: Likewise. * stdlib/stdlib.h: Likewise. * string/string.h: Likewise. * sysdeps/generic/sys/mman.h: Likewise. * sysdeps/unix/bsd/osf/sys/mman.h: Likewise. * sysdeps/unix/bsd/sun/sunos4/sys/mman.h: Likewise. * sysdeps/unix/bsd/ultrix4/sys/mman.h: Likewise. * sysdeps/unix/sysv/irix4/sys/mman.h: Likewise. * sysdeps/unix/sysv/linux/bits/sched.h: Likewise. * sysdeps/unix/sysv/linux/sys/mman.h: Likewise. * termios/termios.h: Likewise. * time/time.h: Likewise. * time/sys/time.h: Likewise. * wcsmbs/wchar.h: Likewise. * include/alloca.h: Add __ prototypes here. * include/db_185.h: Likewise. * include/dirent.h: Likewise. * include/dlfcn.h: Likewise. * include/fcntl.h: Likewise. * include/grp.h: Likewise. * include/libintl.h: Likewise. * include/mntent.h: Likewise. * include/pwd.h: Likewise. * include/sched.h: Likewise. * include/search.h: Likewise. * include/setjmp.h: Likewise. * include/shadow.h: Likewise. * include/signal.h: Likewise. * include/stdio.h: Likewise. * include/stdlib.h: Likewise. * include/string.h: Likewise. * include/termios.h: Likewise. * include/time.h: Likewise. * include/ulimit.h: Likewise. * include/unistd.h: Likewise. * include/utmp.h: Likewise. * include/wchar.h: Likewise. * include/sys/file.h: Likewise. * include/sys/gmon.h: Likewise. * include/sys/ioctl.h: Likewise. * include/sys/mman.h: Likewise. * include/sys/resource.h: Likewise. * include/sys/select.h: Likewise. * include/sys/socket.h: Likewise. * include/sys/stat.h: Likewise. * include/sys/statfs.h: Likewise. * include/sys/time.h: Likewise. * include/sys/times.h: Likewise. * include/sys/uio.h: Likewise. * include/sys/wait.h: Likewise. * Makeconfig (+includes): Search in $(..)include first. * io/fstat.c: Undefine __fstat. * io/lstat.c: Undefine __lstat. * wcsmbs/Versions: Add __mbrlen.
Diffstat (limited to 'io')
-rw-r--r--io/fcntl.h1
-rw-r--r--io/fstat.c3
-rw-r--r--io/lstat.c1
-rw-r--r--io/sys/stat.h39
-rw-r--r--io/sys/statfs.h2
-rw-r--r--io/sys/statvfs.h2
6 files changed, 11 insertions, 37 deletions
diff --git a/io/fcntl.h b/io/fcntl.h
index 9f9fe8d..aa0796b 100644
--- a/io/fcntl.h
+++ b/io/fcntl.h
@@ -64,7 +64,6 @@ extern int fcntl __P ((int __fd, int __cmd, ...));
OFLAG determines the type of access used. If O_CREAT is on OFLAG,
the third argument is taken as a `mode_t', the mode of the created file. */
extern int __open __P ((__const char *__file, int __oflag, ...));
-extern int __open64 __P ((__const char *__file, int __oflag, ...));
#ifndef __USE_FILE_OFFSET64
extern int open __P ((__const char *__file, int __oflag, ...));
#else
diff --git a/io/fstat.c b/io/fstat.c
index 45e60d6..d93d092 100644
--- a/io/fstat.c
+++ b/io/fstat.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1996, 1997 Free Software Foundation, Inc.
+/* Copyright (C) 1996, 1997, 1998 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
@@ -37,6 +37,7 @@
all callers. */
#undef fstat
+#undef __fstat
int
__fstat (int fd, struct stat *buf)
{
diff --git a/io/lstat.c b/io/lstat.c
index 7ad7b90..356001d 100644
--- a/io/lstat.c
+++ b/io/lstat.c
@@ -37,6 +37,7 @@
all callers. */
#undef lstat
+#undef __lstat
int
__lstat (const char *file, struct stat *buf)
{
diff --git a/io/sys/stat.h b/io/sys/stat.h
index ab27f7c..83113e8 100644
--- a/io/sys/stat.h
+++ b/io/sys/stat.h
@@ -176,18 +176,12 @@ __BEGIN_DECLS
#endif
+#ifndef __USE_FILE_OFFSET64
/* Get file attributes for FILE and put them in BUF. */
-extern int __stat __P ((__const char *__file, struct stat *__buf));
+extern int stat __P ((__const char *__file, struct stat *__buf));
+
/* Get file attributes for the file, device, pipe, or socket
that file descriptor FD is open on and put them in BUF. */
-extern int __fstat __P ((int __fd, struct stat *__buf));
-/* Get file attributes about FILE and put them in BUF.
- If FILE is a symbolic link, do not follow it. */
-extern int __lstat __P ((__const char *__file, struct stat *__buf));
-
-
-#ifndef __USE_FILE_OFFSET64
-extern int stat __P ((__const char *__file, struct stat *__buf));
extern int fstat __P ((int __fd, struct stat *__buf));
#else
# ifdef __REDIRECT
@@ -206,6 +200,8 @@ extern int fstat64 __P ((int __fd, struct stat64 *__buf));
#if defined __USE_BSD || defined __USE_XOPEN_EXTENDED
# ifndef __USE_FILE_OFFSET64
+/* Get file attributes about FILE and put them in BUF.
+ If FILE is a symbolic link, do not follow it. */
extern int lstat __P ((__const char *__file, struct stat *__buf));
# else
# ifdef __REDIRECT
@@ -223,11 +219,9 @@ extern int lstat64 __P ((__const char *__file, struct stat64 *__buf));
/* Set file access permissions for FILE to MODE.
This takes an `int' MODE argument because that
is what `mode_t's get widened to. */
-extern int __chmod __P ((__const char *__file, __mode_t __mode));
extern int chmod __P ((__const char *__file, __mode_t __mode));
/* Set file access permissions of the file FD is open on to MODE. */
-extern int __fchmod __P ((int __fd, __mode_t __mode));
#if defined __USE_BSD || defined __USE_XOPEN_EXTENDED
extern int fchmod __P ((int __fd, __mode_t __mode));
#endif
@@ -235,7 +229,6 @@ extern int fchmod __P ((int __fd, __mode_t __mode));
/* Set the file creation mask of the current process to MASK,
and return the old creation mask. */
-extern __mode_t __umask __P ((__mode_t __mask));
extern __mode_t umask __P ((__mode_t __mask));
#ifdef __USE_GNU
@@ -245,14 +238,11 @@ extern __mode_t getumask __P ((void));
#endif
/* Create a new directory named PATH, with permission bits MODE. */
-extern int __mkdir __P ((__const char *__path, __mode_t __mode));
extern int mkdir __P ((__const char *__path, __mode_t __mode));
/* Create a device file named PATH, with permission and special bits MODE
and device number DEV (which can be constructed from major and minor
device numbers with the `makedev' macro above). */
-extern int __mknod __P ((__const char *__path,
- __mode_t __mode, __dev_t __dev));
#if defined __USE_MISC || defined __USE_BSD || defined __USE_XOPEN_EXTENDED
extern int mknod __P ((__const char *__path,
__mode_t __mode, __dev_t __dev));
@@ -322,19 +312,11 @@ extern int __xmknod __P ((int __ver, __const char *__path,
#if defined __GNUC__ && __GNUC__ >= 2
/* Inlined versions of the real stat and mknod functions. */
-extern __inline__ int __stat (__const char *__path, struct stat *__statbuf)
-{
- return __xstat (_STAT_VER, __path, __statbuf);
-}
extern __inline__ int stat (__const char *__path, struct stat *__statbuf)
{
return __xstat (_STAT_VER, __path, __statbuf);
}
-extern __inline__ int __lstat (__const char *__path, struct stat *__statbuf)
-{
- return __lxstat (_STAT_VER, __path, __statbuf);
-}
# if defined __USE_BSD || defined __USE_XOPEN_EXTENDED
extern __inline__ int lstat (__const char *__path, struct stat *__statbuf)
{
@@ -342,22 +324,17 @@ extern __inline__ int lstat (__const char *__path, struct stat *__statbuf)
}
# endif
-extern __inline__ int __fstat (int __fd, struct stat *__statbuf)
-{
- return __fxstat (_STAT_VER, __fd, __statbuf);
-}
extern __inline__ int fstat (int __fd, struct stat *__statbuf)
{
return __fxstat (_STAT_VER, __fd, __statbuf);
}
-extern __inline__ int __mknod (__const char *__path, __mode_t __mode,
- __dev_t __dev)
-{ return __xmknod (_MKNOD_VER, __path, __mode, &__dev); }
# if defined __USE_MISC || defined __USE_BSD
extern __inline__ int mknod (__const char *__path, __mode_t __mode,
__dev_t __dev)
-{ return __xmknod (_MKNOD_VER, __path, __mode, &__dev); }
+{
+ return __xmknod (_MKNOD_VER, __path, __mode, &__dev);
+}
# endif
# ifdef __USE_LARGEFILE64
diff --git a/io/sys/statfs.h b/io/sys/statfs.h
index 436668b..be93bc9 100644
--- a/io/sys/statfs.h
+++ b/io/sys/statfs.h
@@ -28,7 +28,6 @@
__BEGIN_DECLS
/* Return information about the filesystem on which FILE resides. */
-extern int __statfs __P ((__const char *__file, struct statfs *__buf));
#ifndef __USE_FILE_OFFSET64
extern int statfs __P ((__const char *__file, struct statfs *__buf));
#else
@@ -45,7 +44,6 @@ extern int statfs64 __P ((__const char *__file, struct statfs64 *__buf));
/* Return information about the filesystem containing the file FILDES
refers to. */
-extern int __fstatfs __P ((int __fildes, struct statfs *__buf));
#ifndef __USE_FILE_OFFSET64
extern int fstatfs __P ((int __fildes, struct statfs *__buf));
#else
diff --git a/io/sys/statvfs.h b/io/sys/statvfs.h
index 73a2fa7..31d60df 100644
--- a/io/sys/statvfs.h
+++ b/io/sys/statvfs.h
@@ -28,7 +28,6 @@
__BEGIN_DECLS
/* Return information about the filesystem on which FILE resides. */
-extern int __statvfs __P ((__const char *__file, struct statvfs *__buf));
#ifndef __USE_FILE_OFFSET64
extern int statvfs __P ((__const char *__file, struct statvfs *__buf));
#else
@@ -46,7 +45,6 @@ extern int statvfs64 __P ((__const char *__file, struct statvfs64 *__buf));
/* Return information about the filesystem containing the file FILDES
refers to. */
-extern int __fstatvfs __P ((int __fildes, struct statvfs *__buf));
#ifndef __USE_FILE_OFFSET64
extern int fstatvfs __P ((int __fildes, struct statvfs *__buf));
#else