octave-lojdl: src/load-path.cc comparison

comparison src/load-path.cc @ 6838:5e3350bdd91d

[project @ 2007-08-28 02:59:58 by jwe]

author	jwe
date	Tue, 28 Aug 2007 02:59:59 +0000
parents	59e22e30aff8
children	9398f6a81bdf

comparison

equal deleted inserted replaced

-:7eefeed173ea
+:5e3350bdd91d
 std::string
 load_path::do_find_file (const std::string& file) const
 {
 std::string retval;
-if (octave_env::absolute_pathname (file))
+if (file.find ('/') != NPOS)
 {
-file_stat fs (file);
+if (octave_env::absolute_pathname (file)
+	  || octave_env::rooted_relative_pathname (file))
-if (fs.exists ())
+	{
-	return file;
+	  file_stat fs (file);
-}
+	  if (fs.exists ())
-std::string dir_name;
+	    return file;
+	}
-for (const_dir_info_list_iterator p = dir_info_list.begin ();
+else
-p != dir_info_list.end ();
+	{
-p++)
+	  for (const_dir_info_list_iterator p = dir_info_list.begin ();
-{
+	       p != dir_info_list.end ();
-string_vector all_files = p->all_files;
+	       p++)
+	    {
-octave_idx_type len = all_files.length ();
+	      std::string tfile = p->dir_name + file_ops::dir_sep_str + file;
-for (octave_idx_type i = 0; i < len; i++)
+	      file_stat fs (tfile);
-	{
-	  if (all_files[i] == file)
+	      if (fs.exists ())
-	    {
+		return tfile;
-	      dir_name = p->dir_name;
+	    }
+	}
-	      goto done;
+}
-	    }
+else
-	}
+{
-}
+for (const_dir_info_list_iterator p = dir_info_list.begin ();
+	   p != dir_info_list.end ();
-done:
+	   p++)
+	{
-if (! dir_name.empty ())
+	  string_vector all_files = p->all_files;
-retval = dir_name + file_ops::dir_sep_str + file;
+	  octave_idx_type len = all_files.length ();
+	  for (octave_idx_type i = 0; i < len; i++)
+	    {
+	      if (all_files[i] == file)
+		return p->dir_name + file_ops::dir_sep_str + file;
+	    }
+	}
+}
 return retval;
 }
 std::string

Mercurial > hg > octave-lojdl

comparison src/load-path.cc @ 6838:5e3350bdd91d