admin/mruby-mruby
1
0
Fork 0
mirror of https://github.com/mruby/mruby synced 2026-06-08 16:11:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #273 from nurse/support-e-option-without-space

Browse Source 
Support mruby -e'p 1'.
This commit is contained in:
Yukihiro "Matz" Matsumoto
2012-06-14 06:59:01 -07:00
parent 7cbe8cf7ac 03d32796b4
commit 268a1fd289
1 changed files with 13 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tools/mruby/mruby.c
+13 -6
View File
@@ -51,12 +51,14 @@ parse_args(mrb_state *mrb, int argc, char **argv, struct _args *args)
memset(args, 0, sizeof(*args));
for (argc--,argv++; argc > 0; argc--,argv++) {
char *item;
if (argv[0][0] != '-') break;
if (strlen(*argv) <= 1)
return -1;
switch ((*argv)[1]) {
item = argv[0] + 1;
switch (*item++) {
case 'b':
args->mrbfile = 1;
break;
@@ -64,19 +66,24 @@ parse_args(mrb_state *mrb, int argc, char **argv, struct _args *args)
args->check_syntax = 1;
break;
case 'e':
if (argc > 1) {
if (item[0]) {
goto append_cmdline;
}
else if (argc > 1) {
argc--; argv++;
item = argv[0];
append_cmdline:
if (!args->cmdline) {
char *buf;
buf = mrb_malloc(mrb, strlen(argv[0])+1);
strcpy(buf, argv[0]);
buf = mrb_malloc(mrb, strlen(item)+1);
strcpy(buf, item);
args->cmdline = buf;
}
else {
args->cmdline = mrb_realloc(mrb, args->cmdline, strlen(args->cmdline)+strlen(argv[0])+2);
args->cmdline = mrb_realloc(mrb, args->cmdline, strlen(args->cmdline)+strlen(item)+2);
strcat(args->cmdline, "\n");
strcat(args->cmdline, argv[0]);
strcat(args->cmdline, item);
}
}
else {