octave: liboctave/system/oct-env.cc annotate

annotate liboctave/system/oct-env.cc @ 27832:8fd7d1d2a4ca

Read startup files from XDG_CONFIG_HOME or LOCALAPPDATA (bug #36477). * oct-env.[cc,h] (get_user_config_directory, do_get_user_config_directory): New functions. * interpreter.cc (execute_startup_files): Try to execute the octaverc file at a platform dependent location. * doc/interpreter/basics.txi: Document new location for startup file. * NEWS: Announce change.

author	Mike Miller <mtmiller@octave.org>
date	Wed, 06 Mar 2019 14:54:38 -0800
parents	7455523fdf01
children	659acfaaf0c9

rev	line source
2926 66ef74ee5d9f [project @ 1997-05-05 03:20:52 by jwe] jwe parents: diff changeset	1 /*
66ef74ee5d9f [project @ 1997-05-05 03:20:52 by jwe] jwe parents: diff changeset	2
26376 00f796120a6d maint: Update copyright dates in all source files. John W. Eaton <jwe@octave.org> parents: 25916 diff changeset	3 Copyright (C) 1996-2019 John W. Eaton
2926 66ef74ee5d9f [project @ 1997-05-05 03:20:52 by jwe] jwe parents: diff changeset	4
66ef74ee5d9f [project @ 1997-05-05 03:20:52 by jwe] jwe parents: diff changeset	5 This file is part of Octave.
66ef74ee5d9f [project @ 1997-05-05 03:20:52 by jwe] jwe parents: diff changeset	6
24534 194eb4bd202b maint: Update punctuation for GPL v3 license text. Rik <rik@octave.org> parents: 23829 diff changeset	7 Octave is free software: you can redistribute it and/or modify it
22755 3a2b891d0b33 maint: Standardize Copyright formatting. Rik <rik@octave.org> parents: 22402 diff changeset	8 under the terms of the GNU General Public License as published by
24534 194eb4bd202b maint: Update punctuation for GPL v3 license text. Rik <rik@octave.org> parents: 23829 diff changeset	9 the Free Software Foundation, either version 3 of the License, or
22755 3a2b891d0b33 maint: Standardize Copyright formatting. Rik <rik@octave.org> parents: 22402 diff changeset	10 (at your option) any later version.
2926 66ef74ee5d9f [project @ 1997-05-05 03:20:52 by jwe] jwe parents: diff changeset	11
22755 3a2b891d0b33 maint: Standardize Copyright formatting. Rik <rik@octave.org> parents: 22402 diff changeset	12 Octave is distributed in the hope that it will be useful, but
3a2b891d0b33 maint: Standardize Copyright formatting. Rik <rik@octave.org> parents: 22402 diff changeset	13 WITHOUT ANY WARRANTY; without even the implied warranty of
3a2b891d0b33 maint: Standardize Copyright formatting. Rik <rik@octave.org> parents: 22402 diff changeset	14 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
3a2b891d0b33 maint: Standardize Copyright formatting. Rik <rik@octave.org> parents: 22402 diff changeset	15 GNU General Public License for more details.
2926 66ef74ee5d9f [project @ 1997-05-05 03:20:52 by jwe] jwe parents: diff changeset	16
66ef74ee5d9f [project @ 1997-05-05 03:20:52 by jwe] jwe parents: diff changeset	17 You should have received a copy of the GNU General Public License
7016 93c65f2a5668 [project @ 2007-10-12 06:40:56 by jwe] jwe parents: 6838 diff changeset	18 along with Octave; see the file COPYING. If not, see
24534 194eb4bd202b maint: Update punctuation for GPL v3 license text. Rik <rik@octave.org> parents: 23829 diff changeset	19 <https://www.gnu.org/licenses/>.
2926 66ef74ee5d9f [project @ 1997-05-05 03:20:52 by jwe] jwe parents: diff changeset	20
66ef74ee5d9f [project @ 1997-05-05 03:20:52 by jwe] jwe parents: diff changeset	21 */
66ef74ee5d9f [project @ 1997-05-05 03:20:52 by jwe] jwe parents: diff changeset	22
66ef74ee5d9f [project @ 1997-05-05 03:20:52 by jwe] jwe parents: diff changeset	23 /*
66ef74ee5d9f [project @ 1997-05-05 03:20:52 by jwe] jwe parents: diff changeset	24
66ef74ee5d9f [project @ 1997-05-05 03:20:52 by jwe] jwe parents: diff changeset	25 The functions listed below were adapted from a similar functions
66ef74ee5d9f [project @ 1997-05-05 03:20:52 by jwe] jwe parents: diff changeset	26 from GNU Bash, the Bourne Again SHell, copyright (C) 1987, 1989, 1991
66ef74ee5d9f [project @ 1997-05-05 03:20:52 by jwe] jwe parents: diff changeset	27 Free Software Foundation, Inc.
66ef74ee5d9f [project @ 1997-05-05 03:20:52 by jwe] jwe parents: diff changeset	28
21732 6a1eded90355 use namespace for system env class John W. Eaton <jwe@octave.org> parents: 21729 diff changeset	29 octave::sys::env::do_absolute_pathname
27276 7455523fdf01 style fixes: avoid breaking lines immediately after '(' John W. Eaton <jwe@octave.org> parents: 26836 diff changeset	30 octave::sys::env::do_base_pathname
7455523fdf01 style fixes: avoid breaking lines immediately after '(' John W. Eaton <jwe@octave.org> parents: 26836 diff changeset	31 octave::sys::env::do_chdir
7455523fdf01 style fixes: avoid breaking lines immediately after '(' John W. Eaton <jwe@octave.org> parents: 26836 diff changeset	32 octave::sys::env::do_getcwd
7455523fdf01 style fixes: avoid breaking lines immediately after '(' John W. Eaton <jwe@octave.org> parents: 26836 diff changeset	33 octave::sys::env::do_make_absolute
7455523fdf01 style fixes: avoid breaking lines immediately after '(' John W. Eaton <jwe@octave.org> parents: 26836 diff changeset	34 octave::sys::env::do_polite_directory_format
7455523fdf01 style fixes: avoid breaking lines immediately after '(' John W. Eaton <jwe@octave.org> parents: 26836 diff changeset	35 octave::sys::env::pathname_backup
2926 66ef74ee5d9f [project @ 1997-05-05 03:20:52 by jwe] jwe parents: diff changeset	36
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	37 */
2926 66ef74ee5d9f [project @ 1997-05-05 03:20:52 by jwe] jwe parents: diff changeset	38
21724 aba2e6293dd8 use "#if ..." consistently instead of "#ifdef" and "#ifndef" John W. Eaton <jwe@octave.org> parents: 21614 diff changeset	39 #if defined (HAVE_CONFIG_H)
21301 40de9f8f23a6 Use '#include "config.h"' rather than <config.h>. Rik <rik@octave.org> parents: 21202 diff changeset	40 # include "config.h"
2926 66ef74ee5d9f [project @ 1997-05-05 03:20:52 by jwe] jwe parents: diff changeset	41 #endif
66ef74ee5d9f [project @ 1997-05-05 03:20:52 by jwe] jwe parents: diff changeset	42
4093 5a82e874999b [project @ 2002-10-08 23:48:45 by jwe] jwe parents: 4089 diff changeset	43 #include <cctype>
2926 66ef74ee5d9f [project @ 1997-05-05 03:20:52 by jwe] jwe parents: diff changeset	44 #include <cstdlib>
10463 bbe99b2a5ba7 undo recent gnulib-related changes John W. Eaton <jwe@octave.org> parents: 10447 diff changeset	45 #include <cstring>
4093 5a82e874999b [project @ 2002-10-08 23:48:45 by jwe] jwe parents: 4089 diff changeset	46
3504 5eef8a2294bd [project @ 2000-02-01 10:06:51 by jwe] jwe parents: 3347 diff changeset	47 #include <string>
2926 66ef74ee5d9f [project @ 1997-05-05 03:20:52 by jwe] jwe parents: diff changeset	48
4097 596f88296519 [project @ 2002-10-09 20:26:27 by jwe] jwe parents: 4093 diff changeset	49 #include "file-ops.h"
2926 66ef74ee5d9f [project @ 1997-05-05 03:20:52 by jwe] jwe parents: diff changeset	50 #include "lo-error.h"
66ef74ee5d9f [project @ 1997-05-05 03:20:52 by jwe] jwe parents: diff changeset	51 #include "lo-sysdep.h"
66ef74ee5d9f [project @ 1997-05-05 03:20:52 by jwe] jwe parents: diff changeset	52 #include "lo-utils.h"
66ef74ee5d9f [project @ 1997-05-05 03:20:52 by jwe] jwe parents: diff changeset	53 #include "oct-env.h"
2934 dddc1b5c324e [project @ 1997-05-05 22:56:37 by jwe] jwe parents: 2926 diff changeset	54 #include "oct-passwd.h"
2947 cf676ff8b702 [project @ 1997-05-09 13:32:46 by jwe] jwe parents: 2938 diff changeset	55 #include "oct-syscalls.h"
21891 3ca0a5b1b313 hide gnulib progname.h header John W. Eaton <jwe@octave.org> parents: 21738 diff changeset	56 #include "set-program-name-wrapper.h"
13983 7dd7cccf0757 clean up memory allocated for singletons before exit John W. Eaton <jwe@octave.org> parents: 11586 diff changeset	57 #include "singleton-cleanup.h"
21910 4d723ba06b4a provide wrappers for some unistd.h functions John W. Eaton <jwe@octave.org> parents: 21891 diff changeset	58 #include "unistd-wrappers.h"
2926 66ef74ee5d9f [project @ 1997-05-05 03:20:52 by jwe] jwe parents: diff changeset	59
27832 8fd7d1d2a4ca Read startup files from XDG_CONFIG_HOME or LOCALAPPDATA (bug #36477). Mike Miller <mtmiller@octave.org> parents: 27276 diff changeset	60 #if defined (OCTAVE_USE_WINDOWS_API)
8fd7d1d2a4ca Read startup files from XDG_CONFIG_HOME or LOCALAPPDATA (bug #36477). Mike Miller <mtmiller@octave.org> parents: 27276 diff changeset	61 # include "uniconv-wrappers.h"
8fd7d1d2a4ca Read startup files from XDG_CONFIG_HOME or LOCALAPPDATA (bug #36477). Mike Miller <mtmiller@octave.org> parents: 27276 diff changeset	62
8fd7d1d2a4ca Read startup files from XDG_CONFIG_HOME or LOCALAPPDATA (bug #36477). Mike Miller <mtmiller@octave.org> parents: 27276 diff changeset	63 # include <windows.h>
8fd7d1d2a4ca Read startup files from XDG_CONFIG_HOME or LOCALAPPDATA (bug #36477). Mike Miller <mtmiller@octave.org> parents: 27276 diff changeset	64 # include <shlobj.h>
8fd7d1d2a4ca Read startup files from XDG_CONFIG_HOME or LOCALAPPDATA (bug #36477). Mike Miller <mtmiller@octave.org> parents: 27276 diff changeset	65 #endif
8fd7d1d2a4ca Read startup files from XDG_CONFIG_HOME or LOCALAPPDATA (bug #36477). Mike Miller <mtmiller@octave.org> parents: 27276 diff changeset	66
21734 11af9c03400c write namespace keyword and name on same line in C++ files John W. Eaton <jwe@octave.org> parents: 21733 diff changeset	67 namespace octave
2926 66ef74ee5d9f [project @ 1997-05-05 03:20:52 by jwe] jwe parents: diff changeset	68 {
21734 11af9c03400c write namespace keyword and name on same line in C++ files John W. Eaton <jwe@octave.org> parents: 21733 diff changeset	69 namespace sys
21732 6a1eded90355 use namespace for system env class John W. Eaton <jwe@octave.org> parents: 21729 diff changeset	70 {
6a1eded90355 use namespace for system env class John W. Eaton <jwe@octave.org> parents: 21729 diff changeset	71 env::env (void)
6a1eded90355 use namespace for system env class John W. Eaton <jwe@octave.org> parents: 21729 diff changeset	72 : follow_symbolic_links (true), verbatim_pwd (true),
6a1eded90355 use namespace for system env class John W. Eaton <jwe@octave.org> parents: 21729 diff changeset	73 current_directory (), prog_name (), prog_invocation_name (),
6a1eded90355 use namespace for system env class John W. Eaton <jwe@octave.org> parents: 21729 diff changeset	74 user_name (), host_name ()
6a1eded90355 use namespace for system env class John W. Eaton <jwe@octave.org> parents: 21729 diff changeset	75 {
6a1eded90355 use namespace for system env class John W. Eaton <jwe@octave.org> parents: 21729 diff changeset	76 // Get a real value for the current directory.
6a1eded90355 use namespace for system env class John W. Eaton <jwe@octave.org> parents: 21729 diff changeset	77 do_getcwd ();
6a1eded90355 use namespace for system env class John W. Eaton <jwe@octave.org> parents: 21729 diff changeset	78
6a1eded90355 use namespace for system env class John W. Eaton <jwe@octave.org> parents: 21729 diff changeset	79 // Etc.
6a1eded90355 use namespace for system env class John W. Eaton <jwe@octave.org> parents: 21729 diff changeset	80 do_get_user_name ();
2926 66ef74ee5d9f [project @ 1997-05-05 03:20:52 by jwe] jwe parents: diff changeset	81
21732 6a1eded90355 use namespace for system env class John W. Eaton <jwe@octave.org> parents: 21729 diff changeset	82 do_get_host_name ();
6a1eded90355 use namespace for system env class John W. Eaton <jwe@octave.org> parents: 21729 diff changeset	83 }
6a1eded90355 use namespace for system env class John W. Eaton <jwe@octave.org> parents: 21729 diff changeset	84
23457 21baad6b35c4 maint: Use C++11 nullptr rather than 0 or NULL when possible. Rik <rik@octave.org> parents: 23450 diff changeset	85 env *env::instance = nullptr;
2926 66ef74ee5d9f [project @ 1997-05-05 03:20:52 by jwe] jwe parents: diff changeset	86
21732 6a1eded90355 use namespace for system env class John W. Eaton <jwe@octave.org> parents: 21729 diff changeset	87 bool
6a1eded90355 use namespace for system env class John W. Eaton <jwe@octave.org> parents: 21729 diff changeset	88 env::instance_ok (void)
6a1eded90355 use namespace for system env class John W. Eaton <jwe@octave.org> parents: 21729 diff changeset	89 {
6a1eded90355 use namespace for system env class John W. Eaton <jwe@octave.org> parents: 21729 diff changeset	90 bool retval = true;
6a1eded90355 use namespace for system env class John W. Eaton <jwe@octave.org> parents: 21729 diff changeset	91
6a1eded90355 use namespace for system env class John W. Eaton <jwe@octave.org> parents: 21729 diff changeset	92 if (! instance)
6a1eded90355 use namespace for system env class John W. Eaton <jwe@octave.org> parents: 21729 diff changeset	93 {
6a1eded90355 use namespace for system env class John W. Eaton <jwe@octave.org> parents: 21729 diff changeset	94 instance = new env ();
26369 0249ba4c9589 Fix static analyzer detected V668 issues (bug #55347). Andreas Weber <octave@josoansi.de> parents: 25916 diff changeset	95 singleton_cleanup_list::add (cleanup_instance);
21732 6a1eded90355 use namespace for system env class John W. Eaton <jwe@octave.org> parents: 21729 diff changeset	96 }
2926 66ef74ee5d9f [project @ 1997-05-05 03:20:52 by jwe] jwe parents: diff changeset	97
21732 6a1eded90355 use namespace for system env class John W. Eaton <jwe@octave.org> parents: 21729 diff changeset	98 return retval;
6a1eded90355 use namespace for system env class John W. Eaton <jwe@octave.org> parents: 21729 diff changeset	99 }
2926 66ef74ee5d9f [project @ 1997-05-05 03:20:52 by jwe] jwe parents: diff changeset	100
21732 6a1eded90355 use namespace for system env class John W. Eaton <jwe@octave.org> parents: 21729 diff changeset	101 std::string
6a1eded90355 use namespace for system env class John W. Eaton <jwe@octave.org> parents: 21729 diff changeset	102 env::polite_directory_format (const std::string& name)
6a1eded90355 use namespace for system env class John W. Eaton <jwe@octave.org> parents: 21729 diff changeset	103 {
6a1eded90355 use namespace for system env class John W. Eaton <jwe@octave.org> parents: 21729 diff changeset	104 return (instance_ok ())
6a1eded90355 use namespace for system env class John W. Eaton <jwe@octave.org> parents: 21729 diff changeset	105 ? instance->do_polite_directory_format (name) : "";
6a1eded90355 use namespace for system env class John W. Eaton <jwe@octave.org> parents: 21729 diff changeset	106 }
6a1eded90355 use namespace for system env class John W. Eaton <jwe@octave.org> parents: 21729 diff changeset	107
6a1eded90355 use namespace for system env class John W. Eaton <jwe@octave.org> parents: 21729 diff changeset	108 bool
6a1eded90355 use namespace for system env class John W. Eaton <jwe@octave.org> parents: 21729 diff changeset	109 env::absolute_pathname (const std::string& s)
13983 7dd7cccf0757 clean up memory allocated for singletons before exit John W. Eaton <jwe@octave.org> parents: 11586 diff changeset	110 {
21732 6a1eded90355 use namespace for system env class John W. Eaton <jwe@octave.org> parents: 21729 diff changeset	111 return (instance_ok ())
6a1eded90355 use namespace for system env class John W. Eaton <jwe@octave.org> parents: 21729 diff changeset	112 ? instance->do_absolute_pathname (s) : false;
6a1eded90355 use namespace for system env class John W. Eaton <jwe@octave.org> parents: 21729 diff changeset	113 }
13983 7dd7cccf0757 clean up memory allocated for singletons before exit John W. Eaton <jwe@octave.org> parents: 11586 diff changeset	114
21732 6a1eded90355 use namespace for system env class John W. Eaton <jwe@octave.org> parents: 21729 diff changeset	115 bool
6a1eded90355 use namespace for system env class John W. Eaton <jwe@octave.org> parents: 21729 diff changeset	116 env::rooted_relative_pathname (const std::string& s)
6a1eded90355 use namespace for system env class John W. Eaton <jwe@octave.org> parents: 21729 diff changeset	117 {
6a1eded90355 use namespace for system env class John W. Eaton <jwe@octave.org> parents: 21729 diff changeset	118 return (instance_ok ())
6a1eded90355 use namespace for system env class John W. Eaton <jwe@octave.org> parents: 21729 diff changeset	119 ? instance->do_rooted_relative_pathname (s) : false;
13983 7dd7cccf0757 clean up memory allocated for singletons before exit John W. Eaton <jwe@octave.org> parents: 11586 diff changeset	120 }
2926 66ef74ee5d9f [project @ 1997-05-05 03:20:52 by jwe] jwe parents: diff changeset	121
21732 6a1eded90355 use namespace for system env class John W. Eaton <jwe@octave.org> parents: 21729 diff changeset	122 std::string
6a1eded90355 use namespace for system env class John W. Eaton <jwe@octave.org> parents: 21729 diff changeset	123 env::base_pathname (const std::string& s)
6a1eded90355 use namespace for system env class John W. Eaton <jwe@octave.org> parents: 21729 diff changeset	124 {
6a1eded90355 use namespace for system env class John W. Eaton <jwe@octave.org> parents: 21729 diff changeset	125 return (instance_ok ())
6a1eded90355 use namespace for system env class John W. Eaton <jwe@octave.org> parents: 21729 diff changeset	126 ? instance->do_base_pathname (s) : "";
6a1eded90355 use namespace for system env class John W. Eaton <jwe@octave.org> parents: 21729 diff changeset	127 }
2926 66ef74ee5d9f [project @ 1997-05-05 03:20:52 by jwe] jwe parents: diff changeset	128
21732 6a1eded90355 use namespace for system env class John W. Eaton <jwe@octave.org> parents: 21729 diff changeset	129 std::string
6a1eded90355 use namespace for system env class John W. Eaton <jwe@octave.org> parents: 21729 diff changeset	130 env::make_absolute (const std::string& s, const std::string& dot_path)
6a1eded90355 use namespace for system env class John W. Eaton <jwe@octave.org> parents: 21729 diff changeset	131 {
6a1eded90355 use namespace for system env class John W. Eaton <jwe@octave.org> parents: 21729 diff changeset	132 return (instance_ok ())
6a1eded90355 use namespace for system env class John W. Eaton <jwe@octave.org> parents: 21729 diff changeset	133 ? instance->do_make_absolute (s, dot_path) : "";
6a1eded90355 use namespace for system env class John W. Eaton <jwe@octave.org> parents: 21729 diff changeset	134 }
2926 66ef74ee5d9f [project @ 1997-05-05 03:20:52 by jwe] jwe parents: diff changeset	135
21732 6a1eded90355 use namespace for system env class John W. Eaton <jwe@octave.org> parents: 21729 diff changeset	136 std::string
6a1eded90355 use namespace for system env class John W. Eaton <jwe@octave.org> parents: 21729 diff changeset	137 env::get_current_directory ()
6a1eded90355 use namespace for system env class John W. Eaton <jwe@octave.org> parents: 21729 diff changeset	138 {
6a1eded90355 use namespace for system env class John W. Eaton <jwe@octave.org> parents: 21729 diff changeset	139 return (instance_ok ())
6a1eded90355 use namespace for system env class John W. Eaton <jwe@octave.org> parents: 21729 diff changeset	140 ? instance->do_getcwd () : "";
6a1eded90355 use namespace for system env class John W. Eaton <jwe@octave.org> parents: 21729 diff changeset	141 }
2926 66ef74ee5d9f [project @ 1997-05-05 03:20:52 by jwe] jwe parents: diff changeset	142
21732 6a1eded90355 use namespace for system env class John W. Eaton <jwe@octave.org> parents: 21729 diff changeset	143 std::string
6a1eded90355 use namespace for system env class John W. Eaton <jwe@octave.org> parents: 21729 diff changeset	144 env::get_home_directory ()
6a1eded90355 use namespace for system env class John W. Eaton <jwe@octave.org> parents: 21729 diff changeset	145 {
6a1eded90355 use namespace for system env class John W. Eaton <jwe@octave.org> parents: 21729 diff changeset	146 return (instance_ok ())
6a1eded90355 use namespace for system env class John W. Eaton <jwe@octave.org> parents: 21729 diff changeset	147 ? instance->do_get_home_directory () : "";
6a1eded90355 use namespace for system env class John W. Eaton <jwe@octave.org> parents: 21729 diff changeset	148 }
2926 66ef74ee5d9f [project @ 1997-05-05 03:20:52 by jwe] jwe parents: diff changeset	149
21732 6a1eded90355 use namespace for system env class John W. Eaton <jwe@octave.org> parents: 21729 diff changeset	150 std::string
6a1eded90355 use namespace for system env class John W. Eaton <jwe@octave.org> parents: 21729 diff changeset	151 env::get_temp_directory ()
6a1eded90355 use namespace for system env class John W. Eaton <jwe@octave.org> parents: 21729 diff changeset	152 {
6a1eded90355 use namespace for system env class John W. Eaton <jwe@octave.org> parents: 21729 diff changeset	153 return (instance_ok ())
6a1eded90355 use namespace for system env class John W. Eaton <jwe@octave.org> parents: 21729 diff changeset	154 ? instance->do_get_temp_directory () : "";
6a1eded90355 use namespace for system env class John W. Eaton <jwe@octave.org> parents: 21729 diff changeset	155 }
2926 66ef74ee5d9f [project @ 1997-05-05 03:20:52 by jwe] jwe parents: diff changeset	156
21732 6a1eded90355 use namespace for system env class John W. Eaton <jwe@octave.org> parents: 21729 diff changeset	157 std::string
27832 8fd7d1d2a4ca Read startup files from XDG_CONFIG_HOME or LOCALAPPDATA (bug #36477). Mike Miller <mtmiller@octave.org> parents: 27276 diff changeset	158 env::get_user_config_directory ()
8fd7d1d2a4ca Read startup files from XDG_CONFIG_HOME or LOCALAPPDATA (bug #36477). Mike Miller <mtmiller@octave.org> parents: 27276 diff changeset	159 {
8fd7d1d2a4ca Read startup files from XDG_CONFIG_HOME or LOCALAPPDATA (bug #36477). Mike Miller <mtmiller@octave.org> parents: 27276 diff changeset	160 return (instance_ok ())
8fd7d1d2a4ca Read startup files from XDG_CONFIG_HOME or LOCALAPPDATA (bug #36477). Mike Miller <mtmiller@octave.org> parents: 27276 diff changeset	161 ? instance->do_get_user_config_directory () : "";
8fd7d1d2a4ca Read startup files from XDG_CONFIG_HOME or LOCALAPPDATA (bug #36477). Mike Miller <mtmiller@octave.org> parents: 27276 diff changeset	162 }
8fd7d1d2a4ca Read startup files from XDG_CONFIG_HOME or LOCALAPPDATA (bug #36477). Mike Miller <mtmiller@octave.org> parents: 27276 diff changeset	163
8fd7d1d2a4ca Read startup files from XDG_CONFIG_HOME or LOCALAPPDATA (bug #36477). Mike Miller <mtmiller@octave.org> parents: 27276 diff changeset	164 std::string
21732 6a1eded90355 use namespace for system env class John W. Eaton <jwe@octave.org> parents: 21729 diff changeset	165 env::get_program_name (void)
6a1eded90355 use namespace for system env class John W. Eaton <jwe@octave.org> parents: 21729 diff changeset	166 {
6a1eded90355 use namespace for system env class John W. Eaton <jwe@octave.org> parents: 21729 diff changeset	167 return (instance_ok ())
6a1eded90355 use namespace for system env class John W. Eaton <jwe@octave.org> parents: 21729 diff changeset	168 ? instance->prog_name : "";
6a1eded90355 use namespace for system env class John W. Eaton <jwe@octave.org> parents: 21729 diff changeset	169 }
2926 66ef74ee5d9f [project @ 1997-05-05 03:20:52 by jwe] jwe parents: diff changeset	170
21732 6a1eded90355 use namespace for system env class John W. Eaton <jwe@octave.org> parents: 21729 diff changeset	171 std::string
6a1eded90355 use namespace for system env class John W. Eaton <jwe@octave.org> parents: 21729 diff changeset	172 env::get_program_invocation_name (void)
6a1eded90355 use namespace for system env class John W. Eaton <jwe@octave.org> parents: 21729 diff changeset	173 {
6a1eded90355 use namespace for system env class John W. Eaton <jwe@octave.org> parents: 21729 diff changeset	174 return (instance_ok ())
6a1eded90355 use namespace for system env class John W. Eaton <jwe@octave.org> parents: 21729 diff changeset	175 ? instance->prog_invocation_name : "";
6a1eded90355 use namespace for system env class John W. Eaton <jwe@octave.org> parents: 21729 diff changeset	176 }
2926 66ef74ee5d9f [project @ 1997-05-05 03:20:52 by jwe] jwe parents: diff changeset	177
21732 6a1eded90355 use namespace for system env class John W. Eaton <jwe@octave.org> parents: 21729 diff changeset	178 void
6a1eded90355 use namespace for system env class John W. Eaton <jwe@octave.org> parents: 21729 diff changeset	179 env::set_program_name (const std::string& s)
6a1eded90355 use namespace for system env class John W. Eaton <jwe@octave.org> parents: 21729 diff changeset	180 {
6a1eded90355 use namespace for system env class John W. Eaton <jwe@octave.org> parents: 21729 diff changeset	181 if (instance_ok ())
6a1eded90355 use namespace for system env class John W. Eaton <jwe@octave.org> parents: 21729 diff changeset	182 instance->do_set_program_name (s);
6a1eded90355 use namespace for system env class John W. Eaton <jwe@octave.org> parents: 21729 diff changeset	183 }
2926 66ef74ee5d9f [project @ 1997-05-05 03:20:52 by jwe] jwe parents: diff changeset	184
21732 6a1eded90355 use namespace for system env class John W. Eaton <jwe@octave.org> parents: 21729 diff changeset	185 std::string
6a1eded90355 use namespace for system env class John W. Eaton <jwe@octave.org> parents: 21729 diff changeset	186 env::get_user_name (void)
6a1eded90355 use namespace for system env class John W. Eaton <jwe@octave.org> parents: 21729 diff changeset	187 {
6a1eded90355 use namespace for system env class John W. Eaton <jwe@octave.org> parents: 21729 diff changeset	188 return (instance_ok ())
6a1eded90355 use namespace for system env class John W. Eaton <jwe@octave.org> parents: 21729 diff changeset	189 ? instance->do_get_user_name () : "";
6a1eded90355 use namespace for system env class John W. Eaton <jwe@octave.org> parents: 21729 diff changeset	190 }
2926 66ef74ee5d9f [project @ 1997-05-05 03:20:52 by jwe] jwe parents: diff changeset	191
21732 6a1eded90355 use namespace for system env class John W. Eaton <jwe@octave.org> parents: 21729 diff changeset	192 std::string
6a1eded90355 use namespace for system env class John W. Eaton <jwe@octave.org> parents: 21729 diff changeset	193 env::get_host_name (void)
6a1eded90355 use namespace for system env class John W. Eaton <jwe@octave.org> parents: 21729 diff changeset	194 {
6a1eded90355 use namespace for system env class John W. Eaton <jwe@octave.org> parents: 21729 diff changeset	195 return (instance_ok ())
6a1eded90355 use namespace for system env class John W. Eaton <jwe@octave.org> parents: 21729 diff changeset	196 ? instance->do_get_host_name () : "";
6a1eded90355 use namespace for system env class John W. Eaton <jwe@octave.org> parents: 21729 diff changeset	197 }
2926 66ef74ee5d9f [project @ 1997-05-05 03:20:52 by jwe] jwe parents: diff changeset	198
21732 6a1eded90355 use namespace for system env class John W. Eaton <jwe@octave.org> parents: 21729 diff changeset	199 std::string
6a1eded90355 use namespace for system env class John W. Eaton <jwe@octave.org> parents: 21729 diff changeset	200 env::do_get_temp_directory (void) const
6a1eded90355 use namespace for system env class John W. Eaton <jwe@octave.org> parents: 21729 diff changeset	201 {
6a1eded90355 use namespace for system env class John W. Eaton <jwe@octave.org> parents: 21729 diff changeset	202 std::string tempd;
19458 d8fd3842a507 Use gnulib gen_tempname to create temporary names (Bug #43872). John Donoghue <john.donoghue@ieee.org> parents: 17769 diff changeset	203
d8fd3842a507 Use gnulib gen_tempname to create temporary names (Bug #43872). John Donoghue <john.donoghue@ieee.org> parents: 17769 diff changeset	204 #if defined (__MINGW32__) \|\| defined (_MSC_VER)
19597 db92e7e28e1f strip trailing whitespace from most source files John W. Eaton <jwe@octave.org> parents: 19459 diff changeset	205
21732 6a1eded90355 use namespace for system env class John W. Eaton <jwe@octave.org> parents: 21729 diff changeset	206 tempd = do_getenv ("TEMP");
19458 d8fd3842a507 Use gnulib gen_tempname to create temporary names (Bug #43872). John Donoghue <john.donoghue@ieee.org> parents: 17769 diff changeset	207
21732 6a1eded90355 use namespace for system env class John W. Eaton <jwe@octave.org> parents: 21729 diff changeset	208 if (tempd.empty ())
6a1eded90355 use namespace for system env class John W. Eaton <jwe@octave.org> parents: 21729 diff changeset	209 tempd = do_getenv ("TMP");
19458 d8fd3842a507 Use gnulib gen_tempname to create temporary names (Bug #43872). John Donoghue <john.donoghue@ieee.org> parents: 17769 diff changeset	210
21732 6a1eded90355 use namespace for system env class John W. Eaton <jwe@octave.org> parents: 21729 diff changeset	211 #if defined (P_tmpdir)
6a1eded90355 use namespace for system env class John W. Eaton <jwe@octave.org> parents: 21729 diff changeset	212 if (tempd.empty ())
6a1eded90355 use namespace for system env class John W. Eaton <jwe@octave.org> parents: 21729 diff changeset	213 tempd = P_tmpdir;
6a1eded90355 use namespace for system env class John W. Eaton <jwe@octave.org> parents: 21729 diff changeset	214 #endif
19458 d8fd3842a507 Use gnulib gen_tempname to create temporary names (Bug #43872). John Donoghue <john.donoghue@ieee.org> parents: 17769 diff changeset	215
21732 6a1eded90355 use namespace for system env class John W. Eaton <jwe@octave.org> parents: 21729 diff changeset	216 // Some versions of MinGW and MSVC either don't define P_tmpdir, or
6a1eded90355 use namespace for system env class John W. Eaton <jwe@octave.org> parents: 21729 diff changeset	217 // define it to a single backslash. In such cases just use C:\temp.
23809 e56d84a16a2e Fix "no match for 'operator=='" when comparing C++ string to char literal. Markus Mützel <markus.muetzel@gmx.de> parents: 23804 diff changeset	218 if (tempd.empty () \|\| tempd == R"(\)")
23804 8057d3f0673d Use C++11 raw string literals to avoid escaping backslashes in strings. Rik <rik@octave.org> parents: 23696 diff changeset	219 tempd = R"(c:\temp)";
19458 d8fd3842a507 Use gnulib gen_tempname to create temporary names (Bug #43872). John Donoghue <john.donoghue@ieee.org> parents: 17769 diff changeset	220
20945 9d9270e2f98f eliminate comments after preprocessor conditionals John W. Eaton <jwe@octave.org> parents: 19697 diff changeset	221 #else
19458 d8fd3842a507 Use gnulib gen_tempname to create temporary names (Bug #43872). John Donoghue <john.donoghue@ieee.org> parents: 17769 diff changeset	222
21732 6a1eded90355 use namespace for system env class John W. Eaton <jwe@octave.org> parents: 21729 diff changeset	223 tempd = do_getenv ("TMP");
19458 d8fd3842a507 Use gnulib gen_tempname to create temporary names (Bug #43872). John Donoghue <john.donoghue@ieee.org> parents: 17769 diff changeset	224
21732 6a1eded90355 use namespace for system env class John W. Eaton <jwe@octave.org> parents: 21729 diff changeset	225 #if defined (P_tmpdir)
6a1eded90355 use namespace for system env class John W. Eaton <jwe@octave.org> parents: 21729 diff changeset	226 if (tempd.empty ())
6a1eded90355 use namespace for system env class John W. Eaton <jwe@octave.org> parents: 21729 diff changeset	227 tempd = P_tmpdir;
6a1eded90355 use namespace for system env class John W. Eaton <jwe@octave.org> parents: 21729 diff changeset	228 #else
6a1eded90355 use namespace for system env class John W. Eaton <jwe@octave.org> parents: 21729 diff changeset	229 if (tempd.empty ())
6a1eded90355 use namespace for system env class John W. Eaton <jwe@octave.org> parents: 21729 diff changeset	230 tempd = "/tmp";
6a1eded90355 use namespace for system env class John W. Eaton <jwe@octave.org> parents: 21729 diff changeset	231 #endif
19458 d8fd3842a507 Use gnulib gen_tempname to create temporary names (Bug #43872). John Donoghue <john.donoghue@ieee.org> parents: 17769 diff changeset	232
d8fd3842a507 Use gnulib gen_tempname to create temporary names (Bug #43872). John Donoghue <john.donoghue@ieee.org> parents: 17769 diff changeset	233 #endif
d8fd3842a507 Use gnulib gen_tempname to create temporary names (Bug #43872). John Donoghue <john.donoghue@ieee.org> parents: 17769 diff changeset	234
21732 6a1eded90355 use namespace for system env class John W. Eaton <jwe@octave.org> parents: 21729 diff changeset	235 return tempd;
6a1eded90355 use namespace for system env class John W. Eaton <jwe@octave.org> parents: 21729 diff changeset	236 }
19458 d8fd3842a507 Use gnulib gen_tempname to create temporary names (Bug #43872). John Donoghue <john.donoghue@ieee.org> parents: 17769 diff changeset	237
27832 8fd7d1d2a4ca Read startup files from XDG_CONFIG_HOME or LOCALAPPDATA (bug #36477). Mike Miller <mtmiller@octave.org> parents: 27276 diff changeset	238 std::string
8fd7d1d2a4ca Read startup files from XDG_CONFIG_HOME or LOCALAPPDATA (bug #36477). Mike Miller <mtmiller@octave.org> parents: 27276 diff changeset	239 env::do_get_user_config_directory (void) const
8fd7d1d2a4ca Read startup files from XDG_CONFIG_HOME or LOCALAPPDATA (bug #36477). Mike Miller <mtmiller@octave.org> parents: 27276 diff changeset	240 {
8fd7d1d2a4ca Read startup files from XDG_CONFIG_HOME or LOCALAPPDATA (bug #36477). Mike Miller <mtmiller@octave.org> parents: 27276 diff changeset	241 std::string cfg_dir;
8fd7d1d2a4ca Read startup files from XDG_CONFIG_HOME or LOCALAPPDATA (bug #36477). Mike Miller <mtmiller@octave.org> parents: 27276 diff changeset	242
8fd7d1d2a4ca Read startup files from XDG_CONFIG_HOME or LOCALAPPDATA (bug #36477). Mike Miller <mtmiller@octave.org> parents: 27276 diff changeset	243 #if defined (OCTAVE_HAVE_WINDOWS_FILESYSTEM) && defined (OCTAVE_USE_WINDOWS_API)
8fd7d1d2a4ca Read startup files from XDG_CONFIG_HOME or LOCALAPPDATA (bug #36477). Mike Miller <mtmiller@octave.org> parents: 27276 diff changeset	244 wchar_t path[MAX_PATH+1];
8fd7d1d2a4ca Read startup files from XDG_CONFIG_HOME or LOCALAPPDATA (bug #36477). Mike Miller <mtmiller@octave.org> parents: 27276 diff changeset	245 if (SHGetFolderPathW (nullptr,
8fd7d1d2a4ca Read startup files from XDG_CONFIG_HOME or LOCALAPPDATA (bug #36477). Mike Miller <mtmiller@octave.org> parents: 27276 diff changeset	246 CSIDL_LOCAL_APPDATA \| CSIDL_FLAG_DONT_VERIFY,
8fd7d1d2a4ca Read startup files from XDG_CONFIG_HOME or LOCALAPPDATA (bug #36477). Mike Miller <mtmiller@octave.org> parents: 27276 diff changeset	247 nullptr, SHGFP_TYPE_CURRENT, path) == S_OK)
8fd7d1d2a4ca Read startup files from XDG_CONFIG_HOME or LOCALAPPDATA (bug #36477). Mike Miller <mtmiller@octave.org> parents: 27276 diff changeset	248 {
8fd7d1d2a4ca Read startup files from XDG_CONFIG_HOME or LOCALAPPDATA (bug #36477). Mike Miller <mtmiller@octave.org> parents: 27276 diff changeset	249 char *local_app_data = u8_from_wchar (path);
8fd7d1d2a4ca Read startup files from XDG_CONFIG_HOME or LOCALAPPDATA (bug #36477). Mike Miller <mtmiller@octave.org> parents: 27276 diff changeset	250 cfg_dir = local_app_data;
8fd7d1d2a4ca Read startup files from XDG_CONFIG_HOME or LOCALAPPDATA (bug #36477). Mike Miller <mtmiller@octave.org> parents: 27276 diff changeset	251 free (local_app_data);
8fd7d1d2a4ca Read startup files from XDG_CONFIG_HOME or LOCALAPPDATA (bug #36477). Mike Miller <mtmiller@octave.org> parents: 27276 diff changeset	252 }
8fd7d1d2a4ca Read startup files from XDG_CONFIG_HOME or LOCALAPPDATA (bug #36477). Mike Miller <mtmiller@octave.org> parents: 27276 diff changeset	253 #else
8fd7d1d2a4ca Read startup files from XDG_CONFIG_HOME or LOCALAPPDATA (bug #36477). Mike Miller <mtmiller@octave.org> parents: 27276 diff changeset	254 cfg_dir = do_getenv ("XDG_CONFIG_HOME");
8fd7d1d2a4ca Read startup files from XDG_CONFIG_HOME or LOCALAPPDATA (bug #36477). Mike Miller <mtmiller@octave.org> parents: 27276 diff changeset	255
8fd7d1d2a4ca Read startup files from XDG_CONFIG_HOME or LOCALAPPDATA (bug #36477). Mike Miller <mtmiller@octave.org> parents: 27276 diff changeset	256 if (cfg_dir.empty ())
8fd7d1d2a4ca Read startup files from XDG_CONFIG_HOME or LOCALAPPDATA (bug #36477). Mike Miller <mtmiller@octave.org> parents: 27276 diff changeset	257 cfg_dir = do_get_home_directory () + sys::file_ops::dir_sep_str ()
8fd7d1d2a4ca Read startup files from XDG_CONFIG_HOME or LOCALAPPDATA (bug #36477). Mike Miller <mtmiller@octave.org> parents: 27276 diff changeset	258 + ".config";
8fd7d1d2a4ca Read startup files from XDG_CONFIG_HOME or LOCALAPPDATA (bug #36477). Mike Miller <mtmiller@octave.org> parents: 27276 diff changeset	259 #endif
8fd7d1d2a4ca Read startup files from XDG_CONFIG_HOME or LOCALAPPDATA (bug #36477). Mike Miller <mtmiller@octave.org> parents: 27276 diff changeset	260
8fd7d1d2a4ca Read startup files from XDG_CONFIG_HOME or LOCALAPPDATA (bug #36477). Mike Miller <mtmiller@octave.org> parents: 27276 diff changeset	261 return cfg_dir;
8fd7d1d2a4ca Read startup files from XDG_CONFIG_HOME or LOCALAPPDATA (bug #36477). Mike Miller <mtmiller@octave.org> parents: 27276 diff changeset	262 }
8fd7d1d2a4ca Read startup files from XDG_CONFIG_HOME or LOCALAPPDATA (bug #36477). Mike Miller <mtmiller@octave.org> parents: 27276 diff changeset	263
21732 6a1eded90355 use namespace for system env class John W. Eaton <jwe@octave.org> parents: 21729 diff changeset	264 // FIXME: this leaves no way to distinguish between a
6a1eded90355 use namespace for system env class John W. Eaton <jwe@octave.org> parents: 21729 diff changeset	265 // variable that is not set and one that is set to the empty string.
6a1eded90355 use namespace for system env class John W. Eaton <jwe@octave.org> parents: 21729 diff changeset	266 // Is this a problem?
2926 66ef74ee5d9f [project @ 1997-05-05 03:20:52 by jwe] jwe parents: diff changeset	267
21732 6a1eded90355 use namespace for system env class John W. Eaton <jwe@octave.org> parents: 21729 diff changeset	268 std::string
6a1eded90355 use namespace for system env class John W. Eaton <jwe@octave.org> parents: 21729 diff changeset	269 env::getenv (const std::string& name)
6a1eded90355 use namespace for system env class John W. Eaton <jwe@octave.org> parents: 21729 diff changeset	270 {
6a1eded90355 use namespace for system env class John W. Eaton <jwe@octave.org> parents: 21729 diff changeset	271 return (instance_ok ())
6a1eded90355 use namespace for system env class John W. Eaton <jwe@octave.org> parents: 21729 diff changeset	272 ? instance->do_getenv (name) : "";
6a1eded90355 use namespace for system env class John W. Eaton <jwe@octave.org> parents: 21729 diff changeset	273 }
2926 66ef74ee5d9f [project @ 1997-05-05 03:20:52 by jwe] jwe parents: diff changeset	274
21732 6a1eded90355 use namespace for system env class John W. Eaton <jwe@octave.org> parents: 21729 diff changeset	275 void
6a1eded90355 use namespace for system env class John W. Eaton <jwe@octave.org> parents: 21729 diff changeset	276 env::putenv (const std::string& name, const std::string& value)
6a1eded90355 use namespace for system env class John W. Eaton <jwe@octave.org> parents: 21729 diff changeset	277 {
25916 3f2282954600 Support non-ASCII characters in environment variables on Windows (bug #53922). Markus Mützel <markus.muetzel@gmx.de> parents: 25054 diff changeset	278 putenv_wrapper (name, value);
21732 6a1eded90355 use namespace for system env class John W. Eaton <jwe@octave.org> parents: 21729 diff changeset	279 }
2926 66ef74ee5d9f [project @ 1997-05-05 03:20:52 by jwe] jwe parents: diff changeset	280
21732 6a1eded90355 use namespace for system env class John W. Eaton <jwe@octave.org> parents: 21729 diff changeset	281 bool
6a1eded90355 use namespace for system env class John W. Eaton <jwe@octave.org> parents: 21729 diff changeset	282 env::have_x11_display (void)
6a1eded90355 use namespace for system env class John W. Eaton <jwe@octave.org> parents: 21729 diff changeset	283 {
6a1eded90355 use namespace for system env class John W. Eaton <jwe@octave.org> parents: 21729 diff changeset	284 std::string display = getenv ("DISPLAY");
5489 250917610b55 [project @ 2005-10-12 23:53:36 by jwe] jwe parents: 5454 diff changeset	285
21732 6a1eded90355 use namespace for system env class John W. Eaton <jwe@octave.org> parents: 21729 diff changeset	286 return ! display.empty ();
6a1eded90355 use namespace for system env class John W. Eaton <jwe@octave.org> parents: 21729 diff changeset	287 }
5489 250917610b55 [project @ 2005-10-12 23:53:36 by jwe] jwe parents: 5454 diff changeset	288
21732 6a1eded90355 use namespace for system env class John W. Eaton <jwe@octave.org> parents: 21729 diff changeset	289 bool
6a1eded90355 use namespace for system env class John W. Eaton <jwe@octave.org> parents: 21729 diff changeset	290 env::chdir (const std::string& newdir)
6a1eded90355 use namespace for system env class John W. Eaton <jwe@octave.org> parents: 21729 diff changeset	291 {
6a1eded90355 use namespace for system env class John W. Eaton <jwe@octave.org> parents: 21729 diff changeset	292 return (instance_ok ())
6a1eded90355 use namespace for system env class John W. Eaton <jwe@octave.org> parents: 21729 diff changeset	293 ? instance->do_chdir (newdir) : false;
6a1eded90355 use namespace for system env class John W. Eaton <jwe@octave.org> parents: 21729 diff changeset	294 }
2926 66ef74ee5d9f [project @ 1997-05-05 03:20:52 by jwe] jwe parents: diff changeset	295
21732 6a1eded90355 use namespace for system env class John W. Eaton <jwe@octave.org> parents: 21729 diff changeset	296 void
6a1eded90355 use namespace for system env class John W. Eaton <jwe@octave.org> parents: 21729 diff changeset	297 env::do_set_program_name (const std::string& s) const
21610 eff26982a19b avoid passing temp string to ::set_program_name (bug #47372) John W. Eaton <jwe@octave.org> parents: 21609 diff changeset	298 {
21732 6a1eded90355 use namespace for system env class John W. Eaton <jwe@octave.org> parents: 21729 diff changeset	299 static bool initialized = false;
21610 eff26982a19b avoid passing temp string to ::set_program_name (bug #47372) John W. Eaton <jwe@octave.org> parents: 21609 diff changeset	300
21732 6a1eded90355 use namespace for system env class John W. Eaton <jwe@octave.org> parents: 21729 diff changeset	301 if (! initialized)
6a1eded90355 use namespace for system env class John W. Eaton <jwe@octave.org> parents: 21729 diff changeset	302 {
21891 3ca0a5b1b313 hide gnulib progname.h header John W. Eaton <jwe@octave.org> parents: 21738 diff changeset	303 // octave_set_program_name_wrapper returns a cleaned up
3ca0a5b1b313 hide gnulib progname.h header John W. Eaton <jwe@octave.org> parents: 21738 diff changeset	304 // version of the program name (stripping libtool's "lt-"
3ca0a5b1b313 hide gnulib progname.h header John W. Eaton <jwe@octave.org> parents: 21738 diff changeset	305 // prefix, for example).
3ca0a5b1b313 hide gnulib progname.h header John W. Eaton <jwe@octave.org> parents: 21738 diff changeset	306
21732 6a1eded90355 use namespace for system env class John W. Eaton <jwe@octave.org> parents: 21729 diff changeset	307 // The string passed to gnulib's ::set_program_name function must
6a1eded90355 use namespace for system env class John W. Eaton <jwe@octave.org> parents: 21729 diff changeset	308 // exist for the duration of the program so allocate a copy here
6a1eded90355 use namespace for system env class John W. Eaton <jwe@octave.org> parents: 21729 diff changeset	309 // instead of passing S.c_str () which only exists as long as the
6a1eded90355 use namespace for system env class John W. Eaton <jwe@octave.org> parents: 21729 diff changeset	310 // string object S.
6a1eded90355 use namespace for system env class John W. Eaton <jwe@octave.org> parents: 21729 diff changeset	311
21891 3ca0a5b1b313 hide gnulib progname.h header John W. Eaton <jwe@octave.org> parents: 21738 diff changeset	312 prog_invocation_name
3ca0a5b1b313 hide gnulib progname.h header John W. Eaton <jwe@octave.org> parents: 21738 diff changeset	313 = octave_set_program_name_wrapper (strsave (s.c_str ()));
21610 eff26982a19b avoid passing temp string to ::set_program_name (bug #47372) John W. Eaton <jwe@octave.org> parents: 21609 diff changeset	314
21732 6a1eded90355 use namespace for system env class John W. Eaton <jwe@octave.org> parents: 21729 diff changeset	315 size_t pos
23696 08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace John W. Eaton <jwe@octave.org> parents: 23457 diff changeset	316 = prog_invocation_name.find_last_of (sys::file_ops::dir_sep_chars ());
2926 66ef74ee5d9f [project @ 1997-05-05 03:20:52 by jwe] jwe parents: diff changeset	317
21732 6a1eded90355 use namespace for system env class John W. Eaton <jwe@octave.org> parents: 21729 diff changeset	318 // Also keep a shortened version of the program name.
6a1eded90355 use namespace for system env class John W. Eaton <jwe@octave.org> parents: 21729 diff changeset	319 prog_name = (pos == std::string::npos
6a1eded90355 use namespace for system env class John W. Eaton <jwe@octave.org> parents: 21729 diff changeset	320 ? prog_invocation_name
6a1eded90355 use namespace for system env class John W. Eaton <jwe@octave.org> parents: 21729 diff changeset	321 : prog_invocation_name.substr (pos+1));
21614 9bb39b754ab1 finish previous change to octave_env::set_program_name John W. Eaton <jwe@octave.org> parents: 21610 diff changeset	322
21732 6a1eded90355 use namespace for system env class John W. Eaton <jwe@octave.org> parents: 21729 diff changeset	323 initialized = true;
6a1eded90355 use namespace for system env class John W. Eaton <jwe@octave.org> parents: 21729 diff changeset	324 }
21610 eff26982a19b avoid passing temp string to ::set_program_name (bug #47372) John W. Eaton <jwe@octave.org> parents: 21609 diff changeset	325 }
2926 66ef74ee5d9f [project @ 1997-05-05 03:20:52 by jwe] jwe parents: diff changeset	326
21732 6a1eded90355 use namespace for system env class John W. Eaton <jwe@octave.org> parents: 21729 diff changeset	327 // Return a pretty pathname. If the first part of the pathname is the
6a1eded90355 use namespace for system env class John W. Eaton <jwe@octave.org> parents: 21729 diff changeset	328 // same as $HOME, then replace that with '~'.
2926 66ef74ee5d9f [project @ 1997-05-05 03:20:52 by jwe] jwe parents: diff changeset	329
21732 6a1eded90355 use namespace for system env class John W. Eaton <jwe@octave.org> parents: 21729 diff changeset	330 std::string
6a1eded90355 use namespace for system env class John W. Eaton <jwe@octave.org> parents: 21729 diff changeset	331 env::do_polite_directory_format (const std::string& name) const
6a1eded90355 use namespace for system env class John W. Eaton <jwe@octave.org> parents: 21729 diff changeset	332 {
6a1eded90355 use namespace for system env class John W. Eaton <jwe@octave.org> parents: 21729 diff changeset	333 std::string retval;
2926 66ef74ee5d9f [project @ 1997-05-05 03:20:52 by jwe] jwe parents: diff changeset	334
21732 6a1eded90355 use namespace for system env class John W. Eaton <jwe@octave.org> parents: 21729 diff changeset	335 std::string home_dir = do_get_home_directory ();
2926 66ef74ee5d9f [project @ 1997-05-05 03:20:52 by jwe] jwe parents: diff changeset	336
21732 6a1eded90355 use namespace for system env class John W. Eaton <jwe@octave.org> parents: 21729 diff changeset	337 size_t len = home_dir.length ();
2926 66ef74ee5d9f [project @ 1997-05-05 03:20:52 by jwe] jwe parents: diff changeset	338
21732 6a1eded90355 use namespace for system env class John W. Eaton <jwe@octave.org> parents: 21729 diff changeset	339 if (len > 1 && home_dir == name.substr (0, len)
23696 08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace John W. Eaton <jwe@octave.org> parents: 23457 diff changeset	340 && (name.length () == len \|\| sys::file_ops::is_dir_sep (name[len])))
21732 6a1eded90355 use namespace for system env class John W. Eaton <jwe@octave.org> parents: 21729 diff changeset	341 {
6a1eded90355 use namespace for system env class John W. Eaton <jwe@octave.org> parents: 21729 diff changeset	342 retval = "~";
6a1eded90355 use namespace for system env class John W. Eaton <jwe@octave.org> parents: 21729 diff changeset	343 retval.append (name.substr (len));
6a1eded90355 use namespace for system env class John W. Eaton <jwe@octave.org> parents: 21729 diff changeset	344 }
6a1eded90355 use namespace for system env class John W. Eaton <jwe@octave.org> parents: 21729 diff changeset	345 else
6a1eded90355 use namespace for system env class John W. Eaton <jwe@octave.org> parents: 21729 diff changeset	346 retval = name;
2926 66ef74ee5d9f [project @ 1997-05-05 03:20:52 by jwe] jwe parents: diff changeset	347
21732 6a1eded90355 use namespace for system env class John W. Eaton <jwe@octave.org> parents: 21729 diff changeset	348 return retval;
6a1eded90355 use namespace for system env class John W. Eaton <jwe@octave.org> parents: 21729 diff changeset	349 }
2926 66ef74ee5d9f [project @ 1997-05-05 03:20:52 by jwe] jwe parents: diff changeset	350
21732 6a1eded90355 use namespace for system env class John W. Eaton <jwe@octave.org> parents: 21729 diff changeset	351 bool
6a1eded90355 use namespace for system env class John W. Eaton <jwe@octave.org> parents: 21729 diff changeset	352 env::do_absolute_pathname (const std::string& s) const
6a1eded90355 use namespace for system env class John W. Eaton <jwe@octave.org> parents: 21729 diff changeset	353 {
6a1eded90355 use namespace for system env class John W. Eaton <jwe@octave.org> parents: 21729 diff changeset	354 size_t len = s.length ();
4087 a54f61b5d491 [project @ 2002-10-05 03:02:56 by jwe] jwe parents: 3803 diff changeset	355
21732 6a1eded90355 use namespace for system env class John W. Eaton <jwe@octave.org> parents: 21729 diff changeset	356 if (len == 0)
6a1eded90355 use namespace for system env class John W. Eaton <jwe@octave.org> parents: 21729 diff changeset	357 return false;
2926 66ef74ee5d9f [project @ 1997-05-05 03:20:52 by jwe] jwe parents: diff changeset	358
23696 08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace John W. Eaton <jwe@octave.org> parents: 23457 diff changeset	359 if (sys::file_ops::is_dir_sep (s[0]))
21732 6a1eded90355 use namespace for system env class John W. Eaton <jwe@octave.org> parents: 21729 diff changeset	360 return true;
2926 66ef74ee5d9f [project @ 1997-05-05 03:20:52 by jwe] jwe parents: diff changeset	361
4101 ea537559ab07 [project @ 2002-10-11 20:57:21 by jwe] jwe parents: 4099 diff changeset	362 #if defined (OCTAVE_HAVE_WINDOWS_FILESYSTEM)
21732 6a1eded90355 use namespace for system env class John W. Eaton <jwe@octave.org> parents: 21729 diff changeset	363 if ((len == 2 && isalpha (s[0]) && s[1] == ':')
6a1eded90355 use namespace for system env class John W. Eaton <jwe@octave.org> parents: 21729 diff changeset	364 \|\| (len > 2 && isalpha (s[0]) && s[1] == ':'
23696 08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace John W. Eaton <jwe@octave.org> parents: 23457 diff changeset	365 && sys::file_ops::is_dir_sep (s[2])))
21732 6a1eded90355 use namespace for system env class John W. Eaton <jwe@octave.org> parents: 21729 diff changeset	366 return true;
4087 a54f61b5d491 [project @ 2002-10-05 03:02:56 by jwe] jwe parents: 3803 diff changeset	367 #endif
a54f61b5d491 [project @ 2002-10-05 03:02:56 by jwe] jwe parents: 3803 diff changeset	368
21732 6a1eded90355 use namespace for system env class John W. Eaton <jwe@octave.org> parents: 21729 diff changeset	369 return false;
6a1eded90355 use namespace for system env class John W. Eaton <jwe@octave.org> parents: 21729 diff changeset	370 }
2926 66ef74ee5d9f [project @ 1997-05-05 03:20:52 by jwe] jwe parents: diff changeset	371
21732 6a1eded90355 use namespace for system env class John W. Eaton <jwe@octave.org> parents: 21729 diff changeset	372 bool
6a1eded90355 use namespace for system env class John W. Eaton <jwe@octave.org> parents: 21729 diff changeset	373 env::do_rooted_relative_pathname (const std::string& s) const
6a1eded90355 use namespace for system env class John W. Eaton <jwe@octave.org> parents: 21729 diff changeset	374 {
6a1eded90355 use namespace for system env class John W. Eaton <jwe@octave.org> parents: 21729 diff changeset	375 size_t len = s.length ();
6a1eded90355 use namespace for system env class John W. Eaton <jwe@octave.org> parents: 21729 diff changeset	376
6a1eded90355 use namespace for system env class John W. Eaton <jwe@octave.org> parents: 21729 diff changeset	377 if (len == 0)
6a1eded90355 use namespace for system env class John W. Eaton <jwe@octave.org> parents: 21729 diff changeset	378 return false;
6838 5e3350bdd91d [project @ 2007-08-28 02:59:58 by jwe] jwe parents: 6184 diff changeset	379
21732 6a1eded90355 use namespace for system env class John W. Eaton <jwe@octave.org> parents: 21729 diff changeset	380 if (len == 1 && s[0] == '.')
6a1eded90355 use namespace for system env class John W. Eaton <jwe@octave.org> parents: 21729 diff changeset	381 return true;
6a1eded90355 use namespace for system env class John W. Eaton <jwe@octave.org> parents: 21729 diff changeset	382
23696 08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace John W. Eaton <jwe@octave.org> parents: 23457 diff changeset	383 if (len > 1 && s[0] == '.' && sys::file_ops::is_dir_sep (s[1]))
21732 6a1eded90355 use namespace for system env class John W. Eaton <jwe@octave.org> parents: 21729 diff changeset	384 return true;
6838 5e3350bdd91d [project @ 2007-08-28 02:59:58 by jwe] jwe parents: 6184 diff changeset	385
21732 6a1eded90355 use namespace for system env class John W. Eaton <jwe@octave.org> parents: 21729 diff changeset	386 if (len == 2 && s[0] == '.' && s[1] == '.')
6a1eded90355 use namespace for system env class John W. Eaton <jwe@octave.org> parents: 21729 diff changeset	387 return true;
6838 5e3350bdd91d [project @ 2007-08-28 02:59:58 by jwe] jwe parents: 6184 diff changeset	388
22402 4caa7b28d183 maint: Style check C++ code in liboctave/ Rik <rik@octave.org> parents: 22323 diff changeset	389 if (len > 2 && s[0] == '.' && s[1] == '.'
23696 08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace John W. Eaton <jwe@octave.org> parents: 23457 diff changeset	390 && sys::file_ops::is_dir_sep (s[2]))
21732 6a1eded90355 use namespace for system env class John W. Eaton <jwe@octave.org> parents: 21729 diff changeset	391 return true;
6838 5e3350bdd91d [project @ 2007-08-28 02:59:58 by jwe] jwe parents: 6184 diff changeset	392
21732 6a1eded90355 use namespace for system env class John W. Eaton <jwe@octave.org> parents: 21729 diff changeset	393 return false;
6a1eded90355 use namespace for system env class John W. Eaton <jwe@octave.org> parents: 21729 diff changeset	394 }
6838 5e3350bdd91d [project @ 2007-08-28 02:59:58 by jwe] jwe parents: 6184 diff changeset	395
21732 6a1eded90355 use namespace for system env class John W. Eaton <jwe@octave.org> parents: 21729 diff changeset	396 // Return the 'basename' of the pathname in STRING (the stuff after
6a1eded90355 use namespace for system env class John W. Eaton <jwe@octave.org> parents: 21729 diff changeset	397 // the last directory separator). If STRING is not a full pathname,
6a1eded90355 use namespace for system env class John W. Eaton <jwe@octave.org> parents: 21729 diff changeset	398 // simply return it.
6838 5e3350bdd91d [project @ 2007-08-28 02:59:58 by jwe] jwe parents: 6184 diff changeset	399
21732 6a1eded90355 use namespace for system env class John W. Eaton <jwe@octave.org> parents: 21729 diff changeset	400 std::string
6a1eded90355 use namespace for system env class John W. Eaton <jwe@octave.org> parents: 21729 diff changeset	401 env::do_base_pathname (const std::string& s) const
6a1eded90355 use namespace for system env class John W. Eaton <jwe@octave.org> parents: 21729 diff changeset	402 {
6a1eded90355 use namespace for system env class John W. Eaton <jwe@octave.org> parents: 21729 diff changeset	403 if (! (do_absolute_pathname (s) \|\| do_rooted_relative_pathname (s)))
6a1eded90355 use namespace for system env class John W. Eaton <jwe@octave.org> parents: 21729 diff changeset	404 return s;
6a1eded90355 use namespace for system env class John W. Eaton <jwe@octave.org> parents: 21729 diff changeset	405
23696 08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace John W. Eaton <jwe@octave.org> parents: 23457 diff changeset	406 size_t pos = s.find_last_of (sys::file_ops::dir_sep_chars ());
2926 66ef74ee5d9f [project @ 1997-05-05 03:20:52 by jwe] jwe parents: diff changeset	407
21732 6a1eded90355 use namespace for system env class John W. Eaton <jwe@octave.org> parents: 21729 diff changeset	408 if (pos == std::string::npos)
6a1eded90355 use namespace for system env class John W. Eaton <jwe@octave.org> parents: 21729 diff changeset	409 return s;
6a1eded90355 use namespace for system env class John W. Eaton <jwe@octave.org> parents: 21729 diff changeset	410 else
6a1eded90355 use namespace for system env class John W. Eaton <jwe@octave.org> parents: 21729 diff changeset	411 return s.substr (pos+1);
6a1eded90355 use namespace for system env class John W. Eaton <jwe@octave.org> parents: 21729 diff changeset	412 }
2926 66ef74ee5d9f [project @ 1997-05-05 03:20:52 by jwe] jwe parents: diff changeset	413
21732 6a1eded90355 use namespace for system env class John W. Eaton <jwe@octave.org> parents: 21729 diff changeset	414 // Turn STRING (a pathname) into an absolute pathname, assuming that
6a1eded90355 use namespace for system env class John W. Eaton <jwe@octave.org> parents: 21729 diff changeset	415 // DOT_PATH contains the symbolic location of the current directory.
2926 66ef74ee5d9f [project @ 1997-05-05 03:20:52 by jwe] jwe parents: diff changeset	416
21732 6a1eded90355 use namespace for system env class John W. Eaton <jwe@octave.org> parents: 21729 diff changeset	417 std::string
6a1eded90355 use namespace for system env class John W. Eaton <jwe@octave.org> parents: 21729 diff changeset	418 env::do_make_absolute (const std::string& s,
6a1eded90355 use namespace for system env class John W. Eaton <jwe@octave.org> parents: 21729 diff changeset	419 const std::string& dot_path) const
6a1eded90355 use namespace for system env class John W. Eaton <jwe@octave.org> parents: 21729 diff changeset	420 {
6a1eded90355 use namespace for system env class John W. Eaton <jwe@octave.org> parents: 21729 diff changeset	421 if (dot_path.empty () \|\| s.empty () \|\| do_absolute_pathname (s))
6a1eded90355 use namespace for system env class John W. Eaton <jwe@octave.org> parents: 21729 diff changeset	422 return s;
2926 66ef74ee5d9f [project @ 1997-05-05 03:20:52 by jwe] jwe parents: diff changeset	423
22034 8df31c24dce3 Optimize do_make_absolute for most common calling usage. Rik <rik@octave.org> parents: 22029 diff changeset	424 // Optimization: every time Octave returns to the prompt it calls
8df31c24dce3 Optimize do_make_absolute for most common calling usage. Rik <rik@octave.org> parents: 22029 diff changeset	425 // make_absolute_filename with '.' as argument.
8df31c24dce3 Optimize do_make_absolute for most common calling usage. Rik <rik@octave.org> parents: 22029 diff changeset	426 if (s == ".")
8df31c24dce3 Optimize do_make_absolute for most common calling usage. Rik <rik@octave.org> parents: 22029 diff changeset	427 return dot_path;
8df31c24dce3 Optimize do_make_absolute for most common calling usage. Rik <rik@octave.org> parents: 22029 diff changeset	428
21732 6a1eded90355 use namespace for system env class John W. Eaton <jwe@octave.org> parents: 21729 diff changeset	429 std::string current_dir = dot_path;
2926 66ef74ee5d9f [project @ 1997-05-05 03:20:52 by jwe] jwe parents: diff changeset	430
23696 08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace John W. Eaton <jwe@octave.org> parents: 23457 diff changeset	431 if (! sys::file_ops::is_dir_sep (current_dir.back ()))
08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace John W. Eaton <jwe@octave.org> parents: 23457 diff changeset	432 current_dir.append (sys::file_ops::dir_sep_str ());
2926 66ef74ee5d9f [project @ 1997-05-05 03:20:52 by jwe] jwe parents: diff changeset	433
21732 6a1eded90355 use namespace for system env class John W. Eaton <jwe@octave.org> parents: 21729 diff changeset	434 size_t i = 0;
6a1eded90355 use namespace for system env class John W. Eaton <jwe@octave.org> parents: 21729 diff changeset	435 size_t slen = s.length ();
2926 66ef74ee5d9f [project @ 1997-05-05 03:20:52 by jwe] jwe parents: diff changeset	436
21732 6a1eded90355 use namespace for system env class John W. Eaton <jwe@octave.org> parents: 21729 diff changeset	437 while (i < slen)
6a1eded90355 use namespace for system env class John W. Eaton <jwe@octave.org> parents: 21729 diff changeset	438 {
6a1eded90355 use namespace for system env class John W. Eaton <jwe@octave.org> parents: 21729 diff changeset	439 if (s[i] == '.')
6a1eded90355 use namespace for system env class John W. Eaton <jwe@octave.org> parents: 21729 diff changeset	440 {
6a1eded90355 use namespace for system env class John W. Eaton <jwe@octave.org> parents: 21729 diff changeset	441 if (i + 1 == slen)
22034 8df31c24dce3 Optimize do_make_absolute for most common calling usage. Rik <rik@octave.org> parents: 22029 diff changeset	442 break;
4097 596f88296519 [project @ 2002-10-09 20:26:27 by jwe] jwe parents: 4093 diff changeset	443
23696 08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace John W. Eaton <jwe@octave.org> parents: 23457 diff changeset	444 if (sys::file_ops::is_dir_sep (s[i+1]))
21732 6a1eded90355 use namespace for system env class John W. Eaton <jwe@octave.org> parents: 21729 diff changeset	445 {
6a1eded90355 use namespace for system env class John W. Eaton <jwe@octave.org> parents: 21729 diff changeset	446 i += 2;
6a1eded90355 use namespace for system env class John W. Eaton <jwe@octave.org> parents: 21729 diff changeset	447 continue;
6a1eded90355 use namespace for system env class John W. Eaton <jwe@octave.org> parents: 21729 diff changeset	448 }
2926 66ef74ee5d9f [project @ 1997-05-05 03:20:52 by jwe] jwe parents: diff changeset	449
21732 6a1eded90355 use namespace for system env class John W. Eaton <jwe@octave.org> parents: 21729 diff changeset	450 if (s[i+1] == '.'
22029 6e618b8277ad Strip extra file separators with make_absolute_filename (bug #48351). Rik <rik@octave.org> parents: 21942 diff changeset	451 && (i + 2 == slen
23696 08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace John W. Eaton <jwe@octave.org> parents: 23457 diff changeset	452 \|\| sys::file_ops::is_dir_sep (s[i+2])))
21732 6a1eded90355 use namespace for system env class John W. Eaton <jwe@octave.org> parents: 21729 diff changeset	453 {
6a1eded90355 use namespace for system env class John W. Eaton <jwe@octave.org> parents: 21729 diff changeset	454 i += 2;
6a1eded90355 use namespace for system env class John W. Eaton <jwe@octave.org> parents: 21729 diff changeset	455 if (i != slen)
6a1eded90355 use namespace for system env class John W. Eaton <jwe@octave.org> parents: 21729 diff changeset	456 i++;
6a1eded90355 use namespace for system env class John W. Eaton <jwe@octave.org> parents: 21729 diff changeset	457
6a1eded90355 use namespace for system env class John W. Eaton <jwe@octave.org> parents: 21729 diff changeset	458 pathname_backup (current_dir, 1);
6a1eded90355 use namespace for system env class John W. Eaton <jwe@octave.org> parents: 21729 diff changeset	459
6a1eded90355 use namespace for system env class John W. Eaton <jwe@octave.org> parents: 21729 diff changeset	460 continue;
6a1eded90355 use namespace for system env class John W. Eaton <jwe@octave.org> parents: 21729 diff changeset	461 }
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10278 diff changeset	462 }
2926 66ef74ee5d9f [project @ 1997-05-05 03:20:52 by jwe] jwe parents: diff changeset	463
22034 8df31c24dce3 Optimize do_make_absolute for most common calling usage. Rik <rik@octave.org> parents: 22029 diff changeset	464 size_t sep_pos;
23696 08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace John W. Eaton <jwe@octave.org> parents: 23457 diff changeset	465 sep_pos = s.find_first_of (sys::file_ops::dir_sep_chars (), i);
2926 66ef74ee5d9f [project @ 1997-05-05 03:20:52 by jwe] jwe parents: diff changeset	466
22034 8df31c24dce3 Optimize do_make_absolute for most common calling usage. Rik <rik@octave.org> parents: 22029 diff changeset	467 if (sep_pos == std::string::npos)
21732 6a1eded90355 use namespace for system env class John W. Eaton <jwe@octave.org> parents: 21729 diff changeset	468 {
22034 8df31c24dce3 Optimize do_make_absolute for most common calling usage. Rik <rik@octave.org> parents: 22029 diff changeset	469 current_dir.append (s, i, sep_pos-i);
21732 6a1eded90355 use namespace for system env class John W. Eaton <jwe@octave.org> parents: 21729 diff changeset	470 break;
6a1eded90355 use namespace for system env class John W. Eaton <jwe@octave.org> parents: 21729 diff changeset	471 }
22034 8df31c24dce3 Optimize do_make_absolute for most common calling usage. Rik <rik@octave.org> parents: 22029 diff changeset	472 else if (sep_pos == i)
22029 6e618b8277ad Strip extra file separators with make_absolute_filename (bug #48351). Rik <rik@octave.org> parents: 21942 diff changeset	473 {
6e618b8277ad Strip extra file separators with make_absolute_filename (bug #48351). Rik <rik@octave.org> parents: 21942 diff changeset	474 /* Two separators in a row, skip adding 2nd separator */
6e618b8277ad Strip extra file separators with make_absolute_filename (bug #48351). Rik <rik@octave.org> parents: 21942 diff changeset	475 i++;
6e618b8277ad Strip extra file separators with make_absolute_filename (bug #48351). Rik <rik@octave.org> parents: 21942 diff changeset	476 }
21732 6a1eded90355 use namespace for system env class John W. Eaton <jwe@octave.org> parents: 21729 diff changeset	477 else
6a1eded90355 use namespace for system env class John W. Eaton <jwe@octave.org> parents: 21729 diff changeset	478 {
22034 8df31c24dce3 Optimize do_make_absolute for most common calling usage. Rik <rik@octave.org> parents: 22029 diff changeset	479 current_dir.append (s, i, sep_pos-i+1);
8df31c24dce3 Optimize do_make_absolute for most common calling usage. Rik <rik@octave.org> parents: 22029 diff changeset	480 i = sep_pos + 1;
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10278 diff changeset	481 }
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10278 diff changeset	482 }
2926 66ef74ee5d9f [project @ 1997-05-05 03:20:52 by jwe] jwe parents: diff changeset	483
22029 6e618b8277ad Strip extra file separators with make_absolute_filename (bug #48351). Rik <rik@octave.org> parents: 21942 diff changeset	484 // Strip any trailing directory separator
23696 08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace John W. Eaton <jwe@octave.org> parents: 23457 diff changeset	485 if (sys::file_ops::is_dir_sep (current_dir.back ()))
22029 6e618b8277ad Strip extra file separators with make_absolute_filename (bug #48351). Rik <rik@octave.org> parents: 21942 diff changeset	486 current_dir.pop_back ();
22066 c4ef0b3dc40c maint: Strip trailing whitespace from source files. John W. Eaton <jwe@octave.org> parents: 22034 diff changeset	487
21732 6a1eded90355 use namespace for system env class John W. Eaton <jwe@octave.org> parents: 21729 diff changeset	488 return current_dir;
2926 66ef74ee5d9f [project @ 1997-05-05 03:20:52 by jwe] jwe parents: diff changeset	489 }
66ef74ee5d9f [project @ 1997-05-05 03:20:52 by jwe] jwe parents: diff changeset	490
21732 6a1eded90355 use namespace for system env class John W. Eaton <jwe@octave.org> parents: 21729 diff changeset	491 // Return a string which is the current working directory.
2926 66ef74ee5d9f [project @ 1997-05-05 03:20:52 by jwe] jwe parents: diff changeset	492
21732 6a1eded90355 use namespace for system env class John W. Eaton <jwe@octave.org> parents: 21729 diff changeset	493 std::string
6a1eded90355 use namespace for system env class John W. Eaton <jwe@octave.org> parents: 21729 diff changeset	494 env::do_getcwd () const
6a1eded90355 use namespace for system env class John W. Eaton <jwe@octave.org> parents: 21729 diff changeset	495 {
6a1eded90355 use namespace for system env class John W. Eaton <jwe@octave.org> parents: 21729 diff changeset	496 if (! follow_symbolic_links)
6a1eded90355 use namespace for system env class John W. Eaton <jwe@octave.org> parents: 21729 diff changeset	497 current_directory = "";
6a1eded90355 use namespace for system env class John W. Eaton <jwe@octave.org> parents: 21729 diff changeset	498
6a1eded90355 use namespace for system env class John W. Eaton <jwe@octave.org> parents: 21729 diff changeset	499 if (verbatim_pwd \|\| current_directory.empty ())
23696 08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace John W. Eaton <jwe@octave.org> parents: 23457 diff changeset	500 current_directory = sys::getcwd ();
2926 66ef74ee5d9f [project @ 1997-05-05 03:20:52 by jwe] jwe parents: diff changeset	501
21732 6a1eded90355 use namespace for system env class John W. Eaton <jwe@octave.org> parents: 21729 diff changeset	502 return current_directory;
6a1eded90355 use namespace for system env class John W. Eaton <jwe@octave.org> parents: 21729 diff changeset	503 }
2926 66ef74ee5d9f [project @ 1997-05-05 03:20:52 by jwe] jwe parents: diff changeset	504
21732 6a1eded90355 use namespace for system env class John W. Eaton <jwe@octave.org> parents: 21729 diff changeset	505 // This value is not cached because it can change while Octave is
6a1eded90355 use namespace for system env class John W. Eaton <jwe@octave.org> parents: 21729 diff changeset	506 // running.
2926 66ef74ee5d9f [project @ 1997-05-05 03:20:52 by jwe] jwe parents: diff changeset	507
21732 6a1eded90355 use namespace for system env class John W. Eaton <jwe@octave.org> parents: 21729 diff changeset	508 std::string
6a1eded90355 use namespace for system env class John W. Eaton <jwe@octave.org> parents: 21729 diff changeset	509 env::do_get_home_directory (void) const
6a1eded90355 use namespace for system env class John W. Eaton <jwe@octave.org> parents: 21729 diff changeset	510 {
6a1eded90355 use namespace for system env class John W. Eaton <jwe@octave.org> parents: 21729 diff changeset	511 std::string hd = do_getenv ("HOME");
2926 66ef74ee5d9f [project @ 1997-05-05 03:20:52 by jwe] jwe parents: diff changeset	512
6096 40212bfaed1d [project @ 2006-10-26 01:57:49 by jwe] jwe parents: 5775 diff changeset	513 #if defined (__MINGW32__) \|\| defined (_MSC_VER)
21732 6a1eded90355 use namespace for system env class John W. Eaton <jwe@octave.org> parents: 21729 diff changeset	514 // Maybe we are started directly from cmd.exe.
6a1eded90355 use namespace for system env class John W. Eaton <jwe@octave.org> parents: 21729 diff changeset	515 if (hd.empty ())
6a1eded90355 use namespace for system env class John W. Eaton <jwe@octave.org> parents: 21729 diff changeset	516 {
6a1eded90355 use namespace for system env class John W. Eaton <jwe@octave.org> parents: 21729 diff changeset	517 std::string drv = do_getenv ("HOMEDRIVE");
6a1eded90355 use namespace for system env class John W. Eaton <jwe@octave.org> parents: 21729 diff changeset	518 if (drv.empty ())
6a1eded90355 use namespace for system env class John W. Eaton <jwe@octave.org> parents: 21729 diff changeset	519 hd = do_getenv ("HOMEPATH");
6a1eded90355 use namespace for system env class John W. Eaton <jwe@octave.org> parents: 21729 diff changeset	520 else
6a1eded90355 use namespace for system env class John W. Eaton <jwe@octave.org> parents: 21729 diff changeset	521 hd = drv + do_getenv ("HOMEPATH");
6a1eded90355 use namespace for system env class John W. Eaton <jwe@octave.org> parents: 21729 diff changeset	522 }
5451 ed08548b9054 [project @ 2005-09-15 19:52:50 by jwe] jwe parents: 5307 diff changeset	523 #endif
ed08548b9054 [project @ 2005-09-15 19:52:50 by jwe] jwe parents: 5307 diff changeset	524
21732 6a1eded90355 use namespace for system env class John W. Eaton <jwe@octave.org> parents: 21729 diff changeset	525 if (hd.empty ())
6a1eded90355 use namespace for system env class John W. Eaton <jwe@octave.org> parents: 21729 diff changeset	526 {
27276 7455523fdf01 style fixes: avoid breaking lines immediately after '(' John W. Eaton <jwe@octave.org> parents: 26836 diff changeset	527 sys::password pw = sys::password::getpwuid (sys::getuid ());
2947 cf676ff8b702 [project @ 1997-05-09 13:32:46 by jwe] jwe parents: 2938 diff changeset	528
23696 08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace John W. Eaton <jwe@octave.org> parents: 23457 diff changeset	529 hd = (pw ? pw.dir () : std::string (sys::file_ops::dir_sep_str ()));
21732 6a1eded90355 use namespace for system env class John W. Eaton <jwe@octave.org> parents: 21729 diff changeset	530 }
6a1eded90355 use namespace for system env class John W. Eaton <jwe@octave.org> parents: 21729 diff changeset	531
6a1eded90355 use namespace for system env class John W. Eaton <jwe@octave.org> parents: 21729 diff changeset	532 return hd;
2947 cf676ff8b702 [project @ 1997-05-09 13:32:46 by jwe] jwe parents: 2938 diff changeset	533 }
cf676ff8b702 [project @ 1997-05-09 13:32:46 by jwe] jwe parents: 2938 diff changeset	534
21732 6a1eded90355 use namespace for system env class John W. Eaton <jwe@octave.org> parents: 21729 diff changeset	535 std::string
6a1eded90355 use namespace for system env class John W. Eaton <jwe@octave.org> parents: 21729 diff changeset	536 env::do_get_user_name (void) const
6a1eded90355 use namespace for system env class John W. Eaton <jwe@octave.org> parents: 21729 diff changeset	537 {
6a1eded90355 use namespace for system env class John W. Eaton <jwe@octave.org> parents: 21729 diff changeset	538 if (user_name.empty ())
6a1eded90355 use namespace for system env class John W. Eaton <jwe@octave.org> parents: 21729 diff changeset	539 {
27276 7455523fdf01 style fixes: avoid breaking lines immediately after '(' John W. Eaton <jwe@octave.org> parents: 26836 diff changeset	540 sys::password pw = sys::password::getpwuid (sys::getuid ());
2926 66ef74ee5d9f [project @ 1997-05-05 03:20:52 by jwe] jwe parents: diff changeset	541
23829 01899bdd2a3a Eliminate unnecessary std::string ("...") constructor calls when "..." suffices. Rik <rik@octave.org> parents: 23812 diff changeset	542 user_name = (pw ? pw.name () : "unknown");
21732 6a1eded90355 use namespace for system env class John W. Eaton <jwe@octave.org> parents: 21729 diff changeset	543 }
2926 66ef74ee5d9f [project @ 1997-05-05 03:20:52 by jwe] jwe parents: diff changeset	544
21732 6a1eded90355 use namespace for system env class John W. Eaton <jwe@octave.org> parents: 21729 diff changeset	545 return user_name;
2926 66ef74ee5d9f [project @ 1997-05-05 03:20:52 by jwe] jwe parents: diff changeset	546 }
66ef74ee5d9f [project @ 1997-05-05 03:20:52 by jwe] jwe parents: diff changeset	547
21732 6a1eded90355 use namespace for system env class John W. Eaton <jwe@octave.org> parents: 21729 diff changeset	548 std::string
6a1eded90355 use namespace for system env class John W. Eaton <jwe@octave.org> parents: 21729 diff changeset	549 env::do_get_host_name (void) const
6a1eded90355 use namespace for system env class John W. Eaton <jwe@octave.org> parents: 21729 diff changeset	550 {
6a1eded90355 use namespace for system env class John W. Eaton <jwe@octave.org> parents: 21729 diff changeset	551 if (host_name.empty ())
6a1eded90355 use namespace for system env class John W. Eaton <jwe@octave.org> parents: 21729 diff changeset	552 {
6a1eded90355 use namespace for system env class John W. Eaton <jwe@octave.org> parents: 21729 diff changeset	553 char hostname[1024];
2926 66ef74ee5d9f [project @ 1997-05-05 03:20:52 by jwe] jwe parents: diff changeset	554
21910 4d723ba06b4a provide wrappers for some unistd.h functions John W. Eaton <jwe@octave.org> parents: 21891 diff changeset	555 int status = octave_gethostname_wrapper (hostname, 1023);
2926 66ef74ee5d9f [project @ 1997-05-05 03:20:52 by jwe] jwe parents: diff changeset	556
21732 6a1eded90355 use namespace for system env class John W. Eaton <jwe@octave.org> parents: 21729 diff changeset	557 host_name = (status < 0) ? "unknown" : hostname;
6a1eded90355 use namespace for system env class John W. Eaton <jwe@octave.org> parents: 21729 diff changeset	558 }
2926 66ef74ee5d9f [project @ 1997-05-05 03:20:52 by jwe] jwe parents: diff changeset	559
21732 6a1eded90355 use namespace for system env class John W. Eaton <jwe@octave.org> parents: 21729 diff changeset	560 return host_name;
2926 66ef74ee5d9f [project @ 1997-05-05 03:20:52 by jwe] jwe parents: diff changeset	561 }
66ef74ee5d9f [project @ 1997-05-05 03:20:52 by jwe] jwe parents: diff changeset	562
21732 6a1eded90355 use namespace for system env class John W. Eaton <jwe@octave.org> parents: 21729 diff changeset	563 std::string
6a1eded90355 use namespace for system env class John W. Eaton <jwe@octave.org> parents: 21729 diff changeset	564 env::do_getenv (const std::string& name) const
6a1eded90355 use namespace for system env class John W. Eaton <jwe@octave.org> parents: 21729 diff changeset	565 {
25916 3f2282954600 Support non-ASCII characters in environment variables on Windows (bug #53922). Markus Mützel <markus.muetzel@gmx.de> parents: 25054 diff changeset	566 return getenv_wrapper (name);
21732 6a1eded90355 use namespace for system env class John W. Eaton <jwe@octave.org> parents: 21729 diff changeset	567 }
2926 66ef74ee5d9f [project @ 1997-05-05 03:20:52 by jwe] jwe parents: diff changeset	568
23829 01899bdd2a3a Eliminate unnecessary std::string ("...") constructor calls when "..." suffices. Rik <rik@octave.org> parents: 23812 diff changeset	569 // Do the work of changing to the directory NEWDIR.
01899bdd2a3a Eliminate unnecessary std::string ("...") constructor calls when "..." suffices. Rik <rik@octave.org> parents: 23812 diff changeset	570 // Handle symbolic link following, etc.
21732 6a1eded90355 use namespace for system env class John W. Eaton <jwe@octave.org> parents: 21729 diff changeset	571
6a1eded90355 use namespace for system env class John W. Eaton <jwe@octave.org> parents: 21729 diff changeset	572 bool
6a1eded90355 use namespace for system env class John W. Eaton <jwe@octave.org> parents: 21729 diff changeset	573 env::do_chdir (const std::string& newdir)
6a1eded90355 use namespace for system env class John W. Eaton <jwe@octave.org> parents: 21729 diff changeset	574 {
6a1eded90355 use namespace for system env class John W. Eaton <jwe@octave.org> parents: 21729 diff changeset	575 bool retval = false;
2926 66ef74ee5d9f [project @ 1997-05-05 03:20:52 by jwe] jwe parents: diff changeset	576
21732 6a1eded90355 use namespace for system env class John W. Eaton <jwe@octave.org> parents: 21729 diff changeset	577 std::string tmp;
6a1eded90355 use namespace for system env class John W. Eaton <jwe@octave.org> parents: 21729 diff changeset	578
6a1eded90355 use namespace for system env class John W. Eaton <jwe@octave.org> parents: 21729 diff changeset	579 if (follow_symbolic_links)
6a1eded90355 use namespace for system env class John W. Eaton <jwe@octave.org> parents: 21729 diff changeset	580 {
6a1eded90355 use namespace for system env class John W. Eaton <jwe@octave.org> parents: 21729 diff changeset	581 if (current_directory.empty ())
6a1eded90355 use namespace for system env class John W. Eaton <jwe@octave.org> parents: 21729 diff changeset	582 do_getcwd ();
2926 66ef74ee5d9f [project @ 1997-05-05 03:20:52 by jwe] jwe parents: diff changeset	583
21732 6a1eded90355 use namespace for system env class John W. Eaton <jwe@octave.org> parents: 21729 diff changeset	584 if (current_directory.empty ())
6a1eded90355 use namespace for system env class John W. Eaton <jwe@octave.org> parents: 21729 diff changeset	585 tmp = newdir;
6a1eded90355 use namespace for system env class John W. Eaton <jwe@octave.org> parents: 21729 diff changeset	586 else
6a1eded90355 use namespace for system env class John W. Eaton <jwe@octave.org> parents: 21729 diff changeset	587 tmp = do_make_absolute (newdir, current_directory);
2926 66ef74ee5d9f [project @ 1997-05-05 03:20:52 by jwe] jwe parents: diff changeset	588
21732 6a1eded90355 use namespace for system env class John W. Eaton <jwe@octave.org> parents: 21729 diff changeset	589 // Get rid of trailing directory separator.
23812 057a894914df Use C++11 string fcns back() and pop_back() to simplify code. Rik <rik@octave.org> parents: 23809 diff changeset	590 if (tmp.length () > 1 && sys::file_ops::is_dir_sep (tmp.back ()))
057a894914df Use C++11 string fcns back() and pop_back() to simplify code. Rik <rik@octave.org> parents: 23809 diff changeset	591 tmp.pop_back ();
2926 66ef74ee5d9f [project @ 1997-05-05 03:20:52 by jwe] jwe parents: diff changeset	592
23696 08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace John W. Eaton <jwe@octave.org> parents: 23457 diff changeset	593 if (! sys::chdir (tmp))
21732 6a1eded90355 use namespace for system env class John W. Eaton <jwe@octave.org> parents: 21729 diff changeset	594 {
6a1eded90355 use namespace for system env class John W. Eaton <jwe@octave.org> parents: 21729 diff changeset	595 current_directory = tmp;
6a1eded90355 use namespace for system env class John W. Eaton <jwe@octave.org> parents: 21729 diff changeset	596 retval = true;
6a1eded90355 use namespace for system env class John W. Eaton <jwe@octave.org> parents: 21729 diff changeset	597 }
6a1eded90355 use namespace for system env class John W. Eaton <jwe@octave.org> parents: 21729 diff changeset	598 }
2926 66ef74ee5d9f [project @ 1997-05-05 03:20:52 by jwe] jwe parents: diff changeset	599 else
23696 08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace John W. Eaton <jwe@octave.org> parents: 23457 diff changeset	600 retval = (! sys::chdir (newdir));
2926 66ef74ee5d9f [project @ 1997-05-05 03:20:52 by jwe] jwe parents: diff changeset	601
21732 6a1eded90355 use namespace for system env class John W. Eaton <jwe@octave.org> parents: 21729 diff changeset	602 return retval;
6a1eded90355 use namespace for system env class John W. Eaton <jwe@octave.org> parents: 21729 diff changeset	603 }
6a1eded90355 use namespace for system env class John W. Eaton <jwe@octave.org> parents: 21729 diff changeset	604
6a1eded90355 use namespace for system env class John W. Eaton <jwe@octave.org> parents: 21729 diff changeset	605 // Remove the last N directories from PATH.
2926 66ef74ee5d9f [project @ 1997-05-05 03:20:52 by jwe] jwe parents: diff changeset	606
21732 6a1eded90355 use namespace for system env class John W. Eaton <jwe@octave.org> parents: 21729 diff changeset	607 void
6a1eded90355 use namespace for system env class John W. Eaton <jwe@octave.org> parents: 21729 diff changeset	608 env::pathname_backup (std::string& path, int n) const
6a1eded90355 use namespace for system env class John W. Eaton <jwe@octave.org> parents: 21729 diff changeset	609 {
6a1eded90355 use namespace for system env class John W. Eaton <jwe@octave.org> parents: 21729 diff changeset	610 if (path.empty ())
6a1eded90355 use namespace for system env class John W. Eaton <jwe@octave.org> parents: 21729 diff changeset	611 return;
6a1eded90355 use namespace for system env class John W. Eaton <jwe@octave.org> parents: 21729 diff changeset	612
6a1eded90355 use namespace for system env class John W. Eaton <jwe@octave.org> parents: 21729 diff changeset	613 size_t i = path.length () - 1;
2926 66ef74ee5d9f [project @ 1997-05-05 03:20:52 by jwe] jwe parents: diff changeset	614
21732 6a1eded90355 use namespace for system env class John W. Eaton <jwe@octave.org> parents: 21729 diff changeset	615 while (n--)
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10278 diff changeset	616 {
23696 08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace John W. Eaton <jwe@octave.org> parents: 23457 diff changeset	617 while (sys::file_ops::is_dir_sep (path[i]) && i > 0)
21732 6a1eded90355 use namespace for system env class John W. Eaton <jwe@octave.org> parents: 21729 diff changeset	618 i--;
6a1eded90355 use namespace for system env class John W. Eaton <jwe@octave.org> parents: 21729 diff changeset	619
26819 670ebc29ec69 make_absolute_filename: Don't strip drive letter from path (bug #36677). Markus Mützel <markus.muetzel@gmx.de> parents: 26377 diff changeset	620 #if defined (OCTAVE_HAVE_WINDOWS_FILESYSTEM)
670ebc29ec69 make_absolute_filename: Don't strip drive letter from path (bug #36677). Markus Mützel <markus.muetzel@gmx.de> parents: 26377 diff changeset	621 // Don't strip file letter part.
670ebc29ec69 make_absolute_filename: Don't strip drive letter from path (bug #36677). Markus Mützel <markus.muetzel@gmx.de> parents: 26377 diff changeset	622 if (i == 1 && path[i] == ':')
670ebc29ec69 make_absolute_filename: Don't strip drive letter from path (bug #36677). Markus Mützel <markus.muetzel@gmx.de> parents: 26377 diff changeset	623 {
670ebc29ec69 make_absolute_filename: Don't strip drive letter from path (bug #36677). Markus Mützel <markus.muetzel@gmx.de> parents: 26377 diff changeset	624 // Keep path separator if present.
670ebc29ec69 make_absolute_filename: Don't strip drive letter from path (bug #36677). Markus Mützel <markus.muetzel@gmx.de> parents: 26377 diff changeset	625 i = std::min (i+2, path.length ());
670ebc29ec69 make_absolute_filename: Don't strip drive letter from path (bug #36677). Markus Mützel <markus.muetzel@gmx.de> parents: 26377 diff changeset	626 break;
670ebc29ec69 make_absolute_filename: Don't strip drive letter from path (bug #36677). Markus Mützel <markus.muetzel@gmx.de> parents: 26377 diff changeset	627 }
670ebc29ec69 make_absolute_filename: Don't strip drive letter from path (bug #36677). Markus Mützel <markus.muetzel@gmx.de> parents: 26377 diff changeset	628 #endif
670ebc29ec69 make_absolute_filename: Don't strip drive letter from path (bug #36677). Markus Mützel <markus.muetzel@gmx.de> parents: 26377 diff changeset	629
23696 08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace John W. Eaton <jwe@octave.org> parents: 23457 diff changeset	630 while (! sys::file_ops::is_dir_sep (path[i]) && i > 0)
21732 6a1eded90355 use namespace for system env class John W. Eaton <jwe@octave.org> parents: 21729 diff changeset	631 i--;
6a1eded90355 use namespace for system env class John W. Eaton <jwe@octave.org> parents: 21729 diff changeset	632
6a1eded90355 use namespace for system env class John W. Eaton <jwe@octave.org> parents: 21729 diff changeset	633 i++;
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10278 diff changeset	634 }
2926 66ef74ee5d9f [project @ 1997-05-05 03:20:52 by jwe] jwe parents: diff changeset	635
21732 6a1eded90355 use namespace for system env class John W. Eaton <jwe@octave.org> parents: 21729 diff changeset	636 path.resize (i);
2926 66ef74ee5d9f [project @ 1997-05-05 03:20:52 by jwe] jwe parents: diff changeset	637 }
66ef74ee5d9f [project @ 1997-05-05 03:20:52 by jwe] jwe parents: diff changeset	638
21732 6a1eded90355 use namespace for system env class John W. Eaton <jwe@octave.org> parents: 21729 diff changeset	639 void
6a1eded90355 use namespace for system env class John W. Eaton <jwe@octave.org> parents: 21729 diff changeset	640 env::error (int err_num) const
6a1eded90355 use namespace for system env class John W. Eaton <jwe@octave.org> parents: 21729 diff changeset	641 {
21942 aab79a1885cc limit gnulib headers to liboctave/wrappers directory John W. Eaton <jwe@octave.org> parents: 21910 diff changeset	642 (*current_liboctave_error_handler) ("%s", std::strerror (err_num));
21732 6a1eded90355 use namespace for system env class John W. Eaton <jwe@octave.org> parents: 21729 diff changeset	643 }
2926 66ef74ee5d9f [project @ 1997-05-05 03:20:52 by jwe] jwe parents: diff changeset	644
21732 6a1eded90355 use namespace for system env class John W. Eaton <jwe@octave.org> parents: 21729 diff changeset	645 void
6a1eded90355 use namespace for system env class John W. Eaton <jwe@octave.org> parents: 21729 diff changeset	646 env::error (const std::string& s) const
6a1eded90355 use namespace for system env class John W. Eaton <jwe@octave.org> parents: 21729 diff changeset	647 {
6a1eded90355 use namespace for system env class John W. Eaton <jwe@octave.org> parents: 21729 diff changeset	648 (*current_liboctave_error_handler) ("%s", s.c_str ());
6a1eded90355 use namespace for system env class John W. Eaton <jwe@octave.org> parents: 21729 diff changeset	649 }
6a1eded90355 use namespace for system env class John W. Eaton <jwe@octave.org> parents: 21729 diff changeset	650 }
2926 66ef74ee5d9f [project @ 1997-05-05 03:20:52 by jwe] jwe parents: diff changeset	651 }

Mercurial > octave

annotate liboctave/system/oct-env.cc @ 27832:8fd7d1d2a4ca