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

comparison src/oct-hist.cc @ 529:7ea224e713cd

[project @ 1994-07-20 18:54:27 by jwe]

author	jwe
date	Wed, 20 Jul 1994 19:19:08 +0000
parents	3c23b8ea9099
children	bc813f5eb025

comparison

equal deleted inserted replaced

-:e1e6e33e26f8
+:7ea224e713cd
 #include "statdefs.h"
 #include "utils.h"
 #include "error.h"
 #include "input.h"
 #include "octave.h"
+#include "oct-obj.h"
 #include "user-prefs.h"
 #include "unwind-prot.h"
 #include "octave-hist.h"
 #include "sighandlers.h"
+#include "defun.h"
 extern "C"
 {
 #include <readline/history.h>
 }
 static int
 default_history_size (void)
 {
 int size = 1024;
 char *env_size = getenv ("OCTAVE_HISTSIZE");
-if (env_size != (char *) NULL)
+if (env_size)
 {
 int val;
 if (sscanf (env_size, "%d", &val) == 1)
 	size = val > 0 ? val : 0;
 }
 }
 static char *
 default_history_file (void)
 {
-char *file = (char *) NULL;;
+char *file = 0;
 char *env_file = getenv ("OCTAVE_HISTFILE");
-if (env_file != (char *) NULL)
+if (env_file)
 {
 fstream f (env_file, (ios::in | ios::out));
-if (f != 0)
+if (f)
 	{
 	  file = strsave (env_file);
 	  f.close ();
 	}
 }
-if (file == (char *) NULL)
+if (! file && home_directory)
-{
+file = strconcat (home_directory, "/.octave_hist");
-if (home_directory != NULL)
-	file = strconcat (home_directory, "/.octave_hist");
-}
 return file;
 }
 /*
 hlist = history_list ();
 if (hlist)
 {
-for (int i = 0; hlist[i] != (HIST_ENTRY *) NULL; i++)
+for (int i = 0; hlist[i]; i++)
 	; // Do nothing.
 if (limit < 0)
 	limit = -limit;
 }
 if (! lindex)
 {
 delete [] line;
-return (char *) NULL;
+return 0;
 }
 if (lindex + 2 >= line_len)
 {
 char *tmp_line = new char [lindex+3];
 * your heart's content.
 */
 static void
 edit_history_repl_hist (char *command)
 {
-if (command == (char *) NULL || *command == '\0')
+if (! command || ! *command)
 return;
 HIST_ENTRY **hlist = history_list ();
-if (hlist == (HIST_ENTRY **) NULL)
+if (! hlist)
 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)
+if (! histent)
 return;
-char *data = (char *) NULL;
+char *data = 0;
-if (histent->data != (char *) NULL)
+if (histent->data)
 {
 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')
+if (command && *command)
 {
 HIST_ENTRY *discard = replace_history_entry (i, command, data);
-if (discard != (HIST_ENTRY *) NULL)
+if (discard)
 	{
-	  if (discard->line != (char *) NULL)
+	  if (discard->line)
 	    free (discard->line);
 	  free ((char *) discard);
 	}
 }
 }
 static void
 edit_history_add_hist (char *line)
 {
-if (line != (char *) NULL)
+if (line)
 {
 int len = strlen (line);
 if (len > 0 && line[len-1] == '\n')
 	line[len-1] = '\0';
 hlist = history_list ();
 int hist_count = 0;
-while (hlist[hist_count++] != (HIST_ENTRY *) NULL)
+while (hlist[hist_count++])
 ; // Find the number of items in the 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.
 if (hist_beg < 0 || hist_end < 0 || hist_beg > hist_count
 || hist_end > hist_count)
 {
 error ("%s: history specification out of range", warn_for);
-return (char *) NULL;
+return 0;
 }
 if (usage_error)
 {
 usage ("%s [first] [last]", warn_for);
-return (char *) NULL;
+return 0;
 }
 if (hist_end < hist_beg)
 {
 int t = hist_end;
 hist_end = hist_beg;
 hist_beg = t;
 reverse = 1;
 }
-char *name = tmpnam ((char *) NULL);
+char *name = tmpnam (0);
 fstream file (name, ios::out);
 if (! file)
 {
 error ("%s: couldn't open temporary file `%s'", warn_for, name);
-return (char *) NULL;
+return 0;
 }
 if (reverse)
 {
 for (int i = hist_end; i >= hist_beg; i--)
 void
 do_edit_history (int argc, char **argv)
 {
 char *name = mk_tmp_hist_file (argc, argv, 0, "edit_history");
-if (name == (char *) NULL)
+if (! name)
 return;
 // Call up our favorite editor on the file of commands.
 ostrstream buf;
 fstream file (name, ios::in);
 char *line;
 int first = 1;
-while ((line = edit_history_readline (file)) != NULL)
+while ((line = edit_history_readline (file)) != 0)
 {
 // Skip blank lines
 if (line[0] == '\n')
 void
 do_run_history (int argc, char **argv)
 {
 char *name = mk_tmp_hist_file (argc, argv, 1, "run_history");
-if (name == (char *) NULL)
+if (! name)
 return;
 // Turn on command echo, so the output from this will make better sense.
 begin_unwind_frame ("do_run_history");
 if (octave_hist_size > 0)
 return history_base + where_history ();
 else
 return -1;
+}
+DEFUN_TEXT ("edit_history", Fedit_history, Sedit_history, -1, 1,
+"edit_history [first] [last]\n\
+\n\
+edit commands from the history list")
+{
+Octave_object retval;
+DEFINE_ARGV("edit_history");
+do_edit_history (argc, argv);
+DELETE_ARGV;
+return retval;
+}
+DEFUN_TEXT ("history", Fhistory, Shistory, -1, 1,
+"history [N] [-w file] [-r file] [-q]\n\
+\n\
+display, save, or load command history")
+{
+Octave_object retval;
+DEFINE_ARGV("history");
+do_history (argc, argv);
+DELETE_ARGV;
+return retval;
+}
+DEFUN_TEXT ("run_history", Frun_history, Srun_history, -1, 1,
+"run_history [first] [last]\n\
+\n\
+run commands from the history list")
+{
+Octave_object retval;
+DEFINE_ARGV("run_history");
+do_run_history (argc, argv);
+DELETE_ARGV;
+return retval;
 }
 /*
 ;;; Local Variables: ***
 ;;; mode: C++ ***

Mercurial > hg > octave-lyh

comparison src/oct-hist.cc @ 529:7ea224e713cd