summaryrefslogtreecommitdiff
path: root/libc
diff options
context:
space:
mode:
authorEric Andersen <andersen@codepoet.org>2002-04-09 08:27:21 +0000
committerEric Andersen <andersen@codepoet.org>2002-04-09 08:27:21 +0000
commit30bd96dabe71bc0cadc1638101e910eefb1e1e61 (patch)
tree517fec806c921dfdb82ce6c68a523a49b7655ab7 /libc
parent5c86ab5bc17f0a4f87065a7acc6d9390f708a186 (diff)
undefine __USE_FILE_OFFSET64, since we absolutely do _NOT_ want interfaces
silently renamed under us or very bad things will happen. In this case, statfs64() ended up recurively calling statfs64() instead of statfs().... -Erik
Diffstat (limited to 'libc')
-rw-r--r--libc/misc/statfs/statfs64.c15
-rw-r--r--libc/sysdeps/linux/common/Makefile2
-rw-r--r--libc/sysdeps/linux/common/statfs64.c62
3 files changed, 9 insertions, 70 deletions
diff --git a/libc/misc/statfs/statfs64.c b/libc/misc/statfs/statfs64.c
index 187929286..b237624c3 100644
--- a/libc/misc/statfs/statfs64.c
+++ b/libc/misc/statfs/statfs64.c
@@ -19,23 +19,24 @@
#include <features.h>
-#ifdef __UCLIBC_HAVE_LFS__
-
#if defined _FILE_OFFSET_BITS && _FILE_OFFSET_BITS != 64
#undef _FILE_OFFSET_BITS
#define _FILE_OFFSET_BITS 64
#endif
-#ifndef __USE_FILE_OFFSET64
-# define __USE_FILE_OFFSET64 1
-#endif
#ifndef __USE_LARGEFILE64
# define __USE_LARGEFILE64 1
#endif
+/* We absolutely do _NOT_ want interfaces silently
+ * renamed under us or very bad things will happen... */
+#ifdef __USE_FILE_OFFSET64
+# undef __USE_FILE_OFFSET64
+#endif
-#include <errno.h>
#include <string.h>
-#include <sys/statfs.h>
#include <stddef.h>
+#include <sys/statfs.h>
+
+#if defined __UCLIBC_HAVE_LFS__
/* Return information about the filesystem on which FILE resides. */
int statfs64 (const char *file, struct statfs64 *buf)
diff --git a/libc/sysdeps/linux/common/Makefile b/libc/sysdeps/linux/common/Makefile
index 8f5f505e6..48214189e 100644
--- a/libc/sysdeps/linux/common/Makefile
+++ b/libc/sysdeps/linux/common/Makefile
@@ -32,7 +32,7 @@ endif
CSRC= waitpid.c kernel_version.c statfix.c getdnnm.c gethstnm.c \
mkfifo.c setegid.c wait.c getpagesize.c seteuid.c \
wait3.c setpgrp.c getdtablesize.c create_module.c ptrace.c \
- cmsg_nxthdr.c open64.c statfix64.c statfs64.c longjmp.c \
+ cmsg_nxthdr.c open64.c statfix64.c longjmp.c \
getrlimit64.c setrlimit64.c
ifneq ($(strip $(EXCLUDE_BRK)),true)
CSRC+=sbrk.c
diff --git a/libc/sysdeps/linux/common/statfs64.c b/libc/sysdeps/linux/common/statfs64.c
deleted file mode 100644
index 7d5060914..000000000
--- a/libc/sysdeps/linux/common/statfs64.c
+++ /dev/null
@@ -1,62 +0,0 @@
-/* Return information about the filesystem on which FILE resides.
- Copyright (C) 1996, 1997, 1998, 1999, 2000 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 Lesser General Public
- License as published by the Free Software Foundation; either
- version 2.1 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
- Lesser General Public License for more details.
-
- You should have received a copy of the GNU Lesser General Public
- License along with the GNU C Library; if not, write to the Free
- Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
- 02111-1307 USA. */
-
-#include <features.h>
-
-#if defined _FILE_OFFSET_BITS && _FILE_OFFSET_BITS != 64
-#undef _FILE_OFFSET_BITS
-#define _FILE_OFFSET_BITS 64
-#endif
-#ifndef __USE_FILE_OFFSET64
-# define __USE_FILE_OFFSET64 1
-#endif
-#ifndef __USE_LARGEFILE64
-# define __USE_LARGEFILE64 1
-#endif
-
-#include <string.h>
-#include <stddef.h>
-#include <sys/statfs.h>
-
-
-#if defined __UCLIBC_HAVE_LFS__
-
-/* Return information about the filesystem on which FILE resides. */
-int statfs64 (const char *file, struct statfs64 *buf)
-{
- struct statfs buf32;
-
- if (statfs (file, &buf32) < 0)
- return -1;
-
- buf->f_type = buf32.f_type;
- buf->f_bsize = buf32.f_bsize;
- buf->f_blocks = buf32.f_blocks;
- buf->f_bfree = buf32.f_bfree;
- buf->f_bavail = buf32.f_bavail;
- buf->f_files = buf32.f_files;
- buf->f_ffree = buf32.f_ffree;
- buf->f_fsid = buf32.f_fsid;
- buf->f_namelen = buf32.f_namelen;
- memcpy (buf->f_spare, buf32.f_spare, sizeof (buf32.f_spare));
-
- return 0;
-}
-
-#endif