From 19749db7bffb99dd045cd513f19ec5452bd5ef8d Mon Sep 17 00:00:00 2001 From: Paul Sokolovsky Date: Sun, 28 Feb 2016 20:30:07 +0200 Subject: [PATCH] extmod/vfs_fat: Add .remove() method. Based on stmhal implementation - rather small, so just duplicating. --- extmod/vfs_fat.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/extmod/vfs_fat.c b/extmod/vfs_fat.c index 77662ba985..e1b938f4e3 100644 --- a/extmod/vfs_fat.c +++ b/extmod/vfs_fat.c @@ -74,10 +74,25 @@ STATIC mp_obj_t fat_vfs_listdir_func(size_t n_args, const mp_obj_t *args) { } STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(fat_vfs_listdir_obj, 1, 2, fat_vfs_listdir_func); +STATIC mp_obj_t fat_vfs_remove(mp_obj_t vfs_in, mp_obj_t path_in) { + const char *path = mp_obj_str_get_str(path_in); + // TODO check that path is actually a file before trying to unlink it + FRESULT res = f_unlink(path); + switch (res) { + case FR_OK: + return mp_const_none; + default: + // TODO: standard errno's + nlr_raise(mp_obj_new_exception_msg_varg(&mp_type_OSError, "Error removing file '%s'", path)); + } +} +STATIC MP_DEFINE_CONST_FUN_OBJ_2(fat_vfs_remove_obj, fat_vfs_remove); + STATIC const mp_rom_map_elem_t fat_vfs_locals_dict_table[] = { { MP_ROM_QSTR(MP_QSTR_mkfs), MP_ROM_PTR(&fat_vfs_mkfs_obj) }, { MP_ROM_QSTR(MP_QSTR_open), MP_ROM_PTR(&fat_vfs_open_obj) }, { MP_ROM_QSTR(MP_QSTR_listdir), MP_ROM_PTR(&fat_vfs_listdir_obj) }, + { MP_ROM_QSTR(MP_QSTR_remove), MP_ROM_PTR(&fat_vfs_remove_obj) }, }; STATIC MP_DEFINE_CONST_DICT(fat_vfs_locals_dict, fat_vfs_locals_dict_table);