diff options
Diffstat (limited to 'io')
| -rw-r--r-- | io/Makefile | 12 | ||||
| -rw-r--r-- | io/creat64.c | 31 | ||||
| -rw-r--r-- | io/fcntl.h | 49 | ||||
| -rw-r--r-- | io/fstat64.c | 43 | ||||
| -rw-r--r-- | io/fts.c | 24 | ||||
| -rw-r--r-- | io/ftw.c | 61 | ||||
| -rw-r--r-- | io/ftw.h | 24 | ||||
| -rw-r--r-- | io/ftw64.c | 32 | ||||
| -rw-r--r-- | io/lstat64.c | 43 | ||||
| -rw-r--r-- | io/stat64.c | 43 | ||||
| -rw-r--r-- | io/sys/stat.h | 198 | ||||
| -rw-r--r-- | io/sys/statfs.h | 18 |
12 files changed, 472 insertions, 106 deletions
diff --git a/io/Makefile b/io/Makefile index 3f37e37c8a..e5c86b4cf6 100644 --- a/io/Makefile +++ b/io/Makefile @@ -29,21 +29,21 @@ headers := sys/stat.h bits/stat.h sys/statfs.h bits/statfs.h sys/vfs.h \ routines := \ utime \ mkfifo \ - stat fstat lstat mknod \ - xstat fxstat lxstat xmknod \ - statfs fstatfs \ + stat fstat lstat mknod stat64 fstat64 lstat64 \ + xstat fxstat lxstat xmknod xstat64 fxstat64 lxstat64 \ + statfs fstatfs statfs64 fstatfs64 \ umask chmod fchmod mkdir \ - open close read write lseek access euidaccess \ + open open64 close read write lseek lseek64 access euidaccess \ fcntl flock lockf \ dup dup2 pipe \ - creat \ + creat creat64 \ chdir fchdir \ getcwd getwd getdirname \ chown fchown lchown \ ttyname ttyname_r isatty \ link symlink readlink \ unlink rmdir \ - ftw fts poll + ftw ftw64 fts poll # These routines will be omitted from the libc shared object. # Instead the static object files will be included in a special archive diff --git a/io/creat64.c b/io/creat64.c new file mode 100644 index 0000000000..6e51dc0ff4 --- /dev/null +++ b/io/creat64.c @@ -0,0 +1,31 @@ +/* Copyright (C) 1991, 1996, 1997 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. */ + +#include <fcntl.h> +#include <sys/types.h> + +#undef creat + +/* Create FILE with protections MODE. */ +int +creat64 (file, mode) + const char *file; + mode_t mode; +{ + return __open64 (file, O_WRONLY|O_CREAT|O_TRUNC, mode); +} diff --git a/io/fcntl.h b/io/fcntl.h index 519230019c..d47da0a1ff 100644 --- a/io/fcntl.h +++ b/io/fcntl.h @@ -1,4 +1,4 @@ -/* Copyright (C) 1991, 92, 94, 95, 96 Free Software Foundation, Inc. +/* Copyright (C) 1991, 92, 94, 95, 96, 97 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 @@ -33,14 +33,14 @@ __BEGIN_DECLS #include <bits/fcntl.h> #ifdef __USE_MISC -#ifndef R_OK /* Verbatim from <unistd.h>. Ugh. */ +# ifndef R_OK /* Verbatim from <unistd.h>. Ugh. */ /* Values for the second argument to access. These may be OR'd together. */ -#define R_OK 4 /* Test for read permission. */ -#define W_OK 2 /* Test for write permission. */ -#define X_OK 1 /* Test for execute permission. */ -#define F_OK 0 /* Test for existence. */ -#endif +# define R_OK 4 /* Test for read permission. */ +# define W_OK 2 /* Test for write permission. */ +# define X_OK 1 /* Test for execute permission. */ +# define F_OK 0 /* Test for existence. */ +# endif #endif /* Use misc. */ /* Do the file control operation described by CMD on FD. @@ -52,14 +52,31 @@ 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 +extern int open __P ((__const char *__file, int __oflag, ...)) + __asm__ ("open64"); +#endif +#ifdef __USE_LARGEFILE64 +extern int open64 __P ((__const char *__file, int __oflag, ...)); +#endif /* Create and open FILE, with mode MODE. This takes an `int' MODE argument because that is what `mode_t' will be widened to. */ +#ifndef __USE_FILE_OFFSET64 extern int creat __P ((__const char *__file, __mode_t __mode)); +#else +extern int creat __P ((__const char *__file, __mode_t __mode)) + __asm__ ("creat64"); +#endif +#ifdef __USE_LARGEFILE64 +extern int creat64 __P ((__const char *__file, __mode_t __mode)); +#endif -#if !defined(F_LOCK) && (defined(__USE_MISC) || defined(__USE_XOPEN_EXTENDED)) +#if !defined F_LOCK && (defined __USE_MISC || defined __USE_XOPEN_EXTENDED) /* NOTE: These declarations also appear in <unistd.h>; be sure to keep both files consistent. Some systems have them there and some here, and some software depends on the macros being defined without including both. */ @@ -68,12 +85,20 @@ extern int creat __P ((__const char *__file, __mode_t __mode)); LEN is always relative to the current file position. The CMD argument is one of the following. */ -#define F_ULOCK 0 /* Unlock a previously locked region. */ -#define F_LOCK 1 /* Lock a region for exclusive use. */ -#define F_TLOCK 2 /* Test and lock a region for exclusive use. */ -#define F_TEST 3 /* Test a region for other processes locks. */ +# define F_ULOCK 0 /* Unlock a previously locked region. */ +# define F_LOCK 1 /* Lock a region for exclusive use. */ +# define F_TLOCK 2 /* Test and lock a region for exclusive use. */ +# define F_TEST 3 /* Test a region for other processes locks. */ +# ifndef __USE_FILE_OFFSET64 extern int lockf __P ((int __fd, int __cmd, __off_t __len)); +# else +extern int lockf __P ((int __fd, int __cmd, __off_t __len)) + __asm__ ("lockf64"); +# endif +# ifdef __USE_LARGEFILE64 +extern int lockf64 __P ((int __fd, int __cmd, __off64_t __len)); +# endif #endif __END_DECLS diff --git a/io/fstat64.c b/io/fstat64.c new file mode 100644 index 0000000000..376a262a10 --- /dev/null +++ b/io/fstat64.c @@ -0,0 +1,43 @@ +/* Copyright (C) 1996, 1997 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. + + In addition to the permissions in the GNU Library General Public + License, the Free Software Foundation gives you unlimited + permission to link the compiled version of this file with other + programs, and to distribute those programs without any restriction + coming from the use of this file. (The Library General Public + License restrictions do apply in other respects; for example, they + cover modification of the file, and distribution when not linked + into another program.) + + 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, 59 Temple Place - Suite 330, + Boston, MA 02111-1307, USA. */ + +#include <sys/stat.h> + +/* This definition is only used if inlining fails for this function; see + the last page of <sys/stat.h>. The real work is done by the `x' + function which is passed a version number argument. We arrange in the + makefile that when not inlined this function is always statically + linked; that way a dynamically-linked executable always encodes the + version number corresponding to the data structures it uses, so the `x' + functions in the shared library can adapt without needing to recompile + all callers. */ + +int +fstat64 (int fd, struct stat64 *buf) +{ + return __fxstat64 (_STAT_VER, fd, buf); +} diff --git a/io/fts.c b/io/fts.c index f283c17450..255c53f529 100644 --- a/io/fts.c +++ b/io/fts.c @@ -57,15 +57,15 @@ static char sccsid[] = "@(#)fts.c 8.2 (Berkeley) 1/2/94"; #endif -static FTSENT *fts_alloc __P((FTS *, const char *, int)); -static FTSENT *fts_build __P((FTS *, int)); -static void fts_lfree __P((FTSENT *)); +static FTSENT *fts_alloc __P((FTS *, const char *, int)) internal_function; +static FTSENT *fts_build __P((FTS *, int)) internal_function; +static void fts_lfree __P((FTSENT *)) internal_function; static void fts_load __P((FTS *, FTSENT *)); -static size_t fts_maxarglen __P((char * const *)); -static void fts_padjust __P((FTS *, void *)); -static int fts_palloc __P((FTS *, size_t)); -static FTSENT *fts_sort __P((FTS *, FTSENT *, int)); -static u_short fts_stat __P((FTS *, FTSENT *, int)); +static size_t fts_maxarglen __P((char * const *)) internal_function; +static void fts_padjust __P((FTS *, void *)) internal_function; +static int fts_palloc __P((FTS *, size_t)) internal_function; +static FTSENT *fts_sort __P((FTS *, FTSENT *, int)) internal_function; +static u_short fts_stat __P((FTS *, FTSENT *, int)) internal_function; #ifndef MAX #define MAX(a, b) ({ __typeof__ (a) _a = (a); \ @@ -566,6 +566,7 @@ fts_children(sp, instr) * been found, cutting the stat calls by about 2/3. */ static FTSENT * +internal_function fts_build(sp, type) register FTS *sp; int type; @@ -780,6 +781,7 @@ mem1: saved_errno = errno; } static u_short +internal_function fts_stat(sp, p, follow) FTS *sp; register FTSENT *p; @@ -852,6 +854,7 @@ err: bzero(sbp, sizeof(struct stat)); } static FTSENT * +internal_function fts_sort(sp, head, nitems) FTS *sp; FTSENT *head; @@ -884,6 +887,7 @@ fts_sort(sp, head, nitems) } static FTSENT * +internal_function fts_alloc(sp, name, namelen) FTS *sp; const char *name; @@ -922,6 +926,7 @@ fts_alloc(sp, name, namelen) } static void +internal_function fts_lfree(head) register FTSENT *head; { @@ -941,6 +946,7 @@ fts_lfree(head) * plus 256 bytes so don't realloc the path 2 bytes at a time. */ static int +internal_function fts_palloc(sp, more) FTS *sp; size_t more; @@ -955,6 +961,7 @@ fts_palloc(sp, more) * already returned. */ static void +internal_function fts_padjust(sp, addr) FTS *sp; void *addr; @@ -978,6 +985,7 @@ fts_padjust(sp, addr) } static size_t +internal_function fts_maxarglen(argv) char * const *argv; { diff --git a/io/ftw.c b/io/ftw.c index 8cccbacd37..e0835c2839 100644 --- a/io/ftw.c +++ b/io/ftw.c @@ -31,6 +31,19 @@ /* #define NDEBUG 1 */ #include <assert.h> +/* Support for the LFS API version. */ +#ifndef FTW_NAME +# define FTW_NAME ftw +# define NFTW_NAME nftw +# define INO_T ino_t +# define STAT stat +# define DIRENT dirent +# define READDIR readdir +# define LXSTAT __lxstat +# define XSTAT __xstat +# define FTW_FUNC_T __ftw_func_t +# define NFTW_FUNC_T __nftw_func_t +#endif struct dir_data { @@ -41,7 +54,7 @@ struct dir_data struct known_object { dev_t dev; - ino_t ino; + INO_T ino; }; struct ftw_data @@ -68,7 +81,7 @@ struct ftw_data int *cvt_arr; /* Callback function. We always use the `nftw' form. */ - __nftw_func_t func; + NFTW_FUNC_T func; /* Device of starting point. Needed for FTW_MOUNT. */ dev_t dev; @@ -94,7 +107,7 @@ static int ftw_arr[] = /* Forward declarations of local functions. */ -static int ftw_dir (struct ftw_data *data, struct stat *st); +static int ftw_dir (struct ftw_data *data, struct STAT *st) internal_function; static int @@ -113,7 +126,7 @@ object_compare (const void *p1, const void *p2) static inline int -add_object (struct ftw_data *data, struct stat *st) +add_object (struct ftw_data *data, struct STAT *st) { struct known_object *newp = malloc (sizeof (struct known_object)); if (newp == NULL) @@ -125,7 +138,7 @@ add_object (struct ftw_data *data, struct stat *st) static inline int -find_object (struct ftw_data *data, struct stat *st) +find_object (struct ftw_data *data, struct STAT *st) { struct known_object obj = { dev: st->st_dev, ino: st->st_ino }; return __tfind (&obj, &data->known_objects, object_compare) != NULL; @@ -150,10 +163,10 @@ open_dir_stream (struct ftw_data *data, struct dir_data *dirp) else { DIR *st = data->dirstreams[data->actdir]->stream; - struct dirent *d; + struct DIRENT *d; size_t actsize = 0; - while ((d = readdir (st)) != NULL) + while ((d = READDIR (st)) != NULL) { size_t this_len = _D_EXACT_NAMLEN (d); if (actsize + this_len + 2 >= bufsize) @@ -225,7 +238,7 @@ static inline int process_entry (struct ftw_data *data, struct dir_data *dir, const char *name, size_t namlen) { - struct stat st; + struct STAT st; int result = 0; int flag; @@ -250,13 +263,13 @@ process_entry (struct ftw_data *data, struct dir_data *dir, const char *name, data->dirbuf[data->ftw.base + namlen] = '\0'; if (((data->flags & FTW_PHYS) - ? __lxstat (_STAT_VER, data->dirbuf, &st) - : __xstat (_STAT_VER, data->dirbuf, &st)) < 0) + ? LXSTAT (_STAT_VER, data->dirbuf, &st) + : XSTAT (_STAT_VER, data->dirbuf, &st)) < 0) { if (errno != EACCES && errno != ENOENT) result = -1; else if (!(data->flags & FTW_PHYS) - && __lxstat (_STAT_VER, data->dirbuf, &st) == 0 + && LXSTAT (_STAT_VER, data->dirbuf, &st) == 0 && S_ISLNK (st.st_mode)) flag = FTW_SLN; else @@ -324,10 +337,11 @@ process_entry (struct ftw_data *data, struct dir_data *dir, const char *name, static int -ftw_dir (struct ftw_data *data, struct stat *st) +internal_function +ftw_dir (struct ftw_data *data, struct STAT *st) { struct dir_data dir; - struct dirent *d; + struct DIRENT *d; int previous_base = data->ftw.base; int result; char *startp; @@ -386,7 +400,7 @@ ftw_dir (struct ftw_data *data, struct stat *st) *startp++ = '/'; data->ftw.base = startp - data->dirbuf; - while (dir.stream != NULL && (d = readdir (dir.stream)) != NULL) + while (dir.stream != NULL && (d = READDIR (dir.stream)) != NULL) { result = process_entry (data, &dir, d->d_name, _D_EXACT_NAMLEN (d)); if (result != 0) @@ -445,11 +459,12 @@ ftw_dir (struct ftw_data *data, struct stat *st) static int +internal_function ftw_startup (const char *dir, int is_nftw, void *func, int descriptors, int flags) { struct ftw_data data; - struct stat st; + struct STAT st; int result = 0; int save_err; char *cwd = NULL; @@ -497,7 +512,7 @@ ftw_startup (const char *dir, int is_nftw, void *func, int descriptors, every case the callback using the format of the `nftw' version and get the correct result since the stack layout for a function call in C allows this. */ - data.func = (__nftw_func_t) func; + data.func = (NFTW_FUNC_T) func; /* Since we internally use the complete set of FTW_* values we need to reduce the value range before calling a `ftw' callback. */ @@ -534,14 +549,14 @@ ftw_startup (const char *dir, int is_nftw, void *func, int descriptors, /* Get stat info for start directory. */ if (result == 0) if (((flags & FTW_PHYS) - ? __lxstat (_STAT_VER, data.dirbuf, &st) - : __xstat (_STAT_VER, data.dirbuf, &st)) < 0) + ? LXSTAT (_STAT_VER, data.dirbuf, &st) + : XSTAT (_STAT_VER, data.dirbuf, &st)) < 0) { if (errno == EACCES) result = (*data.func) (data.dirbuf, &st, FTW_NS, &data.ftw); else if (!(flags & FTW_PHYS) && errno == ENOENT - && __lxstat (_STAT_VER, dir, &st) == 0 + && LXSTAT (_STAT_VER, dir, &st) == 0 && S_ISLNK (st.st_mode)) result = (*data.func) (data.dirbuf, &st, data.cvt_arr[FTW_SLN], &data.ftw); @@ -597,18 +612,18 @@ ftw_startup (const char *dir, int is_nftw, void *func, int descriptors, /* Entry points. */ int -ftw (path, func, descriptors) +FTW_NAME (path, func, descriptors) const char *path; - __ftw_func_t func; + FTW_FUNC_T func; int descriptors; { return ftw_startup (path, 0, func, descriptors, 0); } int -nftw (path, func, descriptors, flags) +NFTW_NAME (path, func, descriptors, flags) const char *path; - __nftw_func_t func; + NFTW_FUNC_T func; int descriptors; int flags; { diff --git a/io/ftw.h b/io/ftw.h index d377f2c947..ac4abeeb18 100644 --- a/io/ftw.h +++ b/io/ftw.h @@ -88,21 +88,45 @@ struct FTW /* Convenient types for callback functions. */ typedef int (*__ftw_func_t) __P ((__const char *__filename, __const struct stat *__status, int __flag)); +typedef int (*__ftw64_func_t) __P ((__const char *__filename, + __const struct stat64 *__status, + int __flag)); #ifdef __USE_XOPEN_EXTENDED typedef int (*__nftw_func_t) __P ((__const char *__filename, __const struct stat *__status, int __flag, struct FTW *__info)); +typedef int (*__nftw64_func_t) __P ((__const char *__filename, + __const struct stat64 *__status, + int __flag, struct FTW *__info)); #endif /* Call a function on every element in a directory tree. */ +#ifndef __USE_FILE_OFFSET64 extern int ftw __P ((__const char *__dir, __ftw_func_t __func, int __descriptors)); +#else +extern int ftw __P ((__const char *__dir, __ftw64_func_t __func, + int __descriptors)) __asm__ ("ftw64"); +#endif +#ifdef __USE_LARGEFILE64 +extern int ftw64 __P ((__const char *__dir, __ftw64_func_t __func, + int __descriptors)); +#endif #ifdef __USE_XOPEN_EXTENDED /* Call a function on every element in a directory tree. FLAG allows to specify the behaviour more detailed. */ +# ifndef __USE_FILE_OFFSET64 extern int nftw __P ((__const char *__dir, __nftw_func_t __func, int __descriptors, int __flag)); +# else +extern int nftw __P ((__const char *__dir, __nftw64_func_t __func, + int __descriptors, int __flag)) __asm__ ("nftw64"); +# endif +# ifdef __USE_LARGEFILE64 +extern int nftw64 __P ((__const char *__dir, __nftw64_func_t __func, + int __descriptors, int __flag)); +# endif #endif __END_DECLS diff --git a/io/ftw64.c b/io/ftw64.c new file mode 100644 index 0000000000..6dbd03e831 --- /dev/null +++ b/io/ftw64.c @@ -0,0 +1,32 @@ +/* File tree walker functions. LFS version. + Copyright (C) 1996, 1997 Free Software Foundation, Inc. + This file is part of the GNU C Library. + Contributed by Ulrich Drepper <drepper@cygnus.com>, 1996. + + 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 FTW_NAME ftw64 +#define NFTW_NAME nftw64 +#define INO_T ino64_t +#define STAT stat64 +#define DIRENT dirent64 +#define READDIR readdir64 +#define LXSTAT __lxstat64 +#define XSTAT __xstat64 +#define FTW_FUNC_T __ftw64_func_t +#define NFTW_FUNC_T __nftw64_func_t + +#include "ftw.c" diff --git a/io/lstat64.c b/io/lstat64.c new file mode 100644 index 0000000000..ef2b156917 --- /dev/null +++ b/io/lstat64.c @@ -0,0 +1,43 @@ +/* Copyright (C) 1996, 1997 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. + + In addition to the permissions in the GNU Library General Public + License, the Free Software Foundation gives you unlimited + permission to link the compiled version of this file with other + programs, and to distribute those programs without any restriction + coming from the use of this file. (The Library General Public + License restrictions do apply in other respects; for example, they + cover modification of the file, and distribution when not linked + into another program.) + + 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, 59 Temple Place - Suite 330, + Boston, MA 02111-1307, USA. */ + +#include <sys/stat.h> + +/* This definition is only used if inlining fails for this function; see + the last page of <sys/stat.h>. The real work is done by the `x' + function which is passed a version number argument. We arrange in the + makefile that when not inlined this function is always statically + linked; that way a dynamically-linked executable always encodes the + version number corresponding to the data structures it uses, so the `x' + functions in the shared library can adapt without needing to recompile + all callers. */ + +int +lstat64 (const char *file, struct stat64 *buf) +{ + return __lxstat64 (_STAT_VER, file, buf); +} diff --git a/io/stat64.c b/io/stat64.c new file mode 100644 index 0000000000..09eb38ae91 --- /dev/null +++ b/io/stat64.c @@ -0,0 +1,43 @@ +/* Copyright (C) 1996, 1997 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. + + In addition to the permissions in the GNU Library General Public + License, the Free Software Foundation gives you unlimited + permission to link the compiled version of this file with other + programs, and to distribute those programs without any restriction + coming from the use of this file. (The Library General Public + License restrictions do apply in other respects; for example, they + cover modification of the file, and distribution when not linked + into another program.) + + 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, 59 Temple Place - Suite 330, + Boston, MA 02111-1307, USA. */ + +#include <sys/stat.h> + +/* This definition is only used if inlining fails for this function; see + the last page of <sys/stat.h>. The real work is done by the `x' + function which is passed a version number argument. We arrange in the + makefile that when not inlined this function is always statically + linked; that way a dynamically-linked executable always encodes the + version number corresponding to the data structures it uses, so the `x' + functions in the shared library can adapt without needing to recompile + all callers. */ + +int +stat64 (const char *file, struct stat64 *buf) +{ + return __xstat64 (_STAT_VER, file, buf); +} diff --git a/io/sys/stat.h b/io/sys/stat.h index 5485976ca6..01bc00165e 100644 --- a/io/sys/stat.h +++ b/io/sys/stat.h @@ -1,4 +1,4 @@ -/* Copyright (C) 1991, 1992, 1995, 1996 Free Software Foundation, Inc. +/* Copyright (C) 1991, 1992, 1995, 1996, 1997 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 @@ -31,42 +31,42 @@ __BEGIN_DECLS #include <bits/stat.h> -#if defined(__USE_BSD) || defined(__USE_MISC) -#define S_IFMT __S_IFMT -#define S_IFDIR __S_IFDIR -#define S_IFCHR __S_IFCHR -#define S_IFBLK __S_IFBLK -#define S_IFREG __S_IFREG -#ifdef __S_IFLNK -#define S_IFLNK __S_IFLNK -#endif -#ifdef __S_IFSOCK -#define S_IFSOCK __S_IFSOCK -#endif -#ifdef __S_IFIFO -#define S_IFIFO __S_IFIFO -#endif +#if defined __USE_BSD || defined __USE_MISC +# define S_IFMT __S_IFMT +# define S_IFDIR __S_IFDIR +# define S_IFCHR __S_IFCHR +# define S_IFBLK __S_IFBLK +# define S_IFREG __S_IFREG +# ifdef __S_IFLNK +# define S_IFLNK __S_IFLNK +# endif +# ifdef __S_IFSOCK +# define S_IFSOCK __S_IFSOCK +# endif +# ifdef __S_IFIFO +# define S_IFIFO __S_IFIFO +# endif #endif /* Test macros for file types. */ #define __S_ISTYPE(mode, mask) (((mode) & __S_IFMT) == (mask)) -#define S_ISDIR(mode) __S_ISTYPE((mode), __S_IFDIR) -#define S_ISCHR(mode) __S_ISTYPE((mode), __S_IFCHR) -#define S_ISBLK(mode) __S_ISTYPE((mode), __S_IFBLK) -#define S_ISREG(mode) __S_ISTYPE((mode), __S_IFREG) +#define S_ISDIR(mode) __S_ISTYPE((mode), __S_IFDIR) +#define S_ISCHR(mode) __S_ISTYPE((mode), __S_IFCHR) +#define S_ISBLK(mode) __S_ISTYPE((mode), __S_IFBLK) +#define S_ISREG(mode) __S_ISTYPE((mode), __S_IFREG) #ifdef __S_IFIFO -#define S_ISFIFO(mode) __S_ISTYPE((mode), __S_IFIFO) +# define S_ISFIFO(mode) __S_ISTYPE((mode), __S_IFIFO) #endif #ifdef __USE_BSD -#ifdef __S_IFLNK -#define S_ISLNK(mode) __S_ISTYPE((mode), __S_IFLNK) -#endif -#ifdef __S_IFSOCK -#define S_ISSOCK(mode) __S_ISTYPE((mode), __S_IFSOCK) -#endif +# ifdef __S_IFLNK +# define S_ISLNK(mode) __S_ISTYPE((mode), __S_IFLNK) +# endif +# ifdef __S_IFSOCK +# define S_ISSOCK(mode) __S_ISTYPE((mode), __S_IFSOCK) +# endif #endif @@ -75,9 +75,9 @@ __BEGIN_DECLS #define S_ISUID __S_ISUID /* Set user ID on execution. */ #define S_ISGID __S_ISGID /* Set group ID on execution. */ -#if defined(__USE_BSD) || defined(__USE_MISC) +#if defined __USE_BSD || defined __USE_MISC /* Save swapped text after use (sticky bit). This is pretty well obsolete. */ -#define S_ISVTX __S_ISVTX +# define S_ISVTX __S_ISVTX #endif #define S_IRUSR __S_IREAD /* Read by owner. */ @@ -86,10 +86,10 @@ __BEGIN_DECLS /* Read, write, and execute by owner. */ #define S_IRWXU (__S_IREAD|__S_IWRITE|__S_IEXEC) -#if defined(__USE_MISC) && defined(__USE_BSD) -#define S_IREAD S_IRUSR -#define S_IWRITE S_IWUSR -#define S_IEXEC S_IXUSR +#if defined __USE_MISC && defined __USE_BSD +# define S_IREAD S_IRUSR +# define S_IWRITE S_IWUSR +# define S_IEXEC S_IXUSR #endif #define S_IRGRP (S_IRUSR >> 3) /* Read by group. */ @@ -107,28 +107,51 @@ __BEGIN_DECLS #ifdef __USE_BSD /* Macros for common mode bit masks. */ -#define ACCESSPERMS (S_IRWXU|S_IRWXG|S_IRWXO) /* 0777 */ -#define ALLPERMS (S_ISUID|S_ISGID|S_ISTXT|S_IRWXU|S_IRWXG|S_IRWXO)/* 07777 */ -#define DEFFILEMODE (S_IRUSR|S_IWUSR|S_IRGRP|S_IWGRP|S_IROTH|S_IWOTH)/* 0666 */ +# define ACCESSPERMS (S_IRWXU|S_IRWXG|S_IRWXO) /* 0777 */ +# define ALLPERMS (S_ISUID|S_ISGID|S_ISTXT|S_IRWXU|S_IRWXG|S_IRWXO)/* 07777 */ +# define DEFFILEMODE (S_IRUSR|S_IWUSR|S_IRGRP|S_IWGRP|S_IROTH|S_IWOTH)/* 0666*/ -#define S_BLKSIZE 512 /* Block size for `st_blocks'. */ +# define S_BLKSIZE 512 /* Block size for `st_blocks'. */ #endif /* Get file attributes for FILE and put them in BUF. */ extern int __stat __P ((__const char *__file, struct stat *__buf)); +#ifndef __USE_FILE_OFFSET64 extern int stat __P ((__const char *__file, struct stat *__buf)); +#else +extern int stat __P ((__const char *__file, struct stat *__buf)) + __asm__ ("stat64"); +#endif +#ifdef __USE_LARGEFILE64 +extern int stat64 __P ((__const char *__file, struct stat64 *__buf)); +#endif /* 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)); +#ifndef __USE_FILE_OFFSET64 extern int fstat __P ((int __fd, struct stat *__buf)); +#else +extern int fstat __P ((int __fd, struct stat *__buf)) __asm__ ("fstat64"); +#endif +#ifdef __USE_LARGEFILE64 +extern int fstat64 __P ((int __fd, struct stat64 *__buf)); +#endif /* 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)); -#if defined(__USE_BSD) || defined(__USE_XOPEN_EXTENDED) +#if defined __USE_BSD || defined __USE_XOPEN_EXTENDED +# ifndef __USE_FILE_OFFSET64 extern int lstat __P ((__const char *__file, struct stat *__buf)); +# else +extern int lstat __P ((__const char *__file, struct stat *__buf)) + __asm__ ("lstat64"); +# endif +# ifdef __USE_LARGEFILE64 +extern int lstat64 __P ((__const char *__file, struct stat64 *__buf)); +# endif #endif /* Set file access permissions for FILE to MODE. @@ -139,7 +162,7 @@ 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) +#if defined __USE_BSD || defined __USE_XOPEN_EXTENDED extern int fchmod __P ((int __fd, __mode_t __mode)); #endif @@ -164,7 +187,7 @@ extern int mkdir __P ((__const char *__path, __mode_t __mode)); 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) +#if defined __USE_MISC || defined __USE_BSD || defined __USE_XOPEN_EXTENDED extern int mknod __P ((__const char *__path, __mode_t __mode, __dev_t __dev)); #endif @@ -189,10 +212,10 @@ extern int mkfifo __P ((__const char *__path, __mode_t __mode)); callers. */ #ifndef _STAT_VER -#define _STAT_VER 0 +# define _STAT_VER 0 #endif #ifndef _MKNOD_VER -#define _MKNOD_VER 0 +# define _MKNOD_VER 0 #endif /* Wrappers for stat and mknod system calls. */ @@ -204,35 +227,98 @@ extern int __lxstat __P ((int __ver, __const char *__filename, struct stat *__stat_buf)); extern int __xmknod __P ((int __ver, __const char *__path, __mode_t __mode, __dev_t *__dev)); +#if defined __USE_LARGEFILE64 || defined __USE_FILE_OFFSET64 +extern int __fxstat64 __P ((int __ver, int __fildes, + struct stat64 *__stat_buf)); +extern int __xstat64 __P ((int __ver, __const char *__filename, + struct stat64 *__stat_buf)); +extern int __lxstat64 __P ((int __ver, __const char *__filename, + struct stat64 *__stat_buf)); +#endif -#if defined (__GNUC__) && __GNUC__ >= 2 +#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); } +{ +# ifndef __USE_FILE_OFFSET64 + return __xstat (_STAT_VER, __path, __statbuf); +# else + return __xstat64 (_STAT_VER, __path, __statbuf); +# endif +} 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) -{ return __lxstat (_STAT_VER, __path, __statbuf); } -#endif +{ +# ifndef __USE_FILE_OFFSET64 + return __xstat (_STAT_VER, __path, __statbuf); +# else + return __xstat64 (_STAT_VER, __path, __statbuf); +# endif +} + +extern __inline__ int __lstat (__const char *__path, struct stat *__statbuf) +{ +# ifndef __USE_FILE_OFFSET64 + return __lxstat (_STAT_VER, __path, __statbuf); +# else + return __lxstat64 (_STAT_VER, __path, __statbuf); +# endif +} +# if defined __USE_BSD || defined __USE_XOPEN_EXTENDED +extern __inline__ int lstat (__const char *__path, struct stat *__statbuf) +{ +# ifndef __USE_FILE_OFFSET64 + return __lxstat (_STAT_VER, __path, __statbuf); +# else + return __lxstat64 (_STAT_VER, __path, __statbuf); +# endif +} +# endif extern __inline__ int __fstat (int __fd, struct stat *__statbuf) -{ return __fxstat (_STAT_VER, __fd, __statbuf); } +{ +# ifndef __USE_FILE_OFFSET64 + return __fxstat (_STAT_VER, __fd, __statbuf); +# else + return __fxstat64 (_STAT_VER, __fd, __statbuf); +# endif +} extern __inline__ int fstat (int __fd, struct stat *__statbuf) -{ return __fxstat (_STAT_VER, __fd, __statbuf); } +{ +# ifndef __USE_FILE_OFFSET64 + return __fxstat (_STAT_VER, __fd, __statbuf); +# else + return __fxstat64 (_STAT_VER, __fd, __statbuf); +# endif +} 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) +# 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); } -#endif +# endif + +# ifdef __USE_LARGEFILE64 +extern __inline__ int stat64 (__const char *__path, struct stat64 *__statbuf) +{ + return __xstat64 (_STAT_VER, __path, __statbuf); +} + +# if defined __USE_BSD || defined __USE_XOPEN_EXTENDED +extern __inline__ int lstat64 (__const char *__path, struct stat64 *__statbuf) +{ + return __lxstat64 (_STAT_VER, __path, __statbuf); +} +# endif + +extern __inline__ int fstat64 (int __fd, struct stat64 *__statbuf) +{ + return __fxstat64 (_STAT_VER, __fd, __statbuf); +} +# endif #endif diff --git a/io/sys/statfs.h b/io/sys/statfs.h index 49c154d216..fbec44182b 100644 --- a/io/sys/statfs.h +++ b/io/sys/statfs.h @@ -1,5 +1,5 @@ /* Definitions for getting information about a filesystem. - Copyright (C) 1996 Free Software Foundation, Inc. + Copyright (C) 1996, 1997 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 @@ -29,12 +29,28 @@ __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 +extern int statfs __P ((__const char *__file, struct statfs *__buf)) + __asm__ ("statfs64"); +#endif +#ifdef __USE_LARGEFILE64 +extern int statfs64 __P ((__const char *__file, struct statfs64 *__buf)); +#endif /* 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 +extern int fstatfs __P ((int __fildes, struct statfs *__buf)) + __asm__ ("fstatfs64"); +#endif +#ifdef __USE_LARGEFILE64 +extern int fstatfs64 __P ((int __fildes, struct statfs64 *__buf)); +#endif __END_DECLS |