Commit 88731e17 authored by Yukihiro "Matz" Matsumoto's avatar Yukihiro "Matz" Matsumoto

Merge pull request #1390 from kyab/mirb_history

Save mirb history when readline enabled
parents 70d7031e 1fe65b25
...@@ -15,11 +15,19 @@ ...@@ -15,11 +15,19 @@
#include <mruby/data.h> #include <mruby/data.h>
#include <mruby/compile.h> #include <mruby/compile.h>
#ifdef ENABLE_READLINE #ifdef ENABLE_READLINE
#include <limits.h>
#include <readline/readline.h> #include <readline/readline.h>
#include <readline/history.h> #include <readline/history.h>
#endif #endif
#include <mruby/string.h> #include <mruby/string.h>
#ifdef ENABLE_READLINE
static const char *history_file_name = ".mirb_history";
char history_path[PATH_MAX];
#endif
static void static void
p(mrb_state *mrb, mrb_value obj, int prompt) p(mrb_state *mrb, mrb_value obj, int prompt)
{ {
...@@ -245,6 +253,7 @@ main(int argc, char **argv) ...@@ -245,6 +253,7 @@ main(int argc, char **argv)
int n; int n;
int code_block_open = FALSE; int code_block_open = FALSE;
int ai; int ai;
char *home = NULL;
/* new interpreter instance */ /* new interpreter instance */
mrb = mrb_open(); mrb = mrb_open();
...@@ -268,6 +277,21 @@ main(int argc, char **argv) ...@@ -268,6 +277,21 @@ main(int argc, char **argv)
if (args.verbose) cxt->dump_result = 1; if (args.verbose) cxt->dump_result = 1;
ai = mrb_gc_arena_save(mrb); ai = mrb_gc_arena_save(mrb);
#ifdef ENABLE_READLINE
using_history();
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);
#endif
while (TRUE) { while (TRUE) {
#ifndef ENABLE_READLINE #ifndef ENABLE_READLINE
print_cmdline(code_block_open); print_cmdline(code_block_open);
...@@ -361,5 +385,9 @@ main(int argc, char **argv) ...@@ -361,5 +385,9 @@ main(int argc, char **argv)
mrbc_context_free(mrb, cxt); mrbc_context_free(mrb, cxt);
mrb_close(mrb); mrb_close(mrb);
#ifdef ENABLE_READLINE
write_history(history_path);
#endif
return 0; return 0;
} }
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment