diff options
author | Corinna Vinschen <corinna@vinschen.de> | 2010-07-05 20:59:56 +0400 |
---|---|---|
committer | Corinna Vinschen <corinna@vinschen.de> | 2010-07-05 20:59:56 +0400 |
commit | c492992f13f8a270e535fb49a50315c247e3848b (patch) | |
tree | de1653f49b1940cee039b3fdbb9e8d66020026ce /winsup/cygwin/dir.cc | |
parent | c8fe6dc446e6e106514dcc8755c682e6d8455268 (diff) |
Align seekdir and telldir API to POSIX definition.
* Makefile.in (NEW_FUNCTIONS): Remove seekdir and telldir mappings.
* dir.cc (telldir): Move functionality from telldir64 here. Use
long, rather than _off_t.
(telldir64): Just call telldir. Only keep for backward compatibility.
(seekdir): Move functionality from seekdir64 here. Use long, rather
than _off_t.
(seekdir64): Just call seekdir. Only keep for backward compatibility.
* fhandler.h: Throughout, change prototypes of seekdir and telldir
methods to use long, rather than _off64_t.
* fhandler_disk_file.cc: Change aforementioned methods accordingly.
* fhandler_netdrive.cc: Ditto.
* fhandler_registry.cc: Ditto.
* fhandler_virtual.cc: Ditto.
* include/sys/dirent.h (struct __DIR): Change __d_position from
_off_t to long to reflect API change.
(telldir): Change prototype to use long, rather than off_t.
(seekdir): Ditto.
Diffstat (limited to 'winsup/cygwin/dir.cc')
-rw-r--r-- | winsup/cygwin/dir.cc | 26 |
1 files changed, 16 insertions, 10 deletions
diff --git a/winsup/cygwin/dir.cc b/winsup/cygwin/dir.cc index 641aabe4b..c51cff701 100644 --- a/winsup/cygwin/dir.cc +++ b/winsup/cygwin/dir.cc @@ -187,8 +187,9 @@ readdir_r (DIR *dir, dirent *de, dirent **ode) return res; } -extern "C" _off64_t -telldir64 (DIR *dir) +/* telldir */ +extern "C" long +telldir (DIR *dir) { myfault efault; if (efault.faulted (EFAULT)) @@ -199,15 +200,18 @@ telldir64 (DIR *dir) return ((fhandler_base *) dir->__fh)->telldir (dir); } -/* telldir */ -extern "C" _off_t -telldir (DIR *dir) +/* telldir was never defined using off_t in POSIX, only in early versions + of glibc. We have to keep the function in as entry point for backward + compatibility. */ +extern "C" _off64_t +telldir64 (DIR *dir) { - return telldir64 (dir); + return (_off64_t) telldir (dir); } +/* seekdir */ extern "C" void -seekdir64 (DIR *dir, _off64_t loc) +seekdir (DIR *dir, long loc) { myfault efault; if (efault.faulted (EFAULT)) @@ -219,11 +223,13 @@ seekdir64 (DIR *dir, _off64_t loc) return ((fhandler_base *) dir->__fh)->seekdir (dir, loc); } -/* seekdir */ +/* seekdir was never defined using off_t in POSIX, only in early versions + of glibc. We have to keep the function in as entry point for backward + compatibility. */ extern "C" void -seekdir (DIR *dir, _off_t loc) +seekdir64 (DIR *dir, _off64_t loc) { - seekdir64 (dir, (_off64_t)loc); + seekdir (dir, (long) loc); } /* rewinddir: POSIX 5.1.2.1 */ |