Mercurial > hg > octave-lojdl

comparison src/utils.cc @ 3195:7a5a5da64756

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[project @ 1998-10-28 22:54:04 by jwe]
author jwe
date Wed, 28 Oct 1998 23:01:17 +0000
parents 390d5e396682
children 7aae2c3636a7
comparison
equal deleted inserted replaced
3194:bea685644090 3195:7a5a5da64756
233 dir_path p (path); 233 dir_path p (path);
234 234
235 return octave_env::make_absolute (p.find (name), octave_env::getcwd ()); 235 return octave_env::make_absolute (p.find (name), octave_env::getcwd ());
236 } 236 }
237 237
238 DEFUN (file_in_loadpath, args, ,
239 "file_in_loadpath (NAME)\n\
240 \n\
241 Look up NAME in LOADPATH. See also file_in_path")
242 {
243 octave_value_list retval;
244
245 int argc = args.length () + 1;
246
247 string_vector argv = args.make_argv ("file_in_loadpath");
248
249 if (error_state)
250 return retval;
251
252 if (argc == 3)
253 retval = octave_env::make_absolute (Vload_path_dir_path.find (argv[1]),
254 octave_env::getcwd ());
255 else
256 print_usage ("file_in_loadpath");
257
258 return retval;
259 }
260
238 DEFUN (file_in_path, args, , 261 DEFUN (file_in_path, args, ,
239 "file_in_path (PATH, NAME)") 262 "file_in_path (PATH, NAME)")
240 { 263 {
241 octave_value_list retval; 264 octave_value_list retval;
242 265
247 if (error_state) 270 if (error_state)
248 return retval; 271 return retval;
249 272
250 if (argc == 3) 273 if (argc == 3)
251 { 274 {
252 string path = maybe_add_default_load_path (argv[1]); 275 string fname = search_path_for_file (argv[1], argv[2]);
253
254 string fname = search_path_for_file (path, argv[2]);
255 276
256 if (fname.empty ()) 277 if (fname.empty ())
257 retval = Matrix (); 278 retval = Matrix ();
258 else 279 else
259 retval = fname; 280 retval = fname;