X-Git-Url: http://mj.ucw.cz/gitweb/?a=blobdiff_plain;ds=sidebyside;f=lib%2Flfs.h;h=5a9ab5d2493e6d8f4ff53331bdeffdbe27dabf9d;hb=ff36b07f44efa12a78809ee05bd6d0c25fc60495;hp=089fad358d1bef825833c3ac44a61f46662731c0;hpb=e7d3990e2780df560a0f8dfddda5df25f2d4ada1;p=libucw.git

diff --git a/lib/lfs.h b/lib/lfs.h
index 089fad35..5a9ab5d2 100644
--- a/lib/lfs.h
+++ b/lib/lfs.h
@@ -1,89 +1,51 @@
 /*
- *	Sherlock Library -- Large File Support
+ *	UCW Library -- Large File Support
  *
- *	(c) 1999 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>
 
-#ifndef O_LARGEFILE
-#if defined(__linux__) && defined(__i386__)
-#define O_LARGEFILE 0100000
-#else
-#error O_LARGEFILE unknown
-#endif
-#endif
+#ifdef CONFIG_LFS
 
-#define SHERLOCK_O_LARGEFILE O_LARGEFILE
+#define sh_open open64
+#define sh_seek lseek64
+#define sh_pread pread64
+#define sh_pwrite pwrite64
+#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
 
-#if 0
+#else	/* !CONFIG_LFS */
 
-/* A "do it yourself" solution */
+#define sh_open open
+#define sh_seek(f,o,w) lseek(f,o,w)
+#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
 
-#include <asm/unistd.h>
-#include <errno.h>
+#endif	/* !CONFIG_LFS */
 
-_syscall5(int, _llseek, int, fd, int, hi, int, lo, loff_t *, result, int, whence);
+#define HAVE_PREAD
 
-extern inline loff_t sh_seek(int fd, sh_off_t pos, int whence)
+static inline sh_off_t
+sh_file_size(byte *name)
 {
-  loff_t result;
-  int err;
-
-  err = _llseek(fd, pos >> 32, pos, &result, whence);
-  return (err < 0) ? err : result;
+  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;
 }
-#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
-
-#else	/* !SHERLOCK_CONFIG_LFS */
-
-#define sh_seek(f,o,w) lseek(f,o,w)
-#define SHERLOCK_O_LARGEFILE 0
-
-#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.
- */
-
-#ifdef __linux__
-#if defined(__GLIBC__) && __GLIBC__ == 2 && __GLIBC_MINOR__ > 0
-/* glibc 2.1 or newer -> pread/pwrite supported automatically */
-#define SHERLOCK_HAVE_PREAD
-#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 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 pwrite(unsigned int fd, void *buf, size_t size, loff_t where)
-{ return syscall(SYS_pwrite, fd, buf, size, where); }
-#define SHERLOCK_HAVE_PREAD
-#elif defined(i386)
-/* old libc on i386 -> call syscalls directly the old way */
-#include <asm/unistd.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 SHERLOCK_HAVE_PREAD
-#endif
-#endif	/* __linux__ */
 
-#endif	/* !_SHERLOCK_LFS_H */
+#endif	/* !_UCW_LFS_H */