octave-nkf: src/oct-hist.cc comparison

comparison src/oct-hist.cc @ 64:bd04d91a7a4a

[project @ 1993-08-15 05:08:48 by jwe] (mk_tmp_hist_file): New function, extracted from do_edit_history. (do_edit_history): Simplify using mk_tmp_hist_file. (do_run_history): New function. (edit_history_repl_hist): New function.

author	jwe
date	Sun, 15 Aug 1993 05:08:48 +0000
parents	78fd87e624cb
children	a500c60e8f23

comparison

equal deleted inserted replaced

-:91ab99b0dbae
+:bd04d91a7a4a
 line[lindex++] = '\n';
 line[lindex++] = '\0';
 return line;
 }
+extern "C"
+{
+HIST_ENTRY *history_get ();
+}
+/*
+* Use `command' to replace the last entry in the history list, which,
+* by this time, is `run_history blah...'.  The intent is that the
+* new command become the history entry, and that `fc' should never
+* appear in the history list.  This way you can do `run_history' to
+* your heart's content.
+*/
+static void
+edit_history_repl_hist (char *command)
+{
+if (command == (char *) NULL || *command == '\0')
+return;
+HIST_ENTRY **hlist = history_list ();
+if (hlist == (HIST_ENTRY **) NULL)
+return;
+for (int i = 0; hlist[i]; i++)
+; // Count 'em.
+i--;
+/* History_get () takes a parameter that should be
+offset by history_base. */
+// Don't free this.
+HIST_ENTRY *histent = history_get (history_base + i);
+if (histent == (HIST_ENTRY *) NULL)
+return;
+char *data = (char *) NULL;
+if (histent->data != (char *) NULL)
+{
+int len = strlen (histent->data);
+data = (char *) malloc (len);
+strcpy (data, histent->data);
+}
+int n = strlen (command);
+if (command[n - 1] == '\n')
+command[n - 1] = '\0';
+if (command != (char *) NULL && *command != '\0')
+{
+HIST_ENTRY *discard = replace_history_entry (i, command, data);
+if (discard != (HIST_ENTRY *) NULL)
+	{
+	  if (discard->line != (char *) NULL)
+	    free (discard->line);
+	  free ((char *) discard);
+	}
+}
+}
 static void
 edit_history_add_hist (char *line)
 {
 if (line != (char *) NULL)
 {
 #define histline(i) (hlist[(i)]->line)
 #define EDIT_COMMAND "${EDITOR:-vi}"
-void
+static char *
-do_edit_history (int argc, char **argv)
+mk_tmp_hist_file (int argc, char **argv, int insert_curr, char *warn_for)
 {
 HIST_ENTRY **hlist;
 hlist = history_list ();
 // The current command line is already part of the history list by the
 // time we get to this point.  Delete it from the list.
 hist_count -= 2;
-remove_history (hist_count);
+if (! insert_curr)
+remove_history (hist_count);
 hist_count--;
 // If no numbers have been specified, the default is to edit the last
 // command in the history list.
 }
 if (hist_beg < 0 || hist_end < 0 || hist_beg > hist_count
 || hist_end > hist_count)
 {
-error ("history specification out of range");
+error ("%s: history specification out of range", warn_for);
-return;
+return (char *) NULL;
 }
 if (usage_error)
 {
-usage ("edit_history [first] [last]");
+usage ("%s [first] [last]", warn_for);
-return;
+return (char *) NULL;
 }
 if (hist_end < hist_beg)
 {
 int t = hist_end;
 }
 char *name = tmpnam ((char *) NULL);
 fstream file (name, ios::out);
 if (! file)
 {
-error ("edit_history: couldn't open temporary file `%s'", name);
+error ("%s: couldn't open temporary file `%s'", warn_for, name);
-return;
+return (char *) NULL;
 }
 if (reverse)
 {
 for (int i = hist_end; i >= hist_beg; i--)
 for (int i = hist_beg; i <= hist_end; i++)
 	file << histline (i) << "\n";
 }
 file.close ();
+return name;
+}
+void
+do_edit_history (int argc, char **argv)
+{
+char *name = mk_tmp_hist_file (argc, argv, 0, "edit_history");
+if (name == (char *) NULL)
+return;
 // Call up our favorite editor on the file of commands.
 ostrstream buf;
 buf << EDIT_COMMAND << " " << name << ends;
 char *cmd = buf.str ();
 // Ignore interrupts while we are off editing commands.  Should we
-// maybe avoid using system()?  There still seems to be a problem with
+// maybe avoid using system()?
-// properly waiting for emacsclient.
 volatile sig_handler *saved_sigint_handler = signal (SIGINT, SIG_IGN);
 system (cmd);
 signal (SIGINT, saved_sigint_handler);
 // Write the commands to the history file since parse_and_execute
 // disables command line history while it executes.
-file.open (name, ios::in);
+fstream file (name, ios::in);
 char *line;
+int first = 1;
 while ((line = edit_history_readline (file)) != NULL)
 {
 // Skip blank lines
 	{
 	  delete [] line;
 	  continue;
 	}
-edit_history_add_hist (line);
+if (first)
+	{
+	  first = 0;
+	  edit_history_repl_hist (line);
+	}
+else
+	edit_history_add_hist (line);
 }
 file.close ();
 // Turn on command echo, so the output from this will make better sense.
 echo_input = 1;
 parse_and_execute (name, 1);
 run_unwind_frame ("do_edit_history");
+// Delete the temporary file.  Should probably be done with an
+// unwind_protect.
+unlink (name);
+}
+void
+do_run_history (int argc, char **argv)
+{
+char *name = mk_tmp_hist_file (argc, argv, 1, "run_history");
+if (name == (char *) NULL)
+return;
+// Turn on command echo, so the output from this will make better sense.
+begin_unwind_frame ("do_run_history");
+unwind_protect_int (echo_input);
+echo_input = 1;
+parse_and_execute (name, 1);
+run_unwind_frame ("do_run_history");
 // Delete the temporary file.  Should probably be done with an
 // unwind_protect.
 unlink (name);

Mercurial > octave-nkf

comparison src/oct-hist.cc @ 64:bd04d91a7a4a