X-Git-Url: http://mj.ucw.cz/gitweb/?a=blobdiff_plain;f=lib%2Flfs.h;h=3896c0e61d2655d4b1b0224f54a1593ad04495dd;hb=4adf195fb2f36dfbd054745469fa1c580de2f61b;hp=f12f5ef37e99e1014df6ec3cfbf2f7a46bf5163c;hpb=25c9f7352b4ff19e324e8997668197e7dc9db5fa;p=libucw.git

diff --git a/lib/lfs.h b/lib/lfs.h
index f12f5ef3..3896c0e6 100644
--- a/lib/lfs.h
+++ b/lib/lfs.h
@@ -1,137 +1,63 @@
 /*
- *	Sherlock Library -- Large File Support
+ *	UCW Library -- Large File Support
  *
- *	(c) 1999--2000 Martin Mares, <mj@atrey.karlin.mff.cuni.cz>
+ *	(c) 1999--2002 Martin Mares <mj@ucw.cz>
+ *
+ *	This software may be freely distributed and used according to the terms
+ *	of the GNU Lesser General Public License.
  */
 
-#ifndef _SHERLOCK_LFS_H
-#define _SHERLOCK_LFS_H
+#ifndef _UCW_LFS_H
+#define _UCW_LFS_H
 
-#ifdef SHERLOCK_CONFIG_LFS
+#include <fcntl.h>
+#include <unistd.h>
 
-#ifdef SHERLOCK_CONFIG_LFS_LIBC
-
-/*
- *  Unfortunately, we need to configure this manually since
- *  out-of-the-box glibc 2.1 offers the 64-bit calls, but
- *  converts them to 32-bit syscalls. Damn it!
- */
+#ifdef CONFIG_LFS
 
 #define sh_open open64
 #define sh_seek lseek64
 #define sh_pread pread64
 #define sh_pwrite pwrite64
-#define SHERLOCK_HAVE_PREAD
-
-#else
-
-/*
- *  Talk directly with the kernel. The LFS implementations of LFS in Linux 2.2
- *  and 2.4 differ, but fortunately for us only in things like stat64 which
- *  we don't need to use.
- */
-
-#ifndef O_LARGEFILE
-#if defined(__linux__) && defined(__i386__)
-#define O_LARGEFILE 0100000
-#else
-#error O_LARGEFILE unknown
-#endif
-#endif
-
-static inline int
-sh_open(char *name, int flags, int mode)
-{
-  return open(name, flags | O_LARGEFILE, mode);
-}
-
-#if 0
-
-/* A "do it yourself" solution */
-
-#include <asm/unistd.h>
-#include <errno.h>
-
-_syscall5(int, _llseek, int, fd, int, hi, int, lo, loff_t *, result, int, whence);
-
-static inline loff_t sh_seek(int fd, sh_off_t pos, int whence)
-{
-  loff_t result;
-  int err;
-
-  err = _llseek(fd, pos >> 32, pos, &result, whence);
-  return (err < 0) ? err : result;
-}
-#else
-
-#if defined(__GLIBC__) && __GLIBC__ == 2 && __GLIBC_MINOR__ > 0
-/* glibc 2.1 or newer -> has lseek64 */
-#define sh_seek(f,o,w) lseek64(f,o,w)
-#else
-/* Touching hidden places in glibc */
-extern loff_t llseek(int fd, loff_t pos, int whence);
-#define sh_seek(f,o,w) llseek(f,o,w)
-#endif
-
-#endif
-
-#endif  /* !SHERLOCK_CONFIG_LFS_LIBC */
+#define sh_ftruncate ftruncate64
+#define sh_mmap(a,l,p,f,d,o) mmap64(a,l,p,f,d,o)
+#define sh_pread pread64
+#define sh_pwrite pwrite64
+#define sh_stat stat64
+#define sh_fstat fstat64
+typedef struct stat64 sh_stat_t;
 
-#else	/* !SHERLOCK_CONFIG_LFS */
+#else	/* !CONFIG_LFS */
 
 #define sh_open open
 #define sh_seek(f,o,w) lseek(f,o,w)
-
-#endif	/* !SHERLOCK_CONFIG_LFS */
-
-/*
- *  We'd like to use pread/pwrite for our file accesses, but unfortunately it
- *  isn't simple at all since all libc's until glibc 2.1 don't define it.
- */
-
-#ifndef SHERLOCK_HAVE_PREAD
-
-#ifdef __linux__
-#define SHERLOCK_HAVE_PREAD
-#if defined(__GLIBC__) && __GLIBC__ == 2 && __GLIBC_MINOR__ > 0
-/* glibc 2.1 or newer -> pread/pwrite supported automatically */
-#ifdef SHERLOCK_CONFIG_LFS
-/* but have to use the 64-bit versions explicitly */
-#define sh_pread pread64
-#define sh_pwrite pwrite64
-#else
-#define sh_pread pread
-#define sh_pwrite pwrite
-#endif
-#elif defined(i386) && defined(__GLIBC__)
-/* glibc 2.0 on i386 -> call syscalls directly */
-#include <asm/unistd.h>
-#include <syscall-list.h>
-#include <sys/types.h>
-#include <unistd.h>
-#ifndef SYS_pread
-#define SYS_pread 180
-#endif
-static int sh_pread(unsigned int fd, void *buf, size_t size, loff_t where)
-{ return syscall(SYS_pread, fd, buf, size, where); }
-#ifndef SYS_pwrite
-#define SYS_pwrite 181
-#endif
-static int sh_pwrite(unsigned int fd, void *buf, size_t size, loff_t where)
-{ return syscall(SYS_pwrite, fd, buf, size, where); }
-#elif defined(i386)
-/* old libc on i386 -> call syscalls directly the old way */
-#include <asm/unistd.h>
-#include <errno.h>
-static _syscall4(int, pread, unsigned int, fd, void *, buf, size_t, size, loff_t, where);
-static _syscall4(int, pwrite, unsigned int, fd, void *, buf, size_t, size, loff_t, where);
+#define sh_ftruncate(f,o) ftruncate(f,o)
+#define sh_mmap(a,l,p,f,d,o) mmap(a,l,p,f,d,o)
 #define sh_pread pread
 #define sh_pwrite pwrite
+#define sh_stat stat
+#define sh_fstat fstat
+typedef struct stat sh_stat_t;
+
+#endif	/* !CONFIG_LFS */
+
+#if defined(_POSIX_SYNCHRONIZED_IO) && (_POSIX_SYNCHRONIZED_IO > 0)
+#define sh_fdatasync fdatasync
 #else
-#undef SHERLOCK_HAVE_PREAD
+#define sh_fdatasync fsync
 #endif
-#endif	/* __linux__ */
 
-#endif  /* !SHERLOCK_HAVE_PREAD */
+#define HAVE_PREAD
+
+static inline sh_off_t
+sh_file_size(byte *name)
+{
+  int fd = sh_open(name, O_RDONLY);
+  if (fd < 0)
+    die("Cannot open %s: %m", name);
+  sh_off_t len = sh_seek(fd, 0, SEEK_END);
+  close(fd);
+  return len;
+}
 
-#endif	/* !_SHERLOCK_LFS_H */
+#endif	/* !_UCW_LFS_H */