utils/pyexec: Allow pyexec_file_if_exists to run frozen files if they exist.

pi-anl · pi-anl · commit 94acf41966a6 · 2019-04-29T12:00:13.000+10:00
diff --git a/lib/utils/pyexec.c b/lib/utils/pyexec.c
@@ -542,8 +542,12 @@ int pyexec_file(const char *filename) {
 }
 
 int pyexec_file_if_exists(const char *filename) {
-    mp_import_stat_t stat = mp_import_stat(filename);
-    if (stat != MP_IMPORT_STAT_FILE) {
+    #if MICROPY_MODULE_FROZEN
+    if (mp_frozen_stat(filename) == MP_IMPORT_STAT_FILE) {
+        return pyexec_frozen_module(filename);
+    }
+    #endif
+    if (mp_import_stat(filename) != MP_IMPORT_STAT_FILE) {
         return 1; // success (no file is the same as an empty file executing without fail)
     }
     return pyexec_file(filename);

Original file line number	Diff line number	Diff line change
`@@ -542,8 +542,12 @@ int pyexec_file(const char *filename) {`
`542`	`542`	`}`
`543`	`543`
`544`	`544`	`int pyexec_file_if_exists(const char *filename) {`
`545`		`- mp_import_stat_t stat = mp_import_stat(filename);`
`546`		`- if (stat != MP_IMPORT_STAT_FILE) {`
	`545`	`+ #if MICROPY_MODULE_FROZEN`
	`546`	`+ if (mp_frozen_stat(filename) == MP_IMPORT_STAT_FILE) {`
	`547`	`+ return pyexec_frozen_module(filename);`
	`548`	`+ }`
	`549`	`+ #endif`
	`550`	`+ if (mp_import_stat(filename) != MP_IMPORT_STAT_FILE) {`
`547`	`551`	`return 1; // success (no file is the same as an empty file executing without fail)`
`548`	`552`	`}`
`549`	`553`	`return pyexec_file(filename);`