diff options
| author | Paolo Bosetti <[email protected]> | 2012-08-16 10:12:40 +0200 |
|---|---|---|
| committer | Paolo Bosetti <[email protected]> | 2012-08-16 10:18:41 +0200 |
| commit | efa46146a58be501daf3a38a15ffa9e3ddc87508 (patch) | |
| tree | ce57dbd7dba008363513f881599783c1342cdd51 /tools | |
| parent | 441079557d8e78f33314aea14b31cc22932d0ff4 (diff) | |
| parent | 23e88dba6e9cfaded527f477341e7a7fe50e6795 (diff) | |
| download | mruby-efa46146a58be501daf3a38a15ffa9e3ddc87508.tar.gz mruby-efa46146a58be501daf3a38a15ffa9e3ddc87508.zip | |
Merge branch 'master' into XCode
Also, fixed issue in Xcode project build settings
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/mruby/mruby.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/tools/mruby/mruby.c b/tools/mruby/mruby.c index e6a088672..af6680e8c 100644 --- a/tools/mruby/mruby.c +++ b/tools/mruby/mruby.c @@ -64,8 +64,11 @@ parse_args(mrb_state *mrb, int argc, char **argv, struct _args *args) char *item; if (argv[0][0] != '-') break; - if (strlen(*argv) <= 1) - return -1; + if (strlen(*argv) <= 1) { + argc--; argv++; + args->rfp = stdin; + break; + } item = argv[0] + 1; switch (*item++) { @@ -121,11 +124,10 @@ append_cmdline: else return -3; return 0; default: - break; + return -4; } } - if (args->rfp == NULL && args->cmdline == NULL) { if (*argv == NULL) args->rfp = stdin; else if ((args->rfp = fopen(*argv, args->mrbfile ? "rb" : "r")) == NULL) { |