Mercurial > jwe > octave

comparison src/variables.cc @ 1121:46619c5ca048

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[project @ 1995-02-17 15:45:07 by jwe]
author jwe
date Fri, 17 Feb 1995 15:45:26 +0000
parents 0e2974c1cc37
children 80973a849607
comparison
equal deleted inserted replaced
1120:3508c2ef142c 1121:46619c5ca048
376 #endif 376 #endif
377 377
378 return pager_binary; 378 return pager_binary;
379 } 379 }
380 380
381 // Always returns a new string.
382
383 char *
384 maybe_add_default_load_path (const char *p)
385 {
386 static char *std_path = subst_octave_home (OCTAVE_FCNFILEPATH);
387
388 char *pathstring = strsave (p);
389
390 if (pathstring[0] == SEPCHAR)
391 {
392 char *tmp = pathstring;
393 pathstring = strconcat (std_path, pathstring);
394 delete [] tmp;
395 }
396
397 int tmp_len = strlen (pathstring);
398 if (pathstring[tmp_len-1] == SEPCHAR)
399 {
400 char *tmp = pathstring;
401 pathstring = strconcat (pathstring, std_path);
402 delete [] tmp;
403 }
404
405 return pathstring;
406 }
407
381 char * 408 char *
382 octave_lib_dir (void) 409 octave_lib_dir (void)
383 { 410 {
384 static char *retval = subst_octave_home (OCTAVE_LIBDIR); 411 static char *retval = subst_octave_home (OCTAVE_LIBDIR);
385 return retval; 412 return retval;
394 // careful not to create memory leaks. 421 // careful not to create memory leaks.
395 422
396 char * 423 char *
397 default_path (void) 424 default_path (void)
398 { 425 {
426 static char *std_path = subst_octave_home (OCTAVE_FCNFILEPATH);
427
428 static char *oct_path = getenv ("OCTAVE_PATH");
429
399 static char *pathstring = 0; 430 static char *pathstring = 0;
400 delete [] pathstring; 431 delete [] pathstring;
401 432
402 static char *std_path = subst_octave_home (OCTAVE_FCNFILEPATH); 433 return oct_path ? strsave (oct_path) : strsave (std_path);
403
404 char *oct_path = getenv ("OCTAVE_PATH");
405
406 if (oct_path)
407 {
408 pathstring = strsave (oct_path);
409
410 if (pathstring[0] == SEPCHAR)
411 {
412 char *tmp = pathstring;
413 pathstring = strconcat (std_path, pathstring);
414 delete [] tmp;
415 }
416
417 int tmp_len = strlen (pathstring);
418 if (pathstring[tmp_len-1] == SEPCHAR)
419 {
420 char *tmp = pathstring;
421 pathstring = strconcat (pathstring, std_path);
422 delete [] tmp;
423 }
424 }
425 else
426 pathstring = strsave (std_path);
427
428 return pathstring;
429 } 434 }
430 435
431 char * 436 char *
432 default_info_file (void) 437 default_info_file (void)
433 { 438 {