Don't shadow a global variable declaration on unistd.h.
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@398 7dcaeef0-15fb-0310-b436-a5af3365683c
Этот коммит содержится в:
родитель
58fd38cd90
Коммит
01e789184a
@ -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
|
||||
* 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);
|
||||
|
||||
|
@ -987,7 +987,7 @@ int sftp_closedir(SFTP_DIR *dir){
|
||||
}
|
||||
|
||||
/* 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_MESSAGE *msg=NULL;
|
||||
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.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
|
||||
if(access & O_WRONLY)
|
||||
if(flags & O_WRONLY)
|
||||
flags |= SSH_FXF_WRITE;
|
||||
if(access & O_RDWR)
|
||||
if(flags & O_RDWR)
|
||||
flags|=(SSH_FXF_WRITE | SSH_FXF_READ);
|
||||
if(access & O_CREAT)
|
||||
if(flags & O_CREAT)
|
||||
flags |=SSH_FXF_CREAT;
|
||||
if(access & O_TRUNC)
|
||||
if(flags & O_TRUNC)
|
||||
flags |=SSH_FXF_TRUNC;
|
||||
if(access & O_EXCL)
|
||||
if(flags & O_EXCL)
|
||||
flags |= SSH_FXF_EXCL;
|
||||
buffer_add_u32(buffer,id);
|
||||
filename=string_from_char(file);
|
||||
|
Загрузка…
Ссылка в новой задаче
Block a user