From cf00c32e3a764bfaab1b2239e709269ff01c2660 Mon Sep 17 00:00:00 2001
From: "Yukihiro \"Matz\" Matsumoto" <matz@ruby.or.jp>
Date: Fri, 4 Feb 2022 16:05:02 +0900
Subject: [PATCH] mruby.c: `-b` option should only affects the script.

Not the libraries loaded by `-r`. Instead, `.mrb` extension in the path
should determine whether they are compiled binary.
---
 mrbgems/mruby-bin-mruby/tools/mruby/mruby.c | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/mrbgems/mruby-bin-mruby/tools/mruby/mruby.c b/mrbgems/mruby-bin-mruby/tools/mruby/mruby.c
index b189aca69..ed6240dbf 100644
--- a/mrbgems/mruby-bin-mruby/tools/mruby/mruby.c
+++ b/mrbgems/mruby-bin-mruby/tools/mruby/mruby.c
@@ -63,6 +63,16 @@ usage(const char *name)
     printf("  %s\n", *p++);
 }
 
+static mrb_bool
+mrb_extension_p(const char *path)
+{
+  const char *e = rindex(path, '.');
+  if (e && e[1] == 'm' && e[2] == 'r' && e[3] == 'b' && e[4] == '\0') {
+    return TRUE;
+  }
+  return FALSE;
+}
+
 static void
 options_init(struct options *opts, int argc, char **argv)
 {
@@ -323,7 +333,7 @@ main(int argc, char **argv)
         return EXIT_FAILURE;
       }
       mrbc_filename(mrb, c, args.libv[i]);
-      if (args.mrbfile) {
+      if (mrb_extension_p(args.libv[i])) {
         v = mrb_load_irep_file_cxt(mrb, lfp, c);
       }
       else {
@@ -340,7 +350,7 @@ main(int argc, char **argv)
     mrbc_filename(mrb, c, cmdline);
 
     /* Load program */
-    if (args.mrbfile) {
+    if (args.mrbfile || mrb_extension_p(cmdline)) {
       v = mrb_load_irep_file_cxt(mrb, args.rfp, c);
     }
     else if (args.rfp) {