changeset 2497:6f7bb8b60579

[project @ 1996-11-12 05:58:39 by jwe]
author jwe
date Tue, 12 Nov 1996 05:58:41 +0000
parents 9823f8bfd1a5
children bdd3a3eda123
files ChangeLog PROJECTS config.h.bot doc/interpreter/preface.texi src/ChangeLog src/load-save.cc
diffstat 6 files changed, 23 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Mon Nov 11 23:56:58 1996  John W. Eaton  <jwe@bevo.che.wisc.edu>
+
+	* config.h.bot: Only check value of __GNUC__ and __GNUC_MINOR__ if
+	__GNUC__ is defined.
+
 Fri Nov  8 11:15:07 1996  John W. Eaton  <jwe@bevo.che.wisc.edu>
 
 	* Makeconf.in (version): Look in $(TOPDIR)/src then
--- a/PROJECTS
+++ b/PROJECTS
@@ -89,6 +89,10 @@
     columns as M, then either w .* M or M .* w scales the columns of
     M.
 
+  * Given two vectors x and y of length m and n, implement a function
+    outer (x, y, f) that returns an m-by-n matrix with entries
+    f (x(i), y(j)).  If f is omitted, multiplication is the default.
+
 --------
 Graphics:
 --------
--- a/config.h.bot
+++ b/config.h.bot
@@ -7,9 +7,11 @@
 #define GCC_ATTR_UNUSED
 #endif
 
+#if defined (__GNUC__)
 #if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ > 7)
 #define NPOS string::npos
 #endif
+#endif
 
 #define STATIC_CAST(T, E) (T) (E)
 
--- a/doc/interpreter/preface.texi
+++ b/doc/interpreter/preface.texi
@@ -82,7 +82,8 @@
 
 @item
 Klaus Gebhardt <gebhardt@@crunch.ikp.physik.th-darmstadt.de> ported
-Octave to OS/2.
+Octave to OS/2 and worked with Michel Juillard <juillard@@msh-paris.fr>
+on the port to DOS.
 
 @item
 A. Scottedward Hodel (scotte@@eng.auburn.edu) contributed a number
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,9 @@
+Mon Nov 11 22:52:58 1996  John W. Eaton  <jwe@bevo.che.wisc.edu>
+
+	* load-save.cc (read_binary_data): Don't forget teminating NUL for
+	string that we plan to insert.
+	(read_ascii_data): Likewise.
+
 Sun Nov 10 16:58:07 1996  John W. Eaton  <jwe@bevo.che.wisc.edu>
 
 	* dirfns.cc (Ffnmatch): New function.
--- a/src/load-save.cc
+++ b/src/load-save.cc
@@ -562,7 +562,7 @@
 		  int len;
 		  if (extract_keyword (is, "length", len) && len > 0)
 		    {
-		      char *tmp = new char [len];
+		      char *tmp = new char [len+1];
 		      if (! is.read (tmp, len))
 			{
 			  error ("load: failed to load string constant");
@@ -570,6 +570,7 @@
 			}
 		      else
 			{
+			  tmp [len] = '0';
 			  if (len > max_len)
 			    {
 			      max_len = len;
@@ -878,7 +879,7 @@
 	      goto data_read_error;
 	    if (swap)
 	      swap_4_bytes ((char *) &len);
-	    char *tmp = new char [len];
+	    char *tmp = new char [len+1];
 	    if (! is.read (tmp, len))
 	      {
 		delete [] tmp;
@@ -889,6 +890,7 @@
 		max_len = len;
 		chm.resize (elements, max_len, 0);
 	      }
+	    tmp [len] = '\0';
 	    chm.insert (tmp, i, 0);
 	    delete [] tmp;
 	  }