#define DIR_SEPARATOR "/"
-struct SilcSFTPFilesystemOpsStruct silc_sftp_fs_memory;
+const struct SilcSFTPFilesystemOpsStruct silc_sftp_fs_memory;
-/* Memory filesystem entry */
typedef struct MemFSEntryStruct {
- char *name; /* Name of the entry */
- char *data; /* Data of the entry */
- bool directory; /* TRUE if this is directory */
- SilcSFTPFSMemoryPerm perm; /* Permissions */
struct MemFSEntryStruct **entry; /* Files and sub-directories */
- uint32 entry_count; /* Number of files and sub-directories */
+ SilcUInt32 entry_count; /* Number of files and sub-directories */
struct MemFSEntryStruct *parent; /* non-NULL if `directory' is TRUE,
includes parent directory. */
unsigned long created; /* Time of creation */
+ char *name; /* Name of the entry */
+ char *data; /* Data of the entry */
+ unsigned int directory : 1; /* Set if this is directory */
+ unsigned int perm : 7; /* Permissions */
} *MemFSEntry;
/* File handle. */
typedef struct {
- uint32 handle; /* Handle index */
+ SilcUInt32 handle; /* Handle index */
int fd; /* Real file handle */
MemFSEntry entry; /* Filesystem entry */
} *MemFSFileHandle;
MemFSEntry root; /* Root of the filesystem hierarchy */
SilcSFTPFSMemoryPerm root_perm;
MemFSFileHandle *handles; /* Open file handles */
- uint32 handles_count;
+ SilcUInt32 handles_count;
} *MemFS;
/* Generates absolute path from relative path that may include '.' and '..'
if (!dir->entry) {
dir->entry = silc_calloc(3, sizeof(*entry));
+ if (!dir->entry)
+ return FALSE;
dir->entry[0] = entry;
dir->entry_count = 3;
entry->created = time(0);
dir->entry = silc_realloc(dir->entry, sizeof(*dir->entry) *
(dir->entry_count + 3));
+ if (!dir->entry)
+ return FALSE;
for (i = dir->entry_count + 1; i < dir->entry_count + 3; i++)
dir->entry[i] = NULL;
dir->entry[dir->entry_count] = entry;
This does not check subdirectories recursively. */
static MemFSEntry mem_find_entry(MemFSEntry dir, const char *name,
- uint32 name_len)
+ SilcUInt32 name_len)
{
int i;
not check subdirectories recursively. */
static bool mem_del_entry_name(MemFSEntry dir, const char *name,
- uint32 name_len, bool check_perm)
+ SilcUInt32 name_len, bool check_perm)
{
MemFSEntry entry;
int i;
handle = silc_calloc(1, sizeof(*handle));
+ if (!handle)
+ return NULL;
handle->fd = fd;
handle->entry = entry;
if (!fs->handles) {
fs->handles = silc_calloc(5, sizeof(*fs->handles));
+ if (!fs->handles)
+ return NULL;
fs->handles[0] = handle;
fs->handles_count = 5;
fs->handles = silc_realloc(fs->handles, sizeof(*fs->handles) *
(fs->handles_count + 5));
+ if (!fs->handles)
+ return NULL;
for (i = fs->handles_count + 1; i < fs->handles_count + 5; i++)
fs->handles[i] = NULL;
fs->handles[fs->handles_count] = handle;
if (fs->handles[handle->handle] == handle) {
fs->handles[handle->handle] = NULL;
if (handle->fd != -1)
- close(handle->fd);
+ silc_file_close(handle->fd);
silc_free(handle);
return TRUE;
}
/* Find handle by handle index. */
-static MemFSFileHandle mem_find_handle(MemFS fs, uint32 handle)
+static MemFSFileHandle mem_find_handle(MemFS fs, SilcUInt32 handle)
{
if (handle > fs->handles_count)
return NULL;
MemFS fs;
fs = silc_calloc(1, sizeof(*fs));
+ if (!fs)
+ return NULL;
+
fs->root = silc_calloc(1, sizeof(*fs->root));
+ if (!fs->root) {
+ silc_free(fs);
+ return NULL;
+ }
+
fs->root->perm = perm;
fs->root_perm = perm;
fs->root->directory = TRUE;
fs->root->name = strdup(DIR_SEPARATOR);
filesystem = silc_calloc(1, sizeof(*filesystem));
- filesystem->fs = &silc_sftp_fs_memory;
+ if (!filesystem) {
+ silc_free(fs->root);
+ silc_free(fs);
+ return NULL;
+ }
+
+ filesystem->fs = (struct SilcSFTPFilesystemOpsStruct *)&silc_sftp_fs_memory;
filesystem->fs_context = (void *)fs;
return filesystem;
MemFSEntry entry;
entry = silc_calloc(1, sizeof(*entry));
+ if (!entry)
+ return NULL;
+
entry->perm = perm;
entry->name = strdup(name);
entry->directory = TRUE;
ret = mem_del_entry(memfs->root, FALSE);
memfs->root = silc_calloc(1, sizeof(*memfs->root));
+ if (!memfs->root)
+ return FALSE;
+
memfs->root->perm = memfs->root_perm;
memfs->root->directory = TRUE;
memfs->root->name = strdup(DIR_SEPARATOR);
MemFSEntry entry;
entry = silc_calloc(1, sizeof(*entry));
+ if (!entry)
+ return FALSE;
+
entry->perm = perm;
entry->name = strdup(filename);
entry->data = strdup(realpath);
SilcSFTPHandle mem_get_handle(void *context, SilcSFTP sftp,
const unsigned char *data,
- uint32 data_len)
+ SilcUInt32 data_len)
{
MemFS fs = (MemFS)context;
- uint32 handle;
+ SilcUInt32 handle;
if (data_len < 4)
return NULL;
unsigned char *mem_encode_handle(void *context, SilcSFTP sftp,
SilcSFTPHandle handle,
- uint32 *handle_len)
+ SilcUInt32 *handle_len)
{
unsigned char *data;
MemFSFileHandle h = (MemFSFileHandle)handle;
data = silc_calloc(4, sizeof(*data));
+ if (!data)
+ return NULL;
+
SILC_PUT32_MSB(h->handle, data);
*handle_len = 4;
-
return data;
}
flags |= O_APPEND;
/* Attempt to open the file for real. */
- fd = open(entry->data + 7, flags,
- (attrs->flags & SILC_SFTP_ATTR_PERMISSIONS ?
- attrs->permissions : 0600));
+ fd = silc_file_open_mode(entry->data + 7, flags,
+ (attrs->flags & SILC_SFTP_ATTR_PERMISSIONS ?
+ attrs->permissions : 0600));
if (fd == -1) {
(*callback)(sftp, silc_sftp_map_errno(errno), NULL, callback_context);
return;
/* File opened, return handle */
handle = mem_create_handle(fs, fd, entry);
- (*callback)(sftp, SILC_SFTP_STATUS_OK, (SilcSFTPHandle)handle,
- callback_context);
+ if (handle)
+ (*callback)(sftp, SILC_SFTP_STATUS_OK, (SilcSFTPHandle)handle,
+ callback_context);
+ else
+ (*callback)(sftp, SILC_SFTP_STATUS_PERMISSION_DENIED, NULL,
+ callback_context);
}
void mem_close(void *context, SilcSFTP sftp,
int ret;
if (h->fd != -1) {
- ret = close(h->fd);
+ ret = silc_file_close(h->fd);
if (ret == -1) {
(*callback)(sftp, silc_sftp_map_errno(errno), NULL, NULL,
callback_context);
void mem_read(void *context, SilcSFTP sftp,
SilcSFTPHandle handle,
- uint64 offset,
- uint32 len,
+ SilcUInt64 offset,
+ SilcUInt32 len,
SilcSFTPDataCallback callback,
void *callback_context)
{
len = 32768;
data = silc_malloc(len);
+ if (!data) {
+ (*callback)(sftp, SILC_SFTP_STATUS_EOF, NULL, 0, callback_context);
+ return;
+ }
lseek(h->fd, (off_t)offset, SEEK_SET);
/* Attempt to read */
- ret = read(h->fd, data, len);
+ ret = silc_file_read(h->fd, data, len);
if (ret <= 0) {
if (!ret)
(*callback)(sftp, SILC_SFTP_STATUS_EOF, NULL, 0, callback_context);
void mem_write(void *context, SilcSFTP sftp,
SilcSFTPHandle handle,
- uint64 offset,
+ SilcUInt64 offset,
const unsigned char *data,
- uint32 data_len,
+ SilcUInt32 data_len,
SilcSFTPStatusCallback callback,
void *callback_context)
{
lseek(h->fd, (off_t)offset, SEEK_SET);
/* Attempt to write */
- ret = write(h->fd, data, data_len);
+ ret = silc_file_write(h->fd, data, data_len);
if (ret <= 0) {
(*callback)(sftp, silc_sftp_map_errno(errno), NULL, NULL,
callback_context);
MemFSFileHandle handle;
if (!path || !strlen(path))
- path = (const char *)strdup("/");
+ path = (const char *)DIR_SEPARATOR;
/* Find such directory */
entry = mem_find_entry_path(fs->root, path);
/* Directory opened, return handle */
handle = mem_create_handle(fs, 0, entry);
- (*callback)(sftp, SILC_SFTP_STATUS_OK, (SilcSFTPHandle)handle,
- callback_context);
+ if (handle)
+ (*callback)(sftp, SILC_SFTP_STATUS_OK, (SilcSFTPHandle)handle,
+ callback_context);
+ else
+ (*callback)(sftp, SILC_SFTP_STATUS_PERMISSION_DENIED, NULL,
+ callback_context);
}
void mem_readdir(void *context, SilcSFTP sftp,
SilcSFTPAttributes attrs;
int i;
char long_name[256];
- unsigned long filesize = 0;
+ SilcUInt64 filesize = 0;
char *date;
struct stat stats;
}
name = silc_calloc(1, sizeof(*name));
+ if (!name) {
+ (*callback)(sftp, SILC_SFTP_STATUS_EOF, NULL, callback_context);
+ return;
+ }
for (i = h->fd; i < 100 + h->fd; i++) {
if (i >= h->entry->entry_count)
break;
if (strrchr(date, ':'))
*strrchr(date, ':') = '\0';
- if (!entry->directory)
-#ifndef SILC_WIN32\r
- if (!lstat(entry->data + 7, &stats))
-#else\r
- if (!stat(entry->data + 7, &stats))\r
-#endif\r
- filesize = stats.st_size;\r
+ if (!entry->directory) {
+ filesize = silc_file_size(entry->data + 7);
+ memset(&stats, 0, sizeof(stats));
+ stat(entry->data + 7, &stats);
+ }
/* Long name format is:
drwx------ 1 324210 Apr 8 08:40 mail/
1234567890 123 12345678 123456789012 */
snprintf(long_name, sizeof(long_name) - 1,
- "%c%c%c%c------ %3d %8lu %12s %s%s",
+ "%c%c%c%c------ %3d %8llu %12s %s%s",
(entry->directory ? 'd' : '-'),
((entry->perm & SILC_SFTP_FS_PERM_READ) ? 'r' : '-'),
((entry->perm & SILC_SFTP_FS_PERM_WRITE) ? 'w' : '-'),
/* Add attributes */
attrs = silc_calloc(1, sizeof(*attrs));
+ if (!attrs) {
+ (*callback)(sftp, SILC_SFTP_STATUS_EOF, NULL, callback_context);
+ return;
+ }
attrs->flags = (SILC_SFTP_ATTR_SIZE |
SILC_SFTP_ATTR_UIDGID);
attrs->size = filesize;
struct stat stats;
if (!path || !strlen(path))
- path = (const char *)strdup("/");
+ path = (const char *)DIR_SEPARATOR;
/* Find such directory */
entry = mem_find_entry_path(fs->root, path);
}
attrs = silc_calloc(1, sizeof(*attrs));
+ if (!attrs) {
+ (*callback)(sftp, SILC_SFTP_STATUS_FAILURE, NULL, callback_context);
+ return;
+ }
attrs->flags = (SILC_SFTP_ATTR_SIZE |
SILC_SFTP_ATTR_UIDGID |
SILC_SFTP_ATTR_ACMODTIME);
struct stat stats;
if (!path || !strlen(path))
- path = (const char *)strdup("/");
+ path = (const char *)DIR_SEPARATOR;
/* Find such directory */
entry = mem_find_entry_path(fs->root, path);
}
/* Get real stat */
-#ifndef SILC_WIN32\r
+#ifndef SILC_WIN32
ret = lstat(entry->data + 7, &stats);
-#else\r
- ret = stat(entry->data + 7, &stats);\r
-#endif\r
+#else
+ ret = stat(entry->data + 7, &stats);
+#endif
if (ret == -1) {
(*callback)(sftp, silc_sftp_map_errno(errno), NULL, callback_context);
return;
}
attrs = silc_calloc(1, sizeof(*attrs));
+ if (!attrs) {
+ (*callback)(sftp, SILC_SFTP_STATUS_FAILURE, NULL, callback_context);
+ return;
+ }
attrs->flags = (SILC_SFTP_ATTR_SIZE |
SILC_SFTP_ATTR_UIDGID |
SILC_SFTP_ATTR_ACMODTIME);
}
attrs = silc_calloc(1, sizeof(*attrs));
+ if (!attrs) {
+ (*callback)(sftp, SILC_SFTP_STATUS_FAILURE, NULL, callback_context);
+ return;
+ }
attrs->flags = (SILC_SFTP_ATTR_SIZE |
SILC_SFTP_ATTR_UIDGID |
SILC_SFTP_ATTR_ACMODTIME);
SilcSFTPName name;
if (!path || !strlen(path))
- path = (const char *)strdup("/");
+ path = (const char *)DIR_SEPARATOR;
realpath = mem_expand_path(fs->root, path);
- if (!realpath) {
- (*callback)(sftp, SILC_SFTP_STATUS_FAILURE, NULL, callback_context);
- return;
- }
+ if (!realpath)
+ goto fail;
name = silc_calloc(1, sizeof(*name));
+ if (!name)
+ goto fail;
+
name->filename = silc_calloc(1, sizeof(*name->filename));
+ if (!name->filename)
+ goto fail;
name->filename[0] = realpath;
name->long_filename = silc_calloc(1, sizeof(*name->long_filename));
+ if (!name->long_filename)
+ goto fail;
name->long_filename[0] = realpath;
name->attrs = silc_calloc(1, sizeof(*name->attrs));
+ if (!name->attrs)
+ goto fail;
name->attrs[0] = silc_calloc(1, sizeof(*name->attrs[0]));
+ if (!name->attrs[0])
+ goto fail;
name->count = 1;
(*callback)(sftp, SILC_SFTP_STATUS_FAILURE, (const SilcSFTPName)name,
callback_context);
silc_sftp_name_free(name);
+ return;
+
+ fail:
+ (*callback)(sftp, SILC_SFTP_STATUS_FAILURE, NULL, callback_context);
}
void mem_extended(void *context, SilcSFTP sftp,
const char *request,
const unsigned char *data,
- uint32 data_len,
+ SilcUInt32 data_len,
SilcSFTPExtendedCallback callback,
void *callback_context)
{
callback_context);
}
-struct SilcSFTPFilesystemOpsStruct silc_sftp_fs_memory = {
+const struct SilcSFTPFilesystemOpsStruct silc_sftp_fs_memory = {
mem_get_handle,
mem_encode_handle,
mem_open,
projects / silc.git / blobdiff