lib/libssh
1
0
Fork 0
mirror of https://git.libssh.org/projects/libssh.git synced 2025-11-27 13:21:11 +03:00
Code Activity

define our own platform-independent S_IF macros

Browse Source 
Signed-off-by: Tilo Eckert <tilo.eckert@flam.de>
Reviewed-by: Andreas Schneider <asn@cryptomilk.org>
This commit is contained in:
Tilo Eckert
2015-07-22 15:24:14 +02:00
committed by Andreas Schneider
parent 267fe02088
commit 71d86be42e
2 changed files with 26 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
include/libssh/sftp.h
View File

@@ -962,6 +962,16 @@ void sftp_handle_remove(sftp_session sftp, void *handle);
#define SSH_FXF_EXCL 0x20 #define SSH_FXF_EXCL 0x20
#define SSH_FXF_TEXT 0x40 #define SSH_FXF_TEXT 0x40
/* file type flags */
#define SSH_S_IFMT 00170000
#define SSH_S_IFSOCK 0140000
#define SSH_S_IFLNK 0120000
#define SSH_S_IFREG 0100000
#define SSH_S_IFBLK 0060000
#define SSH_S_IFDIR 0040000
#define SSH_S_IFCHR 0020000
#define SSH_S_IFIFO 0010000
/* rename flags */ /* rename flags */
#define SSH_FXF_RENAME_OVERWRITE 0x00000001 #define SSH_FXF_RENAME_OVERWRITE 0x00000001
#define SSH_FXF_RENAME_ATOMIC 0x00000002 #define SSH_FXF_RENAME_ATOMIC 0x00000002

40
src/sftp.c
View File

@@ -38,14 +38,6 @@
#ifndef _WIN32 #ifndef _WIN32
#include <netinet/in.h> #include <netinet/in.h>
#include <arpa/inet.h> #include <arpa/inet.h>
#else
#define S_IFSOCK 0140000
#define S_IFLNK 0120000
#ifdef _MSC_VER
#define S_IFBLK 0060000
#define S_IFIFO 0010000
#endif
#endif #endif
#include "libssh/priv.h" #include "libssh/priv.h"
@@ -1008,20 +1000,20 @@ static sftp_attributes sftp_parse_attr_4(sftp_session sftp, ssh_buffer buf,
attr->permissions = ntohl(attr->permissions); attr->permissions = ntohl(attr->permissions);
/* FIXME on windows! */ /* FIXME on windows! */
switch (attr->permissions & S_IFMT) { switch (attr->permissions & SSH_S_IFMT) {
case S_IFSOCK: case SSH_S_IFSOCK:
case S_IFBLK: case SSH_S_IFBLK:
case S_IFCHR: case SSH_S_IFCHR:
case S_IFIFO: case SSH_S_IFIFO:
attr->type = SSH_FILEXFER_TYPE_SPECIAL; attr->type = SSH_FILEXFER_TYPE_SPECIAL;
break; break;
case S_IFLNK: case SSH_S_IFLNK:
attr->type = SSH_FILEXFER_TYPE_SYMLINK; attr->type = SSH_FILEXFER_TYPE_SYMLINK;
break; break;
case S_IFREG: case SSH_S_IFREG:
attr->type = SSH_FILEXFER_TYPE_REGULAR; attr->type = SSH_FILEXFER_TYPE_REGULAR;
break; break;
case S_IFDIR: case SSH_S_IFDIR:
attr->type = SSH_FILEXFER_TYPE_DIRECTORY; attr->type = SSH_FILEXFER_TYPE_DIRECTORY;
break; break;
default: default:
@@ -1244,20 +1236,20 @@ static sftp_attributes sftp_parse_attr_3(sftp_session sftp, ssh_buffer buf,
goto error; goto error;
} }
switch (attr->permissions & S_IFMT) { switch (attr->permissions & SSH_S_IFMT) {
case S_IFSOCK: case SSH_S_IFSOCK:
case S_IFBLK: case SSH_S_IFBLK:
case S_IFCHR: case SSH_S_IFCHR:
case S_IFIFO: case SSH_S_IFIFO:
attr->type = SSH_FILEXFER_TYPE_SPECIAL; attr->type = SSH_FILEXFER_TYPE_SPECIAL;
break; break;
case S_IFLNK: case SSH_S_IFLNK:
attr->type = SSH_FILEXFER_TYPE_SYMLINK; attr->type = SSH_FILEXFER_TYPE_SYMLINK;
break; break;
case S_IFREG: case SSH_S_IFREG:
attr->type = SSH_FILEXFER_TYPE_REGULAR; attr->type = SSH_FILEXFER_TYPE_REGULAR;
break; break;
case S_IFDIR: case SSH_S_IFDIR:
attr->type = SSH_FILEXFER_TYPE_DIRECTORY; attr->type = SSH_FILEXFER_TYPE_DIRECTORY;
break; break;
default: default: