# HG changeset patch
# User Jaroslav Hajek <highegg@gmail.com>
# Date 1221820230 -7200
# Node ID d1b8260dbc76564eec0da131330c7cfc1f2a0b89
# Parent  0b9c56b6bf0e28e9480550317e52cdf7ed88c490
fix problems from transplant 7552

diff -r 0b9c56b6bf0e -r d1b8260dbc76 src/ChangeLog
--- a/src/ChangeLog	Fri Sep 19 11:29:51 2008 +0200
+++ b/src/ChangeLog	Fri Sep 19 12:30:30 2008 +0200
@@ -1,3 +1,8 @@
+2008-09-19  Jaroslav Hajek <highegg@gmail.com>
+
+	* load-path.cc: Fix errors from earlier transplant changeset.
+	* utils.cc: Likewise.
+
 2008-09-10  John W. Eaton  <jwe@octave.org>
 
 	* octave.cc (octave_main): Make all command-line arguments
diff -r 0b9c56b6bf0e -r d1b8260dbc76 src/load-path.cc
--- a/src/load-path.cc	Fri Sep 19 11:29:51 2008 +0200
+++ b/src/load-path.cc	Fri Sep 19 12:30:30 2008 +0200
@@ -798,7 +798,7 @@
 {
   std::string retval;
 
-  if (dir.find_first_of (file_ops::dir_sep_chars ()) != std::string::npos
+  if (dir.find_first_of (file_ops::dir_sep_chars) != std::string::npos
       && (octave_env::absolute_pathname (dir)
 	  || octave_env::rooted_relative_pathname (dir)))
     {
@@ -817,7 +817,7 @@
 
 	  size_t dname_len = dname.length ();
 
-	  if (dname.substr (dname_len - 1) == file_ops::dir_sep_str ())
+	  if (dname.substr (dname_len - 1) == file_ops::dir_sep_str)
 	    dname = dname.substr (0, dname_len - 1);
 
 	  size_t dir_len = dir.length ();
diff -r 0b9c56b6bf0e -r d1b8260dbc76 src/utils.cc
--- a/src/utils.cc	Fri Sep 19 11:29:51 2008 +0200
+++ b/src/utils.cc	Fri Sep 19 12:30:30 2008 +0200
@@ -746,6 +746,10 @@
 	    error ("errno: expecting integer argument");
 	}
     }
+  else if (nargin == 0)
+    retval = octave_errno::get ();
+  else
+    print_usage ();
 
   return retval;
 }
@@ -768,10 +772,6 @@
       if (fs.exists ())
 	retval = octave_env::make_absolute (tcontents, octave_env::getcwd ());
     }
-  else if (nargin == 0)
-    retval = octave_errno::get ();
-  else
-    print_usage ();
 
   return retval;
 }