Merge branch 'master' of github.com:mruby/mruby

.gitignore

@@ -19,3 +19,6 @@ cscope.out
 /bin
 /mrblib/mrblib.c
 /mrblib/*.*tmp
+/test/mrbtest
+/test/mrbtest.c
+/test/*.*tmp

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;
   }