From e8073d35e16c95715b66cec97021333d16f95911 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Franti=C5=A1ek=20Boh=C3=A1=C4=8Dek?= Date: Tue, 22 Jun 2021 22:39:28 +0200 Subject: [PATCH] fix: some file access function types --- file-browser/include/file_access.h | 8 ++++---- file-browser/src/file_access.c | 12 +++++++++++- 2 files changed, 15 insertions(+), 5 deletions(-) diff --git a/file-browser/include/file_access.h b/file-browser/include/file_access.h index acd448303c19f94e7bbdcf97c6c28a2e238ac111..e23e61274a89dfb2fa1005137d7cecb7f0190d06 100644 --- a/file-browser/include/file_access.h +++ b/file-browser/include/file_access.h @@ -92,7 +92,7 @@ typedef file_operation_error_t (*close_directory_fn)(fileaccess_state_t state, typedef file_operation_error_t (*get_mime_type_fn)(fileaccess_state_t state, file_t *file, char *mime); -typedef pid_or_error_t (*execute_file_fn)(fileaccess_state_t state, +typedef executing_file_or_error_t (*execute_file_fn)(fileaccess_state_t state, file_t *file, char *args); typedef file_operation_error_t (*delete_directory_fn)(fileaccess_state_t state, @@ -159,15 +159,15 @@ file_operation_error_t fileaccess_directory_close(fileaccess_state_t state, directory_t *directory); file_operation_error_t fileaccess_directory_delete(fileaccess_state_t state, - directory_t *directory); + char *path); file_operation_error_t fileaccess_file_get_mimetype(fileaccess_state_t state, file_t *file, /*out*/ char *mime); -pid_or_error_t fileaccess_file_execute(fileaccess_state_t state, file_t *file, +executing_file_or_error_t fileaccess_file_execute(fileaccess_state_t state, file_t *file, char *args); -pid_or_error_t fileaccess_file_delete(fileaccess_state_t state, char *path); +file_operation_error_t fileaccess_file_delete(fileaccess_state_t state, char *path); file_operation_error_t file_operation_error_from_errno(int error); diff --git a/file-browser/src/file_access.c b/file-browser/src/file_access.c index d444efe1110195ec638ca63e83dc1ad9cf240a98..9a288d53c1d0d2ed082d2f0417b5f52bd3ed6359 100644 --- a/file-browser/src/file_access.c +++ b/file-browser/src/file_access.c @@ -31,17 +31,27 @@ file_operation_error_t fileaccess_directory_close(fileaccess_state_t state, return state.fileaccess->close_directory(state, directory); } +file_operation_error_t fileaccess_directory_delete(fileaccess_state_t state, + char *path) { + return state.fileaccess->delete_directory(state, path); +} + file_operation_error_t fileaccess_file_get_mimetype(fileaccess_state_t state, file_t *file, /*out*/ char *mime) { return state.fileaccess->get_mime_type(state, file, mime); } -pid_or_error_t fileaccess_file_execute(fileaccess_state_t state, file_t *file, +executing_file_or_error_t fileaccess_file_execute(fileaccess_state_t state, file_t *file, char *args) { return state.fileaccess->execute_file(state, file, args); } +file_operation_error_t fileaccess_file_delete(fileaccess_state_t state, + char *path) { + return state.fileaccess->delete_file(state, path); +} + file_operation_error_t file_operation_error_from_errno(int error) { switch (error) { case EACCES: