diff --git a/NEWS b/NEWS index 49e7645..87973bd 100644 --- a/NEWS +++ b/NEWS @@ -27,8 +27,8 @@ Version 1.0 ( ) - Bug #1862727 fixed libssh2_poll() to work on windows (by defining HAVE_SELECT). -- Based on bug #1815692, we introduce libssh2_sftp_seek2() that allows seeking - beyond the 2GB margin even on 32bit machines. +- Based on bug #1815692, we introduce libssh2_sftp_seek64() that allows + seeking beyond the 2GB margin even on 32bit machines. - Based on a patch in bug #1878059 by Steven Ayre libssh2 now parses >2GB file sizes when downloading SCP files. diff --git a/docs/libssh2_sftp_seek.3 b/docs/libssh2_sftp_seek.3 index 6614881..f371d82 100644 --- a/docs/libssh2_sftp_seek.3 +++ b/docs/libssh2_sftp_seek.3 @@ -1,6 +1,6 @@ -.\" $Id: libssh2_sftp_seek.3,v 1.2 2008/09/29 14:11:30 bagder Exp $ +.\" $Id: libssh2_sftp_seek.3,v 1.3 2008/12/22 13:18:36 bagder Exp $ .\" -.TH libssh2_sftp_seek 3 "1 Jun 2007" "libssh2 0.15" "libssh2 manual" +.TH libssh2_sftp_seek 3 "22 Dec 2008" "libssh2 1.0" "libssh2 manual" .SH NAME libssh2_sftp_seek - set the read/write position indicator within a file .SH SYNOPSIS @@ -11,7 +11,7 @@ void libssh2_sftp_seek(LIBSSH2_SFTP_HANDLE *handle, size_t offset); void -libssh2_sftp_seek2(LIBSSH2_SFTP_HANDLE *handle, libssh2_uint64_t offset); +libssh2_sftp_seek64(LIBSSH2_SFTP_HANDLE *handle, libssh2_uint64_t offset); .SH DESCRIPTION \fIhandle\fP - SFTP File Handle as returned by @@ -24,8 +24,7 @@ Note that libssh2 implements file pointers as a localized concept to make file access appear more POSIX like. No packets are exchanged with the server during a seek operation. The localized file pointer is simply used as a convenience offset during read/write operations. - -Note that the \fBlibssh2_sftp_seek2(3)\fP function was added in 0.19 to make it -possible to seek in large files even on 32bit systems. +.SH AVAILABILITY +libssh2_sftp_seek64(3) was added in 1.0 .SH SEE ALSO .BR libssh2_sftp_open(3) diff --git a/include/libssh2_sftp.h b/include/libssh2_sftp.h index 0ad5c13..682c456 100644 --- a/include/libssh2_sftp.h +++ b/include/libssh2_sftp.h @@ -206,10 +206,11 @@ LIBSSH2_API int libssh2_sftp_close_handle(LIBSSH2_SFTP_HANDLE *handle); #define libssh2_sftp_closedir(handle) libssh2_sftp_close_handle(handle) LIBSSH2_API void libssh2_sftp_seek(LIBSSH2_SFTP_HANDLE *handle, size_t offset); -LIBSSH2_API void libssh2_sftp_seek2(LIBSSH2_SFTP_HANDLE *handle, libssh2_uint64_t offset); -#define libssh2_sftp_rewind(handle) libssh2_sftp_seek2((handle), 0) +LIBSSH2_API void libssh2_sftp_seek64(LIBSSH2_SFTP_HANDLE *handle, libssh2_uint64_t offset); +#define libssh2_sftp_rewind(handle) libssh2_sftp_seek64((handle), 0) LIBSSH2_API size_t libssh2_sftp_tell(LIBSSH2_SFTP_HANDLE *handle); +LIBSSH2_API libssh2_uint64_t libssh2_sftp_tell64(LIBSSH2_SFTP_HANDLE *handle); LIBSSH2_API int libssh2_sftp_fstat_ex(LIBSSH2_SFTP_HANDLE *handle, LIBSSH2_SFTP_ATTRIBUTES *attrs, int setstat); #define libssh2_sftp_fstat(handle, attrs) libssh2_sftp_fstat_ex((handle), (attrs), 0) diff --git a/src/sftp.c b/src/sftp.c index 24460e0..c3ba6b5 100644 --- a/src/sftp.c +++ b/src/sftp.c @@ -1540,11 +1540,11 @@ libssh2_sftp_seek(LIBSSH2_SFTP_HANDLE * handle, size_t offset) /* }}} */ -/* {{{ libssh2_sftp_seek2 +/* {{{ libssh2_sftp_seek64 * Set the read/write pointer to an arbitrary position within the file */ LIBSSH2_API void -libssh2_sftp_seek2(LIBSSH2_SFTP_HANDLE * handle, libssh2_uint64_t offset) +libssh2_sftp_seek64(LIBSSH2_SFTP_HANDLE * handle, libssh2_uint64_t offset) { handle->u.file.offset = offset; }