[BusyBox-cvs] svn commit: trunk/busybox/e2fsprogs: blkid ext2fs

[vapier at busybox.net]

Author: vapier
Date: 2005-06-28 17:50:18 -0600 (Tue, 28 Jun 2005)
New Revision: 10608

Log:
rip out all the non-linux code and ugly workarounds

Modified:
   trunk/busybox/e2fsprogs/blkid/llseek.c
   trunk/busybox/e2fsprogs/ext2fs/llseek.c


Changeset:
Modified: trunk/busybox/e2fsprogs/blkid/llseek.c
===================================================================
--- trunk/busybox/e2fsprogs/blkid/llseek.c	2005-06-27 23:31:24 UTC (rev 10607)
+++ trunk/busybox/e2fsprogs/blkid/llseek.c	2005-06-28 23:50:18 UTC (rev 10608)
@@ -19,71 +19,15 @@
 #if HAVE_UNISTD_H
 #include <unistd.h>
 #endif
-#ifdef __MSDOS__
-#include <io.h>
-#endif
 
 #include "blkidP.h"
 
-#ifdef __linux__
-
-#if defined(HAVE_LSEEK64) && defined(HAVE_LSEEK64_PROTOTYPE)
-
-#define my_llseek lseek64
-
-#elif defined(HAVE_LLSEEK)
-#include <syscall.h>
-
-#ifndef HAVE_LLSEEK_PROTOTYPE
-extern long long llseek(int fd, long long offset, int origin);
-#endif
-
-#define my_llseek llseek
-
-#else	/* ! HAVE_LLSEEK */
-
-#if defined(__alpha__) || defined(__ia64__)
-
-#define llseek lseek
-
-#else /* !__alpha__ && !__ia64__*/
-
-#include <linux/unistd.h>
-
-#ifndef __NR__llseek
-#define __NR__llseek            140
-#endif
-
-#ifndef __i386__
-static int _llseek(unsigned int, unsigned long, unsigned long,
-		   blkid_loff_t *, unsigned int);
-
-static _syscall5(int, _llseek, unsigned int, fd, unsigned long, offset_high,
-		 unsigned long, offset_low, blkid_loff_t *, result,
-		 unsigned int, origin)
-#endif
-
-static blkid_loff_t my_llseek(int fd, blkid_loff_t offset, int origin)
-{
-	blkid_loff_t result;
-	int retval;
-
-#ifndef __i386__
-	retval = _llseek(fd, ((unsigned long long) offset) >> 32,
-			 ((unsigned long long)offset) & 0xffffffff,
-			 &result, origin);
+#ifdef CONFIG_LFS
+# define my_llseek lseek64
 #else
-	retval = syscall(__NR__llseek, fd, ((unsigned long long) offset) >> 32,
-			 ((unsigned long long)offset) & 0xffffffff,
-			 &result, origin);
+# define my_llseek lseek
 #endif
-	return (retval == -1 ? (blkid_loff_t) retval : result);
-}
 
-#endif	/* __alpha__ || __ia64__ */
-
-#endif /* HAVE_LLSEEK */
-
 blkid_loff_t blkid_llseek(int fd, blkid_loff_t offset, int whence)
 {
 	blkid_loff_t result;
@@ -109,31 +53,3 @@
 	}
 	return result;
 }
-
-#else /* !linux */
-
-#ifndef EOVERFLOW
-#ifdef EXT2_ET_INVALID_ARGUMENT
-#define EOVERFLOW EXT2_ET_INVALID_ARGUMENT
-#else
-#define EOVERFLOW 112
-#endif
-#endif
-
-blkid_loff_t blkid_llseek(int fd, blkid_loff_t offset, int origin)
-{
-#if defined(HAVE_LSEEK64) && defined(HAVE_LSEEK64_PROTOTYPE)
-	return lseek64 (fd, offset, origin);
-#else
-	if ((sizeof(off_t) < sizeof(blkid_loff_t)) &&
-	    (offset >= ((blkid_loff_t) 1 << ((sizeof(off_t)*8) - 1)))) {
-		errno = EOVERFLOW;
-		return -1;
-	}
-	return lseek(fd, (off_t) offset, origin);
-#endif
-}
-
-#endif	/* linux */
-
-

Modified: trunk/busybox/e2fsprogs/ext2fs/llseek.c
===================================================================
--- trunk/busybox/e2fsprogs/ext2fs/llseek.c	2005-06-27 23:31:24 UTC (rev 10607)
+++ trunk/busybox/e2fsprogs/ext2fs/llseek.c	2005-06-28 23:50:18 UTC (rev 10608)
@@ -4,8 +4,8 @@
  * Copyright (C) 1994, 1995, 1996, 1997 Theodore Ts'o.
  *
  * %Begin-Header%
- * This file may be redistributed under the terms of the GNU Public
- * License.
+ * This file may be redistributed under the terms of the
+ * GNU Lesser General Public License.
  * %End-Header%
  */
 
@@ -19,70 +19,15 @@
 #if HAVE_UNISTD_H
 #include <unistd.h>
 #endif
-#ifdef __MSDOS__
-#include <io.h>
-#endif
+
 #include "ext2fs/ext2_io.h"
 
-#ifdef __linux__
-
-#if defined(HAVE_LSEEK64) && defined(HAVE_LSEEK64_PROTOTYPE)
-
-#define my_llseek lseek64
-
+#ifdef CONFIG_LFS
+# define my_llseek lseek64
 #else
-#if defined(HAVE_LLSEEK)
-#include <syscall.h>
-
-#ifndef HAVE_LLSEEK_PROTOTYPE
-extern long long llseek (int fd, long long offset, int origin);
+# define my_llseek lseek
 #endif
 
-#define my_llseek llseek
-
-#else	/* ! HAVE_LLSEEK */
-
-#if defined(__alpha__) || defined (__ia64__)
-
-#define llseek lseek
-
-#else /* !__alpha__ && !__ia64__*/
-
-#include <linux/unistd.h>
-
-#ifndef __NR__llseek
-#define __NR__llseek            140
-#endif
-
-#ifndef __i386__
-static int _llseek (unsigned int, unsigned long,
-		   unsigned long, ext2_loff_t *, unsigned int);
-
-static _syscall5(int,_llseek,unsigned int,fd,unsigned long,offset_high,
-		 unsigned long, offset_low,ext2_loff_t *,result,
-		 unsigned int, origin)
-#endif
-
-static ext2_loff_t my_llseek (int fd, ext2_loff_t offset, int origin)
-{
-	ext2_loff_t result;
-	int retval;
-
-#ifndef __i386__
-	retval = _llseek(fd, ((unsigned long long) offset) >> 32,
-#else			  
-	retval = syscall(__NR__llseek, fd, (unsigned long long) (offset >> 32),
-#endif
-			  ((unsigned long long) offset) & 0xffffffff,
-			&result, origin);
-	return (retval == -1 ? (ext2_loff_t) retval : result);
-}
-
-#endif	/* __alpha__ || __ia64__ */
-
-#endif /* HAVE_LLSEEK */
-#endif /* defined(HAVE_LSEEK64) && defined(HAVE_LSEEK64_PROTOTYPE) */
-
 ext2_loff_t ext2fs_llseek (int fd, ext2_loff_t offset, int origin)
 {
 	ext2_loff_t result;
@@ -108,27 +53,3 @@
 	}
 	return result;
 }
-
-#else /* !linux */
-
-#ifndef EINVAL
-#define EINVAL EXT2_ET_INVALID_ARGUMENT
-#endif
-
-ext2_loff_t ext2fs_llseek (int fd, ext2_loff_t offset, int origin)
-{
-#if defined(HAVE_LSEEK64) && defined(HAVE_LSEEK64_PROTOTYPE)
-	return lseek64 (fd, offset, origin);
-#else
-	if ((sizeof(off_t) < sizeof(ext2_loff_t)) &&
-	    (offset >= ((ext2_loff_t) 1 << ((sizeof(off_t)*8) -1)))) {
-		errno = EINVAL;
-		return -1;
-	}
-	return lseek (fd, (off_t) offset, origin);
-#endif
-}
-
-#endif 	/* linux */
-
-