djsundog/circuitpython
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

unix: Properly recognize and report when script on cmdline not found.

Browse Source 
Previosuly just silently exited.
This commit is contained in:
Paul Sokolovsky 2014-04-02 20:19:32 +03:00
parent 094d450003
commit d4e7e06d7f
1 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
unix/main.c
View File

@ -6,6 +6,7 @@
#include <stdarg.h> #include <stdarg.h>
#include <sys/stat.h> #include <sys/stat.h>
#include <sys/types.h> #include <sys/types.h>
#include <errno.h>
#include "nlr.h" #include "nlr.h"
#include "misc.h" #include "misc.h"
@ -369,13 +370,19 @@ int main(int argc, char **argv) {
return usage(); return usage();
} }
} else { } else {
// Set base dir of the script as first entry in sys.path
char *basedir = realpath(argv[a], NULL); char *basedir = realpath(argv[a], NULL);
if (basedir != NULL) { if (basedir == NULL) {
char *p = strrchr(basedir, '/'); fprintf(stderr, "%s: can't open file '%s': [Errno %d] ", argv[0], argv[1], errno);
path_items[0] = MP_OBJ_NEW_QSTR(qstr_from_strn(basedir, p - basedir)); perror("");
free(basedir); // CPython exits with 2 in such case
exit(2);
} }
// Set base dir of the script as first entry in sys.path
char *p = strrchr(basedir, '/');
path_items[0] = MP_OBJ_NEW_QSTR(qstr_from_strn(basedir, p - basedir));
free(basedir);
for (int i = a; i < argc; i++) { for (int i = a; i < argc; i++) {
mp_obj_list_append(py_argv, MP_OBJ_NEW_QSTR(qstr_from_str(argv[i]))); mp_obj_list_append(py_argv, MP_OBJ_NEW_QSTR(qstr_from_str(argv[i])));
} }