bungetc() is no longer passed the character to unget -- it always ungets

[libucw.git] / lib / lfs.h

diff --git a/lib/lfs.h b/lib/lfs.h
index ab9d8e7188de3ddec612196278fd76246a674f00..5802e1a4665eb60ae7ca6750c510fb0a5ac74c38 100644 (file)
--- a/lib/lfs.h
+++ b/lib/lfs.h
@@ -1,50 +1,35 @@
 /*
  *     Sherlock Library -- Large File Support
  *
- *     (c) 1999 Martin Mares, <mj@atrey.karlin.mff.cuni.cz>
+ *     (c) 1999--2002 Martin Mares <mj@ucw.cz>
  */
 
 #ifndef _SHERLOCK_LFS_H
 #define _SHERLOCK_LFS_H
 
-#ifdef SHERLOCK_CONFIG_LFS
-
-#ifndef O_LARGEFILE
-#if defined(__linux__) && defined(__i386__)
-#define O_LARGEFILE 0100000
-#else
-#error O_LARGEFILE unknown
-#endif
-#endif
-
-#if 0
-
-/* A "do it yourself" solution */
-
-#include <asm/unistd.h>
-#include <errno.h>
+#include <fcntl.h>
+#include <unistd.h>
 
-_syscall5(int, _llseek, int, fd, int, hi, int, lo, loff_t *, result, int, whence);
-
-extern 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
-
-/* 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)
+#ifdef SHERLOCK_CONFIG_LFS
 
-#endif
+#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
 
 #else  /* !SHERLOCK_CONFIG_LFS */
 
+#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
 
 #endif /* !SHERLOCK_CONFIG_LFS */
+
 #endif /* !_SHERLOCK_LFS_H */