summaryrefslogtreecommitdiff
path: root/e2fsprogs/blkid
diff options
context:
space:
mode:
authorMike Frysinger2005-06-28 23:50:18 +0000
committerMike Frysinger2005-06-28 23:50:18 +0000
commitfc379ba077d57e9c03339cbd21da2cad33592db4 (patch)
tree660202ab4c974731c650b4a633997ccda131eec9 /e2fsprogs/blkid
parent9e164578f2a93873023d2619c223a6e53951caf4 (diff)
downloadbusybox-fc379ba077d57e9c03339cbd21da2cad33592db4.zip
busybox-fc379ba077d57e9c03339cbd21da2cad33592db4.tar.gz
rip out all the non-linux code and ugly workarounds
Diffstat (limited to 'e2fsprogs/blkid')
-rw-r--r--e2fsprogs/blkid/llseek.c90
1 files changed, 3 insertions, 87 deletions
diff --git a/e2fsprogs/blkid/llseek.c b/e2fsprogs/blkid/llseek.c
index b5dde03..82388dd 100644
--- a/e2fsprogs/blkid/llseek.c
+++ b/e2fsprogs/blkid/llseek.c
@@ -19,70 +19,14 @@
#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)
{
@@ -109,31 +53,3 @@ blkid_loff_t blkid_llseek(int fd, blkid_loff_t offset, int whence)
}
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 */
-
-