From 3cf1a9beaefd48b353139a98b4437de98432fdbc Mon Sep 17 00:00:00 2001
From: Jun Hiroe <Jun.Hiroe@gmail.com>
Date: Sun, 14 Jul 2013 00:39:21 +0900
Subject: Replace mrb_intern() with mrb_intern2() or mrb_intern_cstr().

---
 mrbgems/mruby-bin-mirb/tools/mirb/mirb.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'mrbgems/mruby-bin-mirb')

diff --git a/mrbgems/mruby-bin-mirb/tools/mirb/mirb.c b/mrbgems/mruby-bin-mirb/tools/mirb/mirb.c
index 5e3e123c6..7f2fcf282 100644
--- a/mrbgems/mruby-bin-mirb/tools/mirb/mirb.c
+++ b/mrbgems/mruby-bin-mirb/tools/mirb/mirb.c
@@ -346,7 +346,7 @@ main(int argc, char **argv)
         }
         else {
           /* no */
-          if (!mrb_respond_to(mrb,result,mrb_intern(mrb,"inspect"))){
+          if (!mrb_respond_to(mrb, result, mrb_intern2(mrb, "inspect", 7))){
             result = mrb_any_to_s(mrb,result);
           }
           p(mrb, result, 1);
-- 
cgit v1.2.3


From 8e42868600e7adcdc5665ff9b0244150296960d6 Mon Sep 17 00:00:00 2001
From: Jun Hiroe <Jun.Hiroe@gmail.com>
Date: Mon, 15 Jul 2013 23:00:54 +0900
Subject: Repalace int with mrb_bool because a return value is boolean.

---
 include/mruby.h                          | 18 +++++++++---------
 include/mruby/string.h                   |  2 +-
 mrbgems/mruby-bin-mirb/tools/mirb/mirb.c |  2 +-
 mrbgems/mruby-range-ext/src/range.c      |  4 ++--
 src/class.c                              |  6 +++---
 src/codegen.c                            |  2 +-
 src/kernel.c                             |  6 +++---
 src/object.c                             | 10 +++++-----
 src/range.c                              |  6 +++---
 src/string.c                             |  4 ++--
 src/symbol.c                             |  4 ++--
 11 files changed, 32 insertions(+), 32 deletions(-)

(limited to 'mrbgems/mruby-bin-mirb')

diff --git a/include/mruby.h b/include/mruby.h
index a7f2a49c4..85b464b8e 100644
--- a/include/mruby.h
+++ b/include/mruby.h
@@ -176,13 +176,13 @@ void mrb_undef_class_method(mrb_state*, struct RClass*, const char*);
 mrb_value mrb_instance_new(mrb_state *mrb, mrb_value cv);
 struct RClass * mrb_class_new(mrb_state *mrb, struct RClass *super);
 struct RClass * mrb_module_new(mrb_state *mrb);
-int mrb_class_defined(mrb_state *mrb, const char *name);
+mrb_bool mrb_class_defined(mrb_state *mrb, const char *name);
 struct RClass * mrb_class_get(mrb_state *mrb, const char *name);
 struct RClass * mrb_class_get_under(mrb_state *mrb, struct RClass *outer, const char *name);
 
 mrb_value mrb_obj_dup(mrb_state *mrb, mrb_value obj);
 mrb_value mrb_check_to_integer(mrb_state *mrb, mrb_value val, const char *method);
-int mrb_obj_respond_to(struct RClass* c, mrb_sym mid);
+mrb_bool mrb_obj_respond_to(struct RClass* c, mrb_sym mid);
 struct RClass * mrb_define_class_under(mrb_state *mrb, struct RClass *outer, const char *name, struct RClass *super);
 struct RClass * mrb_define_module_under(mrb_state *mrb, struct RClass *outer, const char *name);
 
@@ -264,13 +264,13 @@ void mrb_p(mrb_state*, mrb_value);
 mrb_int mrb_obj_id(mrb_value obj);
 mrb_sym mrb_obj_to_sym(mrb_state *mrb, mrb_value name);
 
-int mrb_obj_eq(mrb_state*, mrb_value, mrb_value);
-int mrb_obj_equal(mrb_state*, mrb_value, mrb_value);
-int mrb_equal(mrb_state *mrb, mrb_value obj1, mrb_value obj2);
+mrb_bool mrb_obj_eq(mrb_state*, mrb_value, mrb_value);
+mrb_bool mrb_obj_equal(mrb_state*, mrb_value, mrb_value);
+mrb_bool mrb_equal(mrb_state *mrb, mrb_value obj1, mrb_value obj2);
 mrb_value mrb_Integer(mrb_state *mrb, mrb_value val);
 mrb_value mrb_Float(mrb_state *mrb, mrb_value val);
 mrb_value mrb_inspect(mrb_state *mrb, mrb_value obj);
-int mrb_eql(mrb_state *mrb, mrb_value obj1, mrb_value obj2);
+mrb_bool mrb_eql(mrb_state *mrb, mrb_value obj1, mrb_value obj2);
 
 void mrb_garbage_collect(mrb_state*);
 void mrb_incremental_gc(mrb_state *);
@@ -292,7 +292,7 @@ const char * mrb_obj_classname(mrb_state *mrb, mrb_value obj);
 struct RClass* mrb_obj_class(mrb_state *mrb, mrb_value obj);
 mrb_value mrb_class_path(mrb_state *mrb, struct RClass *c);
 mrb_value mrb_convert_type(mrb_state *mrb, mrb_value val, enum mrb_vtype type, const char *tname, const char *method);
-int mrb_obj_is_kind_of(mrb_state *mrb, mrb_value obj, struct RClass *c);
+mrb_bool mrb_obj_is_kind_of(mrb_state *mrb, mrb_value obj, struct RClass *c);
 mrb_value mrb_obj_inspect(mrb_state *mrb, mrb_value self);
 mrb_value mrb_obj_clone(mrb_state *mrb, mrb_value self);
 
@@ -369,8 +369,8 @@ void mrb_define_global_const(mrb_state *mrb, const char *name, mrb_value val);
 mrb_value mrb_block_proc(void);
 mrb_value mrb_attr_get(mrb_state *mrb, mrb_value obj, mrb_sym id);
 
-int mrb_respond_to(mrb_state *mrb, mrb_value obj, mrb_sym mid);
-int mrb_obj_is_instance_of(mrb_state *mrb, mrb_value obj, struct RClass* c);
+mrb_bool mrb_respond_to(mrb_state *mrb, mrb_value obj, mrb_sym mid);
+mrb_bool mrb_obj_is_instance_of(mrb_state *mrb, mrb_value obj, struct RClass* c);
 
 /* memory pool implementation */
 typedef struct mrb_pool mrb_pool;
diff --git a/include/mruby/string.h b/include/mruby/string.h
index 26d1344d8..000c80b09 100644
--- a/include/mruby/string.h
+++ b/include/mruby/string.h
@@ -57,7 +57,7 @@ mrb_value mrb_str_to_str(mrb_state *mrb, mrb_value str);
 mrb_int mrb_str_hash(mrb_state *mrb, mrb_value str);
 mrb_value mrb_str_buf_append(mrb_state *mrb, mrb_value str, mrb_value str2);
 mrb_value mrb_str_inspect(mrb_state *mrb, mrb_value str);
-int mrb_str_equal(mrb_state *mrb, mrb_value str1, mrb_value str2);
+mrb_bool mrb_str_equal(mrb_state *mrb, mrb_value str1, mrb_value str2);
 mrb_value mrb_str_dump(mrb_state *mrb, mrb_value str);
 mrb_value mrb_str_cat(mrb_state *mrb, mrb_value str, const char *ptr, size_t len);
 mrb_value mrb_str_append(mrb_state *mrb, mrb_value str, mrb_value str2);
diff --git a/mrbgems/mruby-bin-mirb/tools/mirb/mirb.c b/mrbgems/mruby-bin-mirb/tools/mirb/mirb.c
index 7f2fcf282..eb7194f30 100644
--- a/mrbgems/mruby-bin-mirb/tools/mirb/mirb.c
+++ b/mrbgems/mruby-bin-mirb/tools/mirb/mirb.c
@@ -38,7 +38,7 @@ p(mrb_state *mrb, mrb_value obj, int prompt)
 
 /* Guess if the user might want to enter more
  * or if he wants an evaluation of his code now */
-int
+mrb_bool
 is_code_block_open(struct mrb_parser_state *parser)
 {
   int code_block_open = FALSE;
diff --git a/mrbgems/mruby-range-ext/src/range.c b/mrbgems/mruby-range-ext/src/range.c
index 377677ffb..4e17dac8c 100644
--- a/mrbgems/mruby-range-ext/src/range.c
+++ b/mrbgems/mruby-range-ext/src/range.c
@@ -1,7 +1,7 @@
 #include "mruby.h"
 #include "mruby/range.h"
 
-static int
+static mrb_bool
 r_le(mrb_state *mrb, mrb_value a, mrb_value b)
 {
   mrb_value r = mrb_funcall(mrb, a, "<=>", 1, b); /* compare result */
@@ -15,7 +15,7 @@ r_le(mrb_state *mrb, mrb_value a, mrb_value b)
   return FALSE;
 }
 
-static int
+static mrb_bool
 r_lt(mrb_state *mrb, mrb_value a, mrb_value b)
 {
   mrb_value r = mrb_funcall(mrb, a, "<=>", 1, b);
diff --git a/src/class.c b/src/class.c
index 9868d0080..606a54a7c 100644
--- a/src/class.c
+++ b/src/class.c
@@ -203,7 +203,7 @@ mrb_vm_define_class(mrb_state *mrb, mrb_value outer, mrb_value super, mrb_sym id
   return c;
 }
 
-int
+mrb_bool
 mrb_class_defined(mrb_state *mrb, const char *name)
 {
   mrb_value sym = mrb_check_intern_cstr(mrb, name);
@@ -1172,7 +1172,7 @@ mrb_bob_missing(mrb_state *mrb, mrb_value mod)
   return mrb_nil_value();
 }
 
-int
+mrb_bool
 mrb_obj_respond_to(struct RClass* c, mrb_sym mid)
 {
   khiter_t k;
@@ -1196,7 +1196,7 @@ mrb_obj_respond_to(struct RClass* c, mrb_sym mid)
   return FALSE;         /* no method */
 }
 
-int
+mrb_bool
 mrb_respond_to(mrb_state *mrb, mrb_value obj, mrb_sym mid)
 {
   return mrb_obj_respond_to(mrb_class(mrb, obj), mid);
diff --git a/src/codegen.c b/src/codegen.c
index 8dd5a124d..37176653b 100644
--- a/src/codegen.c
+++ b/src/codegen.c
@@ -683,7 +683,7 @@ scope_body(codegen_scope *s, node *tree)
   return idx - s->idx;
 }
 
-static int
+static mrb_bool
 nosplat(node *t)
 {
   while (t) {
diff --git a/src/kernel.c b/src/kernel.c
index 965b80b95..ae8d24710 100644
--- a/src/kernel.c
+++ b/src/kernel.c
@@ -26,7 +26,7 @@ typedef enum {
     NOEX_RESPONDS  = 0x80
 } mrb_method_flag_t;
 
-int
+mrb_bool
 mrb_obj_basic_to_s_p(mrb_state *mrb, mrb_value obj)
 {
     struct RProc *me = mrb_method_search(mrb, mrb_class(mrb, obj), mrb_intern2(mrb, "to_s", 4));
@@ -521,7 +521,7 @@ mrb_obj_instance_eval(mrb_state *mrb, mrb_value self)
   return mrb_yield_internal(mrb, b, 0, 0, self, c);
 }
 
-int
+mrb_bool
 mrb_obj_is_instance_of(mrb_state *mrb, mrb_value obj, struct RClass* c)
 {
   if (mrb_obj_class(mrb, obj) == c) return TRUE;
@@ -938,7 +938,7 @@ mrb_obj_remove_instance_variable(mrb_state *mrb, mrb_value self)
   return val;
 }
 
-static inline int
+static inline mrb_bool
 basic_obj_respond_to(mrb_state *mrb, mrb_value obj, mrb_sym id, int pub)
 {
   return mrb_respond_to(mrb, obj, id);
diff --git a/src/object.c b/src/object.c
index 4003452cc..5b2278767 100644
--- a/src/object.c
+++ b/src/object.c
@@ -11,7 +11,7 @@
 #include "mruby/string.h"
 #include "error.h"
 
-int
+mrb_bool
 mrb_obj_eq(mrb_state *mrb, mrb_value v1, mrb_value v2)
 {
   if (mrb_type(v1) != mrb_type(v2)) return FALSE;
@@ -33,14 +33,14 @@ mrb_obj_eq(mrb_state *mrb, mrb_value v1, mrb_value v2)
   }
 }
 
-int
+mrb_bool
 mrb_obj_equal(mrb_state *mrb, mrb_value v1, mrb_value v2)
 {
   /* temporary definition */
   return mrb_obj_eq(mrb, v1, v2);
 }
 
-int
+mrb_bool
 mrb_equal(mrb_state *mrb, mrb_value obj1, mrb_value obj2)
 {
   mrb_value result;
@@ -468,7 +468,7 @@ mrb_any_to_s(mrb_state *mrb, mrb_value obj)
  *     b.kind_of? M       #=> true
  */
 
-int
+mrb_bool
 mrb_obj_is_kind_of(mrb_state *mrb, mrb_value obj, struct RClass *c)
 {
   struct RClass *cl = mrb_class(mrb, obj);
@@ -585,7 +585,7 @@ mrb_inspect(mrb_state *mrb, mrb_value obj)
   return mrb_obj_as_string(mrb, mrb_funcall(mrb, obj, "inspect", 0, 0));
 }
 
-int
+mrb_bool
 mrb_eql(mrb_state *mrb, mrb_value obj1, mrb_value obj2)
 {
   if (mrb_obj_eq(mrb, obj1, obj2)) return TRUE;
diff --git a/src/range.c b/src/range.c
index 92eddfe8c..6e313df51 100644
--- a/src/range.c
+++ b/src/range.c
@@ -170,7 +170,7 @@ mrb_range_eq(mrb_state *mrb, mrb_value range)
   return mrb_true_value();
 }
 
-static int
+static mrb_bool
 r_le(mrb_state *mrb, mrb_value a, mrb_value b)
 {
   mrb_value r = mrb_funcall(mrb, a, "<=>", 1, b); /* compare result */
@@ -184,7 +184,7 @@ r_le(mrb_state *mrb, mrb_value a, mrb_value b)
   return FALSE;
 }
 
-static int
+static mrb_bool
 r_gt(mrb_state *mrb, mrb_value a, mrb_value b)
 {
   mrb_value r = mrb_funcall(mrb, a, "<=>", 1, b);
@@ -197,7 +197,7 @@ r_gt(mrb_state *mrb, mrb_value a, mrb_value b)
   return FALSE;
 }
 
-static int
+static mrb_bool
 r_ge(mrb_state *mrb, mrb_value a, mrb_value b)
 {
   mrb_value r = mrb_funcall(mrb, a, "<=>", 1, b); /* compare result */
diff --git a/src/string.c b/src/string.c
index 59a1df455..975f6cdb9 100644
--- a/src/string.c
+++ b/src/string.c
@@ -595,7 +595,7 @@ mrb_str_cmp_m(mrb_state *mrb, mrb_value str1)
   return mrb_fixnum_value(result);
 }
 
-static int
+static mrb_bool
 str_eql(mrb_state *mrb, const mrb_value str1, const mrb_value str2)
 {
   const mrb_int len = RSTRING_LEN(str1);
@@ -606,7 +606,7 @@ str_eql(mrb_state *mrb, const mrb_value str1, const mrb_value str2)
   return FALSE;
 }
 
-int
+mrb_bool
 mrb_str_equal(mrb_state *mrb, mrb_value str1, mrb_value str2)
 {
   if (mrb_obj_equal(mrb, str1, str2)) return TRUE;
diff --git a/src/symbol.c b/src/symbol.c
index c29f7c6ae..bd8dce7df 100644
--- a/src/symbol.c
+++ b/src/symbol.c
@@ -251,7 +251,7 @@ sym_to_sym(mrb_state *mrb, mrb_value sym)
 #endif
 #define is_identchar(c) (SIGN_EXTEND_CHAR(c)!=-1&&(ISALNUM(c) || (c) == '_'))
 
-static int
+static mrb_bool
 is_special_global_name(const char* m)
 {
   switch (*m) {
@@ -274,7 +274,7 @@ is_special_global_name(const char* m)
   return !*m;
 }
 
-static int
+static mrb_bool
 symname_p(const char *name)
 {
   const char *m = name;
-- 
cgit v1.2.3


From 4306fe798fc92e3a59c1dd3b020f6131c2e80ab4 Mon Sep 17 00:00:00 2001
From: kyab <kyossi212@gmail.com>
Date: Thu, 18 Jul 2013 00:14:03 +0900
Subject: Save mirb history when readline enabled

---
 mrbgems/mruby-bin-mirb/tools/mirb/mirb.c | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

(limited to 'mrbgems/mruby-bin-mirb')

diff --git a/mrbgems/mruby-bin-mirb/tools/mirb/mirb.c b/mrbgems/mruby-bin-mirb/tools/mirb/mirb.c
index eb7194f30..9f030c112 100644
--- a/mrbgems/mruby-bin-mirb/tools/mirb/mirb.c
+++ b/mrbgems/mruby-bin-mirb/tools/mirb/mirb.c
@@ -15,11 +15,19 @@
 #include <mruby/data.h>
 #include <mruby/compile.h>
 #ifdef ENABLE_READLINE
+#include <limits.h>
 #include <readline/readline.h>
 #include <readline/history.h>
 #endif
 #include <mruby/string.h>
 
+
+#ifdef ENABLE_READLINE
+static const char *history_file_name = ".mirb_history";
+char history_path[PATH_MAX];
+#endif
+
+
 static void
 p(mrb_state *mrb, mrb_value obj, int prompt)
 {
@@ -268,6 +276,16 @@ main(int argc, char **argv)
   if (args.verbose) cxt->dump_result = 1;
 
   ai = mrb_gc_arena_save(mrb);
+
+#ifdef ENABLE_READLINE
+  using_history();
+  strcpy(history_path, getenv("HOME"));
+  strcat(history_path, "/");
+  strcat(history_path, history_file_name);
+  read_history(history_path);
+#endif
+
+
   while (TRUE) {
 #ifndef ENABLE_READLINE
     print_cmdline(code_block_open);
@@ -361,5 +379,9 @@ main(int argc, char **argv)
   mrbc_context_free(mrb, cxt);
   mrb_close(mrb);
 
+#ifdef ENABLE_READLINE
+  write_history(history_path);
+#endif
+
   return 0;
 }
-- 
cgit v1.2.3


From 1fe65b2522fb480a5c70a2ac5925c223efd9c492 Mon Sep 17 00:00:00 2001
From: kyab <kyossi212@gmail.com>
Date: Thu, 18 Jul 2013 18:15:05 +0900
Subject: Use env[USERPROFILE] for Windows

---
 mrbgems/mruby-bin-mirb/tools/mirb/mirb.c | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

(limited to 'mrbgems/mruby-bin-mirb')

diff --git a/mrbgems/mruby-bin-mirb/tools/mirb/mirb.c b/mrbgems/mruby-bin-mirb/tools/mirb/mirb.c
index 9f030c112..3111eea8f 100644
--- a/mrbgems/mruby-bin-mirb/tools/mirb/mirb.c
+++ b/mrbgems/mruby-bin-mirb/tools/mirb/mirb.c
@@ -253,6 +253,7 @@ main(int argc, char **argv)
   int n;
   int code_block_open = FALSE;
   int ai;
+  char *home = NULL;
 
   /* new interpreter instance */
   mrb = mrb_open();
@@ -279,7 +280,12 @@ main(int argc, char **argv)
 
 #ifdef ENABLE_READLINE
   using_history();
-  strcpy(history_path, getenv("HOME"));
+  home = getenv("HOME");
+#ifdef _WIN32
+  if (!home)
+    home = getenv("USERPROFILE");
+#endif
+  strcpy(history_path, home);
   strcat(history_path, "/");
   strcat(history_path, history_file_name);
   read_history(history_path);
-- 
cgit v1.2.3


From 8db22d4dfe84cb1c8655e65d860b2441aa59e0d3 Mon Sep 17 00:00:00 2001
From: Carson McDonald <carson@ioncannon.net>
Date: Mon, 22 Jul 2013 18:24:17 -0400
Subject: Move home variable into readline ifdef

---
 mrbgems/mruby-bin-mirb/tools/mirb/mirb.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'mrbgems/mruby-bin-mirb')

diff --git a/mrbgems/mruby-bin-mirb/tools/mirb/mirb.c b/mrbgems/mruby-bin-mirb/tools/mirb/mirb.c
index 3111eea8f..5867d9a14 100644
--- a/mrbgems/mruby-bin-mirb/tools/mirb/mirb.c
+++ b/mrbgems/mruby-bin-mirb/tools/mirb/mirb.c
@@ -244,6 +244,8 @@ main(int argc, char **argv)
 #ifndef ENABLE_READLINE
   int last_char;
   int char_index;
+#else
+  char *home = NULL;
 #endif
   mrbc_context *cxt;
   struct mrb_parser_state *parser;
@@ -253,7 +255,6 @@ main(int argc, char **argv)
   int n;
   int code_block_open = FALSE;
   int ai;
-  char *home = NULL;
 
   /* new interpreter instance */
   mrb = mrb_open();
-- 
cgit v1.2.3


From bd505cc8bb4c49f301f0b2e53aeb569962f9ec0b Mon Sep 17 00:00:00 2001
From: Carson McDonald <carson@ioncannon.net>
Date: Mon, 22 Jul 2013 18:33:45 -0400
Subject: If readline is enabled add readline to libraries to link

---
 mrbgems/mruby-bin-mirb/mrbgem.rake | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'mrbgems/mruby-bin-mirb')

diff --git a/mrbgems/mruby-bin-mirb/mrbgem.rake b/mrbgems/mruby-bin-mirb/mrbgem.rake
index fd0b20254..b168d357b 100644
--- a/mrbgems/mruby-bin-mirb/mrbgem.rake
+++ b/mrbgems/mruby-bin-mirb/mrbgem.rake
@@ -1,5 +1,8 @@
 MRuby::Gem::Specification.new('mruby-bin-mirb') do |spec|
   spec.license = 'MIT'
   spec.authors = 'mruby developers'
+
+  spec.linker.libraries << 'readline' if spec.cc.defines.include? "ENABLE_READLINE"
+
   spec.bins = %w(mirb)
 end
-- 
cgit v1.2.3


From 116f75a8ce9d5d11d41268ecc95863f4e10f2729 Mon Sep 17 00:00:00 2001
From: Tomoyuki Sahara <tsahara@iij.ad.jp>
Date: Tue, 23 Jul 2013 10:09:24 +0900
Subject: "spec.author" is better for single-author gems.

"spec.author=" expects a String represents a single author.
"spec.authors=" expects an Array which is a list of multiple authors.

http://guides.rubygems.org/specification-reference/
---
 doc/mrbgems/README.md                                     | 4 ++--
 examples/mrbgems/c_and_ruby_extension_example/mrbgem.rake | 2 +-
 examples/mrbgems/c_extension_example/mrbgem.rake          | 2 +-
 examples/mrbgems/ruby_extension_example/mrbgem.rake       | 2 +-
 mrbgems/mruby-array-ext/mrbgem.rake                       | 2 +-
 mrbgems/mruby-bin-mirb/mrbgem.rake                        | 2 +-
 mrbgems/mruby-bin-mruby/mrbgem.rake                       | 2 +-
 mrbgems/mruby-enum-ext/mrbgem.rake                        | 2 +-
 mrbgems/mruby-eval/mrbgem.rake                            | 2 +-
 mrbgems/mruby-fiber/mrbgem.rake                           | 2 +-
 mrbgems/mruby-hash-ext/mrbgem.rake                        | 2 +-
 mrbgems/mruby-math/mrbgem.rake                            | 2 +-
 mrbgems/mruby-numeric-ext/mrbgem.rake                     | 2 +-
 mrbgems/mruby-object-ext/mrbgem.rake                      | 2 +-
 mrbgems/mruby-objectspace/mrbgem.rake                     | 2 +-
 mrbgems/mruby-print/mrbgem.rake                           | 2 +-
 mrbgems/mruby-proc-ext/mrbgem.rake                        | 2 +-
 mrbgems/mruby-random/mrbgem.rake                          | 2 +-
 mrbgems/mruby-range-ext/mrbgem.rake                       | 2 +-
 mrbgems/mruby-sprintf/mrbgem.rake                         | 2 +-
 mrbgems/mruby-string-ext/mrbgem.rake                      | 2 +-
 mrbgems/mruby-struct/mrbgem.rake                          | 2 +-
 mrbgems/mruby-symbol-ext/mrbgem.rake                      | 2 +-
 mrbgems/mruby-time/mrbgem.rake                            | 2 +-
 mrbgems/mruby-toplevel-ext/mrbgem.rake                    | 2 +-
 25 files changed, 26 insertions(+), 26 deletions(-)

(limited to 'mrbgems/mruby-bin-mirb')

diff --git a/doc/mrbgems/README.md b/doc/mrbgems/README.md
index 1062adc6b..07f7002fb 100644
--- a/doc/mrbgems/README.md
+++ b/doc/mrbgems/README.md
@@ -99,7 +99,7 @@ GEM directory. A typical GEM specification could look like this for example:
 
 	MRuby::Gem::Specification.new('c_and_ruby_extension_example') do |spec|
 	  spec.license = 'MIT'
-	  spec.authors = 'mruby developers'
+	  spec.author  = 'mruby developers'
 	end
 
 The mrbgems build process will use this specification to compile Object and Ruby
@@ -124,7 +124,7 @@ In case your GEM is depending on other GEMs please use
 
 	MRuby::Gem::Specification.new('c_and_ruby_extension_example') do |spec|
 	  spec.license = 'MIT'
-	  spec.authors = 'mruby developers'
+	  spec.author  = 'mruby developers'
 
 	  # add GEM dependency mruby-parser.
 	  # Version has to be between 1.0.0 and 1.5.2
diff --git a/examples/mrbgems/c_and_ruby_extension_example/mrbgem.rake b/examples/mrbgems/c_and_ruby_extension_example/mrbgem.rake
index 35dbe5e18..a1f964b36 100644
--- a/examples/mrbgems/c_and_ruby_extension_example/mrbgem.rake
+++ b/examples/mrbgems/c_and_ruby_extension_example/mrbgem.rake
@@ -1,6 +1,6 @@
 MRuby::Gem::Specification.new('c_and_ruby_extension_example') do |spec|
   spec.license = 'MIT'
-  spec.authors = 'mruby developers'
+  spec.author  = 'mruby developers'
  
   # Add compile flags
   # spec.cc.flags << ''
diff --git a/examples/mrbgems/c_extension_example/mrbgem.rake b/examples/mrbgems/c_extension_example/mrbgem.rake
index 8c132b233..3524e22f4 100644
--- a/examples/mrbgems/c_extension_example/mrbgem.rake
+++ b/examples/mrbgems/c_extension_example/mrbgem.rake
@@ -1,6 +1,6 @@
 MRuby::Gem::Specification.new('c_extension_example') do |spec|
   spec.license = 'MIT'
-  spec.authors = 'mruby developers'
+  spec.author  = 'mruby developers'
  
   # Add compile flags
   # spec.cc.flags << '-g'
diff --git a/examples/mrbgems/ruby_extension_example/mrbgem.rake b/examples/mrbgems/ruby_extension_example/mrbgem.rake
index 3a80b5cd7..5624c33e9 100644
--- a/examples/mrbgems/ruby_extension_example/mrbgem.rake
+++ b/examples/mrbgems/ruby_extension_example/mrbgem.rake
@@ -1,6 +1,6 @@
 MRuby::Gem::Specification.new('ruby_extension_example') do |spec|
   spec.license = 'MIT'
-  spec.authors = 'mruby developers'
+  spec.author  = 'mruby developers'
  
   # Add compile flags
   # spec.cc.flags << ''
diff --git a/mrbgems/mruby-array-ext/mrbgem.rake b/mrbgems/mruby-array-ext/mrbgem.rake
index 38e0ad267..18f92ad65 100644
--- a/mrbgems/mruby-array-ext/mrbgem.rake
+++ b/mrbgems/mruby-array-ext/mrbgem.rake
@@ -1,4 +1,4 @@
 MRuby::Gem::Specification.new('mruby-array-ext') do |spec|
   spec.license = 'MIT'
-  spec.authors = 'mruby developers'
+  spec.author  = 'mruby developers'
 end
diff --git a/mrbgems/mruby-bin-mirb/mrbgem.rake b/mrbgems/mruby-bin-mirb/mrbgem.rake
index fd0b20254..337473975 100644
--- a/mrbgems/mruby-bin-mirb/mrbgem.rake
+++ b/mrbgems/mruby-bin-mirb/mrbgem.rake
@@ -1,5 +1,5 @@
 MRuby::Gem::Specification.new('mruby-bin-mirb') do |spec|
   spec.license = 'MIT'
-  spec.authors = 'mruby developers'
+  spec.author  = 'mruby developers'
   spec.bins = %w(mirb)
 end
diff --git a/mrbgems/mruby-bin-mruby/mrbgem.rake b/mrbgems/mruby-bin-mruby/mrbgem.rake
index 2e173a291..08ba89855 100644
--- a/mrbgems/mruby-bin-mruby/mrbgem.rake
+++ b/mrbgems/mruby-bin-mruby/mrbgem.rake
@@ -1,5 +1,5 @@
 MRuby::Gem::Specification.new('mruby-bin-mruby') do |spec|
   spec.license = 'MIT'
-  spec.authors = 'mruby developers'
+  spec.author  = 'mruby developers'
   spec.bins = %w(mruby)
 end
diff --git a/mrbgems/mruby-enum-ext/mrbgem.rake b/mrbgems/mruby-enum-ext/mrbgem.rake
index 758d298dc..e054f4318 100644
--- a/mrbgems/mruby-enum-ext/mrbgem.rake
+++ b/mrbgems/mruby-enum-ext/mrbgem.rake
@@ -1,4 +1,4 @@
 MRuby::Gem::Specification.new('mruby-enum-ext') do |spec|
   spec.license = 'MIT'
-  spec.authors = 'mruby developers'
+  spec.author  = 'mruby developers'
 end
diff --git a/mrbgems/mruby-eval/mrbgem.rake b/mrbgems/mruby-eval/mrbgem.rake
index f80cf1b9e..217a9e604 100644
--- a/mrbgems/mruby-eval/mrbgem.rake
+++ b/mrbgems/mruby-eval/mrbgem.rake
@@ -1,4 +1,4 @@
 MRuby::Gem::Specification.new('mruby-eval') do |spec|
   spec.license = 'MIT'
-  spec.authors = 'mruby developers'
+  spec.author  = 'mruby developers'
 end
diff --git a/mrbgems/mruby-fiber/mrbgem.rake b/mrbgems/mruby-fiber/mrbgem.rake
index cb258adcb..25009c47f 100644
--- a/mrbgems/mruby-fiber/mrbgem.rake
+++ b/mrbgems/mruby-fiber/mrbgem.rake
@@ -1,4 +1,4 @@
 MRuby::Gem::Specification.new('mruby-fiber') do |spec|
   spec.license = 'MIT'
-  spec.authors = 'mruby developers'
+  spec.author  = 'mruby developers'
 end
diff --git a/mrbgems/mruby-hash-ext/mrbgem.rake b/mrbgems/mruby-hash-ext/mrbgem.rake
index 3163c8c88..25d4f8e61 100644
--- a/mrbgems/mruby-hash-ext/mrbgem.rake
+++ b/mrbgems/mruby-hash-ext/mrbgem.rake
@@ -1,4 +1,4 @@
 MRuby::Gem::Specification.new('mruby-hash-ext') do |spec|
   spec.license = 'MIT'
-  spec.authors = 'mruby developers'
+  spec.author  = 'mruby developers'
 end
diff --git a/mrbgems/mruby-math/mrbgem.rake b/mrbgems/mruby-math/mrbgem.rake
index 4b0fa40fd..75d3d1fff 100644
--- a/mrbgems/mruby-math/mrbgem.rake
+++ b/mrbgems/mruby-math/mrbgem.rake
@@ -1,4 +1,4 @@
 MRuby::Gem::Specification.new('mruby-math') do |spec|
   spec.license = 'MIT'
-  spec.authors = 'mruby developers'
+  spec.author  = 'mruby developers'
 end
diff --git a/mrbgems/mruby-numeric-ext/mrbgem.rake b/mrbgems/mruby-numeric-ext/mrbgem.rake
index 69c4fde4c..010804058 100644
--- a/mrbgems/mruby-numeric-ext/mrbgem.rake
+++ b/mrbgems/mruby-numeric-ext/mrbgem.rake
@@ -1,4 +1,4 @@
 MRuby::Gem::Specification.new('mruby-numeric-ext') do |spec|
   spec.license = 'MIT'
-  spec.authors = 'mruby developers'
+  spec.author  = 'mruby developers'
 end
diff --git a/mrbgems/mruby-object-ext/mrbgem.rake b/mrbgems/mruby-object-ext/mrbgem.rake
index 1f232949e..980f1667a 100644
--- a/mrbgems/mruby-object-ext/mrbgem.rake
+++ b/mrbgems/mruby-object-ext/mrbgem.rake
@@ -1,4 +1,4 @@
 MRuby::Gem::Specification.new('mruby-object-ext') do |spec|
   spec.license = 'MIT'
-  spec.authors = 'mruby developers'
+  spec.author  = 'mruby developers'
 end
diff --git a/mrbgems/mruby-objectspace/mrbgem.rake b/mrbgems/mruby-objectspace/mrbgem.rake
index 100df4cdc..6a6a3e778 100644
--- a/mrbgems/mruby-objectspace/mrbgem.rake
+++ b/mrbgems/mruby-objectspace/mrbgem.rake
@@ -1,4 +1,4 @@
 MRuby::Gem::Specification.new('mruby-objectspace') do |spec|
   spec.license = 'MIT'
-  spec.authors = 'mruby developers'
+  spec.author  = 'mruby developers'
 end
diff --git a/mrbgems/mruby-print/mrbgem.rake b/mrbgems/mruby-print/mrbgem.rake
index dc7831280..768fc2e18 100644
--- a/mrbgems/mruby-print/mrbgem.rake
+++ b/mrbgems/mruby-print/mrbgem.rake
@@ -1,4 +1,4 @@
 MRuby::Gem::Specification.new('mruby-print') do |spec|
   spec.license = 'MIT'
-  spec.authors = 'mruby developers'
+  spec.author  = 'mruby developers'
 end
diff --git a/mrbgems/mruby-proc-ext/mrbgem.rake b/mrbgems/mruby-proc-ext/mrbgem.rake
index 7f979431d..b75fceda3 100644
--- a/mrbgems/mruby-proc-ext/mrbgem.rake
+++ b/mrbgems/mruby-proc-ext/mrbgem.rake
@@ -1,4 +1,4 @@
 MRuby::Gem::Specification.new('mruby-proc-ext') do |spec|
   spec.license = 'MIT'
-  spec.authors = 'mruby developers'
+  spec.author  = 'mruby developers'
 end
diff --git a/mrbgems/mruby-random/mrbgem.rake b/mrbgems/mruby-random/mrbgem.rake
index 38e93e4b1..7ad3c855c 100644
--- a/mrbgems/mruby-random/mrbgem.rake
+++ b/mrbgems/mruby-random/mrbgem.rake
@@ -1,4 +1,4 @@
 MRuby::Gem::Specification.new('mruby-random') do |spec|
   spec.license = 'MIT'
-  spec.authors = 'mruby developers'
+  spec.author  = 'mruby developers'
 end
diff --git a/mrbgems/mruby-range-ext/mrbgem.rake b/mrbgems/mruby-range-ext/mrbgem.rake
index 5ed521a44..a7970aa51 100644
--- a/mrbgems/mruby-range-ext/mrbgem.rake
+++ b/mrbgems/mruby-range-ext/mrbgem.rake
@@ -1,4 +1,4 @@
 MRuby::Gem::Specification.new('mruby-range-ext') do |spec|
   spec.license = 'MIT'
-  spec.authors = 'mruby developers'
+  spec.author  = 'mruby developers'
 end
diff --git a/mrbgems/mruby-sprintf/mrbgem.rake b/mrbgems/mruby-sprintf/mrbgem.rake
index 8772a5174..3e15ee7a9 100644
--- a/mrbgems/mruby-sprintf/mrbgem.rake
+++ b/mrbgems/mruby-sprintf/mrbgem.rake
@@ -1,4 +1,4 @@
 MRuby::Gem::Specification.new('mruby-sprintf') do |spec|
   spec.license = 'MIT'
-  spec.authors = 'mruby developers'
+  spec.author  = 'mruby developers'
 end
diff --git a/mrbgems/mruby-string-ext/mrbgem.rake b/mrbgems/mruby-string-ext/mrbgem.rake
index 83db97eb4..4a3369998 100644
--- a/mrbgems/mruby-string-ext/mrbgem.rake
+++ b/mrbgems/mruby-string-ext/mrbgem.rake
@@ -1,4 +1,4 @@
 MRuby::Gem::Specification.new('mruby-string-ext') do |spec|
   spec.license = 'MIT'
-  spec.authors = 'mruby developers'
+  spec.author  = 'mruby developers'
 end
diff --git a/mrbgems/mruby-struct/mrbgem.rake b/mrbgems/mruby-struct/mrbgem.rake
index 476e990da..3e9eab8d7 100644
--- a/mrbgems/mruby-struct/mrbgem.rake
+++ b/mrbgems/mruby-struct/mrbgem.rake
@@ -1,4 +1,4 @@
 MRuby::Gem::Specification.new('mruby-struct') do |spec|
   spec.license = 'MIT'
-  spec.authors = 'mruby developers'
+  spec.author  = 'mruby developers'
 end
diff --git a/mrbgems/mruby-symbol-ext/mrbgem.rake b/mrbgems/mruby-symbol-ext/mrbgem.rake
index 8e40c743b..6294e7a46 100644
--- a/mrbgems/mruby-symbol-ext/mrbgem.rake
+++ b/mrbgems/mruby-symbol-ext/mrbgem.rake
@@ -1,4 +1,4 @@
 MRuby::Gem::Specification.new('mruby-symbol-ext') do |spec|
   spec.license = 'MIT'
-  spec.authors = 'mruby developers'
+  spec.author  = 'mruby developers'
 end
diff --git a/mrbgems/mruby-time/mrbgem.rake b/mrbgems/mruby-time/mrbgem.rake
index 0f0b4899d..edf2aa3fc 100644
--- a/mrbgems/mruby-time/mrbgem.rake
+++ b/mrbgems/mruby-time/mrbgem.rake
@@ -1,4 +1,4 @@
 MRuby::Gem::Specification.new('mruby-time') do |spec|
   spec.license = 'MIT'
-  spec.authors = 'mruby developers'
+  spec.author  = 'mruby developers'
 end
diff --git a/mrbgems/mruby-toplevel-ext/mrbgem.rake b/mrbgems/mruby-toplevel-ext/mrbgem.rake
index 457047e8d..78eb73a26 100644
--- a/mrbgems/mruby-toplevel-ext/mrbgem.rake
+++ b/mrbgems/mruby-toplevel-ext/mrbgem.rake
@@ -1,4 +1,4 @@
 MRuby::Gem::Specification.new('mruby-toplevel-ext') do |spec|
   spec.license = 'MIT'
-  spec.authors = 'mruby developers'
+  spec.author  = 'mruby developers'
 end
-- 
cgit v1.2.3


From c8f1f7fdf617b1b383042f5bcae0a1abca3e5883 Mon Sep 17 00:00:00 2001
From: mattn <mattn.jp@gmail.com>
Date: Tue, 23 Jul 2013 12:13:50 +0900
Subject: Check home is null

---
 mrbgems/mruby-bin-mirb/tools/mirb/mirb.c | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

(limited to 'mrbgems/mruby-bin-mirb')

diff --git a/mrbgems/mruby-bin-mirb/tools/mirb/mirb.c b/mrbgems/mruby-bin-mirb/tools/mirb/mirb.c
index 3111eea8f..e9bbb5420 100644
--- a/mrbgems/mruby-bin-mirb/tools/mirb/mirb.c
+++ b/mrbgems/mruby-bin-mirb/tools/mirb/mirb.c
@@ -285,10 +285,12 @@ main(int argc, char **argv)
   if (!home)
     home = getenv("USERPROFILE");
 #endif
-  strcpy(history_path, home);
-  strcat(history_path, "/");
-  strcat(history_path, history_file_name);
-  read_history(history_path);
+  if (home) {
+    strcpy(history_path, home);
+    strcat(history_path, "/");
+    strcat(history_path, history_file_name);
+    read_history(history_path);
+  }
 #endif
 
 
-- 
cgit v1.2.3