Changeset 14449

Timestamp:

Aug 8, 2007, 12:27:44 PM (19 years ago)

Author:

eugene

Message:

support the BSD libedit as well as readlin

Location:

trunk/Ohana/src/opihi

Files:

• cmd.basic/quit.c (modified) (1 diff)
• lib.shell/CommandOps.c (modified) (2 diffs)
• lib.shell/opihi.c (modified) (1 diff)

trunk/Ohana/src/opihi/cmd.basic/quit.c

@@ -12 +12 @@
   } 
 
+// the libedit version of readline does not support an incremental write to history file
+# ifndef RL_READLINE_VERSION
+  history = get_variable("HISTORY");
+  if (history != NULL) write_history (history);
+# endif
+
   exit (state);
 

trunk/Ohana/src/opihi/lib.shell/CommandOps.c

@@ -1 +1 @@
 # include "opihi.h"
+
+// if the user has installed the libedit version of readline, we need to modify a couple symbols:
+# ifndef RL_READLINE_VERSION
+# define rl_completion_matches(A,B) completion_matches(A,B)
+# endif
 
 static Command  *commands;
@@ -118 +123 @@
   matches = (char **) NULL;
   
-  if (start == 0)
+  if (start == 0) {
     matches = rl_completion_matches (text, command_generator);
+  }
 
   return (matches);

trunk/Ohana/src/opihi/lib.shell/opihi.c

@@ -41 +41 @@
       status = multicommand (line);
       add_history (line);
+
+// the libedit version of readline does not support an incremental write to history file
+# ifdef RL_READLINE_VERSION
       if (history != NULL) append_history (1, history);
+# endif
+
     }
     free (line);