diff options
| author | Damien George <damien.p.george@gmail.com> | 2014-04-21 01:18:05 +0100 |
|---|---|---|
| committer | Damien George <damien.p.george@gmail.com> | 2014-04-21 01:18:05 +0100 |
| commit | 0ae21a81f70806afc6f96fe099083bc8273ab34c (patch) | |
| tree | c8e4680b545c720ca28e6a142702ef2f5909f5d7 /unix/main.c | |
| parent | 3771a097dac8baaf6dc8a9618dc8a1074a43c439 (diff) | |
| parent | 521de04ce2dc7048afbdb2445979a203512b13e2 (diff) | |
| download | micropython-0ae21a81f70806afc6f96fe099083bc8273ab34c.tar.gz micropython-0ae21a81f70806afc6f96fe099083bc8273ab34c.zip | |
Merge branch 'master' of github.com:micropython/micropython
Diffstat (limited to 'unix/main.c')
| -rw-r--r-- | unix/main.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/unix/main.c b/unix/main.c index 940fe48c14..4c86edeae5 100644 --- a/unix/main.c +++ b/unix/main.c @@ -250,7 +250,9 @@ int usage(char **argv) { mp_obj_t mem_info(void) { printf("mem: total=%d, current=%d, peak=%d\n", m_get_total_bytes_allocated(), m_get_current_bytes_allocated(), m_get_peak_bytes_allocated()); +#if MICROPY_ENABLE_GC gc_dump_info(); +#endif return mp_const_none; } @@ -392,7 +394,11 @@ int main(int argc, char **argv) { return usage(argv); } } else { +#ifdef __MINGW32__ + char *basedir = _fullpath(NULL, argv[a], _MAX_PATH); +#else char *basedir = realpath(argv[a], NULL); +#endif if (basedir == NULL) { fprintf(stderr, "%s: can't open file '%s': [Errno %d] ", argv[0], argv[1], errno); perror(""); |