From d648970bc8503b15b1e26c48668f023e3dea3c1c Mon Sep 17 00:00:00 2001 From: suzukaze Date: Tue, 14 Aug 2012 23:50:39 +0900 Subject: fixed showing no 'Usage'. --- tools/mruby/mruby.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'tools') diff --git a/tools/mruby/mruby.c b/tools/mruby/mruby.c index e6a088672..3a234d22e 100644 --- a/tools/mruby/mruby.c +++ b/tools/mruby/mruby.c @@ -60,6 +60,8 @@ parse_args(mrb_state *mrb, int argc, char **argv, struct _args *args) memset(args, 0, sizeof(*args)); + if (argc == 1) return -2; + for (argc--,argv++; argc > 0; argc--,argv++) { char *item; if (argv[0][0] != '-') break; @@ -121,7 +123,7 @@ append_cmdline: else return -3; return 0; default: - break; + return -4; } } -- cgit v1.2.3 From 5f11890d0488319ddbe8978d33acad52f2410ced Mon Sep 17 00:00:00 2001 From: Yukihiro Matsumoto Date: Wed, 15 Aug 2012 09:31:13 +0900 Subject: mruby should accept "-" as stdin --- tools/mruby/mruby.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'tools') diff --git a/tools/mruby/mruby.c b/tools/mruby/mruby.c index 3a234d22e..8336089ee 100644 --- a/tools/mruby/mruby.c +++ b/tools/mruby/mruby.c @@ -61,13 +61,15 @@ parse_args(mrb_state *mrb, int argc, char **argv, struct _args *args) memset(args, 0, sizeof(*args)); if (argc == 1) return -2; - for (argc--,argv++; argc > 0; argc--,argv++) { 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++) { @@ -127,7 +129,6 @@ append_cmdline: } } - if (args->rfp == NULL && args->cmdline == NULL) { if (*argv == NULL) args->rfp = stdin; else if ((args->rfp = fopen(*argv, args->mrbfile ? "rb" : "r")) == NULL) { -- cgit v1.2.3 From 7bf4142c4210956da179783aa6d6377b9ab7043f Mon Sep 17 00:00:00 2001 From: Yukihiro Matsumoto Date: Wed, 15 Aug 2012 09:31:59 +0900 Subject: mruby should read from stdin if no argument given as cruby does --- tools/mruby/mruby.c | 1 - 1 file changed, 1 deletion(-) (limited to 'tools') diff --git a/tools/mruby/mruby.c b/tools/mruby/mruby.c index 8336089ee..af6680e8c 100644 --- a/tools/mruby/mruby.c +++ b/tools/mruby/mruby.c @@ -60,7 +60,6 @@ parse_args(mrb_state *mrb, int argc, char **argv, struct _args *args) memset(args, 0, sizeof(*args)); - if (argc == 1) return -2; for (argc--,argv++; argc > 0; argc--,argv++) { char *item; if (argv[0][0] != '-') break; -- cgit v1.2.3