Mercurial > hg > octave-nkf
diff src/octave.cc @ 10250:2d47356a7a1a
use gnulib getcwd module
author | John W. Eaton <jwe@octave.org> |
---|---|
date | Wed, 03 Feb 2010 03:07:06 -0500 |
parents | b0485f5a921e |
children | 57a59eae83cc |
line wrap: on
line diff
--- a/src/octave.cc +++ b/src/octave.cc @@ -335,9 +335,7 @@ // We want to check for curr_dir after executing home_rc // because doing that may change the working directory. - std::string curr_dir = octave_env::getcwd (); - - local_rc = octave_env::make_absolute (initfile, curr_dir); + local_rc = octave_env::make_absolute (initfile); home_rc_already_executed = same_file (home_rc, local_rc); } @@ -346,11 +344,7 @@ if (! home_rc_already_executed) { if (local_rc.empty ()) - { - std::string curr_dir = octave_env::getcwd (); - - local_rc = octave_env::make_absolute (initfile, curr_dir); - } + local_rc = octave_env::make_absolute (initfile); source_file (local_rc, context, verbose, require_file); }