Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 38 additions & 0 deletions extmod/vfs.c
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,25 @@
// A fixed maximum size is used to avoid the need for a costly variable array.
#define PROXY_MAX_ARGS (2)

// Declare the global vfs object to be changed by main.c and mp
mp_vfs_mount_t *main_vfs = NULL;

// Function to set the exec_allowed value
void vfs_set_exec_allowed(bool allowed) {
if (main_vfs != NULL) {
main_vfs->exec_allowed = allowed;
}
}

// Python wrapper function to vfs_set_exec_allowed
STATIC mp_obj_t mp_set_exec_allowed(mp_obj_t allowed_obj) {
bool allowed = mp_obj_get_int(allowed_obj);
vfs_set_exec_allowed(allowed);
return mp_const_none;
}
// Register the function so it can be called from MicroPython
STATIC MP_DEFINE_CONST_FUN_OBJ_1(mp_set_exec_allowed_obj, mp_set_exec_allowed);

// path is the path to lookup and *path_out holds the path within the VFS
// object (starts with / if an absolute path).
// Returns MP_VFS_ROOT for root dir (and then path_out is undefined) and
Expand Down Expand Up @@ -490,4 +509,23 @@ mp_obj_t mp_vfs_statvfs(mp_obj_t path_in) {
}
MP_DEFINE_CONST_FUN_OBJ_1(mp_vfs_statvfs_obj, mp_vfs_statvfs);


/****************************** MODULE ******************************/
// Define the vfs module to mp
STATIC const mp_rom_map_elem_t mp_module_vfs_globals_table[] = {
{ MP_OBJ_NEW_QSTR(MP_QSTR___name__), MP_OBJ_NEW_QSTR(MP_QSTR_vfs) },
{ MP_OBJ_NEW_QSTR(MP_QSTR_exec_allowed), (mp_obj_t)&mp_set_exec_allowed_obj },
};

STATIC MP_DEFINE_CONST_DICT(module_vfs_globals, mp_module_vfs_globals_table);

// Define the module
const mp_obj_module_t vfs_module = {
.base = { &mp_type_module },
.globals = (mp_obj_dict_t*)&module_vfs_globals,
};

// Register the module to make it available in Python
MP_REGISTER_MODULE(MP_QSTR_vfs, vfs_module, MICROPY_VFS);

#endif // MICROPY_VFS
6 changes: 6 additions & 0 deletions extmod/vfs.h
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,12 @@ typedef struct _mp_vfs_mount_t {
bool exec_allowed; // Flag indicating if execution is allowed from this VFS
} mp_vfs_mount_t;

// Declaration of the global vfs object
extern mp_vfs_mount_t *main_vfs;

// Function to set exec_allowed value
void vfs_set_exec_allowed(bool allowed);

mp_vfs_mount_t *mp_vfs_lookup_path(const char *path, const char **path_out);
mp_import_stat_t mp_vfs_import_stat(const char *path);
mp_obj_t mp_vfs_mount(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args);
Expand Down