shinys000114/libssh
1
0
Fork 0
mirror of https://git.libssh.org/projects/libssh.git synced 2026-02-11 18:50:28 +09:00
Code Issues Packages Projects Releases Wiki Activity

Don't shadow a global variable declaration on unistd.h.

Browse Source 
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@398 7dcaeef0-15fb-0310-b436-a5af3365683c
This commit is contained in:
Andreas Schneider
2009-04-05 10:15:57 +00:00
parent 58fd38cd90
commit 01e789184a
2 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
include/libssh/sftp.h
View File

@@ -340,7 +340,8 @@ int sftp_file_close(SFTP_FILE *file) SFTP_DEPRECATED;
* @return A sftp file handle, NULL on error with ssh and sftp * @return A sftp file handle, NULL on error with ssh and sftp
* error set. * error set.
*/ */
SFTP_FILE *sftp_open(SFTP_SESSION *session, const char *file, int access, mode_t mode); SFTP_FILE *sftp_open(SFTP_SESSION *session, const char *file, int flags,
mode_t mode);
void sftp_file_set_nonblocking(SFTP_FILE *handle); void sftp_file_set_nonblocking(SFTP_FILE *handle);

14
libssh/sftp.c
View File

@@ -987,7 +987,7 @@ int sftp_closedir(SFTP_DIR *dir){
} }
/* Open a file on the server. */ /* Open a file on the server. */
SFTP_FILE *sftp_open(SFTP_SESSION *sftp, const char *file, int access, mode_t mode){ SFTP_FILE *sftp_open(SFTP_SESSION *sftp, const char *file, int flags, mode_t mode){
SFTP_FILE *handle; SFTP_FILE *handle;
SFTP_MESSAGE *msg=NULL; SFTP_MESSAGE *msg=NULL;
STATUS_MESSAGE *status; STATUS_MESSAGE *status;
@@ -1001,17 +1001,17 @@ SFTP_FILE *sftp_open(SFTP_SESSION *sftp, const char *file, int access, mode_t mo
attr.permissions = mode; attr.permissions = mode;
attr.flags = SSH_FILEXFER_ATTR_PERMISSIONS; attr.flags = SSH_FILEXFER_ATTR_PERMISSIONS;
if(access == O_RDONLY) if(flags == O_RDONLY)
flags|=SSH_FXF_READ; // if any of the other flag is set, READ should not be set initialy flags|=SSH_FXF_READ; // if any of the other flag is set, READ should not be set initialy
if(access & O_WRONLY) if(flags & O_WRONLY)
flags |= SSH_FXF_WRITE; flags |= SSH_FXF_WRITE;
if(access & O_RDWR) if(flags & O_RDWR)
flags|=(SSH_FXF_WRITE | SSH_FXF_READ); flags|=(SSH_FXF_WRITE | SSH_FXF_READ);
if(access & O_CREAT) if(flags & O_CREAT)
flags |=SSH_FXF_CREAT; flags |=SSH_FXF_CREAT;
if(access & O_TRUNC) if(flags & O_TRUNC)
flags |=SSH_FXF_TRUNC; flags |=SSH_FXF_TRUNC;
if(access & O_EXCL) if(flags & O_EXCL)
flags |= SSH_FXF_EXCL; flags |= SSH_FXF_EXCL;
buffer_add_u32(buffer,id); buffer_add_u32(buffer,id);
filename=string_from_char(file); filename=string_from_char(file);