Mercurial > octave-nkf
changeset 5149:8b7b4ffab39c
[project @ 2005-02-18 21:59:24 by jwe]
| author | jwe |
|---|---|
| date | Fri, 18 Feb 2005 21:59:24 +0000 |
| parents | 9eab94f5fadf |
| children | 5f82526a4c66 |
| files | liboctave/ChangeLog liboctave/file-ops.cc src/ChangeLog src/version.h |
| diffstat | 4 files changed, 20 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/liboctave/ChangeLog Fri Feb 18 19:04:34 2005 +0000 +++ b/liboctave/ChangeLog Fri Feb 18 21:59:24 2005 +0000 @@ -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
--- a/liboctave/file-ops.cc Fri Feb 18 19:04:34 2005 +0000 +++ b/liboctave/file-ops.cc Fri Feb 18 21:59:24 2005 +0000 @@ -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;
--- a/src/ChangeLog Fri Feb 18 19:04:34 2005 +0000 +++ b/src/ChangeLog Fri Feb 18 21:59:24 2005 +0000 @@ -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
--- a/src/version.h Fri Feb 18 19:04:34 2005 +0000 +++ b/src/version.h Fri Feb 18 21:59:24 2005 +0000 @@ -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."