From 283f7172a1d7f3e42a38747f7a9b83bfc04c5238 Mon Sep 17 00:00:00 2001 From: Eric Andersen Date: Sun, 9 Jul 2000 04:29:04 +0000 Subject: fix sys/vfs so it doesn't pull in kernel stuff. -Erik --- include/sys/statfs.h | 63 +++++++++++++++++++++++++++++++++++ include/sys/vfs.h | 19 ++--------- libc/sysdeps/linux/i386/bits/statfs.h | 61 +++++++++++++++++++++++++++++++++ 3 files changed, 127 insertions(+), 16 deletions(-) create mode 100644 include/sys/statfs.h create mode 100644 libc/sysdeps/linux/i386/bits/statfs.h diff --git a/include/sys/statfs.h b/include/sys/statfs.h new file mode 100644 index 000000000..be93bc923 --- /dev/null +++ b/include/sys/statfs.h @@ -0,0 +1,63 @@ +/* Definitions for getting information about a filesystem. + 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 + 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. */ + +#ifndef _SYS_STATFS_H +#define _SYS_STATFS_H 1 + +#include + +/* Get the system-specific definition of `struct statfs'. */ +#include + +__BEGIN_DECLS + +/* Return information about the filesystem on which FILE resides. */ +#ifndef __USE_FILE_OFFSET64 +extern int statfs __P ((__const char *__file, struct statfs *__buf)); +#else +# ifdef __REDIRECT +extern int __REDIRECT (statfs, __P ((__const char *__file, + struct statfs *__buf)), statfs64); +# else +# define statfs statfs64 +# endif +#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. */ +#ifndef __USE_FILE_OFFSET64 +extern int fstatfs __P ((int __fildes, struct statfs *__buf)); +#else +# ifdef __REDIRECT +extern int __REDIRECT (fstatfs, __P ((int __fildes, struct statfs *__buf)), + fstatfs64); +# else +# define fstatfs fstatfs64 +# endif +#endif +#ifdef __USE_LARGEFILE64 +extern int fstatfs64 __P ((int __fildes, struct statfs64 *__buf)); +#endif + +__END_DECLS + +#endif /* sys/statfs.h */ diff --git a/include/sys/vfs.h b/include/sys/vfs.h index 1018591b9..fa22d31c4 100644 --- a/include/sys/vfs.h +++ b/include/sys/vfs.h @@ -1,17 +1,4 @@ -#ifndef _SYS_VFS_H -#define _SYS_VFS_H +/* Other systems declare `struct statfs' et al in , + so we have this file to be compatible with programs expecting it. */ -#include -#include - -__BEGIN_DECLS - -extern int __statfs __P ((__const char *__path, struct statfs *__buf)); -extern int statfs __P ((__const char *__path, struct statfs *__buf)); - -extern int __fstatfs __P ((int __fildes, struct statfs *__buf)); -extern int fstatfs __P ((int __fildes, struct statfs *__buf)); - -__END_DECLS - -#endif /*_SYS_VFS_H */ +#include diff --git a/libc/sysdeps/linux/i386/bits/statfs.h b/libc/sysdeps/linux/i386/bits/statfs.h new file mode 100644 index 000000000..31ae564b4 --- /dev/null +++ b/libc/sysdeps/linux/i386/bits/statfs.h @@ -0,0 +1,61 @@ +/* Copyright (C) 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 + 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. */ + +#ifndef _SYS_STATFS_H +# error "Never include directly; use instead." +#endif + +#include /* for __fsid_t and __fsblkcnt_t*/ + +struct statfs + { + int f_type; + int f_bsize; +#ifndef __USE_FILE_OFFSET64 + __fsblkcnt_t f_blocks; + __fsblkcnt_t f_bfree; + __fsblkcnt_t f_bavail; + __fsfilcnt_t f_files; + __fsfilcnt_t f_ffree; +#else + __fsblkcnt64_t f_blocks; + __fsblkcnt64_t f_bfree; + __fsblkcnt64_t f_bavail; + __fsfilcnt64_t f_files; + __fsfilcnt64_t f_ffree; +#endif + __fsid_t f_fsid; + int f_namelen; + int f_spare[6]; + }; + +#ifdef __USE_LARGEFILE64 +struct statfs64 + { + int f_type; + int f_bsize; + __fsblkcnt64_t f_blocks; + __fsblkcnt64_t f_bfree; + __fsblkcnt64_t f_bavail; + __fsfilcnt64_t f_files; + __fsfilcnt64_t f_ffree; + __fsid_t f_fsid; + int f_namelen; + int f_spare[6]; + }; +#endif -- cgit v1.2.3