X-Git-Url: http://mj.ucw.cz/gitweb/?a=blobdiff_plain;ds=sidebyside;f=lib%2Flfs.h;h=5aac2363015ac5f22e3b0950e1679b3ce073bb0a;hb=d1a5b69d490ce61a0f41db08263580487720bf2f;hp=59b9a5e108cf743322369a0c1edf2f841fe5b2f5;hpb=f95c936825d0d4150d9ee2484c6b50a1596bb8dc;p=libucw.git

diff --git a/lib/lfs.h b/lib/lfs.h
index 59b9a5e1..5aac2363 100644
--- a/lib/lfs.h
+++ b/lib/lfs.h
@@ -1,53 +1,55 @@
 /*
- *	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
+#define sh_stat stat64
+typedef struct stat64 sh_stat_t;
 
-#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
+#define sh_stat stat
+typedef struct stat sh_stat_t;
 
-#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 */
-#endif	/* !_SHERLOCK_LFS_H */
+#endif	/* !_UCW_LFS_H */