svn commit: trunk/uClibc/libc: misc/statfs sysdeps/linux/common unistd
aldot at uclibc.org
aldot at uclibc.org
Mon Jul 14 14:30:49 UTC 2008
Author: aldot
Date: 2008-07-14 07:30:48 -0700 (Mon, 14 Jul 2008)
New Revision: 22829
Log:
- improve UCLIBC_LINUX_SPECIFIC
compile-tested only, fixes
libc/misc/statfs/fstatfs64.c:29: error: 'fstatfs' undeclared here (not in a function)
Modified:
trunk/uClibc/libc/misc/statfs/Makefile.in
trunk/uClibc/libc/misc/statfs/fstatvfs.c
trunk/uClibc/libc/misc/statfs/fstatvfs64.c
trunk/uClibc/libc/misc/statfs/statvfs64.c
trunk/uClibc/libc/sysdeps/linux/common/fstatfs.c
trunk/uClibc/libc/unistd/fpathconf.c
Changeset:
Modified: trunk/uClibc/libc/misc/statfs/Makefile.in
===================================================================
--- trunk/uClibc/libc/misc/statfs/Makefile.in 2008-07-14 14:16:31 UTC (rev 22828)
+++ trunk/uClibc/libc/misc/statfs/Makefile.in 2008-07-14 14:30:48 UTC (rev 22829)
@@ -7,8 +7,11 @@
CSRC := statvfs.c fstatvfs.c
ifeq ($(UCLIBC_HAS_LFS),y)
-CSRC += fstatfs64.c statfs64.c statvfs64.c fstatvfs64.c
+ifeq ($(UCLIBC_LINUX_SPECIFIC),y)
+CSRC += fstatfs64.c statfs64.c
endif
+CSRC += statvfs64.c fstatvfs64.c
+endif
MISC_STATFS_DIR := $(top_srcdir)libc/misc/statfs
MISC_STATFS_OUT := $(top_builddir)libc/misc/statfs
Modified: trunk/uClibc/libc/misc/statfs/fstatvfs.c
===================================================================
--- trunk/uClibc/libc/misc/statfs/fstatvfs.c 2008-07-14 14:16:31 UTC (rev 22828)
+++ trunk/uClibc/libc/misc/statfs/fstatvfs.c 2008-07-14 14:30:48 UTC (rev 22829)
@@ -34,7 +34,6 @@
libc_hidden_proto(getmntent_r)
libc_hidden_proto(endmntent)
-#if !defined __UCLIBC_LINUX_SPECIFIC__
#ifndef __USE_FILE_OFFSET64
extern int fstatfs (int __fildes, struct statfs *__buf)
__THROW __nonnull ((2));
@@ -46,7 +45,7 @@
# define fstatfs fstatfs64
# endif
#endif
-#endif
+
extern __typeof(fstatfs) __libc_fstatfs;
libc_hidden_proto(__libc_fstatfs)
libc_hidden_proto(fstat)
Modified: trunk/uClibc/libc/misc/statfs/fstatvfs64.c
===================================================================
--- trunk/uClibc/libc/misc/statfs/fstatvfs64.c 2008-07-14 14:16:31 UTC (rev 22828)
+++ trunk/uClibc/libc/misc/statfs/fstatvfs64.c 2008-07-14 14:30:48 UTC (rev 22829)
@@ -28,6 +28,7 @@
#include <sys/statfs.h>
#include <sys/statvfs.h>
+
/* Experimentally off - libc_hidden_proto(memset) */
/* Experimentally off - libc_hidden_proto(strcmp) */
/* Experimentally off - libc_hidden_proto(strsep) */
@@ -37,19 +38,40 @@
#undef stat
#define stat stat64
+#if defined __UCLIBC_LINUX_SPECIFIC__
libc_hidden_proto(fstatfs64)
libc_hidden_proto(fstat64)
+#endif
libc_hidden_proto(stat64)
int fstatvfs64 (int fd, struct statvfs64 *buf)
{
struct statfs64 fsbuf;
struct stat64 st;
+#if !defined __UCLIBC_LINUX_SPECIFIC__
+ int ret;
+ struct statvfs buf32;
+ ret = fstatvfs (fd, &buf32);
+ if (ret == 0) {
+ fsbuf.f_bsize = buf32.f_bsize;
+ fsbuf.f_frsize = buf32.f_frsize;
+ fsbuf.f_blocks = buf32.f_blocks;
+ fsbuf.f_bfree = buf32.f_bfree;
+ fsbuf.f_bavail = buf32.f_bavail;
+ fsbuf.f_files = buf32.f_files;
+ fsbuf.f_ffree = buf32.f_ffree;
+ if (sizeof (fsbuf.f_fsid) == sizeof(buf32.f_fsid))
+ memcpy (&fsbuf.f_fsid, &buf32.f_fsid, sizeof(fsbuf.f_fsid));
+ /* and if not, then you could approximate or whatever.. */
+ fsbuf.f_namelen = buf32.f_namemax;
+ } else
+ return ret;
+#else
/* Get as much information as possible from the system. */
if (fstatfs64 (fd, &fsbuf) < 0)
return -1;
-
+#endif
#define STAT(st) fstat64 (fd, st)
#include "internal_statvfs.c"
Modified: trunk/uClibc/libc/misc/statfs/statvfs64.c
===================================================================
--- trunk/uClibc/libc/misc/statfs/statvfs64.c 2008-07-14 14:16:31 UTC (rev 22828)
+++ trunk/uClibc/libc/misc/statfs/statvfs64.c 2008-07-14 14:30:48 UTC (rev 22829)
@@ -37,18 +37,41 @@
#undef stat
#define stat stat64
+#if !defined __UCLIBC_LINUX_SPECIFIC__
libc_hidden_proto(statfs64)
+#else
+libc_hidden_proto(statvfs)
+#endif
libc_hidden_proto(stat64)
int statvfs64 (const char *file, struct statvfs64 *buf)
{
struct statfs64 fsbuf;
struct stat64 st;
+#if !defined __UCLIBC_LINUX_SPECIFIC__
+ int ret;
+ struct statvfs buf32;
+ ret = statvfs (file, &buf32);
+ if (ret == 0) {
+ fsbuf.f_bsize = buf32.f_bsize;
+ fsbuf.f_frsize = buf32.f_frsize;
+ fsbuf.f_blocks = buf32.f_blocks;
+ fsbuf.f_bfree = buf32.f_bfree;
+ fsbuf.f_bavail = buf32.f_bavail;
+ fsbuf.f_files = buf32.f_files;
+ fsbuf.f_ffree = buf32.f_ffree;
+ if (sizeof (fsbuf.f_fsid) == sizeof(buf32.f_fsid))
+ memcpy (&fsbuf.f_fsid, &buf32.f_fsid, sizeof(fsbuf.f_fsid));
+ /* and if not, then you could approximate or whatever.. */
+ fsbuf.f_namelen = buf32.f_namemax;
+ } else
+ return ret;
+#else
/* Get as much information as possible from the system. */
if (statfs64 (file, &fsbuf) < 0)
return -1;
-
+#endif
#define STAT(st) stat (file, st)
#include "internal_statvfs.c"
Modified: trunk/uClibc/libc/sysdeps/linux/common/fstatfs.c
===================================================================
--- trunk/uClibc/libc/sysdeps/linux/common/fstatfs.c 2008-07-14 14:16:31 UTC (rev 22828)
+++ trunk/uClibc/libc/sysdeps/linux/common/fstatfs.c 2008-07-14 14:30:48 UTC (rev 22829)
@@ -10,7 +10,6 @@
#include <sys/syscall.h>
#include <sys/vfs.h>
-#if !defined __UCLIBC_LINUX_SPECIFIC__
#ifndef __USE_FILE_OFFSET64
extern int fstatfs (int __fildes, struct statfs *__buf)
__THROW __nonnull ((2));
@@ -22,7 +21,7 @@
# define fstatfs fstatfs64
# endif
#endif
-#endif
+
extern __typeof(fstatfs) __libc_fstatfs;
libc_hidden_proto(__libc_fstatfs)
#define __NR___libc_fstatfs __NR_fstatfs
Modified: trunk/uClibc/libc/unistd/fpathconf.c
===================================================================
--- trunk/uClibc/libc/unistd/fpathconf.c 2008-07-14 14:16:31 UTC (rev 22828)
+++ trunk/uClibc/libc/unistd/fpathconf.c 2008-07-14 14:30:48 UTC (rev 22829)
@@ -32,7 +32,7 @@
//#include "linux_fsinfo.h"
libc_hidden_proto(fstat)
-#if !defined __UCLIBC_LINUX_SPECIFIC__
+
#ifndef __USE_FILE_OFFSET64
extern int fstatfs (int __fildes, struct statfs *__buf)
__THROW __nonnull ((2));
@@ -44,7 +44,7 @@
# define fstatfs fstatfs64
# endif
#endif
-#endif
+
extern __typeof(fstatfs) __libc_fstatfs;
libc_hidden_proto(__libc_fstatfs)
More information about the uClibc-cvs
mailing list