Skip to content

Commit 5164719

Browse files
dhalbertdhalbert
committed
preserve errno in OSError
1 parent 57b566e commit 5164719

4 files changed

Lines changed: 14 additions & 9 deletions

File tree

‎extmod/vfs_fat_file.c‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@
2828
#if MICROPY_VFS && MICROPY_VFS_FAT
2929

3030
#include <stdio.h>
31+
#include <string.h>
3132

3233
#include "py/runtime.h"
3334
#include "py/stream.h"
@@ -199,7 +200,7 @@ STATIC mp_obj_t file_open(fs_user_mount_t *vfs, const mp_obj_type_t *type, mp_ar
199200
FRESULT res = f_open(&vfs->fatfs, &o->fp, fname, mode);
200201
if (res != FR_OK) {
201202
m_del_obj(pyb_file_obj_t, o);
202-
mp_raise_OSError_errno_str(fresult_to_errno_table[res], fname);
203+
mp_raise_OSError_errno_str(fresult_to_errno_table[res], args[0].u_obj);
203204
}
204205
// If we're reading, turn on fast seek.
205206
if (mode == FA_READ) {

‎py/objexcept.c‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -112,14 +112,17 @@ void mp_obj_exception_print(const mp_print_t *print, mp_obj_t o_in, mp_print_kin
112112
if (o->args == NULL || o->args->len == 0) {
113113
mp_print_str(print, "");
114114
return;
115-
} else if (o->args->len == 1) {
116-
// try to provide a nice OSError error message
115+
} else if (o->args->len <= 2) {
116+
// try to provide a nice OSError error message; second arg might exist (e.g. filename).
117117
if (MP_OBJ_IS_SMALL_INT(o->args->items[0]) &&
118118
mp_obj_is_subclass_fast(MP_OBJ_FROM_PTR(o->base.type), MP_OBJ_FROM_PTR(&mp_type_OSError))) {
119119
char decompressed[50];
120120
const char *msg = mp_common_errno_to_str(o->args->items[0], decompressed, sizeof(decompressed));
121121
if (msg != NULL) {
122122
mp_printf(print, "[Errno " INT_FMT "] %s", MP_OBJ_SMALL_INT_VALUE(o->args->items[0]), msg);
123+
if (o->args->len == 2) {
124+
mp_printf(print, ": '%s'", mp_obj_str_get_str(o->args->items[1]));
125+
}
123126
return;
124127
}
125128
}

‎py/runtime.c‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1578,11 +1578,12 @@ NORETURN void mp_raise_OSError_msg(const compressed_string_t *msg) {
15781578
mp_raise_msg(&mp_type_OSError, msg);
15791579
}
15801580

1581-
NORETURN void mp_raise_OSError_errno_str(int errno_, const char *str) {
1582-
char decompressed[50];
1583-
const char *errno_str = mp_common_errno_to_str(MP_OBJ_NEW_SMALL_INT(errno_),
1584-
decompressed, sizeof(decompressed));
1585-
mp_raise_OSError_msg_varg(translate("[Errno %d] %s: %s"), errno_, errno_str, str);
1581+
NORETURN void mp_raise_OSError_errno_str(int errno_, mp_obj_t str) {
1582+
mp_obj_t args[2] = {
1583+
MP_OBJ_NEW_SMALL_INT(errno_),
1584+
str,
1585+
};
1586+
nlr_raise(mp_obj_new_exception_args(&mp_type_OSError, 2, args));
15861587
}
15871588

15881589
NORETURN void mp_raise_OSError_msg_varg(const compressed_string_t *fmt, ...) {

‎py/runtime.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -161,7 +161,7 @@ NORETURN void mp_raise_RuntimeError(const compressed_string_t *msg);
161161
NORETURN void mp_raise_ImportError(const compressed_string_t *msg);
162162
NORETURN void mp_raise_IndexError(const compressed_string_t *msg);
163163
NORETURN void mp_raise_OSError(int errno_);
164-
NORETURN void mp_raise_OSError_errno_str(int errno_, const char *str);
164+
NORETURN void mp_raise_OSError_errno_str(int errno_, mp_obj_t str);
165165
NORETURN void mp_raise_OSError_msg(const compressed_string_t *msg);
166166
NORETURN void mp_raise_OSError_msg_varg(const compressed_string_t *fmt, ...);
167167
NORETURN void mp_raise_NotImplementedError(const compressed_string_t *msg);

0 commit comments

Comments
 (0)