[frontend/pyreadline] Check errors and throw exceptions

Fixes spec-cpp failure in spec/builtin-history
oilshell · Aug 12, 2023 · c793774 · c793774
1 parent 1be8eca
commit c793774
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 6 deletions.
diff --git a/cpp/frontend_pyreadline.cc b/cpp/frontend_pyreadline.cc
@@ -74,7 +74,7 @@ Readline::Readline()
       latest_line_() {
 #if HAVE_READLINE
   using_history();
-  rl_readline_name = "oil";
+  rl_readline_name = "oils";
   /* Force rebind of TAB to insert-tab */
   rl_bind_key('\t', rl_insert);
   /* Bind both ESC-TAB and ESC-ESC to the completion function */
@@ -115,7 +115,10 @@ void Readline::read_history_file(Str* path) {
   if (path != nullptr) {
     p = path->data();
   }
-  read_history(p);
+  int err_num = read_history(p);
+  if (err_num) {
+    throw Alloc<IOError>(err_num);
+  }
 #else
   assert(0);  // not implemented
 #endif
@@ -127,7 +130,10 @@ void Readline::write_history_file(Str* path) {
   if (path != nullptr) {
     p = path->data();
   }
-  write_history(p);
+  int err_num = write_history(p);
+  if (err_num) {
+    throw Alloc<IOError>(err_num);
+  }
 #else
   assert(0);  // not implemented
 #endif
@@ -194,6 +200,9 @@ void Readline::clear_history() {
 void Readline::remove_history_item(int pos) {
 #if HAVE_READLINE
   HIST_ENTRY* entry = remove_history(pos);
+  if (!entry) {
+    throw Alloc<ValueError>(StrFormat("No history item at position %d", pos));
+  }
   histdata_t data = free_history_entry(entry);
   free(data);
 #else

diff --git a/pyext/line_input.c b/pyext/line_input.c
@@ -966,7 +966,7 @@ setup_readline(void)
 
     using_history();
 
-    rl_readline_name = "python";
+    rl_readline_name = "oils";
 #if defined(PYOS_OS2) && defined(PYCC_GCC)
     /* Allow $if term= in .inputrc to work */
     rl_terminal_name = getenv("TERM");

diff --git a/spec/builtin-history.test.sh b/spec/builtin-history.test.sh
@@ -126,9 +126,10 @@ status=1
 
 #### history -d to delete history item
 
+rm -f myhist
 export HISTFILE=myhist
 
-$SH --norc -i <<EOF
+$SH --norc -i <<'EOF'
 
 echo 42
 echo 43
@@ -144,6 +145,8 @@ history -d -1
 echo status=$?
 history -d -2
 echo status=$?
+history -d 99
+echo status=$?
 
 case $SH in bash) echo '^D' ;; esac
 
@@ -154,8 +157,20 @@ EOF
 43
 44
 status=0
+status=2
+status=2
+status=2
+^D
+## END
+
+## OK bash STDOUT:
+42
+43
+44
 status=0
-status=0
+status=1
+status=1
+status=1
 ^D
 ## END