# HG changeset patch
# User jwe
# Date 1108763964 0
# Node ID 8b7b4ffab39c66d02ccaa980408e024f28cf7bc9
# Parent  9eab94f5fadf158c33e1634aaa079f762c5605ae
[project @ 2005-02-18 21:59:24 by jwe]

diff --git a/liboctave/ChangeLog b/liboctave/ChangeLog
--- a/liboctave/ChangeLog
+++ b/liboctave/ChangeLog
@@ -1,3 +1,11 @@
+2005-02-18  John W. Eaton  <jwe@octave.org>
+
+	* file-ops.cc (file_ops::canonicalize_file_name) [HAVE_RESOLVEPATH]:
+	Pass current directory to octave_env::make_absolute.
+	Save value returned from octave_env::make_absolute in local var.
+	Pass const char*, not std::string as first arg of resolvepath.
+	Provide decl for resolved_len.
+
 2005-02-18  John W. Eaton  <jwe@octave.org>
 
 	* Array.cc (Array<T>::permute): Allow permutation vector longer
diff --git a/liboctave/file-ops.cc b/liboctave/file-ops.cc
--- a/liboctave/file-ops.cc
+++ b/liboctave/file-ops.cc
@@ -355,9 +355,10 @@
   // relative names into absolute ones, so prepend the working
   // directory if the path is not absolute.
 
-  name = octave_env::make_absolute (name);
+  std::string absolute_name
+    = octave_env::make_absolute (name, octave_env::getcwd ());
 
-  size_t resolved_size = name.length ();
+  size_t resolved_size = absolute_name.length ();
 
   while (1)
     {
@@ -365,7 +366,8 @@
 
       OCTAVE_LOCAL_BUFFER (char, resolved, resolved_size);
 
-      resolved_len = ::resolvepath (name, resolved, resolved_size);
+      int resolved_len
+	= ::resolvepath (absolute_name.c_str (), resolved, resolved_size);
 
       if (resolved_len < 0)
 	break;
diff --git a/src/ChangeLog b/src/ChangeLog
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -5,6 +5,11 @@
 	Allow permutation vector longer	than number of dimenensions of
 	permuted matrix.
 
+2005-02-17  John W. Eaton  <jwe@octave.org>
+
+	* version.h (OCTAVE_API_VERSION): Now 2.1.64-cvs.
+	(OCTAVE_API_VERSION): Now api-v12-cvs.
+
 2005-02-16  John W. Eaton  <jwe@octave.org>
 
 	* ov-base-mat.h (octave_base_matrix::squeeze): Explicitly convert
diff --git a/src/version.h b/src/version.h
--- a/src/version.h
+++ b/src/version.h
@@ -23,9 +23,9 @@
 #if !defined (octave_version_h)
 #define octave_version_h 1
 
-#define OCTAVE_VERSION "2.1.64"
+#define OCTAVE_VERSION "2.1.64-cvs"
 
-#define OCTAVE_API_VERSION "api-v12"
+#define OCTAVE_API_VERSION "api-v12-cvs"
 
 #define OCTAVE_COPYRIGHT \
   "Copyright (C) 2004 John W. Eaton."