--- a/liboctave/idx-vector.cc	Wed Jul 20 18:45:27 1994 +0000
+++ b/liboctave/idx-vector.cc	Wed Jul 20 18:48:55 1994 +0000
@@ -71,7 +71,7 @@
 }
 
 idx_vector::idx_vector (const Matrix& m, int do_ftn_idx,
-			const char *rc, int z_len = 0)
+			const char *rc, int z_len)
 {
   initialized = 0;
 
@@ -178,7 +178,7 @@
 }
 
 void
-idx_vector::init_state (const char *rc, int z_len = 0)
+idx_vector::init_state (const char *rc, int z_len)
 {
   one_zero = 1;
   num_zeros = 0;
@@ -290,7 +290,7 @@
 idx_vector::sort (void)
 {
   qsort ((void *) data, len, sizeof (int),
-	 (int (*)(void*, void*)) intcmp); 
+	 (int (*)(const void*, const void*)) intcmp); 
 }
 
 void

--- a/liboctave/idx-vector.h	Wed Jul 20 18:45:27 1994 +0000
+++ b/liboctave/idx-vector.h	Wed Jul 20 18:48:55 1994 +0000
@@ -40,7 +40,7 @@
   idx_vector (const idx_vector& a);
 
   idx_vector (const Matrix& m, int do_ftn_idx,
-	      const char *rc = (char *) 0, int z_len = 0);
+	      const char *rc = 0, int z_len = 0);
 
   idx_vector (const Range& r);
 
@@ -86,7 +86,7 @@
   int initialized;
   int *data;
 
-  void init_state (const char *rc = (char *) 0, int z_len = 0);
+  void init_state (const char *rc = 0, int z_len = 0);
   void convert_one_zero_to_idx (void);
 };
 

--- a/src/arith-ops.cc	Wed Jul 20 18:45:27 1994 +0000
+++ b/src/arith-ops.cc	Wed Jul 20 18:48:55 1994 +0000
@@ -1,5 +1,4 @@
-// Helper functions for arithmetic operations.            -*- C++ -*-
-// Used by the tree class.                    
+// arith-ops.cc                                         -*- C++ -*-
 /*
 
 Copyright (C) 1992, 1993, 1994 John W. Eaton

--- a/src/arith-ops.h	Wed Jul 20 18:45:27 1994 +0000
+++ b/src/arith-ops.h	Wed Jul 20 18:48:55 1994 +0000
@@ -1,5 +1,4 @@
-// Helper functions for arithmetic operations.            -*- C++ -*-
-// Used by the tree class.                    
+// arith-ops.h                                        -*- C++ -*-
 /*
 
 Copyright (C) 1992, 1993, 1994 John W. Eaton

--- a/src/oct-obj.cc	Wed Jul 20 18:45:27 1994 +0000
+++ b/src/oct-obj.cc	Wed Jul 20 18:48:55 1994 +0000
@@ -48,10 +48,10 @@
 Octave_object::Octave_object (const DiagMatrix& d)
   : Array<tree_constant> (1, tree_constant (d)) { }
 
-Octave_object::Octave_object (const RowVector& v, int pcv = -1)
+Octave_object::Octave_object (const RowVector& v, int pcv)
   : Array<tree_constant> (1, tree_constant (v, pcv)) { }
 
-Octave_object::Octave_object (const ColumnVector& v, int pcv = -1)
+Octave_object::Octave_object (const ColumnVector& v, int pcv)
   : Array<tree_constant> (1, tree_constant (v, pcv)) { }
 
 Octave_object::Octave_object (const Complex& c)
@@ -63,10 +63,10 @@
 Octave_object::Octave_object (const ComplexDiagMatrix& d)
   : Array<tree_constant> (1, tree_constant (d)) { }
 
-Octave_object::Octave_object (const ComplexRowVector& v, int pcv = -1)
+Octave_object::Octave_object (const ComplexRowVector& v, int pcv)
   : Array<tree_constant> (1, tree_constant (v, pcv)) { }
 
-Octave_object::Octave_object (const ComplexColumnVector& v, int pcv = -1)
+Octave_object::Octave_object (const ComplexColumnVector& v, int pcv)
   : Array<tree_constant> (1, tree_constant (v, pcv)) { }
 
 Octave_object::Octave_object (const char *s)

--- a/src/oct-obj.h	Wed Jul 20 18:45:27 1994 +0000
+++ b/src/oct-obj.h	Wed Jul 20 18:48:55 1994 +0000
@@ -1,7 +1,7 @@
 // oct-obj.h                                            -*- C -*-
 /*
 
-Copyright (C) 1992, 1993, 1994 John W. Eaton
+Copyright (C) 1994 John W. Eaton
 
 This file is part of Octave.
 
@@ -24,9 +24,23 @@
 #if !defined (octave_oct_obj_h)
 #define octave_oct_obj_h 1
 
+#if defined (__GNUG__)
+#pragma interface
+#endif
+
 #include "Array.h"
+#include "mx-base.h"
 
 class tree_constant;
+class Matrix;
+class RowVector;
+class ColumnVector;
+class DiagMatrix;
+class ComplexMatrix;
+class ComplexRowVector;
+class ComplexColumnVector;
+class ComplexDiagMatrix;
+class Range;
 
 class Octave_object : public Array<tree_constant>
 {
@@ -37,6 +51,25 @@
   Octave_object (int n, const tree_constant& val)
     : Array<tree_constant> (n, val) { }
 
+  Octave_object (const tree_constant& tc) : Array<tree_constant> (1, tc) { }
+
+  Octave_object (double d);
+  Octave_object (const Matrix& m);
+  Octave_object (const DiagMatrix& d);
+  Octave_object (const RowVector& v, int pcv = -1);
+  Octave_object (const ColumnVector& v, int pcv = -1);
+
+  Octave_object (const Complex& c);
+  Octave_object (const ComplexMatrix& m);
+  Octave_object (const ComplexDiagMatrix& d);
+  Octave_object (const ComplexRowVector& v, int pcv = -1);
+  Octave_object (const ComplexColumnVector& v, int pcv = -1);
+
+  Octave_object (const char *s);
+
+  Octave_object (double base, double limit, double inc);
+  Octave_object (const Range& r);
+
   Octave_object (const Octave_object& obj) : Array<tree_constant> (obj) { }
 
   Octave_object& operator = (const Octave_object& obj)
@@ -45,32 +78,23 @@
       return *this;
     }
 
-#if 0
-// For now, translate the index, since it will be somewhat difficult
-// to fix this without some major (and relatively risky) surgery.
-
-  tree_constant& elem (int n)
-    { return Array<tree_constant>::elem (n - 1); }
-
-  tree_constant& checkelem (int n);
-    { return Array<tree_constant>::checkelem (n - 1); }
+// Assignment will resize on range errors.
 
   tree_constant& operator () (int n);
-    { return Array<tree_constant>::operator () (n - 1); }
+
+  tree_constant operator () (int n) const;
+
+private:
 
-// No checking.
+  void maybe_resize (int n);
+
+  tree_constant& elem (int n);
+  tree_constant& checkelem (int n);
+
   tree_constant& xelem (int n);
-    { return Array<tree_constant>::xelem (n - 1); }
 
   tree_constant elem (int n) const;
-    { return Array<tree_constant>::elem (n - 1); }
-
   tree_constant checkelem (int n) const;
-    { return Array<tree_constant>::checkelem (n - 1); }
-
-  tree_constant operator () (int n) const;
-    { return Array<tree_constant>::operator () (n - 1); }
-#endif
 };
 
 #endif

--- a/src/utils.cc	Wed Jul 20 18:45:27 1994 +0000
+++ b/src/utils.cc	Wed Jul 20 18:48:55 1994 +0000
@@ -49,38 +49,12 @@
 #include <string.h>
 #include <stdlib.h>
 #include <stdio.h>
-#include <time.h>
-#include <math.h>
 #include <limits.h>
 #include <iostream.h>
 #include <strstream.h>
 #include <fstream.h>
 
-// This mess suggested by the autoconf manual.
-// unistd.h defines _POSIX_VERSION on POSIX.1 systems.
-#if defined(DIRENT) || defined(_POSIX_VERSION)
-#include <dirent.h>
-#define NLENGTH(dirent) (strlen((dirent)->d_name))
-#else /* not (DIRENT or _POSIX_VERSION) */
-#define dirent direct
-#define NLENGTH(dirent) ((dirent)->d_namlen)
-#ifdef SYSNDIR
-#include <sys/ndir.h>
-#endif /* SYSNDIR */
-#ifdef SYSDIR
-#include <sys/dir.h>
-#endif /* SYSDIR */
-#ifdef NDIR
-#include <ndir.h>
-#endif /* NDIR */
-#endif /* not (DIRENT or _POSIX_VERSION) */
-
-#ifndef HAVE_STRCASECMP
-extern "C"
-{
-extern int strcasecmp (const char*, const char*);
-}
-#endif
+#include <Complex.h>
 
 #ifndef HAVE_STRNCASECMP
 extern "C"
@@ -105,81 +79,54 @@
 char *tilde_expand (char *s); /* From readline's tilde.c */
 }
 
+// This mess suggested by the autoconf manual.
+// unistd.h defines _POSIX_VERSION on POSIX.1 systems.
+#if defined(DIRENT) || defined(_POSIX_VERSION)
+#include <dirent.h>
+#define NLENGTH(dirent) (strlen((dirent)->d_name))
+#else /* not (DIRENT or _POSIX_VERSION) */
+#define dirent direct
+#define NLENGTH(dirent) ((dirent)->d_namlen)
+#ifdef SYSNDIR
+#include <sys/ndir.h>
+#endif /* SYSNDIR */
+#ifdef SYSDIR
+#include <sys/dir.h>
+#endif /* SYSDIR */
+#ifdef NDIR
+#include <ndir.h>
+#endif /* NDIR */
+#endif /* not (DIRENT or _POSIX_VERSION) */
+
 #include "SLStack.h"
 
-#include "statdefs.h"
 #include "procstream.h"
 #include "user-prefs.h"
 #include "variables.h"
+#include "dirfns.h"
 #include "error.h"
+#include "pager.h"
 #include "utils.h"
 #include "input.h"
 #include "octave.h"
+#include "oct-obj.h"
 #include "mappers.h"
 #include "version.h"
-#include "defaults.h"
 #include "tree-const.h"
 #include "unwind-prot.h"
 #include "octave-hist.h"
 
-#ifndef STDIN_FILENO
-#define STDIN_FILENO 1
-#endif
-
 // Top level context (?)
 extern jmp_buf toplevel;
 
-// The number of lines we\'ve plotted so far.
-extern int plot_line_count;
-
-// Pipe to gnuplot.
-static oprocstream plot_stream;
-
-// Non-zero means follow symbolic links that point to directories just
-// as if they are real directories.
-static int follow_symbolic_links = 1;
-
-#ifndef MAXPATHLEN
-#define MAXPATHLEN 1024
-#endif
-
-// The size that strings change by.
-#ifndef DEFAULT_ARRAY_SIZE
-#define DEFAULT_ARRAY_SIZE 512
-#endif
-
-// The growth rate for the prompt string.
-#ifndef PROMPT_GROWTH
-#define PROMPT_GROWTH 50
-#endif
-
-#ifndef MAX
-#define MAX(a,b) ((a) > (b) ? (a) : (b))
-#endif
-
-#ifndef MIN
-#define MIN(a,b) ((a) < (b) ? (a) : (b))
-#endif
-
-// Where to find the site-wide configuration file
-#ifndef OCTAVE_HOME
-#define OCTAVE_HOME "/usr/local"
-#endif
-
-// Temp storage for a path.
-static char tdir[MAXPATHLEN];
-
-// List of files to delete when we exit or crash.
-static SLStack <char *> tmp_files;
-
 /*
  * Save a string.
  */
 char *
 strsave (const char *s)
 {
-  if (s == (char *) NULL)
-    return (char *) NULL;
+  if (! s)
+    return 0;
 
   int len = strlen (s);
   char *tmp = new char [len+1];
@@ -216,186 +163,12 @@
     stream.putback ((char) c);
 } 
 
-void
-check_dimensions (int& nr, int& nc, const char *warnfor)
-{
-  if (nr < 0 || nc < 0)
-    {
-      if (user_pref.treat_neg_dim_as_zero)
-	nr = nc = 0;
-      else
-	error ("%s: can't create a matrix with negative dimensions",
-	       warnfor);
-    }
-}
-
-/*
- * Set terminal in raw mode.  From less-177.
- *
- * Change terminal to "raw mode", or restore to "normal" mode.
- * "Raw mode" means 
- *	1. An outstanding read will complete on receipt of a single keystroke.
- *	2. Input is not echoed.  
- *	3. On output, \n is mapped to \r\n.
- *	4. \t is NOT expanded into spaces.
- *	5. Signal-causing characters such as ctrl-C (interrupt),
- *	   etc. are NOT disabled.
- * It doesn't matter whether an input \n is mapped to \r, or vice versa.
- */
-void
-raw_mode (int on)
-{
-  static int curr_on = 0;
-
-  int tty_fd = STDIN_FILENO;
-  if (! isatty (tty_fd))
-    {
-      if (interactive)
-	error ("stdin is not a tty!");
-      return;
-    }
-
-  if (on == curr_on)
-    return;
-
-#if defined (HAVE_TERMIOS_H)
-  {
-    struct termios s;
-    static struct termios save_term;
-
-    if (on)
-      {
-// Get terminal modes.
-
-	tcgetattr (tty_fd, &s);
-
-// Save modes and set certain variables dependent on modes.
-
-	save_term = s;
-//	ospeed = s.c_cflag & CBAUD;
-//	erase_char = s.c_cc[VERASE];
-//	kill_char = s.c_cc[VKILL];
-
-// Set the modes to the way we want them.
-
-	s.c_lflag &= ~(ICANON|ECHO|ECHOE|ECHOK|ECHONL);
-	s.c_oflag |=  (OPOST|ONLCR);
-#if defined (OCRNL)
-	s.c_oflag &= ~(OCRNL);
-#endif
-#if defined (ONOCR)
-	s.c_oflag &= ~(ONOCR);
-#endif
-#if defined (ONLRET)
-	s.c_oflag &= ~(ONLRET);
-#endif
-	s.c_cc[VMIN] = 1;
-	s.c_cc[VTIME] = 0;
-      }      
-    else
-      {
-// Restore saved modes.
-	s = save_term;
-      }
-    tcsetattr (tty_fd, TCSAFLUSH, &s);
-  }
-#elif defined (HAVE_TERMIO_H)
-  {
-    struct termio s;
-    static struct termio save_term;
-
-    if (on)
-      {
-// Get terminal modes.
-
-	ioctl (tty_fd, TCGETA, &s);
-
-// Save modes and set certain variables dependent on modes.
-
-	save_term = s;
-//	ospeed = s.c_cflag & CBAUD;
-//	erase_char = s.c_cc[VERASE];
-//	kill_char = s.c_cc[VKILL];
-
-// Set the modes to the way we want them.
-
-	s.c_lflag &= ~(ICANON|ECHO|ECHOE|ECHOK|ECHONL);
-	s.c_oflag |=  (OPOST|ONLCR);
-#if defined (OCRNL)
-	s.c_oflag &= ~(OCRNL);
-#endif
-#if defined (ONOCR)
-	s.c_oflag &= ~(ONOCR);
-#endif
-#if defined (ONLRET)
-	s.c_oflag &= ~(ONLRET);
-#endif
-	s.c_cc[VMIN] = 1;
-	s.c_cc[VTIME] = 0;
-      }      
-    else
-      {
-// Restore saved modes.
-	s = save_term;
-      }
-    ioctl (tty_fd, TCSETAW, &s);
-  }
-#elif defined (HAVE_SGTTY_H)
-  {
-    struct sgttyb s;
-    static struct sgttyb save_term;
-
-    if (on)
-      {
-// Get terminal modes.
-
-	ioctl (tty_fd, TIOCGETP, &s);
-
-// Save modes and set certain variables dependent on modes.
-
-	save_term = s;
-//	ospeed = s.sg_ospeed;
-//	erase_char = s.sg_erase;
-//	kill_char = s.sg_kill;
-
-// Set the modes to the way we want them.
-
-	s.sg_flags |= CBREAK;
-	s.sg_flags &= ~(ECHO);
-      } 
-    else
-      {
-// Restore saved modes.
-	s = save_term;
-      }
-    ioctl (tty_fd, TIOCSETN, &s);
-  }
-#else
-LOSE! LOSE!
-#endif
-
-  curr_on = on;
-}
-
-/*
- * Read one character from the terminal.
- */
-int
-kbhit (void)
-{
-  int c;
-  raw_mode (1);
-  c = cin.get ();
-  raw_mode (0);
-  return c;
-}
-
 char **
 pathstring_to_vector (char *pathstring)
 {
-  static char **path = (char **) NULL;
+  static char **path = 0;
 
-  if (pathstring != (char *) NULL)
+  if (pathstring)
     {
       int nelem = 0;
       char *tmp_path = strsave (pathstring);
@@ -417,14 +190,14 @@
       delete [] path;
 
       path = new char * [nelem+1];
-      path[nelem] = (char *) NULL;
+      path[nelem] = 0;
 
       int i = 0;
       char *ptr = tmp_path;
       while (i < nelem)
 	{
 	  char *end = strchr (ptr, ':');
-	  if (end != (char *) NULL)
+	  if (end)
 	    *end = '\0';
 	  char *result = tilde_expand (ptr);
 	  path[i] = strsave (result);
@@ -439,782 +212,6 @@
   return path;
 }
 
-char *
-octave_home (void)
-{
-#ifdef RUN_IN_PLACE
-  static char *home = OCTAVE_HOME;
-  return home;
-#else
-  static char *home =  (char *) NULL;
-  delete [] home;
-  char *oh = getenv ("OCTAVE_HOME");
-  if (oh != (char *) NULL)
-    home = strsave (oh);
-  else
-    home = strsave (OCTAVE_HOME);
-  return home;
-#endif
-}
-
-char *
-octave_lib_dir (void)
-{
-#ifdef RUN_IN_PLACE
-  static char *ol = OCTAVE_LIB_DIR;
-  return ol;
-#else
-  static char *ol = (char *) NULL;
-  delete [] ol;
-  char *oh = octave_home ();
-  char *tmp = strconcat (oh, "/lib/octave/");
-  ol = strconcat (tmp, version_string);
-  delete [] tmp;
-  return ol;
-#endif
-}
-
-char *
-octave_info_dir (void)
-{
-#ifdef RUN_IN_PLACE
-  static char *oi = OCTAVE_INFO_DIR;
-  return oi;
-#else
-  static char *oi = (char *) NULL;
-  delete [] oi;
-  char *oh = octave_home ();
-  oi = strconcat (oh, "/info/");
-  return oi;
-#endif
-}
-
-/*
- * Handle OCTAVE_PATH from the environment like TeX handles TEXINPUTS.
- * If the path starts with `:', prepend the standard path.  If it ends
- * with `:' append the standard path.  If it begins and ends with
- * `:', do both (which is useless, but the luser asked for it...).
- *
- * This function may eventually be called more than once, so be
- * careful not to create memory leaks. 
- */
-char *
-default_path (void)
-{
-  static char *pathstring = (char *) NULL;
-  delete [] pathstring;
-
-  static char *std_path = (char *) NULL;
-  delete [] std_path;
-
-  char *libdir = octave_lib_dir ();
-
-  std_path = strconcat (".:", libdir);
-
-  char *oct_path = getenv ("OCTAVE_PATH");
-
-  if (oct_path != (char *) NULL)
-    {
-      pathstring = strsave (oct_path);
-
-      if (pathstring[0] == ':')
-	{
-	  char *tmp = pathstring;
-	  pathstring = strconcat (std_path, pathstring);
-	  delete [] tmp;
-	}
-
-      int tmp_len = strlen (pathstring);
-      if (pathstring[tmp_len-1] == ':')
-	{
-	  char *tmp = pathstring;
-	  pathstring = strconcat (pathstring, std_path);
-	  delete [] tmp;
-	}
-    }
-  else
-    pathstring = strsave (std_path);
-
-  return pathstring;
-}
-
-char *
-default_info_file (void)
-{
-  static char *info_file_string = (char *) NULL;
-  delete [] info_file_string;
-  char *oct_info_file = getenv ("OCTAVE_INFO_FILE");
-  if (oct_info_file != (char *) NULL)
-    info_file_string = strsave (oct_info_file);
-  else
-    {
-      char *infodir = octave_info_dir ();
-      info_file_string = strconcat (infodir, "/octave.info");
-    }
-  return info_file_string;
-}
-
-char *
-default_editor (void)
-{
-  static char *editor_string = (char *) NULL;
-  delete [] editor_string;
-  char *env_editor = getenv ("EDITOR");
-  if (env_editor == (char *) NULL || *env_editor == '\0')
-    editor_string = strsave ("vi");
-  else
-    editor_string = strsave (env_editor);
-  return editor_string;
-}
-
-char *
-get_site_defaults (void)
-{
-  static char *sd = (char *) NULL;
-  delete [] sd;
-  char *libdir = octave_lib_dir ();
-  sd = strconcat (libdir, "/octaverc");
-  return sd;
-}
-
-char *
-default_pager (void)
-{
-  static char *pager_binary = (char *) NULL;
-  delete [] pager_binary;
-  char *pgr = getenv ("PAGER");
-  if (pgr != (char *) NULL)
-    pager_binary = strsave (pgr);
-  else
-#ifdef DEFAULT_PAGER
-    pager_binary = strsave (DEFAULT_PAGER);
-#else
-    pager_binary = strsave ("");
-#endif
-
-  return pager_binary;
-}
-
-/*
- * See if the given file is in the path.
- */
-char *
-file_in_path (const char *name, const char *suffix)
-{
-  char *retval = (char *) NULL;
-
-  char *nm = strconcat ("/", name);
-  if (suffix != (char *) NULL)
-    {
-      char *tmp = nm;
-      nm = strconcat (tmp, suffix);
-      delete [] tmp;
-    }
-
-  if (! the_current_working_directory)
-    get_working_directory ("file_in_path");
-
-  char **path = pathstring_to_vector (user_pref.loadpath);
-
-  char **ptr = path;
-  if (ptr != (char **) NULL)
-    {
-      while (*ptr != (char *) NULL)
-	{
-	  char *tmp = strconcat (*ptr, nm);
-	  char *p = make_absolute (tmp, the_current_working_directory);
-	  delete [] tmp;
-	  ifstream in_file (p);
-	  if (in_file)
-	    {
-	      in_file.close ();
-	      retval = p;
-	      goto done;
-	    }
-	  delete [] p;
-	  ptr++;
-	}
-    }
-
- done:
-  delete [] nm;
-  return retval;
-}
-
-/*
- * See if there is an function file in the path.  If so, return the
- * full path to the file.
- */
-char *
-fcn_file_in_path (const char *name)
-{
-  return file_in_path (name, ".m");
-}
-
-/*
- * Return a pretty pathname.  If the first part of the pathname is the
- * same as $HOME, then replace that with `~'.
- */
-char *
-polite_directory_format (char *name)
-{
-  int l = home_directory ? strlen (home_directory) : 0;
-
-  if (l > 1 && strncmp (home_directory, name, l) == 0
-      && (! name[l] || name[l] == '/'))
-    {
-      strcpy (tdir + 1, name + l);
-      tdir[0] = '~';
-      return (tdir);
-    }
-  else
-    return name;
-}
-
-/*
- * Return 1 if STRING contains an absolute pathname, else 0.
- */
-int
-absolute_pathname (const char *string)
-{
-  if (! string || ! *string)
-    return 0;
-
-  if (*string == '/')
-    return 1;
-
-  if (*string++ == '.')
-    {
-      if ((! *string) || *string == '/')
-	return 1;
-
-      if (*string++ == '.')
-	if (! *string || *string == '/')
-	  return 1;
-    }
-  return 0;
-}
-
-/*
- * Return 1 if STRING is an absolute program name; it is absolute if
- * it contains any slashes.  This is used to decide whether or not to
- * look up through $PATH.
- */
-int
-absolute_program (const char *string)
-{
-  return (strchr (string, '/') != (char *)NULL);
-}
-
-/*
- * Return the `basename' of the pathname in STRING (the stuff after
- * the last '/').  If STRING is not a full pathname, simply return it.
- */
-char *
-base_pathname (char *string)
-{
-  char *p = strrchr (string, '/');
-
-  if (! absolute_pathname (string))
-    return (string);
-
-  if (p)
-    return (++p);
-  else
-    return (string);
-}
-
-/*
- * Return the octal number parsed from STRING, or -1 to indicate that
- * the string contained a bad number.
- */
-int
-read_octal (const char *string)
-{
-  int result = 0;
-  int digits = 0;
-
-  while (*string && *string >= '0' && *string < '8')
-    {
-      digits++;
-      result = (result * 8) + *string++ - '0';
-    }
-
-  if (! digits || result > 0777 || *string)
-    result = -1;
-
-  return result;
-}
-
-/*
- * Append SOURCE to TARGET at INDEX.  SIZE is the current amount of
- * space allocated to TARGET.  SOURCE can be NULL, in which case
- * nothing happens.  Gets rid of SOURCE by free ()ing it.  Returns
- * TARGET in case the location has changed.
- */
-char *
-sub_append_string (char *source, char *target, int *index, int *size)
-{
-  if (source)
-    {
-      while ((int)strlen (source) >= (int)(*size - *index))
-	{
-	  char *tmp = new char [*size += DEFAULT_ARRAY_SIZE];
-	  strcpy (tmp, target);
-	  delete [] target;
-	  target = tmp;
-	}
-
-      strcat (target, source);
-      *index += strlen (source);
-
-      delete [] source;
-    }
-  return target;
-}
-
-/*
- * Return a string which will be printed as a prompt.  The string may
- * contain special characters which are decoded as follows: 
- *   
- *	\t	the time
- *	\d	the date
- *	\n	CRLF
- *	\s	the name of the shell (program)
- *	\w	the current working directory
- *	\W	the last element of PWD
- *	\u	your username
- *	\h	the hostname
- *	\#	the command number of this command
- *	\!	the history number of this command
- *	\$	a $ or a # if you are root
- *	\<octal> character code in octal
- *	\\	a backslash
- */
-char *
-decode_prompt_string (const char *string)
-{
-  int result_size = PROMPT_GROWTH;
-  int result_index = 0;
-  char *result = new char [PROMPT_GROWTH];
-  int c;
-  char *temp = (char *)NULL;
-
-  result[0] = 0;
-  while (c = *string++)
-    {
-      if (c == '\\')
-	{
-	  c = *string;
-
-	  switch (c)
-	    {
-	    case '0':
-	    case '1':
-	    case '2':
-	    case '3':
-	    case '4':
-	    case '5':
-	    case '6':
-	    case '7':
-	      {
-		char octal_string[4];
-		int n;
-
-		strncpy (octal_string, string, 3);
-		octal_string[3] = '\0';
-
-		n = read_octal (octal_string);
-
-		temp = strsave ("\\");
-		if (n != -1)
-		  {
-		    string += 3;
-		    temp[0] = n;
-		  }
-
-		c = 0;
-		goto add_string;
-	      }
-	  
-	    case 't':
-	    case 'd':
-	      /* Make the current time/date into a string. */
-	      {
-		time_t the_time = time (0);
-		char *ttemp = ctime (&the_time);
-		temp = strsave (ttemp);
-
-		if (c == 't')
-		  {
-		    strcpy (temp, temp + 11);
-		    temp[8] = '\0';
-		  }
-		else
-		  temp[10] = '\0';
-
-		goto add_string;
-	      }
-
-	    case 'n':
-	      if (! no_line_editing)
-		temp = strsave ("\r\n");
-	      else
-		temp = strsave ("\n");
-	      goto add_string;
-
-	    case 's':
-	      {
-		temp = base_pathname (prog_name);
-		temp = strsave (temp);
-		goto add_string;
-	      }
-	
-	    case 'w':
-	    case 'W':
-	      {
-		char t_string[MAXPATHLEN];
-#define EFFICIENT
-#ifdef EFFICIENT
-
-// Use the value of PWD because it is much more effecient.
-
-		temp = user_pref.pwd;
-
-		if (! temp)
-		  getcwd (t_string, MAXPATHLEN);
-		else
-		  strcpy (t_string, temp);
-#else
-		getcwd (t_string, MAXPATHLEN);
-#endif	/* EFFICIENT */
-
-		if (c == 'W')
-		  {
-		    char *dir = strrchr (t_string, '/');
-		    if (dir && dir != t_string)
-		      strcpy (t_string, dir + 1);
-		    temp = strsave (t_string);
-		  }
-		else
-		  temp = strsave (polite_directory_format (t_string));
-		goto add_string;
-	      }
-      
-	    case 'u':
-	      {
-		temp = strsave (user_name);
-
-		goto add_string;
-	      }
-
-	    case 'h':
-	      {
-		char *t_string;
-
-		temp = strsave (host_name);
-		if (t_string = strchr (temp, '.'))
-		  *t_string = '\0';
-		
-		goto add_string;
-	      }
-
-	    case '#':
-	      {
-		char number_buffer[128];
-		sprintf (number_buffer, "%d", current_command_number);
-		temp = strsave (number_buffer);
-		goto add_string;
-	      }
-
-	    case '!':
-	      {
-		char number_buffer[128];
-		int num = current_history_number ();
-		if (num > 0)
-                  sprintf (number_buffer, "%d", num);
-		else
-		  strcpy (number_buffer, "!");
-		temp = strsave (number_buffer);
-		goto add_string;
-	      }
-
-	    case '$':
-	      temp = strsave (geteuid () == 0 ? "#" : "$");
-	      goto add_string;
-
-	    case '\\':
-	      temp = strsave ("\\");
-	      goto add_string;
-
-	    default:
-	      temp = strsave ("\\ ");
-	      temp[1] = c;
-
-	    add_string:
-	      if (c)
-		string++;
-	      result =
-		(char *)sub_append_string (temp, result,
-					   &result_index, &result_size);
-	      temp = (char *)NULL; /* Free ()'ed in sub_append_string (). */
-	      result[result_index] = '\0';
-	      break;
-	    }
-	}
-      else
-	{
-	  while (3 + result_index > result_size)
-	    {
-	      char *tmp = new char [result_size += PROMPT_GROWTH];
-	      strcpy (tmp, result);
-	      delete [] result;
-	      result = tmp;
-	    }
-	  result[result_index++] = c;
-	  result[result_index] = '\0';
-	}
-    }
-
-#if 0
-  /* I don't really think that this is a good idea.  Do you? */
-  if (! find_variable ("NO_PROMPT_VARS"))
-    {
-      WORD_LIST *expand_string (), *list;
-      char *string_list ();
-
-      list = expand_string (result, 1);
-      free (result);
-      result = string_list (list);
-      dispose_words (list);
-    }
-#endif
-
-  return result;
-}
-
-/*
- * Remove the last N directories from PATH.  Do not PATH blank.
- * PATH must contain enough space for MAXPATHLEN characters.
- */
-void
-pathname_backup (char *path, int n)
-{
-  register char *p;
-
-  if (! *path)
-    return;
-
-  p = path + (strlen (path) - 1);
-
-  while (n--)
-    {
-      while (*p == '/' && p != path)
-	p--;
-
-      while (*p != '/' && p != path)
-	p--;
-
-      *++p = '\0';
-    }
-}
-
-/*
- * Turn STRING (a pathname) into an absolute pathname, assuming that
- * DOT_PATH contains the symbolic location of '.'.  This always
- * returns a new string, even if STRING was an absolute pathname to
- * begin with.
- */
-char *
-make_absolute (const char *string, const char *dot_path)
-{
-  static char current_path[MAXPATHLEN];
-  register char *cp;
-
-  if (! dot_path || *string == '/')
-    return strsave (string);
-
-  strcpy (current_path, dot_path);
-
-  if (! current_path[0])
-    strcpy (current_path, "./");
-
-  cp = current_path + (strlen (current_path) - 1);
-
-  if (*cp++ != '/')
-    *cp++ = '/';
-
-  *cp = '\0';
-
-  while (*string)
-    {
-      if (*string == '.')
-	{
-	  if (! string[1])
-	    return strsave (current_path);
-
-	  if (string[1] == '/')
-	    {
-	      string += 2;
-	      continue;
-	    }
-
-	  if (string[1] == '.' && (string[2] == '/' || ! string[2]))
-	    {
-	      string += 2;
-
-	      if (*string)
-		string++;
-
-	      pathname_backup (current_path, 1);
-	      cp = current_path + strlen (current_path);
-	      continue;
-	    }
-	}
-
-      while (*string && *string != '/')
-	*cp++ = *string++;
-
-      if (*string)
-	*cp++ = *string++;
-
-      *cp = '\0';
-    }
-  return strsave (current_path);
-}
-
-/*
- * Return a consed string which is the current working directory.
- * FOR_WHOM is the name of the caller for error printing.
- */ 
-char *
-get_working_directory (const char *for_whom)
-{
-  if (! follow_symbolic_links)
-    {
-      if (the_current_working_directory)
-	delete [] the_current_working_directory;
-
-      the_current_working_directory = (char *)NULL;
-    }
-
-  if (! the_current_working_directory)
-    {
-      char *directory;
-
-      the_current_working_directory = new char [MAXPATHLEN];
-      directory = getcwd (the_current_working_directory, MAXPATHLEN);
-      if (! directory)
-	{
-	  message (for_whom, the_current_working_directory);
-	  delete [] the_current_working_directory;
-	  the_current_working_directory = (char *)NULL;
-	  return (char *)NULL;
-	}
-    }
-
-  return the_current_working_directory;
-}
-
-/*
- * Do the work of changing to the directory NEWDIR.  Handle symbolic
- * link following, etc.
- */ 
-int
-change_to_directory (const char *newdir)
-{
-  char *t;
-
-  if (follow_symbolic_links)
-    {
-      if (! the_current_working_directory)
-	get_working_directory ("cd_links");
-
-      if (the_current_working_directory)
-	t = make_absolute (newdir, the_current_working_directory);
-      else
-	t = strsave (newdir);
-
-      /* Get rid of trailing `/'. */
-      {
-	register int len_t = strlen (t);
-	if (len_t > 1)
-	  {
-	    --len_t;
-	    if (t[len_t] == '/')
-	      t[len_t] = '\0';
-	  }
-      }
-
-      if (chdir (t) < 0)
-	{
-	  delete [] t;
-	  return 0;
-	}
-
-      if (the_current_working_directory)
-	strcpy (the_current_working_directory, t);
-
-      delete [] t;
-      return 1;
-    }
-  else
-    {
-      if (chdir (newdir) < 0)
-	return 0;
-      else
-	return 1;
-    }
-}
-
-#if !defined (HAVE_GETHOSTNAME) && defined (HAVE_SYS_UTSNAME_H)
-extern "C"
-{
-#include <sys/utsname.h>
-int
-gethostname (char *name, int namelen)
-{
-  int i;
-  struct utsname ut;
-
-  --namelen;
-
-  uname (&ut);
-  i = strlen (ut.nodename) + 1;
-  strncpy (name, ut.nodename, i < namelen ? i : namelen);
-  name[namelen] = '\0';
-
-  return 0;
-}
-}
-#endif
-
-/*
- * Has file `A' been modified after time `T'?
- *
- * case:
- *
- *   a newer than t         returns    1
- *   a older than t         returns    0
- *   stat on a fails        returns   -1
- */
-int
-is_newer (const char *fa, time_t t)
-{
-  struct stat fa_sb;
-  register int fa_stat;
-  register int status = 0;
-
-  fa_stat = stat (fa, &fa_sb);
-  if (fa_stat != 0)
-    status = -1;
-
-  if (status != 0)
-    return status;
-
-  return (fa_sb.st_mtime > t);
-}
-
 /*
  * Return to the main command loop in octave.cc.
  */
@@ -1226,143 +223,9 @@
   longjmp (toplevel, 1);
 }
 
-/*
- * Gag.
- */
-char *
-s_plural (int i)
-{
-  static char *empty = "";
-  static char *s = "s";
-  return i == 1 ? empty : s;
-}
-
-char *
-es_plural (int i)
-{
-  static char *empty = "";
-  static char *es = "es";
-  return i == 1 ? es : empty;
-}
-
-char *
-save_in_tmp_file (tree_constant& t, int ndim = 2, int parametric = 0)
-{
-  char *name = strsave (tmpnam ((char *) NULL));
-  if (name != (char *) NULL)
-    {
-      ofstream file (name);
-      if (file)
-	{
-	  switch (ndim)
-	    {
-	    case 2:
-	      t.save (file);
-	      break;
-	    case 3:
-	      t.save_three_d (file, parametric);
-	      break;
-	    default:
-	      panic_impossible ();
-	      break;
-	    }
-	}
-      else
-	{
-	  error ("couldn't open temporary output file `%s'", name);
-	  delete [] name;
-	  name = (char *) NULL;
-	}
-    }
-  return name;
-}
-
-void
-mark_for_deletion (const char *filename)
-{
-  char *tmp = strsave (filename);
-  tmp_files.push (tmp);
-}
-
-void
-cleanup_tmp_files (void)
-{
-  while (! tmp_files.empty ())
-    {
-      char *filename = tmp_files.pop ();
-      unlink (filename);
-      delete [] filename;
-    }
-}
-
 int
-send_to_plot_stream (const char *cmd)
-{
-// From sighandlers.cc:
-  extern int pipe_handler_error_count;
-
-  static int initialized = 0;
-
-  if (! plot_stream.is_open ())
-    {
-      plot_line_count = 0;
-
-      char *plot_prog = user_pref.gnuplot_binary;
-      if (plot_prog != (char *) NULL)
-	{
-	  plot_stream.open (plot_prog);
-	  if (! plot_stream.is_open ())
-	    {
-	      warning ("plot: unable to open pipe to `%s'",
-		       plot_prog);
-
-	      if (strcmp (plot_prog, "gnuplot") != 0)
-		{
-		  warning ("having trouble finding plotting program.");
-		  warning ("trying again with `gnuplot'");
-		  goto last_chance;
-		}
-	    }
-	}
-      else
-	{
-	last_chance:
-
-	  plot_stream.open ("gnuplot");
-
-	  if (! plot_stream.is_open ())
-	    {
-	      error ("plot: unable to open pipe to `%s'", plot_prog);
-	      return -1;
-	    }
-	}
-    }
-
-  if (! initialized)
-    {
-      initialized = 1;
-      plot_stream << "set data style lines\n";
-    }
-
-  plot_stream << cmd;
-  plot_stream.flush ();
-  pipe_handler_error_count = 0;
-
-  return 0;
-}
-
-void
-close_plot_stream (void)
-{
-  if (plot_stream.is_open ())
-    plot_stream.close ();
-
-  plot_line_count = 0;
-}
-
-int
-almost_match (const char *std, const char *s,
-	      int min_match_len = 1, int case_sens = 1)
+almost_match (const char *std, const char *s, int min_match_len,
+	      int case_sens)
 {
   int stdlen = strlen (std);
   int slen = strlen (s);
@@ -1385,7 +248,7 @@
   int tok_count = 0;
   int toks_matched = 0;
 
-  if (s == NULL || *s == '\0' || max_toks < 1)
+  if (! s || *s == '\0' || max_toks < 1)
     return status;
 
   char *kw = strsave (s);
@@ -1407,15 +270,15 @@
 
 
   char **to_match = new char * [max_toks + 1];
-  char **s1 = std;
+  const char **s1 = std;
   char **s2 = to_match;
 
-  if (s1 == NULL || s2 == NULL)
+  if (! s1 || ! s2)
     goto done;
 
   s2[tok_count] = beg;
   char *end;
-  while ((end = strchr (beg, ' ')) != NULL)
+  while ((end = strchr (beg, ' ')) != 0)
     {
       *end = '\0';
       beg = end + 1;
@@ -1432,7 +295,7 @@
 
       s2[tok_count] = beg;
     }
-  s2[tok_count+1] = NULL;
+  s2[tok_count+1] = 0;
 
   s2 = to_match;
 
@@ -1472,10 +335,10 @@
   int i = 0;
 
   DIR *dirp = opendir (dir);
-  if (dirp != (DIR *) NULL)
+  if (dirp)
     {
       struct dirent *entry;
-      while ((entry = readdir (dirp)) != (struct dirent *) NULL)
+      while ((entry = readdir (dirp)) != 0)
 	{
 	  int len = NLENGTH (entry);
 	  if (len > 2
@@ -1508,7 +371,7 @@
       closedir (dirp);
     }
 
-  retval[i] = (char *) NULL;
+  retval[i] = 0;
   num = i;
 
   return retval;
@@ -1524,9 +387,9 @@
   char **path = pathstring_to_vector (user_pref.loadpath);
 
   char **ptr = path;
-  if (ptr != (char **) NULL)
+  if (ptr)
     {
-      while (*ptr != (char *) NULL)
+      while (*ptr)
 	{
 	  int tmp_num;
 	  char **names = get_fcn_file_names (tmp_num, *ptr, no_suffix);
@@ -1555,7 +418,7 @@
 	}
     }
 
-  retval[i] = (char *) NULL;
+  retval[i] = 0;
   num = i;
 
   return retval;
@@ -1581,6 +444,160 @@
     return floor (x + 0.5);
 }
 
+// XXX FIXME XXX --  put these in some file, and make them extern.
+
+static int
+all_strings (const Octave_object& args)
+{
+  int n = args.length ();
+  for (int i = 1; i < n; i++)
+    if (! args(i).is_string_type ())
+      return 0;
+  return 1;
+}
+
+char **
+make_argv (const Octave_object& args, const char *warnfor)
+{
+  char **argv = 0;
+  if (all_strings (args))
+    {
+      int n = args.length ();
+      argv = new char * [n + 1];
+      argv[0] = 0;
+      for (int i = 1; i < n; i++)
+	argv[i] = strsave (args(i).string_value ());
+    }
+  else
+    error ("%s: expecting all arguments to be strings", warnfor);
+
+  return argv;
+}
+
+/*
+ * Format a list in neat columns.  Mostly stolen from GNU ls.  This
+ * should maybe be in utils.cc.
+ */
+ostrstream&
+list_in_columns (ostrstream& os, char **list)
+{
+// Compute the maximum name length.
+
+  int max_name_length = 0;
+  int total_names = 0;
+  for (char **names = list; *names; names++)
+    {
+      total_names++;
+      int name_length = strlen (*names);
+      if (name_length > max_name_length)
+	max_name_length = name_length;
+    }
+
+// Allow at least two spaces between names.
+
+  max_name_length += 2;
+
+// Calculate the maximum number of columns that will fit.
+
+  int line_length = terminal_columns ();
+  int cols = line_length / max_name_length;
+  if (cols == 0)
+    cols = 1;
+
+// Calculate the number of rows that will be in each column except
+// possibly  for a short column on the right.
+
+  int rows = total_names / cols + (total_names % cols != 0);
+
+// Recalculate columns based on rows.
+
+  cols = total_names / rows + (total_names % rows != 0);
+
+  names = list;
+  int count;
+  for (int row = 0; row < rows; row++)
+    {
+      count = row;
+      int pos = 0;
+
+// Print the next row.
+
+      while (1)
+	{
+	  os << *(names + count);
+	  int name_length = strlen (*(names + count));
+
+	  count += rows;
+	  if (count >= total_names)
+	    break;
+
+	  int spaces_to_pad = max_name_length - name_length;
+	  for (int i = 0; i < spaces_to_pad; i++)
+	    os << " ";
+	  pos += max_name_length;
+	}
+      os << "\n";
+    }
+
+  return os;
+}
+
+/*
+ * See if the given file is in the path.
+ */
+char *
+file_in_path (const char *name, const char *suffix)
+{
+  char *retval = 0;
+
+  char *nm = strconcat ("/", name);
+  if (suffix)
+    {
+      char *tmp = nm;
+      nm = strconcat (tmp, suffix);
+      delete [] tmp;
+    }
+
+  if (! the_current_working_directory)
+    get_working_directory ("file_in_path");
+
+  char **path = pathstring_to_vector (user_pref.loadpath);
+
+  char **ptr = path;
+  if (ptr)
+    {
+      while (*ptr)
+	{
+	  char *tmp = strconcat (*ptr, nm);
+	  char *p = make_absolute (tmp, the_current_working_directory);
+	  delete [] tmp;
+	  ifstream in_file (p);
+	  if (in_file)
+	    {
+	      in_file.close ();
+	      retval = p;
+	      goto done;
+	    }
+	  delete [] p;
+	  ptr++;
+	}
+    }
+
+ done:
+  delete [] nm;
+  return retval;
+}
+
+/*
+ * See if there is an function file in the path.  If so, return the
+ * full path to the file.
+ */
+char *
+fcn_file_in_path (const char *name)
+{
+  return file_in_path (name, ".m");
+}
+
 /*
 ;;; Local Variables: ***
 ;;; mode: C++ ***

--- a/src/utils.h	Wed Jul 20 18:45:27 1994 +0000
+++ b/src/utils.h	Wed Jul 20 18:48:55 1994 +0000
@@ -24,11 +24,10 @@
 #if !defined (octave_utils_h)
 #define octave_utils_h 1
 
-#include <time.h>
-
 class istream;
 class ostrstream;
 class tree_constant;
+class Octave_object;
 
 // Tell g++ that jump_to_top_level doesn't return;
 
@@ -40,40 +39,10 @@
 extern char *strsave (const char *);
 extern char *strconcat (const char *, const char *);
 extern void discard_until (istream&, char);
-extern void check_dimensions (int& nr, int& nc, const char *warnfor);
-extern void raw_mode (int);
-extern int kbhit (void);
-extern char **pathstring_to_vector (char *);
-extern char *octave_home (void);
-extern char *octave_lib_dir (void);
-extern char *octave_info_dir (void);
-extern char *default_path (void);
-extern char *default_info_file (void);
-extern char *default_editor (void);
-extern char *get_site_defaults (void);
-extern char *default_pager (void);
 extern char *file_in_path (const char *, const char *);
 extern char *fcn_file_in_path (const char *);
-extern char *polite_directory_format (const char *);
-extern int absolute_pathname (const char *);
-extern int absolute_program (const char *);
-extern char *base_pathname (char *);
-extern int read_octal (const char *);
-extern char *sub_append_string (char *, char *, int *, int *);
-extern char *decode_prompt_string (const char *);
-extern void pathname_backup (char *, int);
-extern char *make_absolute (const char *, const char *);
-extern char *get_working_directory (const char *);
-extern int change_to_directory (const char *);
-extern int is_newer (const char *, time_t);
+extern char **pathstring_to_vector (char *pathstring);
 extern void jump_to_top_level (void);
-extern char *s_plural (int);
-extern char *es_plural (int);
-extern char *save_in_tmp_file (tree_constant& t, int nd = 2, int para = 0); 
-extern void mark_for_deletion (const char *);
-extern void cleanup_tmp_files (void);
-extern int send_to_plot_stream (const char *cmd);
-extern void close_plot_stream (void);
 extern int almost_match (const char *std, const char *s,
 			 int min_match_len = 1, int case_sens = 1);
 extern int keyword_almost_match (const char **std, int *min_len,
@@ -84,12 +53,10 @@
 extern char **get_fcn_file_names (int& ffl_len, int no_suffix);
 extern int NINT (double x);
 extern double D_NINT (double x);
-extern void delete_ppchar (char **);
 
-extern "C"
-{
-extern int gethostname ();
-}
+extern char **make_argv (const Octave_object& args, const char *warnfor);
+
+extern ostrstream& list_in_columns (ostrstream& os, char **list);
 
 #endif