octave: liboctave/system/file-ops.cc annotate

annotate liboctave/system/file-ops.cc @ 26376:00f796120a6d stable

maint: Update copyright dates in all source files.

author	John W. Eaton <jwe@octave.org>
date	Wed, 02 Jan 2019 16:32:43 -0500
parents	815cfd72ddf5
children	097774bed4ed

rev	line source
1765 a51354c34bea [project @ 1996-01-23 03:33:34 by jwe] jwe parents: diff changeset	1 /*
a51354c34bea [project @ 1996-01-23 03:33:34 by jwe] jwe parents: diff changeset	2
26376 00f796120a6d maint: Update copyright dates in all source files. John W. Eaton <jwe@octave.org> parents: 25624 diff changeset	3 Copyright (C) 1996-2019 John W. Eaton
1765 a51354c34bea [project @ 1996-01-23 03:33:34 by jwe] jwe parents: diff changeset	4
a51354c34bea [project @ 1996-01-23 03:33:34 by jwe] jwe parents: diff changeset	5 This file is part of Octave.
a51354c34bea [project @ 1996-01-23 03:33:34 by jwe] jwe parents: diff changeset	6
24534 194eb4bd202b maint: Update punctuation for GPL v3 license text. Rik <rik@octave.org> parents: 23812 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: 23812 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.
1765 a51354c34bea [project @ 1996-01-23 03:33:34 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.
1765 a51354c34bea [project @ 1996-01-23 03:33:34 by jwe] jwe parents: diff changeset	16
a51354c34bea [project @ 1996-01-23 03:33:34 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: 6709 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: 23812 diff changeset	19 <https://www.gnu.org/licenses/>.
1765 a51354c34bea [project @ 1996-01-23 03:33:34 by jwe] jwe parents: diff changeset	20
a51354c34bea [project @ 1996-01-23 03:33:34 by jwe] jwe parents: diff changeset	21 */
a51354c34bea [project @ 1996-01-23 03:33:34 by jwe] jwe parents: diff changeset	22
21724 aba2e6293dd8 use "#if ..." consistently instead of "#ifdef" and "#ifndef" John W. Eaton <jwe@octave.org> parents: 21308 diff changeset	23 #if defined (HAVE_CONFIG_H)
21301 40de9f8f23a6 Use '#include "config.h"' rather than <config.h>. Rik <rik@octave.org> parents: 21202 diff changeset	24 # include "config.h"
1765 a51354c34bea [project @ 1996-01-23 03:33:34 by jwe] jwe parents: diff changeset	25 #endif
a51354c34bea [project @ 1996-01-23 03:33:34 by jwe] jwe parents: diff changeset	26
a51354c34bea [project @ 1996-01-23 03:33:34 by jwe] jwe parents: diff changeset	27 #include <cerrno>
10463 bbe99b2a5ba7 undo recent gnulib-related changes John W. Eaton <jwe@octave.org> parents: 10447 diff changeset	28 #include <cstdio>
bbe99b2a5ba7 undo recent gnulib-related changes John W. Eaton <jwe@octave.org> parents: 10447 diff changeset	29 #include <cstdlib>
bbe99b2a5ba7 undo recent gnulib-related changes John W. Eaton <jwe@octave.org> parents: 10447 diff changeset	30 #include <cstring>
1765 a51354c34bea [project @ 1996-01-23 03:33:34 by jwe] jwe parents: diff changeset	31
21896 83c824c727c9 hide gnulib pathlen header John W. Eaton <jwe@octave.org> parents: 21890 diff changeset	32 #if (defined (OCTAVE_HAVE_WINDOWS_FILESYSTEM) && ! defined (OCTAVE_HAVE_POSIX_FILESYSTEM))
83c824c727c9 hide gnulib pathlen header John W. Eaton <jwe@octave.org> parents: 21890 diff changeset	33 # include <algorithm>
83c824c727c9 hide gnulib pathlen header John W. Eaton <jwe@octave.org> parents: 21890 diff changeset	34 #endif
83c824c727c9 hide gnulib pathlen header John W. Eaton <jwe@octave.org> parents: 21890 diff changeset	35
4726 14dc2267c343 [project @ 2004-01-23 20:04:35 by jwe] jwe parents: 4578 diff changeset	36 #include <vector>
3040 443851377f3f [project @ 1997-06-06 09:29:28 by jwe] jwe parents: 2947 diff changeset	37
21896 83c824c727c9 hide gnulib pathlen header John W. Eaton <jwe@octave.org> parents: 21890 diff changeset	38 #include "areadlink-wrapper.h"
21888 00f1249f2483 create wrappers for some gnulib functions John W. Eaton <jwe@octave.org> parents: 21885 diff changeset	39 #include "canonicalize-file-name-wrapper.h"
5476 941f0fc6b596 [project @ 2005-09-29 22:46:07 by jwe] jwe parents: 5307 diff changeset	40 #include "dir-ops.h"
1765 a51354c34bea [project @ 1996-01-23 03:33:34 by jwe] jwe parents: diff changeset	41 #include "file-ops.h"
5476 941f0fc6b596 [project @ 2005-09-29 22:46:07 by jwe] jwe parents: 5307 diff changeset	42 #include "file-stat.h"
21896 83c824c727c9 hide gnulib pathlen header John W. Eaton <jwe@octave.org> parents: 21890 diff changeset	43 #include "gen-tempname-wrapper.h"
25516 8945a6a6c0eb Add Unicode support for getting directory listing in Windows (bug #49118). Markus Mützel <markus.muetzel@gmx.de> parents: 25438 diff changeset	44 #include "lo-sysdep.h"
2926 66ef74ee5d9f [project @ 1997-05-05 03:20:52 by jwe] jwe parents: 2847 diff changeset	45 #include "oct-env.h"
13983 7dd7cccf0757 clean up memory allocated for singletons before exit John W. Eaton <jwe@octave.org> parents: 11586 diff changeset	46 #include "oct-locbuf.h"
2934 dddc1b5c324e [project @ 1997-05-05 22:56:37 by jwe] jwe parents: 2926 diff changeset	47 #include "oct-passwd.h"
5476 941f0fc6b596 [project @ 2005-09-29 22:46:07 by jwe] jwe parents: 5307 diff changeset	48 #include "quit.h"
21909 d7cac41df82a provide wrappers for some sys/stat functions John W. Eaton <jwe@octave.org> parents: 21896 diff changeset	49 #include "stat-wrappers.h"
2926 66ef74ee5d9f [project @ 1997-05-05 03:20:52 by jwe] jwe parents: 2847 diff changeset	50 #include "str-vec.h"
21910 4d723ba06b4a provide wrappers for some unistd.h functions John W. Eaton <jwe@octave.org> parents: 21909 diff changeset	51 #include "unistd-wrappers.h"
20503 0829b6ff3ac9 Use backslash as windows file separator for canonicalize_file_name (Bug #45816). Rik <rik@octave.org> parents: 19697 diff changeset	52
23744 ae74608b6a5d don't use singleton pattern for file_ops John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	53 // The following tilde-expansion code was stolen and adapted from
ae74608b6a5d don't use singleton pattern for file_ops John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	54 // readline.
ae74608b6a5d don't use singleton pattern for file_ops John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	55
ae74608b6a5d don't use singleton pattern for file_ops John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	56 // The default value of tilde_additional_prefixes. This is set to
ae74608b6a5d don't use singleton pattern for file_ops John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	57 // whitespace preceding a tilde so that simple programs which do not
ae74608b6a5d don't use singleton pattern for file_ops John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	58 // perform any word separation get desired behavior.
23795 980f39c3ab90 Use C++11 nullptr rather than 0 in code (bug #51565). Rik <rik@octave.org> parents: 23744 diff changeset	59 static const char *default_prefixes[] = { " ~", "\t~", ":~", nullptr };
23744 ae74608b6a5d don't use singleton pattern for file_ops John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	60
ae74608b6a5d don't use singleton pattern for file_ops John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	61 // The default value of tilde_additional_suffixes. This is set to
ae74608b6a5d don't use singleton pattern for file_ops John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	62 // whitespace or newline so that simple programs which do not perform
ae74608b6a5d don't use singleton pattern for file_ops John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	63 // any word separation get desired behavior.
23795 980f39c3ab90 Use C++11 nullptr rather than 0 in code (bug #51565). Rik <rik@octave.org> parents: 23744 diff changeset	64 static const char *default_suffixes[] = { " ", "\n", ":", nullptr };
23744 ae74608b6a5d don't use singleton pattern for file_ops John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	65
ae74608b6a5d don't use singleton pattern for file_ops John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	66 static size_t
ae74608b6a5d don't use singleton pattern for file_ops John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	67 tilde_find_prefix (const std::string& s, size_t& len)
ae74608b6a5d don't use singleton pattern for file_ops John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	68 {
ae74608b6a5d don't use singleton pattern for file_ops John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	69 len = 0;
ae74608b6a5d don't use singleton pattern for file_ops John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	70
ae74608b6a5d don't use singleton pattern for file_ops John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	71 size_t s_len = s.length ();
ae74608b6a5d don't use singleton pattern for file_ops John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	72
ae74608b6a5d don't use singleton pattern for file_ops John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	73 if (s_len == 0 \|\| s[0] == '~')
ae74608b6a5d don't use singleton pattern for file_ops John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	74 return 0;
ae74608b6a5d don't use singleton pattern for file_ops John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	75
ae74608b6a5d don't use singleton pattern for file_ops John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	76 string_vector prefixes = octave::sys::file_ops::tilde_additional_prefixes;
ae74608b6a5d don't use singleton pattern for file_ops John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	77
ae74608b6a5d don't use singleton pattern for file_ops John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	78 if (! prefixes.empty ())
ae74608b6a5d don't use singleton pattern for file_ops John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	79 {
ae74608b6a5d don't use singleton pattern for file_ops John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	80 for (size_t i = 0; i < s_len; i++)
ae74608b6a5d don't use singleton pattern for file_ops John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	81 {
ae74608b6a5d don't use singleton pattern for file_ops John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	82 for (int j = 0; j < prefixes.numel (); j++)
ae74608b6a5d don't use singleton pattern for file_ops John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	83 {
ae74608b6a5d don't use singleton pattern for file_ops John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	84 size_t pfx_len = prefixes[j].length ();
ae74608b6a5d don't use singleton pattern for file_ops John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	85
ae74608b6a5d don't use singleton pattern for file_ops John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	86 if (prefixes[j] == s.substr (i, pfx_len))
ae74608b6a5d don't use singleton pattern for file_ops John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	87 {
ae74608b6a5d don't use singleton pattern for file_ops John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	88 len = pfx_len - 1;
ae74608b6a5d don't use singleton pattern for file_ops John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	89 return i + len;
ae74608b6a5d don't use singleton pattern for file_ops John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	90 }
ae74608b6a5d don't use singleton pattern for file_ops John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	91 }
ae74608b6a5d don't use singleton pattern for file_ops John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	92 }
ae74608b6a5d don't use singleton pattern for file_ops John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	93 }
ae74608b6a5d don't use singleton pattern for file_ops John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	94
ae74608b6a5d don't use singleton pattern for file_ops John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	95 return s_len;
ae74608b6a5d don't use singleton pattern for file_ops John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	96 }
ae74608b6a5d don't use singleton pattern for file_ops John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	97
ae74608b6a5d don't use singleton pattern for file_ops John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	98 // Find the end of a tilde expansion in S, and return the index
ae74608b6a5d don't use singleton pattern for file_ops John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	99 // of the character which ends the tilde definition.
ae74608b6a5d don't use singleton pattern for file_ops John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	100
ae74608b6a5d don't use singleton pattern for file_ops John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	101 static size_t
ae74608b6a5d don't use singleton pattern for file_ops John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	102 tilde_find_suffix (const std::string& s)
ae74608b6a5d don't use singleton pattern for file_ops John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	103 {
ae74608b6a5d don't use singleton pattern for file_ops John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	104 size_t s_len = s.length ();
ae74608b6a5d don't use singleton pattern for file_ops John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	105
ae74608b6a5d don't use singleton pattern for file_ops John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	106 string_vector suffixes = octave::sys::file_ops::tilde_additional_suffixes;
ae74608b6a5d don't use singleton pattern for file_ops John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	107
ae74608b6a5d don't use singleton pattern for file_ops John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	108 size_t i = 0;
ae74608b6a5d don't use singleton pattern for file_ops John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	109
ae74608b6a5d don't use singleton pattern for file_ops John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	110 for ( ; i < s_len; i++)
ae74608b6a5d don't use singleton pattern for file_ops John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	111 {
ae74608b6a5d don't use singleton pattern for file_ops John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	112 if (octave::sys::file_ops::is_dir_sep (s[i]))
ae74608b6a5d don't use singleton pattern for file_ops John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	113 break;
ae74608b6a5d don't use singleton pattern for file_ops John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	114
ae74608b6a5d don't use singleton pattern for file_ops John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	115 if (! suffixes.empty ())
ae74608b6a5d don't use singleton pattern for file_ops John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	116 {
ae74608b6a5d don't use singleton pattern for file_ops John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	117 for (int j = 0; j < suffixes.numel (); j++)
ae74608b6a5d don't use singleton pattern for file_ops John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	118 {
ae74608b6a5d don't use singleton pattern for file_ops John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	119 size_t sfx_len = suffixes[j].length ();
ae74608b6a5d don't use singleton pattern for file_ops John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	120
ae74608b6a5d don't use singleton pattern for file_ops John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	121 if (suffixes[j] == s.substr (i, sfx_len))
ae74608b6a5d don't use singleton pattern for file_ops John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	122 return i;
ae74608b6a5d don't use singleton pattern for file_ops John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	123 }
ae74608b6a5d don't use singleton pattern for file_ops John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	124 }
ae74608b6a5d don't use singleton pattern for file_ops John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	125 }
ae74608b6a5d don't use singleton pattern for file_ops John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	126
ae74608b6a5d don't use singleton pattern for file_ops John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	127 return i;
ae74608b6a5d don't use singleton pattern for file_ops John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	128 }
ae74608b6a5d don't use singleton pattern for file_ops John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	129
ae74608b6a5d don't use singleton pattern for file_ops John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	130 // Take FNAME and return the tilde prefix we want expanded.
ae74608b6a5d don't use singleton pattern for file_ops John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	131
ae74608b6a5d don't use singleton pattern for file_ops John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	132 static std::string
ae74608b6a5d don't use singleton pattern for file_ops John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	133 isolate_tilde_prefix (const std::string& fname)
ae74608b6a5d don't use singleton pattern for file_ops John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	134 {
ae74608b6a5d don't use singleton pattern for file_ops John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	135 size_t f_len = fname.length ();
ae74608b6a5d don't use singleton pattern for file_ops John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	136
ae74608b6a5d don't use singleton pattern for file_ops John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	137 size_t len = 1;
ae74608b6a5d don't use singleton pattern for file_ops John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	138
ae74608b6a5d don't use singleton pattern for file_ops John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	139 while (len < f_len && ! octave::sys::file_ops::is_dir_sep (fname[len]))
ae74608b6a5d don't use singleton pattern for file_ops John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	140 len++;
ae74608b6a5d don't use singleton pattern for file_ops John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	141
ae74608b6a5d don't use singleton pattern for file_ops John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	142 return fname.substr (1, len);
ae74608b6a5d don't use singleton pattern for file_ops John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	143 }
ae74608b6a5d don't use singleton pattern for file_ops John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	144
ae74608b6a5d don't use singleton pattern for file_ops John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	145 // Do the work of tilde expansion on FILENAME. FILENAME starts with a
ae74608b6a5d don't use singleton pattern for file_ops John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	146 // tilde.
ae74608b6a5d don't use singleton pattern for file_ops John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	147
ae74608b6a5d don't use singleton pattern for file_ops John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	148 static std::string
ae74608b6a5d don't use singleton pattern for file_ops John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	149 tilde_expand_word (const std::string& filename)
ae74608b6a5d don't use singleton pattern for file_ops John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	150 {
ae74608b6a5d don't use singleton pattern for file_ops John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	151 size_t f_len = filename.length ();
ae74608b6a5d don't use singleton pattern for file_ops John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	152
ae74608b6a5d don't use singleton pattern for file_ops John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	153 if (f_len == 0 \|\| filename[0] != '~')
ae74608b6a5d don't use singleton pattern for file_ops John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	154 return std::string (filename);
ae74608b6a5d don't use singleton pattern for file_ops John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	155
ae74608b6a5d don't use singleton pattern for file_ops John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	156 // A leading '~/' or a bare '~' is always translated to the value
ae74608b6a5d don't use singleton pattern for file_ops John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	157 // of $HOME or the home directory of the current user, regardless of
ae74608b6a5d don't use singleton pattern for file_ops John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	158 // any preexpansion hook.
ae74608b6a5d don't use singleton pattern for file_ops John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	159
ae74608b6a5d don't use singleton pattern for file_ops John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	160 if (f_len == 1 \|\| octave::sys::file_ops::is_dir_sep (filename[1]))
ae74608b6a5d don't use singleton pattern for file_ops John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	161 return octave::sys::env::get_home_directory () + filename.substr (1);
ae74608b6a5d don't use singleton pattern for file_ops John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	162
ae74608b6a5d don't use singleton pattern for file_ops John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	163 std::string username = isolate_tilde_prefix (filename);
ae74608b6a5d don't use singleton pattern for file_ops John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	164
ae74608b6a5d don't use singleton pattern for file_ops John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	165 size_t user_len = username.length ();
ae74608b6a5d don't use singleton pattern for file_ops John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	166
ae74608b6a5d don't use singleton pattern for file_ops John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	167 std::string dirname;
ae74608b6a5d don't use singleton pattern for file_ops John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	168
ae74608b6a5d don't use singleton pattern for file_ops John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	169 if (octave::sys::file_ops::tilde_expansion_preexpansion_hook)
ae74608b6a5d don't use singleton pattern for file_ops John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	170 {
ae74608b6a5d don't use singleton pattern for file_ops John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	171 std::string expansion
ae74608b6a5d don't use singleton pattern for file_ops John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	172 = octave::sys::file_ops::tilde_expansion_preexpansion_hook (username);
ae74608b6a5d don't use singleton pattern for file_ops John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	173
ae74608b6a5d don't use singleton pattern for file_ops John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	174 if (! expansion.empty ())
ae74608b6a5d don't use singleton pattern for file_ops John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	175 return expansion + filename.substr (user_len+1);
ae74608b6a5d don't use singleton pattern for file_ops John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	176 }
ae74608b6a5d don't use singleton pattern for file_ops John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	177
ae74608b6a5d don't use singleton pattern for file_ops John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	178 // No preexpansion hook, or the preexpansion hook failed. Look in the
ae74608b6a5d don't use singleton pattern for file_ops John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	179 // password database.
ae74608b6a5d don't use singleton pattern for file_ops John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	180
ae74608b6a5d don't use singleton pattern for file_ops John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	181 octave::sys::password pw = octave::sys::password::getpwnam (username);
ae74608b6a5d don't use singleton pattern for file_ops John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	182
ae74608b6a5d don't use singleton pattern for file_ops John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	183 if (! pw)
ae74608b6a5d don't use singleton pattern for file_ops John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	184 {
ae74608b6a5d don't use singleton pattern for file_ops John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	185 // If the calling program has a special syntax for expanding tildes,
ae74608b6a5d don't use singleton pattern for file_ops John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	186 // and we couldn't find a standard expansion, then let them try.
ae74608b6a5d don't use singleton pattern for file_ops John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	187
ae74608b6a5d don't use singleton pattern for file_ops John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	188 if (octave::sys::file_ops::tilde_expansion_failure_hook)
ae74608b6a5d don't use singleton pattern for file_ops John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	189 {
ae74608b6a5d don't use singleton pattern for file_ops John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	190 std::string expansion
ae74608b6a5d don't use singleton pattern for file_ops John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	191 = octave::sys::file_ops::tilde_expansion_failure_hook (username);
ae74608b6a5d don't use singleton pattern for file_ops John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	192
ae74608b6a5d don't use singleton pattern for file_ops John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	193 if (! expansion.empty ())
ae74608b6a5d don't use singleton pattern for file_ops John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	194 dirname = expansion + filename.substr (user_len+1);
ae74608b6a5d don't use singleton pattern for file_ops John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	195 }
ae74608b6a5d don't use singleton pattern for file_ops John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	196
ae74608b6a5d don't use singleton pattern for file_ops John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	197 // If we don't have a failure hook, or if the failure hook did not
ae74608b6a5d don't use singleton pattern for file_ops John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	198 // expand the tilde, return a copy of what we were passed.
ae74608b6a5d don't use singleton pattern for file_ops John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	199
ae74608b6a5d don't use singleton pattern for file_ops John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	200 if (dirname.empty ())
ae74608b6a5d don't use singleton pattern for file_ops John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	201 dirname = filename;
ae74608b6a5d don't use singleton pattern for file_ops John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	202 }
ae74608b6a5d don't use singleton pattern for file_ops John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	203 else
ae74608b6a5d don't use singleton pattern for file_ops John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	204 dirname = pw.dir () + filename.substr (user_len+1);
ae74608b6a5d don't use singleton pattern for file_ops John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	205
ae74608b6a5d don't use singleton pattern for file_ops John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	206 return dirname;
ae74608b6a5d don't use singleton pattern for file_ops John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	207 }
ae74608b6a5d don't use singleton pattern for file_ops John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	208
21734 11af9c03400c write namespace keyword and name on same line in C++ files John W. Eaton <jwe@octave.org> parents: 21733 diff changeset	209 namespace octave
8007 a2ab20ba78f7 make file_ops a proper singleton class John W. Eaton <jwe@octave.org> parents: 7520 diff changeset	210 {
21734 11af9c03400c write namespace keyword and name on same line in C++ files John W. Eaton <jwe@octave.org> parents: 21733 diff changeset	211 namespace sys
21733 cb0fdd941d84 use namespace for system file_ops class John W. Eaton <jwe@octave.org> parents: 21732 diff changeset	212 {
23744 ae74608b6a5d don't use singleton pattern for file_ops John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	213 namespace file_ops
8007 a2ab20ba78f7 make file_ops a proper singleton class John W. Eaton <jwe@octave.org> parents: 7520 diff changeset	214 {
23744 ae74608b6a5d don't use singleton pattern for file_ops John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	215 char dev_sep_char (void)
ae74608b6a5d don't use singleton pattern for file_ops John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	216 {
ae74608b6a5d don't use singleton pattern for file_ops John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	217 #if (defined (OCTAVE_HAVE_WINDOWS_FILESYSTEM) && ! defined (OCTAVE_HAVE_POSIX_FILESYSTEM))
ae74608b6a5d don't use singleton pattern for file_ops John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	218 return ':';
ae74608b6a5d don't use singleton pattern for file_ops John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	219 #else
ae74608b6a5d don't use singleton pattern for file_ops John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	220 return 0;
ae74608b6a5d don't use singleton pattern for file_ops John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	221 #endif
ae74608b6a5d don't use singleton pattern for file_ops John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	222 }
21733 cb0fdd941d84 use namespace for system file_ops class John W. Eaton <jwe@octave.org> parents: 21732 diff changeset	223
23744 ae74608b6a5d don't use singleton pattern for file_ops John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	224 char dir_sep_char (void)
ae74608b6a5d don't use singleton pattern for file_ops John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	225 {
10197 4d433bd2d4dc attempt to avoid trouble with gnulib #defines in a consistent way John W. Eaton <jwe@octave.org> parents: 10189 diff changeset	226 #if (defined (OCTAVE_HAVE_WINDOWS_FILESYSTEM) && ! defined (OCTAVE_HAVE_POSIX_FILESYSTEM))
23744 ae74608b6a5d don't use singleton pattern for file_ops John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	227 return '\\';
10197 4d433bd2d4dc attempt to avoid trouble with gnulib #defines in a consistent way John W. Eaton <jwe@octave.org> parents: 10189 diff changeset	228 #else
23744 ae74608b6a5d don't use singleton pattern for file_ops John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	229 return '/';
10197 4d433bd2d4dc attempt to avoid trouble with gnulib #defines in a consistent way John W. Eaton <jwe@octave.org> parents: 10189 diff changeset	230 #endif
23744 ae74608b6a5d don't use singleton pattern for file_ops John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	231 }
ae74608b6a5d don't use singleton pattern for file_ops John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	232
ae74608b6a5d don't use singleton pattern for file_ops John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	233 std::string dir_sep_str (void)
ae74608b6a5d don't use singleton pattern for file_ops John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	234 {
ae74608b6a5d don't use singleton pattern for file_ops John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	235 #if (defined (OCTAVE_HAVE_WINDOWS_FILESYSTEM) && ! defined (OCTAVE_HAVE_POSIX_FILESYSTEM))
23804 8057d3f0673d Use C++11 raw string literals to avoid escaping backslashes in strings. Rik <rik@octave.org> parents: 23795 diff changeset	236 return R"(\)";
23744 ae74608b6a5d don't use singleton pattern for file_ops John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	237 #else
ae74608b6a5d don't use singleton pattern for file_ops John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	238 return "/";
ae74608b6a5d don't use singleton pattern for file_ops John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	239 #endif
ae74608b6a5d don't use singleton pattern for file_ops John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	240 }
ae74608b6a5d don't use singleton pattern for file_ops John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	241
ae74608b6a5d don't use singleton pattern for file_ops John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	242 std::string dir_sep_chars (void)
ae74608b6a5d don't use singleton pattern for file_ops John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	243 {
10197 4d433bd2d4dc attempt to avoid trouble with gnulib #defines in a consistent way John W. Eaton <jwe@octave.org> parents: 10189 diff changeset	244 #if defined (OCTAVE_HAVE_WINDOWS_FILESYSTEM)
23804 8057d3f0673d Use C++11 raw string literals to avoid escaping backslashes in strings. Rik <rik@octave.org> parents: 23795 diff changeset	245 return R"(/\)";
10197 4d433bd2d4dc attempt to avoid trouble with gnulib #defines in a consistent way John W. Eaton <jwe@octave.org> parents: 10189 diff changeset	246 #else
23744 ae74608b6a5d don't use singleton pattern for file_ops John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	247 return dir_sep_str ();
5138 5fa9670b5956 [project @ 2005-02-09 23:13:03 by jwe] jwe parents: 4726 diff changeset	248 #endif
23744 ae74608b6a5d don't use singleton pattern for file_ops John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	249 }
6271 6fab59e81b4e [project @ 2007-02-06 01:36:46 by jwe] jwe parents: 6208 diff changeset	250
23795 980f39c3ab90 Use C++11 nullptr rather than 0 in code (bug #51565). Rik <rik@octave.org> parents: 23744 diff changeset	251 tilde_expansion_hook tilde_expansion_preexpansion_hook = nullptr;
21733 cb0fdd941d84 use namespace for system file_ops class John W. Eaton <jwe@octave.org> parents: 21732 diff changeset	252
23795 980f39c3ab90 Use C++11 nullptr rather than 0 in code (bug #51565). Rik <rik@octave.org> parents: 23744 diff changeset	253 tilde_expansion_hook tilde_expansion_failure_hook = nullptr;
21733 cb0fdd941d84 use namespace for system file_ops class John W. Eaton <jwe@octave.org> parents: 21732 diff changeset	254
23744 ae74608b6a5d don't use singleton pattern for file_ops John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	255 string_vector tilde_additional_prefixes = default_prefixes;
5138 5fa9670b5956 [project @ 2005-02-09 23:13:03 by jwe] jwe parents: 4726 diff changeset	256
23744 ae74608b6a5d don't use singleton pattern for file_ops John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	257 string_vector tilde_additional_suffixes = default_suffixes;
ae74608b6a5d don't use singleton pattern for file_ops John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	258
ae74608b6a5d don't use singleton pattern for file_ops John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	259 bool is_dev_sep (char c)
ae74608b6a5d don't use singleton pattern for file_ops John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	260 {
ae74608b6a5d don't use singleton pattern for file_ops John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	261 #if (defined (OCTAVE_HAVE_WINDOWS_FILESYSTEM) && ! defined (OCTAVE_HAVE_POSIX_FILESYSTEM))
ae74608b6a5d don't use singleton pattern for file_ops John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	262 return c == dev_sep_char ();
ae74608b6a5d don't use singleton pattern for file_ops John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	263 #else
ae74608b6a5d don't use singleton pattern for file_ops John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	264 octave_unused_parameter (c);
1802 8173b1fa052d [project @ 1996-01-29 06:10:18 by jwe] jwe parents: 1779 diff changeset	265
23744 ae74608b6a5d don't use singleton pattern for file_ops John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	266 return false;
ae74608b6a5d don't use singleton pattern for file_ops John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	267 #endif
ae74608b6a5d don't use singleton pattern for file_ops John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	268 }
2926 66ef74ee5d9f [project @ 1997-05-05 03:20:52 by jwe] jwe parents: 2847 diff changeset	269
23744 ae74608b6a5d don't use singleton pattern for file_ops John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	270 bool is_dir_sep (char c)
ae74608b6a5d don't use singleton pattern for file_ops John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	271 {
ae74608b6a5d don't use singleton pattern for file_ops John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	272 std::string tmp = dir_sep_chars ();
ae74608b6a5d don't use singleton pattern for file_ops John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	273 return tmp.find (c) != std::string::npos;
ae74608b6a5d don't use singleton pattern for file_ops John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	274 }
3040 443851377f3f [project @ 1997-06-06 09:29:28 by jwe] jwe parents: 2947 diff changeset	275
23744 ae74608b6a5d don't use singleton pattern for file_ops John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	276 std::string tilde_expand (const std::string& name)
ae74608b6a5d don't use singleton pattern for file_ops John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	277 {
ae74608b6a5d don't use singleton pattern for file_ops John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	278 if (name.find ('~') == std::string::npos)
ae74608b6a5d don't use singleton pattern for file_ops John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	279 return std::string (name);
ae74608b6a5d don't use singleton pattern for file_ops John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	280 else
ae74608b6a5d don't use singleton pattern for file_ops John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	281 {
ae74608b6a5d don't use singleton pattern for file_ops John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	282 std::string result;
ae74608b6a5d don't use singleton pattern for file_ops John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	283
ae74608b6a5d don't use singleton pattern for file_ops John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	284 size_t name_len = name.length ();
ae74608b6a5d don't use singleton pattern for file_ops John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	285
ae74608b6a5d don't use singleton pattern for file_ops John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	286 // Scan through S expanding tildes as we come to them.
3040 443851377f3f [project @ 1997-06-06 09:29:28 by jwe] jwe parents: 2947 diff changeset	287
23744 ae74608b6a5d don't use singleton pattern for file_ops John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	288 size_t pos = 0;
ae74608b6a5d don't use singleton pattern for file_ops John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	289
ae74608b6a5d don't use singleton pattern for file_ops John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	290 while (1)
ae74608b6a5d don't use singleton pattern for file_ops John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	291 {
ae74608b6a5d don't use singleton pattern for file_ops John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	292 if (pos > name_len)
ae74608b6a5d don't use singleton pattern for file_ops John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	293 break;
3040 443851377f3f [project @ 1997-06-06 09:29:28 by jwe] jwe parents: 2947 diff changeset	294
23744 ae74608b6a5d don't use singleton pattern for file_ops John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	295 size_t len;
ae74608b6a5d don't use singleton pattern for file_ops John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	296
ae74608b6a5d don't use singleton pattern for file_ops John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	297 // Make START point to the tilde which starts the expansion.
3040 443851377f3f [project @ 1997-06-06 09:29:28 by jwe] jwe parents: 2947 diff changeset	298
23744 ae74608b6a5d don't use singleton pattern for file_ops John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	299 size_t start = tilde_find_prefix (name.substr (pos), len);
ae74608b6a5d don't use singleton pattern for file_ops John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	300
ae74608b6a5d don't use singleton pattern for file_ops John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	301 result.append (name.substr (pos, start));
3040 443851377f3f [project @ 1997-06-06 09:29:28 by jwe] jwe parents: 2947 diff changeset	302
23744 ae74608b6a5d don't use singleton pattern for file_ops John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	303 // Advance STRING to the starting tilde.
ae74608b6a5d don't use singleton pattern for file_ops John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	304
ae74608b6a5d don't use singleton pattern for file_ops John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	305 pos += start;
ae74608b6a5d don't use singleton pattern for file_ops John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	306
ae74608b6a5d don't use singleton pattern for file_ops John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	307 // Make FINI be the index of one after the last character of the
ae74608b6a5d don't use singleton pattern for file_ops John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	308 // username.
ae74608b6a5d don't use singleton pattern for file_ops John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	309
ae74608b6a5d don't use singleton pattern for file_ops John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	310 size_t fini = tilde_find_suffix (name.substr (pos));
3040 443851377f3f [project @ 1997-06-06 09:29:28 by jwe] jwe parents: 2947 diff changeset	311
23744 ae74608b6a5d don't use singleton pattern for file_ops John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	312 // If both START and FINI are zero, we are all done.
ae74608b6a5d don't use singleton pattern for file_ops John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	313
ae74608b6a5d don't use singleton pattern for file_ops John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	314 if (! (start \|\| fini))
ae74608b6a5d don't use singleton pattern for file_ops John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	315 break;
21733 cb0fdd941d84 use namespace for system file_ops class John W. Eaton <jwe@octave.org> parents: 21732 diff changeset	316
23744 ae74608b6a5d don't use singleton pattern for file_ops John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	317 // Expand the entire tilde word, and copy it into RESULT.
3040 443851377f3f [project @ 1997-06-06 09:29:28 by jwe] jwe parents: 2947 diff changeset	318
23744 ae74608b6a5d don't use singleton pattern for file_ops John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	319 std::string tilde_word = name.substr (pos, fini);
3040 443851377f3f [project @ 1997-06-06 09:29:28 by jwe] jwe parents: 2947 diff changeset	320
23744 ae74608b6a5d don't use singleton pattern for file_ops John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	321 pos += fini;
3040 443851377f3f [project @ 1997-06-06 09:29:28 by jwe] jwe parents: 2947 diff changeset	322
23744 ae74608b6a5d don't use singleton pattern for file_ops John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	323 std::string expansion = tilde_expand_word (tilde_word);
ae74608b6a5d don't use singleton pattern for file_ops John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	324
ae74608b6a5d don't use singleton pattern for file_ops John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	325 result.append (expansion);
ae74608b6a5d don't use singleton pattern for file_ops John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	326 }
ae74608b6a5d don't use singleton pattern for file_ops John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	327
ae74608b6a5d don't use singleton pattern for file_ops John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	328 return result;
ae74608b6a5d don't use singleton pattern for file_ops John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	329 }
ae74608b6a5d don't use singleton pattern for file_ops John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	330 }
3040 443851377f3f [project @ 1997-06-06 09:29:28 by jwe] jwe parents: 2947 diff changeset	331
23744 ae74608b6a5d don't use singleton pattern for file_ops John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	332 string_vector tilde_expand (const string_vector& names)
ae74608b6a5d don't use singleton pattern for file_ops John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	333 {
ae74608b6a5d don't use singleton pattern for file_ops John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	334 int n = names.numel ();
21733 cb0fdd941d84 use namespace for system file_ops class John W. Eaton <jwe@octave.org> parents: 21732 diff changeset	335
23812 057a894914df Use C++11 string fcns back() and pop_back() to simplify code. Rik <rik@octave.org> parents: 23804 diff changeset	336 string_vector retval (n);
3040 443851377f3f [project @ 1997-06-06 09:29:28 by jwe] jwe parents: 2947 diff changeset	337
23744 ae74608b6a5d don't use singleton pattern for file_ops John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	338 for (int i = 0; i < n; i++)
ae74608b6a5d don't use singleton pattern for file_ops John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	339 retval[i] = tilde_expand (names[i]);
ae74608b6a5d don't use singleton pattern for file_ops John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	340
ae74608b6a5d don't use singleton pattern for file_ops John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	341 return retval;
ae74608b6a5d don't use singleton pattern for file_ops John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	342 }
3040 443851377f3f [project @ 1997-06-06 09:29:28 by jwe] jwe parents: 2947 diff changeset	343
23744 ae74608b6a5d don't use singleton pattern for file_ops John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	344 std::string concat (const std::string& dir, const std::string& file)
ae74608b6a5d don't use singleton pattern for file_ops John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	345 {
ae74608b6a5d don't use singleton pattern for file_ops John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	346 return dir.empty ()
ae74608b6a5d don't use singleton pattern for file_ops John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	347 ? file
23812 057a894914df Use C++11 string fcns back() and pop_back() to simplify code. Rik <rik@octave.org> parents: 23804 diff changeset	348 : (is_dir_sep (dir.back ())
23744 ae74608b6a5d don't use singleton pattern for file_ops John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	349 ? dir + file
ae74608b6a5d don't use singleton pattern for file_ops John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	350 : dir + dir_sep_char () + file);
ae74608b6a5d don't use singleton pattern for file_ops John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	351 }
3040 443851377f3f [project @ 1997-06-06 09:29:28 by jwe] jwe parents: 2947 diff changeset	352
23744 ae74608b6a5d don't use singleton pattern for file_ops John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	353 std::string dirname (const std::string& path)
ae74608b6a5d don't use singleton pattern for file_ops John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	354 {
ae74608b6a5d don't use singleton pattern for file_ops John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	355 size_t ipos = path.find_last_of (dir_sep_chars ());
3040 443851377f3f [project @ 1997-06-06 09:29:28 by jwe] jwe parents: 2947 diff changeset	356
23744 ae74608b6a5d don't use singleton pattern for file_ops John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	357 return (ipos != std::string::npos) ? path.substr (0, ipos) : "";
ae74608b6a5d don't use singleton pattern for file_ops John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	358 }
ae74608b6a5d don't use singleton pattern for file_ops John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	359
ae74608b6a5d don't use singleton pattern for file_ops John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	360 std::string tail (const std::string& path)
ae74608b6a5d don't use singleton pattern for file_ops John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	361 {
ae74608b6a5d don't use singleton pattern for file_ops John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	362 size_t ipos = path.find_last_of (dir_sep_chars ());
3040 443851377f3f [project @ 1997-06-06 09:29:28 by jwe] jwe parents: 2947 diff changeset	363
23744 ae74608b6a5d don't use singleton pattern for file_ops John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	364 if (ipos != std::string::npos)
ae74608b6a5d don't use singleton pattern for file_ops John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	365 ipos++;
ae74608b6a5d don't use singleton pattern for file_ops John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	366 else
ae74608b6a5d don't use singleton pattern for file_ops John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	367 ipos = 0;
21733 cb0fdd941d84 use namespace for system file_ops class John W. Eaton <jwe@octave.org> parents: 21732 diff changeset	368
23744 ae74608b6a5d don't use singleton pattern for file_ops John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	369 return path.substr (ipos);
ae74608b6a5d don't use singleton pattern for file_ops John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	370 }
3040 443851377f3f [project @ 1997-06-06 09:29:28 by jwe] jwe parents: 2947 diff changeset	371
23744 ae74608b6a5d don't use singleton pattern for file_ops John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	372 std::string native_separator_path (const std::string& path)
ae74608b6a5d don't use singleton pattern for file_ops John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	373 {
ae74608b6a5d don't use singleton pattern for file_ops John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	374 std::string retval;
3040 443851377f3f [project @ 1997-06-06 09:29:28 by jwe] jwe parents: 2947 diff changeset	375
23744 ae74608b6a5d don't use singleton pattern for file_ops John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	376 if (dir_sep_char () == '/')
ae74608b6a5d don't use singleton pattern for file_ops John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	377 retval = path;
ae74608b6a5d don't use singleton pattern for file_ops John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	378 else
ae74608b6a5d don't use singleton pattern for file_ops John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	379 {
ae74608b6a5d don't use singleton pattern for file_ops John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	380 size_t n = path.length ();
ae74608b6a5d don't use singleton pattern for file_ops John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	381 for (size_t i = 0; i < n; i++)
ae74608b6a5d don't use singleton pattern for file_ops John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	382 {
ae74608b6a5d don't use singleton pattern for file_ops John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	383 if (path[i] == '/')
ae74608b6a5d don't use singleton pattern for file_ops John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	384 retval += dir_sep_char();
ae74608b6a5d don't use singleton pattern for file_ops John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	385 else
ae74608b6a5d don't use singleton pattern for file_ops John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	386 retval += path[i];
ae74608b6a5d don't use singleton pattern for file_ops John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	387 }
ae74608b6a5d don't use singleton pattern for file_ops John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	388 }
3040 443851377f3f [project @ 1997-06-06 09:29:28 by jwe] jwe parents: 2947 diff changeset	389
23744 ae74608b6a5d don't use singleton pattern for file_ops John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	390 return retval;
ae74608b6a5d don't use singleton pattern for file_ops John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	391 }
3040 443851377f3f [project @ 1997-06-06 09:29:28 by jwe] jwe parents: 2947 diff changeset	392 }
443851377f3f [project @ 1997-06-06 09:29:28 by jwe] jwe parents: 2947 diff changeset	393
23744 ae74608b6a5d don't use singleton pattern for file_ops John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	394 int mkdir (const std::string& nm, mode_t md)
21733 cb0fdd941d84 use namespace for system file_ops class John W. Eaton <jwe@octave.org> parents: 21732 diff changeset	395 {
23744 ae74608b6a5d don't use singleton pattern for file_ops John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	396 std::string msg;
ae74608b6a5d don't use singleton pattern for file_ops John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	397 return mkdir (nm, md, msg);
21881 aea1bf9493c0 * file-ops.h, file-ops.cc (file_ops::file_ops): Now protected. John W. Eaton <jwe@octave.org> parents: 21852 diff changeset	398 }
aea1bf9493c0 * file-ops.h, file-ops.cc (file_ops::file_ops): Now protected. John W. Eaton <jwe@octave.org> parents: 21852 diff changeset	399
23744 ae74608b6a5d don't use singleton pattern for file_ops John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	400 int mkdir (const std::string& name, mode_t mode, std::string& msg)
21733 cb0fdd941d84 use namespace for system file_ops class John W. Eaton <jwe@octave.org> parents: 21732 diff changeset	401 {
cb0fdd941d84 use namespace for system file_ops class John W. Eaton <jwe@octave.org> parents: 21732 diff changeset	402 msg = "";
cb0fdd941d84 use namespace for system file_ops class John W. Eaton <jwe@octave.org> parents: 21732 diff changeset	403
21909 d7cac41df82a provide wrappers for some sys/stat functions John W. Eaton <jwe@octave.org> parents: 21896 diff changeset	404 int status = octave_mkdir_wrapper (name.c_str (), mode);
10197 4d433bd2d4dc attempt to avoid trouble with gnulib #defines in a consistent way John W. Eaton <jwe@octave.org> parents: 10189 diff changeset	405
21733 cb0fdd941d84 use namespace for system file_ops class John W. Eaton <jwe@octave.org> parents: 21732 diff changeset	406 if (status < 0)
21942 aab79a1885cc limit gnulib headers to liboctave/wrappers directory John W. Eaton <jwe@octave.org> parents: 21910 diff changeset	407 msg = std::strerror (errno);
10197 4d433bd2d4dc attempt to avoid trouble with gnulib #defines in a consistent way John W. Eaton <jwe@octave.org> parents: 10189 diff changeset	408
21733 cb0fdd941d84 use namespace for system file_ops class John W. Eaton <jwe@octave.org> parents: 21732 diff changeset	409 return status;
cb0fdd941d84 use namespace for system file_ops class John W. Eaton <jwe@octave.org> parents: 21732 diff changeset	410 }
10197 4d433bd2d4dc attempt to avoid trouble with gnulib #defines in a consistent way John W. Eaton <jwe@octave.org> parents: 10189 diff changeset	411
23744 ae74608b6a5d don't use singleton pattern for file_ops John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	412 int mkfifo (const std::string& nm, mode_t md)
21733 cb0fdd941d84 use namespace for system file_ops class John W. Eaton <jwe@octave.org> parents: 21732 diff changeset	413 {
cb0fdd941d84 use namespace for system file_ops class John W. Eaton <jwe@octave.org> parents: 21732 diff changeset	414 std::string msg;
cb0fdd941d84 use namespace for system file_ops class John W. Eaton <jwe@octave.org> parents: 21732 diff changeset	415 return mkfifo (nm, md, msg);
cb0fdd941d84 use namespace for system file_ops class John W. Eaton <jwe@octave.org> parents: 21732 diff changeset	416 }
10197 4d433bd2d4dc attempt to avoid trouble with gnulib #defines in a consistent way John W. Eaton <jwe@octave.org> parents: 10189 diff changeset	417
23744 ae74608b6a5d don't use singleton pattern for file_ops John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	418 int mkfifo (const std::string& name, mode_t mode, std::string& msg)
21733 cb0fdd941d84 use namespace for system file_ops class John W. Eaton <jwe@octave.org> parents: 21732 diff changeset	419 {
cb0fdd941d84 use namespace for system file_ops class John W. Eaton <jwe@octave.org> parents: 21732 diff changeset	420 msg = "";
cb0fdd941d84 use namespace for system file_ops class John W. Eaton <jwe@octave.org> parents: 21732 diff changeset	421
21909 d7cac41df82a provide wrappers for some sys/stat functions John W. Eaton <jwe@octave.org> parents: 21896 diff changeset	422 int status = octave_mkfifo_wrapper (name.c_str (), mode);
10197 4d433bd2d4dc attempt to avoid trouble with gnulib #defines in a consistent way John W. Eaton <jwe@octave.org> parents: 10189 diff changeset	423
21733 cb0fdd941d84 use namespace for system file_ops class John W. Eaton <jwe@octave.org> parents: 21732 diff changeset	424 if (status < 0)
21942 aab79a1885cc limit gnulib headers to liboctave/wrappers directory John W. Eaton <jwe@octave.org> parents: 21910 diff changeset	425 msg = std::strerror (errno);
10197 4d433bd2d4dc attempt to avoid trouble with gnulib #defines in a consistent way John W. Eaton <jwe@octave.org> parents: 10189 diff changeset	426
21733 cb0fdd941d84 use namespace for system file_ops class John W. Eaton <jwe@octave.org> parents: 21732 diff changeset	427 return status;
cb0fdd941d84 use namespace for system file_ops class John W. Eaton <jwe@octave.org> parents: 21732 diff changeset	428 }
10197 4d433bd2d4dc attempt to avoid trouble with gnulib #defines in a consistent way John W. Eaton <jwe@octave.org> parents: 10189 diff changeset	429
23744 ae74608b6a5d don't use singleton pattern for file_ops John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	430 int link (const std::string& old_name, const std::string& new_name)
21733 cb0fdd941d84 use namespace for system file_ops class John W. Eaton <jwe@octave.org> parents: 21732 diff changeset	431 {
cb0fdd941d84 use namespace for system file_ops class John W. Eaton <jwe@octave.org> parents: 21732 diff changeset	432 std::string msg;
cb0fdd941d84 use namespace for system file_ops class John W. Eaton <jwe@octave.org> parents: 21732 diff changeset	433 return link (old_name, new_name, msg);
cb0fdd941d84 use namespace for system file_ops class John W. Eaton <jwe@octave.org> parents: 21732 diff changeset	434 }
cb0fdd941d84 use namespace for system file_ops class John W. Eaton <jwe@octave.org> parents: 21732 diff changeset	435
23744 ae74608b6a5d don't use singleton pattern for file_ops John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	436 int link (const std::string& old_name, const std::string& new_name,
ae74608b6a5d don't use singleton pattern for file_ops John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	437 std::string& msg)
21733 cb0fdd941d84 use namespace for system file_ops class John W. Eaton <jwe@octave.org> parents: 21732 diff changeset	438 {
cb0fdd941d84 use namespace for system file_ops class John W. Eaton <jwe@octave.org> parents: 21732 diff changeset	439 msg = "";
10197 4d433bd2d4dc attempt to avoid trouble with gnulib #defines in a consistent way John W. Eaton <jwe@octave.org> parents: 10189 diff changeset	440
21733 cb0fdd941d84 use namespace for system file_ops class John W. Eaton <jwe@octave.org> parents: 21732 diff changeset	441 int status = -1;
10197 4d433bd2d4dc attempt to avoid trouble with gnulib #defines in a consistent way John W. Eaton <jwe@octave.org> parents: 10189 diff changeset	442
21910 4d723ba06b4a provide wrappers for some unistd.h functions John W. Eaton <jwe@octave.org> parents: 21909 diff changeset	443 status = octave_link_wrapper (old_name.c_str (), new_name.c_str ());
10197 4d433bd2d4dc attempt to avoid trouble with gnulib #defines in a consistent way John W. Eaton <jwe@octave.org> parents: 10189 diff changeset	444
21733 cb0fdd941d84 use namespace for system file_ops class John W. Eaton <jwe@octave.org> parents: 21732 diff changeset	445 if (status < 0)
21942 aab79a1885cc limit gnulib headers to liboctave/wrappers directory John W. Eaton <jwe@octave.org> parents: 21910 diff changeset	446 msg = std::strerror (errno);
10197 4d433bd2d4dc attempt to avoid trouble with gnulib #defines in a consistent way John W. Eaton <jwe@octave.org> parents: 10189 diff changeset	447
21733 cb0fdd941d84 use namespace for system file_ops class John W. Eaton <jwe@octave.org> parents: 21732 diff changeset	448 return status;
cb0fdd941d84 use namespace for system file_ops class John W. Eaton <jwe@octave.org> parents: 21732 diff changeset	449 }
10197 4d433bd2d4dc attempt to avoid trouble with gnulib #defines in a consistent way John W. Eaton <jwe@octave.org> parents: 10189 diff changeset	450
23744 ae74608b6a5d don't use singleton pattern for file_ops John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	451 int symlink (const std::string& old_name, const std::string& new_name)
10197 4d433bd2d4dc attempt to avoid trouble with gnulib #defines in a consistent way John W. Eaton <jwe@octave.org> parents: 10189 diff changeset	452 {
21733 cb0fdd941d84 use namespace for system file_ops class John W. Eaton <jwe@octave.org> parents: 21732 diff changeset	453 std::string msg;
cb0fdd941d84 use namespace for system file_ops class John W. Eaton <jwe@octave.org> parents: 21732 diff changeset	454 return symlink (old_name, new_name, msg);
10197 4d433bd2d4dc attempt to avoid trouble with gnulib #defines in a consistent way John W. Eaton <jwe@octave.org> parents: 10189 diff changeset	455 }
4d433bd2d4dc attempt to avoid trouble with gnulib #defines in a consistent way John W. Eaton <jwe@octave.org> parents: 10189 diff changeset	456
23744 ae74608b6a5d don't use singleton pattern for file_ops John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	457 int symlink (const std::string& old_name, const std::string& new_name,
ae74608b6a5d don't use singleton pattern for file_ops John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	458 std::string& msg)
21733 cb0fdd941d84 use namespace for system file_ops class John W. Eaton <jwe@octave.org> parents: 21732 diff changeset	459 {
cb0fdd941d84 use namespace for system file_ops class John W. Eaton <jwe@octave.org> parents: 21732 diff changeset	460 msg = "";
cb0fdd941d84 use namespace for system file_ops class John W. Eaton <jwe@octave.org> parents: 21732 diff changeset	461
cb0fdd941d84 use namespace for system file_ops class John W. Eaton <jwe@octave.org> parents: 21732 diff changeset	462 int status = -1;
10197 4d433bd2d4dc attempt to avoid trouble with gnulib #defines in a consistent way John W. Eaton <jwe@octave.org> parents: 10189 diff changeset	463
21910 4d723ba06b4a provide wrappers for some unistd.h functions John W. Eaton <jwe@octave.org> parents: 21909 diff changeset	464 status = octave_symlink_wrapper (old_name.c_str (), new_name.c_str ());
21733 cb0fdd941d84 use namespace for system file_ops class John W. Eaton <jwe@octave.org> parents: 21732 diff changeset	465
cb0fdd941d84 use namespace for system file_ops class John W. Eaton <jwe@octave.org> parents: 21732 diff changeset	466 if (status < 0)
21942 aab79a1885cc limit gnulib headers to liboctave/wrappers directory John W. Eaton <jwe@octave.org> parents: 21910 diff changeset	467 msg = std::strerror (errno);
21733 cb0fdd941d84 use namespace for system file_ops class John W. Eaton <jwe@octave.org> parents: 21732 diff changeset	468
cb0fdd941d84 use namespace for system file_ops class John W. Eaton <jwe@octave.org> parents: 21732 diff changeset	469 return status;
cb0fdd941d84 use namespace for system file_ops class John W. Eaton <jwe@octave.org> parents: 21732 diff changeset	470 }
10197 4d433bd2d4dc attempt to avoid trouble with gnulib #defines in a consistent way John W. Eaton <jwe@octave.org> parents: 10189 diff changeset	471
23744 ae74608b6a5d don't use singleton pattern for file_ops John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	472 int readlink (const std::string& path, std::string& result)
21733 cb0fdd941d84 use namespace for system file_ops class John W. Eaton <jwe@octave.org> parents: 21732 diff changeset	473 {
cb0fdd941d84 use namespace for system file_ops class John W. Eaton <jwe@octave.org> parents: 21732 diff changeset	474 std::string msg;
cb0fdd941d84 use namespace for system file_ops class John W. Eaton <jwe@octave.org> parents: 21732 diff changeset	475 return readlink (path, result, msg);
cb0fdd941d84 use namespace for system file_ops class John W. Eaton <jwe@octave.org> parents: 21732 diff changeset	476 }
10197 4d433bd2d4dc attempt to avoid trouble with gnulib #defines in a consistent way John W. Eaton <jwe@octave.org> parents: 10189 diff changeset	477
23744 ae74608b6a5d don't use singleton pattern for file_ops John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	478 int readlink (const std::string& path, std::string& result, std::string& msg)
21733 cb0fdd941d84 use namespace for system file_ops class John W. Eaton <jwe@octave.org> parents: 21732 diff changeset	479 {
cb0fdd941d84 use namespace for system file_ops class John W. Eaton <jwe@octave.org> parents: 21732 diff changeset	480 int status = -1;
10197 4d433bd2d4dc attempt to avoid trouble with gnulib #defines in a consistent way John W. Eaton <jwe@octave.org> parents: 10189 diff changeset	481
21733 cb0fdd941d84 use namespace for system file_ops class John W. Eaton <jwe@octave.org> parents: 21732 diff changeset	482 msg = "";
cb0fdd941d84 use namespace for system file_ops class John W. Eaton <jwe@octave.org> parents: 21732 diff changeset	483
21896 83c824c727c9 hide gnulib pathlen header John W. Eaton <jwe@octave.org> parents: 21890 diff changeset	484 char *buf = octave_areadlink_wrapper (path.c_str ());
21733 cb0fdd941d84 use namespace for system file_ops class John W. Eaton <jwe@octave.org> parents: 21732 diff changeset	485
21896 83c824c727c9 hide gnulib pathlen header John W. Eaton <jwe@octave.org> parents: 21890 diff changeset	486 if (! buf)
21942 aab79a1885cc limit gnulib headers to liboctave/wrappers directory John W. Eaton <jwe@octave.org> parents: 21910 diff changeset	487 msg = std::strerror (errno);
21733 cb0fdd941d84 use namespace for system file_ops class John W. Eaton <jwe@octave.org> parents: 21732 diff changeset	488 else
cb0fdd941d84 use namespace for system file_ops class John W. Eaton <jwe@octave.org> parents: 21732 diff changeset	489 {
21896 83c824c727c9 hide gnulib pathlen header John W. Eaton <jwe@octave.org> parents: 21890 diff changeset	490 result = buf;
83c824c727c9 hide gnulib pathlen header John W. Eaton <jwe@octave.org> parents: 21890 diff changeset	491 ::free (buf);
21733 cb0fdd941d84 use namespace for system file_ops class John W. Eaton <jwe@octave.org> parents: 21732 diff changeset	492 status = 0;
cb0fdd941d84 use namespace for system file_ops class John W. Eaton <jwe@octave.org> parents: 21732 diff changeset	493 }
10197 4d433bd2d4dc attempt to avoid trouble with gnulib #defines in a consistent way John W. Eaton <jwe@octave.org> parents: 10189 diff changeset	494
21733 cb0fdd941d84 use namespace for system file_ops class John W. Eaton <jwe@octave.org> parents: 21732 diff changeset	495 return status;
cb0fdd941d84 use namespace for system file_ops class John W. Eaton <jwe@octave.org> parents: 21732 diff changeset	496 }
10197 4d433bd2d4dc attempt to avoid trouble with gnulib #defines in a consistent way John W. Eaton <jwe@octave.org> parents: 10189 diff changeset	497
23744 ae74608b6a5d don't use singleton pattern for file_ops John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	498 int rename (const std::string& from, const std::string& to)
21733 cb0fdd941d84 use namespace for system file_ops class John W. Eaton <jwe@octave.org> parents: 21732 diff changeset	499 {
cb0fdd941d84 use namespace for system file_ops class John W. Eaton <jwe@octave.org> parents: 21732 diff changeset	500 std::string msg;
cb0fdd941d84 use namespace for system file_ops class John W. Eaton <jwe@octave.org> parents: 21732 diff changeset	501 return rename (from, to, msg);
cb0fdd941d84 use namespace for system file_ops class John W. Eaton <jwe@octave.org> parents: 21732 diff changeset	502 }
10197 4d433bd2d4dc attempt to avoid trouble with gnulib #defines in a consistent way John W. Eaton <jwe@octave.org> parents: 10189 diff changeset	503
25624 815cfd72ddf5 Fix "rename" for files with non-ASCII chars on Windows. Markus Mützel <markus.muetzel@gmx.de> parents: 25516 diff changeset	504 int rename (const std::string& from, const std::string& to,
815cfd72ddf5 Fix "rename" for files with non-ASCII chars on Windows. Markus Mützel <markus.muetzel@gmx.de> parents: 25516 diff changeset	505 std::string& msg)
21733 cb0fdd941d84 use namespace for system file_ops class John W. Eaton <jwe@octave.org> parents: 21732 diff changeset	506 {
cb0fdd941d84 use namespace for system file_ops class John W. Eaton <jwe@octave.org> parents: 21732 diff changeset	507 int status = -1;
cb0fdd941d84 use namespace for system file_ops class John W. Eaton <jwe@octave.org> parents: 21732 diff changeset	508
cb0fdd941d84 use namespace for system file_ops class John W. Eaton <jwe@octave.org> parents: 21732 diff changeset	509 msg = "";
10197 4d433bd2d4dc attempt to avoid trouble with gnulib #defines in a consistent way John W. Eaton <jwe@octave.org> parents: 10189 diff changeset	510
25624 815cfd72ddf5 Fix "rename" for files with non-ASCII chars on Windows. Markus Mützel <markus.muetzel@gmx.de> parents: 25516 diff changeset	511 #if defined (OCTAVE_USE_WINDOWS_API)
815cfd72ddf5 Fix "rename" for files with non-ASCII chars on Windows. Markus Mützel <markus.muetzel@gmx.de> parents: 25516 diff changeset	512 status = _wrename (u8_to_wstring (from).c_str (),
815cfd72ddf5 Fix "rename" for files with non-ASCII chars on Windows. Markus Mützel <markus.muetzel@gmx.de> parents: 25516 diff changeset	513 u8_to_wstring (to).c_str ());
815cfd72ddf5 Fix "rename" for files with non-ASCII chars on Windows. Markus Mützel <markus.muetzel@gmx.de> parents: 25516 diff changeset	514 #else
21942 aab79a1885cc limit gnulib headers to liboctave/wrappers directory John W. Eaton <jwe@octave.org> parents: 21910 diff changeset	515 status = std::rename (from.c_str (), to.c_str ());
25624 815cfd72ddf5 Fix "rename" for files with non-ASCII chars on Windows. Markus Mützel <markus.muetzel@gmx.de> parents: 25516 diff changeset	516 #endif
10197 4d433bd2d4dc attempt to avoid trouble with gnulib #defines in a consistent way John W. Eaton <jwe@octave.org> parents: 10189 diff changeset	517
21733 cb0fdd941d84 use namespace for system file_ops class John W. Eaton <jwe@octave.org> parents: 21732 diff changeset	518 if (status < 0)
21942 aab79a1885cc limit gnulib headers to liboctave/wrappers directory John W. Eaton <jwe@octave.org> parents: 21910 diff changeset	519 msg = std::strerror (errno);
10197 4d433bd2d4dc attempt to avoid trouble with gnulib #defines in a consistent way John W. Eaton <jwe@octave.org> parents: 10189 diff changeset	520
21733 cb0fdd941d84 use namespace for system file_ops class John W. Eaton <jwe@octave.org> parents: 21732 diff changeset	521 return status;
cb0fdd941d84 use namespace for system file_ops class John W. Eaton <jwe@octave.org> parents: 21732 diff changeset	522 }
10197 4d433bd2d4dc attempt to avoid trouble with gnulib #defines in a consistent way John W. Eaton <jwe@octave.org> parents: 10189 diff changeset	523
23744 ae74608b6a5d don't use singleton pattern for file_ops John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	524 int rmdir (const std::string& name)
21733 cb0fdd941d84 use namespace for system file_ops class John W. Eaton <jwe@octave.org> parents: 21732 diff changeset	525 {
cb0fdd941d84 use namespace for system file_ops class John W. Eaton <jwe@octave.org> parents: 21732 diff changeset	526 std::string msg;
cb0fdd941d84 use namespace for system file_ops class John W. Eaton <jwe@octave.org> parents: 21732 diff changeset	527 return rmdir (name, msg);
cb0fdd941d84 use namespace for system file_ops class John W. Eaton <jwe@octave.org> parents: 21732 diff changeset	528 }
10197 4d433bd2d4dc attempt to avoid trouble with gnulib #defines in a consistent way John W. Eaton <jwe@octave.org> parents: 10189 diff changeset	529
23744 ae74608b6a5d don't use singleton pattern for file_ops John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	530 int rmdir (const std::string& name, std::string& msg)
21733 cb0fdd941d84 use namespace for system file_ops class John W. Eaton <jwe@octave.org> parents: 21732 diff changeset	531 {
cb0fdd941d84 use namespace for system file_ops class John W. Eaton <jwe@octave.org> parents: 21732 diff changeset	532 msg = "";
cb0fdd941d84 use namespace for system file_ops class John W. Eaton <jwe@octave.org> parents: 21732 diff changeset	533
cb0fdd941d84 use namespace for system file_ops class John W. Eaton <jwe@octave.org> parents: 21732 diff changeset	534 int status = -1;
cb0fdd941d84 use namespace for system file_ops class John W. Eaton <jwe@octave.org> parents: 21732 diff changeset	535
21910 4d723ba06b4a provide wrappers for some unistd.h functions John W. Eaton <jwe@octave.org> parents: 21909 diff changeset	536 status = octave_rmdir_wrapper (name.c_str ());
10197 4d433bd2d4dc attempt to avoid trouble with gnulib #defines in a consistent way John W. Eaton <jwe@octave.org> parents: 10189 diff changeset	537
21733 cb0fdd941d84 use namespace for system file_ops class John W. Eaton <jwe@octave.org> parents: 21732 diff changeset	538 if (status < 0)
21942 aab79a1885cc limit gnulib headers to liboctave/wrappers directory John W. Eaton <jwe@octave.org> parents: 21910 diff changeset	539 msg = std::strerror (errno);
21733 cb0fdd941d84 use namespace for system file_ops class John W. Eaton <jwe@octave.org> parents: 21732 diff changeset	540
cb0fdd941d84 use namespace for system file_ops class John W. Eaton <jwe@octave.org> parents: 21732 diff changeset	541 return status;
cb0fdd941d84 use namespace for system file_ops class John W. Eaton <jwe@octave.org> parents: 21732 diff changeset	542 }
cb0fdd941d84 use namespace for system file_ops class John W. Eaton <jwe@octave.org> parents: 21732 diff changeset	543
cb0fdd941d84 use namespace for system file_ops class John W. Eaton <jwe@octave.org> parents: 21732 diff changeset	544 // And a version that works recursively.
10197 4d433bd2d4dc attempt to avoid trouble with gnulib #defines in a consistent way John W. Eaton <jwe@octave.org> parents: 10189 diff changeset	545
23744 ae74608b6a5d don't use singleton pattern for file_ops John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	546 int recursive_rmdir (const std::string& name)
21733 cb0fdd941d84 use namespace for system file_ops class John W. Eaton <jwe@octave.org> parents: 21732 diff changeset	547 {
cb0fdd941d84 use namespace for system file_ops class John W. Eaton <jwe@octave.org> parents: 21732 diff changeset	548 std::string msg;
cb0fdd941d84 use namespace for system file_ops class John W. Eaton <jwe@octave.org> parents: 21732 diff changeset	549 return recursive_rmdir (name, msg);
cb0fdd941d84 use namespace for system file_ops class John W. Eaton <jwe@octave.org> parents: 21732 diff changeset	550 }
10197 4d433bd2d4dc attempt to avoid trouble with gnulib #defines in a consistent way John W. Eaton <jwe@octave.org> parents: 10189 diff changeset	551
23744 ae74608b6a5d don't use singleton pattern for file_ops John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	552 int recursive_rmdir (const std::string& name, std::string& msg)
10197 4d433bd2d4dc attempt to avoid trouble with gnulib #defines in a consistent way John W. Eaton <jwe@octave.org> parents: 10189 diff changeset	553 {
21733 cb0fdd941d84 use namespace for system file_ops class John W. Eaton <jwe@octave.org> parents: 21732 diff changeset	554 msg = "";
cb0fdd941d84 use namespace for system file_ops class John W. Eaton <jwe@octave.org> parents: 21732 diff changeset	555
cb0fdd941d84 use namespace for system file_ops class John W. Eaton <jwe@octave.org> parents: 21732 diff changeset	556 int status = 0;
10197 4d433bd2d4dc attempt to avoid trouble with gnulib #defines in a consistent way John W. Eaton <jwe@octave.org> parents: 10189 diff changeset	557
25516 8945a6a6c0eb Add Unicode support for getting directory listing in Windows (bug #49118). Markus Mützel <markus.muetzel@gmx.de> parents: 25438 diff changeset	558 string_vector dirlist;
21733 cb0fdd941d84 use namespace for system file_ops class John W. Eaton <jwe@octave.org> parents: 21732 diff changeset	559
25516 8945a6a6c0eb Add Unicode support for getting directory listing in Windows (bug #49118). Markus Mützel <markus.muetzel@gmx.de> parents: 25438 diff changeset	560 if (get_dirlist (name, dirlist, msg))
10197 4d433bd2d4dc attempt to avoid trouble with gnulib #defines in a consistent way John W. Eaton <jwe@octave.org> parents: 10189 diff changeset	561 {
21733 cb0fdd941d84 use namespace for system file_ops class John W. Eaton <jwe@octave.org> parents: 21732 diff changeset	562 for (octave_idx_type i = 0; i < dirlist.numel (); i++)
cb0fdd941d84 use namespace for system file_ops class John W. Eaton <jwe@octave.org> parents: 21732 diff changeset	563 {
cb0fdd941d84 use namespace for system file_ops class John W. Eaton <jwe@octave.org> parents: 21732 diff changeset	564 octave_quit ();
10197 4d433bd2d4dc attempt to avoid trouble with gnulib #defines in a consistent way John W. Eaton <jwe@octave.org> parents: 10189 diff changeset	565
21733 cb0fdd941d84 use namespace for system file_ops class John W. Eaton <jwe@octave.org> parents: 21732 diff changeset	566 std::string nm = dirlist[i];
cb0fdd941d84 use namespace for system file_ops class John W. Eaton <jwe@octave.org> parents: 21732 diff changeset	567
cb0fdd941d84 use namespace for system file_ops class John W. Eaton <jwe@octave.org> parents: 21732 diff changeset	568 // Skip current directory and parent.
cb0fdd941d84 use namespace for system file_ops class John W. Eaton <jwe@octave.org> parents: 21732 diff changeset	569 if (nm == "." \|\| nm == "..")
cb0fdd941d84 use namespace for system file_ops class John W. Eaton <jwe@octave.org> parents: 21732 diff changeset	570 continue;
10197 4d433bd2d4dc attempt to avoid trouble with gnulib #defines in a consistent way John W. Eaton <jwe@octave.org> parents: 10189 diff changeset	571
23744 ae74608b6a5d don't use singleton pattern for file_ops John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	572 std::string fullnm = name + file_ops::dir_sep_str () + nm;
21733 cb0fdd941d84 use namespace for system file_ops class John W. Eaton <jwe@octave.org> parents: 21732 diff changeset	573
cb0fdd941d84 use namespace for system file_ops class John W. Eaton <jwe@octave.org> parents: 21732 diff changeset	574 // Get info about the file. Don't follow links.
23744 ae74608b6a5d don't use singleton pattern for file_ops John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	575 file_stat fs (fullnm, false);
10197 4d433bd2d4dc attempt to avoid trouble with gnulib #defines in a consistent way John W. Eaton <jwe@octave.org> parents: 10189 diff changeset	576
21733 cb0fdd941d84 use namespace for system file_ops class John W. Eaton <jwe@octave.org> parents: 21732 diff changeset	577 if (fs)
cb0fdd941d84 use namespace for system file_ops class John W. Eaton <jwe@octave.org> parents: 21732 diff changeset	578 {
cb0fdd941d84 use namespace for system file_ops class John W. Eaton <jwe@octave.org> parents: 21732 diff changeset	579 if (fs.is_dir ())
cb0fdd941d84 use namespace for system file_ops class John W. Eaton <jwe@octave.org> parents: 21732 diff changeset	580 {
cb0fdd941d84 use namespace for system file_ops class John W. Eaton <jwe@octave.org> parents: 21732 diff changeset	581 status = recursive_rmdir (fullnm, msg);
10197 4d433bd2d4dc attempt to avoid trouble with gnulib #defines in a consistent way John W. Eaton <jwe@octave.org> parents: 10189 diff changeset	582
21733 cb0fdd941d84 use namespace for system file_ops class John W. Eaton <jwe@octave.org> parents: 21732 diff changeset	583 if (status < 0)
cb0fdd941d84 use namespace for system file_ops class John W. Eaton <jwe@octave.org> parents: 21732 diff changeset	584 break;
cb0fdd941d84 use namespace for system file_ops class John W. Eaton <jwe@octave.org> parents: 21732 diff changeset	585 }
cb0fdd941d84 use namespace for system file_ops class John W. Eaton <jwe@octave.org> parents: 21732 diff changeset	586 else
cb0fdd941d84 use namespace for system file_ops class John W. Eaton <jwe@octave.org> parents: 21732 diff changeset	587 {
cb0fdd941d84 use namespace for system file_ops class John W. Eaton <jwe@octave.org> parents: 21732 diff changeset	588 status = unlink (fullnm, msg);
10197 4d433bd2d4dc attempt to avoid trouble with gnulib #defines in a consistent way John W. Eaton <jwe@octave.org> parents: 10189 diff changeset	589
21733 cb0fdd941d84 use namespace for system file_ops class John W. Eaton <jwe@octave.org> parents: 21732 diff changeset	590 if (status < 0)
cb0fdd941d84 use namespace for system file_ops class John W. Eaton <jwe@octave.org> parents: 21732 diff changeset	591 break;
cb0fdd941d84 use namespace for system file_ops class John W. Eaton <jwe@octave.org> parents: 21732 diff changeset	592 }
10197 4d433bd2d4dc attempt to avoid trouble with gnulib #defines in a consistent way John W. Eaton <jwe@octave.org> parents: 10189 diff changeset	593 }
4d433bd2d4dc attempt to avoid trouble with gnulib #defines in a consistent way John W. Eaton <jwe@octave.org> parents: 10189 diff changeset	594 else
4d433bd2d4dc attempt to avoid trouble with gnulib #defines in a consistent way John W. Eaton <jwe@octave.org> parents: 10189 diff changeset	595 {
21733 cb0fdd941d84 use namespace for system file_ops class John W. Eaton <jwe@octave.org> parents: 21732 diff changeset	596 msg = fs.error ();
cb0fdd941d84 use namespace for system file_ops class John W. Eaton <jwe@octave.org> parents: 21732 diff changeset	597 break;
10197 4d433bd2d4dc attempt to avoid trouble with gnulib #defines in a consistent way John W. Eaton <jwe@octave.org> parents: 10189 diff changeset	598 }
4d433bd2d4dc attempt to avoid trouble with gnulib #defines in a consistent way John W. Eaton <jwe@octave.org> parents: 10189 diff changeset	599 }
21733 cb0fdd941d84 use namespace for system file_ops class John W. Eaton <jwe@octave.org> parents: 21732 diff changeset	600
cb0fdd941d84 use namespace for system file_ops class John W. Eaton <jwe@octave.org> parents: 21732 diff changeset	601 if (status >= 0)
25516 8945a6a6c0eb Add Unicode support for getting directory listing in Windows (bug #49118). Markus Mützel <markus.muetzel@gmx.de> parents: 25438 diff changeset	602 status = rmdir (name, msg);
10197 4d433bd2d4dc attempt to avoid trouble with gnulib #defines in a consistent way John W. Eaton <jwe@octave.org> parents: 10189 diff changeset	603 }
21733 cb0fdd941d84 use namespace for system file_ops class John W. Eaton <jwe@octave.org> parents: 21732 diff changeset	604 else
25516 8945a6a6c0eb Add Unicode support for getting directory listing in Windows (bug #49118). Markus Mützel <markus.muetzel@gmx.de> parents: 25438 diff changeset	605 status = -1;
21733 cb0fdd941d84 use namespace for system file_ops class John W. Eaton <jwe@octave.org> parents: 21732 diff changeset	606
cb0fdd941d84 use namespace for system file_ops class John W. Eaton <jwe@octave.org> parents: 21732 diff changeset	607 return status;
10197 4d433bd2d4dc attempt to avoid trouble with gnulib #defines in a consistent way John W. Eaton <jwe@octave.org> parents: 10189 diff changeset	608 }
21733 cb0fdd941d84 use namespace for system file_ops class John W. Eaton <jwe@octave.org> parents: 21732 diff changeset	609
23744 ae74608b6a5d don't use singleton pattern for file_ops John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	610 int umask (mode_t mode)
21733 cb0fdd941d84 use namespace for system file_ops class John W. Eaton <jwe@octave.org> parents: 21732 diff changeset	611 {
21909 d7cac41df82a provide wrappers for some sys/stat functions John W. Eaton <jwe@octave.org> parents: 21896 diff changeset	612 return octave_umask_wrapper (mode);
21733 cb0fdd941d84 use namespace for system file_ops class John W. Eaton <jwe@octave.org> parents: 21732 diff changeset	613 }
cb0fdd941d84 use namespace for system file_ops class John W. Eaton <jwe@octave.org> parents: 21732 diff changeset	614
23744 ae74608b6a5d don't use singleton pattern for file_ops John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	615 int unlink (const std::string& name)
10197 4d433bd2d4dc attempt to avoid trouble with gnulib #defines in a consistent way John W. Eaton <jwe@octave.org> parents: 10189 diff changeset	616 {
21733 cb0fdd941d84 use namespace for system file_ops class John W. Eaton <jwe@octave.org> parents: 21732 diff changeset	617 std::string msg;
cb0fdd941d84 use namespace for system file_ops class John W. Eaton <jwe@octave.org> parents: 21732 diff changeset	618 return unlink (name, msg);
cb0fdd941d84 use namespace for system file_ops class John W. Eaton <jwe@octave.org> parents: 21732 diff changeset	619 }
cb0fdd941d84 use namespace for system file_ops class John W. Eaton <jwe@octave.org> parents: 21732 diff changeset	620
23744 ae74608b6a5d don't use singleton pattern for file_ops John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	621 int unlink (const std::string& name, std::string& msg)
21733 cb0fdd941d84 use namespace for system file_ops class John W. Eaton <jwe@octave.org> parents: 21732 diff changeset	622 {
cb0fdd941d84 use namespace for system file_ops class John W. Eaton <jwe@octave.org> parents: 21732 diff changeset	623 msg = "";
cb0fdd941d84 use namespace for system file_ops class John W. Eaton <jwe@octave.org> parents: 21732 diff changeset	624
cb0fdd941d84 use namespace for system file_ops class John W. Eaton <jwe@octave.org> parents: 21732 diff changeset	625 int status = -1;
10197 4d433bd2d4dc attempt to avoid trouble with gnulib #defines in a consistent way John W. Eaton <jwe@octave.org> parents: 10189 diff changeset	626
21910 4d723ba06b4a provide wrappers for some unistd.h functions John W. Eaton <jwe@octave.org> parents: 21909 diff changeset	627 status = octave_unlink_wrapper (name.c_str ());
21733 cb0fdd941d84 use namespace for system file_ops class John W. Eaton <jwe@octave.org> parents: 21732 diff changeset	628
cb0fdd941d84 use namespace for system file_ops class John W. Eaton <jwe@octave.org> parents: 21732 diff changeset	629 if (status < 0)
21942 aab79a1885cc limit gnulib headers to liboctave/wrappers directory John W. Eaton <jwe@octave.org> parents: 21910 diff changeset	630 msg = std::strerror (errno);
21733 cb0fdd941d84 use namespace for system file_ops class John W. Eaton <jwe@octave.org> parents: 21732 diff changeset	631
cb0fdd941d84 use namespace for system file_ops class John W. Eaton <jwe@octave.org> parents: 21732 diff changeset	632 return status;
cb0fdd941d84 use namespace for system file_ops class John W. Eaton <jwe@octave.org> parents: 21732 diff changeset	633 }
cb0fdd941d84 use namespace for system file_ops class John W. Eaton <jwe@octave.org> parents: 21732 diff changeset	634
23744 ae74608b6a5d don't use singleton pattern for file_ops John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	635 std::string tempnam (const std::string& dir, const std::string& pfx)
21733 cb0fdd941d84 use namespace for system file_ops class John W. Eaton <jwe@octave.org> parents: 21732 diff changeset	636 {
cb0fdd941d84 use namespace for system file_ops class John W. Eaton <jwe@octave.org> parents: 21732 diff changeset	637 std::string msg;
cb0fdd941d84 use namespace for system file_ops class John W. Eaton <jwe@octave.org> parents: 21732 diff changeset	638 return tempnam (dir, pfx, msg);
10197 4d433bd2d4dc attempt to avoid trouble with gnulib #defines in a consistent way John W. Eaton <jwe@octave.org> parents: 10189 diff changeset	639 }
4d433bd2d4dc attempt to avoid trouble with gnulib #defines in a consistent way John W. Eaton <jwe@octave.org> parents: 10189 diff changeset	640
23744 ae74608b6a5d don't use singleton pattern for file_ops John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	641 std::string tempnam (const std::string& dir, const std::string& pfx,
ae74608b6a5d don't use singleton pattern for file_ops John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	642 std::string& msg)
21733 cb0fdd941d84 use namespace for system file_ops class John W. Eaton <jwe@octave.org> parents: 21732 diff changeset	643 {
cb0fdd941d84 use namespace for system file_ops class John W. Eaton <jwe@octave.org> parents: 21732 diff changeset	644 msg = "";
10197 4d433bd2d4dc attempt to avoid trouble with gnulib #defines in a consistent way John W. Eaton <jwe@octave.org> parents: 10189 diff changeset	645
21733 cb0fdd941d84 use namespace for system file_ops class John W. Eaton <jwe@octave.org> parents: 21732 diff changeset	646 std::string retval;
10197 4d433bd2d4dc attempt to avoid trouble with gnulib #defines in a consistent way John W. Eaton <jwe@octave.org> parents: 10189 diff changeset	647
21733 cb0fdd941d84 use namespace for system file_ops class John W. Eaton <jwe@octave.org> parents: 21732 diff changeset	648 // get dir path to use for template
cb0fdd941d84 use namespace for system file_ops class John W. Eaton <jwe@octave.org> parents: 21732 diff changeset	649 std::string templatename;
cb0fdd941d84 use namespace for system file_ops class John W. Eaton <jwe@octave.org> parents: 21732 diff changeset	650 if (dir.empty ())
23744 ae74608b6a5d don't use singleton pattern for file_ops John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	651 templatename = env::get_temp_directory ();
ae74608b6a5d don't use singleton pattern for file_ops John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	652 else if (! file_stat (dir, false).is_dir ())
ae74608b6a5d don't use singleton pattern for file_ops John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	653 templatename = env::get_temp_directory ();
21733 cb0fdd941d84 use namespace for system file_ops class John W. Eaton <jwe@octave.org> parents: 21732 diff changeset	654 else
cb0fdd941d84 use namespace for system file_ops class John W. Eaton <jwe@octave.org> parents: 21732 diff changeset	655 templatename = dir;
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	656
21733 cb0fdd941d84 use namespace for system file_ops class John W. Eaton <jwe@octave.org> parents: 21732 diff changeset	657 // add dir sep char if it is not there
23744 ae74608b6a5d don't use singleton pattern for file_ops John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	658 if (*templatename.rbegin () != file_ops::dir_sep_char ())
ae74608b6a5d don't use singleton pattern for file_ops John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	659 templatename += file_ops::dir_sep_char ();
19420 82f2a3437e02 Fix tempname so it prioritizes user input dir rather than TMPDIR (bug #43844). Rik <rik@octave.org> parents: 18412 diff changeset	660
21733 cb0fdd941d84 use namespace for system file_ops class John W. Eaton <jwe@octave.org> parents: 21732 diff changeset	661 if (pfx.empty ())
cb0fdd941d84 use namespace for system file_ops class John W. Eaton <jwe@octave.org> parents: 21732 diff changeset	662 templatename += "file";
cb0fdd941d84 use namespace for system file_ops class John W. Eaton <jwe@octave.org> parents: 21732 diff changeset	663 else
cb0fdd941d84 use namespace for system file_ops class John W. Eaton <jwe@octave.org> parents: 21732 diff changeset	664 templatename += pfx;
19458 d8fd3842a507 Use gnulib gen_tempname to create temporary names (Bug #43872). John Donoghue <john.donoghue@ieee.org> parents: 19428 diff changeset	665
21733 cb0fdd941d84 use namespace for system file_ops class John W. Eaton <jwe@octave.org> parents: 21732 diff changeset	666 // add the required XXXXXX for the template
cb0fdd941d84 use namespace for system file_ops class John W. Eaton <jwe@octave.org> parents: 21732 diff changeset	667 templatename += "XXXXXX";
19428 eee9f111c164 Check if tempfile name exists when changing path of temporary file name (Bug #43872) John Donoghue parents: 19420 diff changeset	668
21733 cb0fdd941d84 use namespace for system file_ops class John W. Eaton <jwe@octave.org> parents: 21732 diff changeset	669 // create and copy template to char array for call to gen_tempname
cb0fdd941d84 use namespace for system file_ops class John W. Eaton <jwe@octave.org> parents: 21732 diff changeset	670 char tname [templatename.length () + 1];
19597 db92e7e28e1f strip trailing whitespace from most source files John W. Eaton <jwe@octave.org> parents: 19458 diff changeset	671
21733 cb0fdd941d84 use namespace for system file_ops class John W. Eaton <jwe@octave.org> parents: 21732 diff changeset	672 strcpy (tname, templatename.c_str ());
10252 2fcc927a8757 liboctave/file-ops.h: avoid gnulib #define for canonicalize_file_name John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	673
21888 00f1249f2483 create wrappers for some gnulib functions John W. Eaton <jwe@octave.org> parents: 21885 diff changeset	674 if (octave_gen_tempname_wrapper (tname) == -1)
21942 aab79a1885cc limit gnulib headers to liboctave/wrappers directory John W. Eaton <jwe@octave.org> parents: 21910 diff changeset	675 msg = std::strerror (errno);
21733 cb0fdd941d84 use namespace for system file_ops class John W. Eaton <jwe@octave.org> parents: 21732 diff changeset	676 else
cb0fdd941d84 use namespace for system file_ops class John W. Eaton <jwe@octave.org> parents: 21732 diff changeset	677 retval = tname;
10252 2fcc927a8757 liboctave/file-ops.h: avoid gnulib #define for canonicalize_file_name John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	678
21733 cb0fdd941d84 use namespace for system file_ops class John W. Eaton <jwe@octave.org> parents: 21732 diff changeset	679 return retval;
10252 2fcc927a8757 liboctave/file-ops.h: avoid gnulib #define for canonicalize_file_name John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	680 }
2fcc927a8757 liboctave/file-ops.h: avoid gnulib #define for canonicalize_file_name John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	681
23744 ae74608b6a5d don't use singleton pattern for file_ops John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	682 std::string canonicalize_file_name (const std::string& name)
21733 cb0fdd941d84 use namespace for system file_ops class John W. Eaton <jwe@octave.org> parents: 21732 diff changeset	683 {
cb0fdd941d84 use namespace for system file_ops class John W. Eaton <jwe@octave.org> parents: 21732 diff changeset	684 std::string msg;
cb0fdd941d84 use namespace for system file_ops class John W. Eaton <jwe@octave.org> parents: 21732 diff changeset	685 return canonicalize_file_name (name, msg);
cb0fdd941d84 use namespace for system file_ops class John W. Eaton <jwe@octave.org> parents: 21732 diff changeset	686 }
cb0fdd941d84 use namespace for system file_ops class John W. Eaton <jwe@octave.org> parents: 21732 diff changeset	687
23744 ae74608b6a5d don't use singleton pattern for file_ops John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	688 std::string canonicalize_file_name (const std::string& name, std::string& msg)
21733 cb0fdd941d84 use namespace for system file_ops class John W. Eaton <jwe@octave.org> parents: 21732 diff changeset	689 {
cb0fdd941d84 use namespace for system file_ops class John W. Eaton <jwe@octave.org> parents: 21732 diff changeset	690 msg = "";
cb0fdd941d84 use namespace for system file_ops class John W. Eaton <jwe@octave.org> parents: 21732 diff changeset	691
cb0fdd941d84 use namespace for system file_ops class John W. Eaton <jwe@octave.org> parents: 21732 diff changeset	692 std::string retval;
cb0fdd941d84 use namespace for system file_ops class John W. Eaton <jwe@octave.org> parents: 21732 diff changeset	693
21888 00f1249f2483 create wrappers for some gnulib functions John W. Eaton <jwe@octave.org> parents: 21885 diff changeset	694 char *tmp = octave_canonicalize_file_name_wrapper (name.c_str ());
21733 cb0fdd941d84 use namespace for system file_ops class John W. Eaton <jwe@octave.org> parents: 21732 diff changeset	695
cb0fdd941d84 use namespace for system file_ops class John W. Eaton <jwe@octave.org> parents: 21732 diff changeset	696 if (tmp)
cb0fdd941d84 use namespace for system file_ops class John W. Eaton <jwe@octave.org> parents: 21732 diff changeset	697 {
cb0fdd941d84 use namespace for system file_ops class John W. Eaton <jwe@octave.org> parents: 21732 diff changeset	698 retval = tmp;
cb0fdd941d84 use namespace for system file_ops class John W. Eaton <jwe@octave.org> parents: 21732 diff changeset	699 free (tmp);
cb0fdd941d84 use namespace for system file_ops class John W. Eaton <jwe@octave.org> parents: 21732 diff changeset	700 }
cb0fdd941d84 use namespace for system file_ops class John W. Eaton <jwe@octave.org> parents: 21732 diff changeset	701
20503 0829b6ff3ac9 Use backslash as windows file separator for canonicalize_file_name (Bug #45816). Rik <rik@octave.org> parents: 19697 diff changeset	702 #if (defined (OCTAVE_HAVE_WINDOWS_FILESYSTEM) && ! defined (OCTAVE_HAVE_POSIX_FILESYSTEM))
21733 cb0fdd941d84 use namespace for system file_ops class John W. Eaton <jwe@octave.org> parents: 21732 diff changeset	703 // Canonical Windows file separator is backslash.
cb0fdd941d84 use namespace for system file_ops class John W. Eaton <jwe@octave.org> parents: 21732 diff changeset	704 std::replace (retval.begin (), retval.end (), '/', '\\');
20503 0829b6ff3ac9 Use backslash as windows file separator for canonicalize_file_name (Bug #45816). Rik <rik@octave.org> parents: 19697 diff changeset	705 #endif
0829b6ff3ac9 Use backslash as windows file separator for canonicalize_file_name (Bug #45816). Rik <rik@octave.org> parents: 19697 diff changeset	706
21733 cb0fdd941d84 use namespace for system file_ops class John W. Eaton <jwe@octave.org> parents: 21732 diff changeset	707 if (retval.empty ())
21942 aab79a1885cc limit gnulib headers to liboctave/wrappers directory John W. Eaton <jwe@octave.org> parents: 21910 diff changeset	708 msg = std::strerror (errno);
10252 2fcc927a8757 liboctave/file-ops.h: avoid gnulib #define for canonicalize_file_name John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	709
21733 cb0fdd941d84 use namespace for system file_ops class John W. Eaton <jwe@octave.org> parents: 21732 diff changeset	710 return retval;
cb0fdd941d84 use namespace for system file_ops class John W. Eaton <jwe@octave.org> parents: 21732 diff changeset	711 }
cb0fdd941d84 use namespace for system file_ops class John W. Eaton <jwe@octave.org> parents: 21732 diff changeset	712 }
10252 2fcc927a8757 liboctave/file-ops.h: avoid gnulib #define for canonicalize_file_name John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	713 }

Mercurial > octave

annotate liboctave/system/file-ops.cc @ 26376:00f796120a6d stable