diff options
Diffstat (limited to 'io')
| -rw-r--r-- | io/fcntl.h | 1 | ||||
| -rw-r--r-- | io/fstat.c | 3 | ||||
| -rw-r--r-- | io/lstat.c | 1 | ||||
| -rw-r--r-- | io/sys/stat.h | 39 | ||||
| -rw-r--r-- | io/sys/statfs.h | 2 | ||||
| -rw-r--r-- | io/sys/statvfs.h | 2 |
6 files changed, 11 insertions, 37 deletions
diff --git a/io/fcntl.h b/io/fcntl.h index 9f9fe8d50c..aa0796b24d 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 45e60d6b32..d93d0929ac 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 7ad7b90d4c..356001db8b 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 ab27f7c5fc..83113e8d36 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 436668b590..be93bc9239 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 73a2fa7df7..31d60df28b 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 |