diff options
| author | Yukihiro Matsumoto <[email protected]> | 2012-05-17 23:49:12 +0900 |
|---|---|---|
| committer | Yukihiro Matsumoto <[email protected]> | 2012-05-17 23:49:12 +0900 |
| commit | e67c03529d4faaf0a5be0bc34596e20904b485e9 (patch) | |
| tree | 11f4822a189522c8c5057cd402104ff8f547e3c6 | |
| parent | 0a00c28ca12f78ba510603eb40a038206457c0a4 (diff) | |
| parent | 069768b77c53b7624bfa62ed86b89fc6e956c0b0 (diff) | |
| download | mruby-e67c03529d4faaf0a5be0bc34596e20904b485e9.tar.gz mruby-e67c03529d4faaf0a5be0bc34596e20904b485e9.zip | |
Merge branch 'master' of github.com:mruby/mruby
| -rw-r--r-- | .gitignore | 3 | ||||
| -rw-r--r-- | tools/mruby/mruby.c | 3 |
2 files changed, 5 insertions, 1 deletions
diff --git a/.gitignore b/.gitignore index 94a9f5d79..1f700fa66 100644 --- a/.gitignore +++ b/.gitignore @@ -19,3 +19,6 @@ cscope.out /bin /mrblib/mrblib.c /mrblib/*.*tmp +/test/mrbtest +/test/mrbtest.c +/test/*.*tmp diff --git a/tools/mruby/mruby.c b/tools/mruby/mruby.c index 427f62276..f59cbcace 100644 --- a/tools/mruby/mruby.c +++ b/tools/mruby/mruby.c @@ -105,7 +105,8 @@ parse_args(mrb_state *mrb, int argc, char **argv, struct _args *args) } - if (args->rfp == NULL && args->cmdline == NULL && (args->rfp = fopen(*argv, args->mrbfile ? "rb" : "r")) == NULL) { + if (args->rfp == NULL && args->cmdline == NULL && + (*argv == NULL || (args->rfp = fopen(*argv, args->mrbfile ? "rb" : "r")) == NULL)) { printf("%s: Cannot open program file. (%s)\n", *origargv, *argv); return 0; } |