svn commit: trunk/uClibc/libc/misc: file glob statfs
psm at uclibc.org
psm at uclibc.org
Sun Feb 26 13:24:44 UTC 2006
Author: psm
Date: 2006-02-26 05:24:42 -0800 (Sun, 26 Feb 2006)
New Revision: 14300
Log:
Use _lfs_64, reorganize a bit, why did stat*fs64 use stat*fs?
Modified:
trunk/uClibc/libc/misc/file/lockf64.c
trunk/uClibc/libc/misc/glob/glob64.c
trunk/uClibc/libc/misc/statfs/fstatfs64.c
trunk/uClibc/libc/misc/statfs/fstatvfs64.c
trunk/uClibc/libc/misc/statfs/statfs64.c
trunk/uClibc/libc/misc/statfs/statvfs64.c
Changeset:
Modified: trunk/uClibc/libc/misc/file/lockf64.c
===================================================================
--- trunk/uClibc/libc/misc/file/lockf64.c 2006-02-26 13:15:31 UTC (rev 14299)
+++ trunk/uClibc/libc/misc/file/lockf64.c 2006-02-26 13:24:42 UTC (rev 14300)
@@ -16,21 +16,8 @@
write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
Boston, MA 02111-1307, USA. */
-#include <features.h>
+#include <_lfs_64.h>
-#ifdef __UCLIBC_HAS_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
-#endif
-
#include <sys/types.h>
#include <unistd.h>
#include <fcntl.h>
@@ -43,16 +30,17 @@
#define fcntl fcntl64
#define F_GETLK F_GETLK64
#define F_SETLK F_SETLK64
+libc_hidden_proto(fcntl64)
+#else
+libc_hidden_proto(fcntl)
#endif
-libc_hidden_proto(lockf64)
-
libc_hidden_proto(memset)
-libc_hidden_proto(fcntl64)
libc_hidden_proto(getpid)
/* lockf is a simplified interface to fcntl's locking facilities. */
+libc_hidden_proto(lockf64)
int lockf64 (int fd, int cmd, off64_t len64)
{
struct flock fl;
Modified: trunk/uClibc/libc/misc/glob/glob64.c
===================================================================
--- trunk/uClibc/libc/misc/glob/glob64.c 2006-02-26 13:15:31 UTC (rev 14299)
+++ trunk/uClibc/libc/misc/glob/glob64.c 2006-02-26 13:24:42 UTC (rev 14300)
@@ -4,22 +4,8 @@
* Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball.
*/
-#include <features.h>
+#include <_lfs_64.h>
-#ifdef __UCLIBC_HAS_LFS__
-
-#if defined _FILE_OFFSET_BITS && _FILE_OFFSET_BITS != 64
-#undef _FILE_OFFSET_BITS
-#define _FILE_OFFSET_BITS 64
-#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 <dirent.h>
#include <glob.h>
#include <sys/stat.h>
@@ -38,5 +24,3 @@
#define __GLOB64 1
#include "glob.c"
-
-#endif
Modified: trunk/uClibc/libc/misc/statfs/fstatfs64.c
===================================================================
--- trunk/uClibc/libc/misc/statfs/fstatfs64.c 2006-02-26 13:15:31 UTC (rev 14299)
+++ trunk/uClibc/libc/misc/statfs/fstatfs64.c 2006-02-26 13:24:42 UTC (rev 14300)
@@ -17,33 +17,19 @@
Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
02111-1307 USA. */
-#include <features.h>
+#include <_lfs_64.h>
-#if defined _FILE_OFFSET_BITS && _FILE_OFFSET_BITS != 64
-#undef _FILE_OFFSET_BITS
-#define _FILE_OFFSET_BITS 64
-#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 <sys/statvfs.h>
#include <stddef.h>
-libc_hidden_proto(fstatfs64)
-
libc_hidden_proto(memcpy)
libc_hidden_proto(fstatfs)
/* Return information about the filesystem on which FD resides. */
+libc_hidden_proto(fstatfs64)
int fstatfs64 (int fd, struct statfs64 *buf)
{
struct statfs buf32;
Modified: trunk/uClibc/libc/misc/statfs/fstatvfs64.c
===================================================================
--- trunk/uClibc/libc/misc/statfs/fstatvfs64.c 2006-02-26 13:15:31 UTC (rev 14299)
+++ trunk/uClibc/libc/misc/statfs/fstatvfs64.c 2006-02-26 13:24:42 UTC (rev 14300)
@@ -17,19 +17,8 @@
Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
02111-1307 USA. */
-#include <features.h>
+#include <_lfs_64.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 <errno.h>
#include <mntent.h>
#include <paths.h>
@@ -52,7 +41,7 @@
libc_hidden_proto(fstat64)
libc_hidden_proto(stat64)
-int fstatvfs (int fd, struct statvfs *buf)
+int fstatvfs64 (int fd, struct statvfs64 *buf)
{
struct statfs64 fsbuf;
struct stat64 st;
Modified: trunk/uClibc/libc/misc/statfs/statfs64.c
===================================================================
--- trunk/uClibc/libc/misc/statfs/statfs64.c 2006-02-26 13:15:31 UTC (rev 14299)
+++ trunk/uClibc/libc/misc/statfs/statfs64.c 2006-02-26 13:24:42 UTC (rev 14300)
@@ -17,31 +17,18 @@
Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
02111-1307 USA. */
-#include <features.h>
+#include <_lfs_64.h>
-#if defined _FILE_OFFSET_BITS && _FILE_OFFSET_BITS != 64
-#undef _FILE_OFFSET_BITS
-#define _FILE_OFFSET_BITS 64
-#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 <string.h>
#include <stddef.h>
#include <sys/statfs.h>
-libc_hidden_proto(statfs64)
libc_hidden_proto(memcpy)
libc_hidden_proto(statfs)
/* Return information about the filesystem on which FILE resides. */
+libc_hidden_proto(statfs64)
int statfs64 (const char *file, struct statfs64 *buf)
{
struct statfs buf32;
Modified: trunk/uClibc/libc/misc/statfs/statvfs64.c
===================================================================
--- trunk/uClibc/libc/misc/statfs/statvfs64.c 2006-02-26 13:15:31 UTC (rev 14299)
+++ trunk/uClibc/libc/misc/statfs/statvfs64.c 2006-02-26 13:24:42 UTC (rev 14300)
@@ -17,21 +17,8 @@
Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
02111-1307 USA. */
-#include <features.h>
+#include <_lfs_64.h>
-#ifdef __UCLIBC_HAS_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
-#endif
-
#include <errno.h>
#include <mntent.h>
#include <paths.h>
@@ -53,7 +40,7 @@
libc_hidden_proto(statfs64)
libc_hidden_proto(stat64)
-int statvfs (const char *file, struct statvfs *buf)
+int statvfs64 (const char *file, struct statvfs64 *buf)
{
struct statfs64 fsbuf;
struct stat64 st;
More information about the uClibc-cvs
mailing list