annotate liboctave/file-ops.cc @ 10178:6bd86b6287b1

provide wrapper for tempnam
author John W. Eaton <jwe@octave.org>
date Thu, 21 Jan 2010 02:53:37 -0500
parents cb3d926b4d9e
children 326746625a51
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
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
7017
a1dbe9d80eee [project @ 2007-10-12 21:27:11 by jwe]
jwe
parents: 7016
diff changeset
3 Copyright (C) 1996, 1997, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
8920
eb63fbe60fab update copyright notices
John W. Eaton <jwe@octave.org>
parents: 8377
diff changeset
4 2007, 2008 John W. Eaton
1765
a51354c34bea [project @ 1996-01-23 03:33:34 by jwe]
jwe
parents:
diff changeset
5
a51354c34bea [project @ 1996-01-23 03:33:34 by jwe]
jwe
parents:
diff changeset
6 This file is part of Octave.
a51354c34bea [project @ 1996-01-23 03:33:34 by jwe]
jwe
parents:
diff changeset
7
a51354c34bea [project @ 1996-01-23 03:33:34 by jwe]
jwe
parents:
diff changeset
8 Octave is free software; you can redistribute it and/or modify it
a51354c34bea [project @ 1996-01-23 03:33:34 by jwe]
jwe
parents:
diff changeset
9 under the terms of the GNU General Public License as published by the
7016
93c65f2a5668 [project @ 2007-10-12 06:40:56 by jwe]
jwe
parents: 6709
diff changeset
10 Free Software Foundation; either version 3 of the License, or (at your
93c65f2a5668 [project @ 2007-10-12 06:40:56 by jwe]
jwe
parents: 6709
diff changeset
11 option) any later version.
1765
a51354c34bea [project @ 1996-01-23 03:33:34 by jwe]
jwe
parents:
diff changeset
12
a51354c34bea [project @ 1996-01-23 03:33:34 by jwe]
jwe
parents:
diff changeset
13 Octave is distributed in the hope that it will be useful, but WITHOUT
a51354c34bea [project @ 1996-01-23 03:33:34 by jwe]
jwe
parents:
diff changeset
14 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
a51354c34bea [project @ 1996-01-23 03:33:34 by jwe]
jwe
parents:
diff changeset
15 FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
a51354c34bea [project @ 1996-01-23 03:33:34 by jwe]
jwe
parents:
diff changeset
16 for more details.
a51354c34bea [project @ 1996-01-23 03:33:34 by jwe]
jwe
parents:
diff changeset
17
a51354c34bea [project @ 1996-01-23 03:33:34 by jwe]
jwe
parents:
diff changeset
18 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
19 along with Octave; see the file COPYING. If not, see
93c65f2a5668 [project @ 2007-10-12 06:40:56 by jwe]
jwe
parents: 6709
diff changeset
20 <http://www.gnu.org/licenses/>.
1765
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 */
a51354c34bea [project @ 1996-01-23 03:33:34 by jwe]
jwe
parents:
diff changeset
23
a51354c34bea [project @ 1996-01-23 03:33:34 by jwe]
jwe
parents:
diff changeset
24 #ifdef HAVE_CONFIG_H
a51354c34bea [project @ 1996-01-23 03:33:34 by jwe]
jwe
parents:
diff changeset
25 #include <config.h>
a51354c34bea [project @ 1996-01-23 03:33:34 by jwe]
jwe
parents:
diff changeset
26 #endif
a51354c34bea [project @ 1996-01-23 03:33:34 by jwe]
jwe
parents:
diff changeset
27
a51354c34bea [project @ 1996-01-23 03:33:34 by jwe]
jwe
parents:
diff changeset
28 #include <cerrno>
1802
8173b1fa052d [project @ 1996-01-29 06:10:18 by jwe]
jwe
parents: 1779
diff changeset
29 #include <cstdio>
8173b1fa052d [project @ 1996-01-29 06:10:18 by jwe]
jwe
parents: 1779
diff changeset
30 #include <cstdlib>
1765
a51354c34bea [project @ 1996-01-23 03:33:34 by jwe]
jwe
parents:
diff changeset
31 #include <cstring>
a51354c34bea [project @ 1996-01-23 03:33:34 by jwe]
jwe
parents:
diff changeset
32
3503
d14c483b3c12 [project @ 2000-02-01 04:06:07 by jwe]
jwe
parents: 3074
diff changeset
33 #include <iostream>
4726
14dc2267c343 [project @ 2004-01-23 20:04:35 by jwe]
jwe
parents: 4578
diff changeset
34 #include <vector>
3040
443851377f3f [project @ 1997-06-06 09:29:28 by jwe]
jwe
parents: 2947
diff changeset
35
2443
4d941ba99862 [project @ 1996-10-30 18:51:26 by jwe]
jwe
parents: 2433
diff changeset
36 #ifdef HAVE_SYS_TYPES_H
1765
a51354c34bea [project @ 1996-01-23 03:33:34 by jwe]
jwe
parents:
diff changeset
37 #include <sys/types.h>
2443
4d941ba99862 [project @ 1996-10-30 18:51:26 by jwe]
jwe
parents: 2433
diff changeset
38 #endif
2926
66ef74ee5d9f [project @ 1997-05-05 03:20:52 by jwe]
jwe
parents: 2847
diff changeset
39
10177
cb3d926b4d9e use readlink module from gnulib
John W. Eaton <jwe@octave.org>
parents: 10176
diff changeset
40 #incluede <pathmax.h>
cb3d926b4d9e use readlink module from gnulib
John W. Eaton <jwe@octave.org>
parents: 10176
diff changeset
41
2926
66ef74ee5d9f [project @ 1997-05-05 03:20:52 by jwe]
jwe
parents: 2847
diff changeset
42 #ifdef HAVE_UNISTD_H
1765
a51354c34bea [project @ 1996-01-23 03:33:34 by jwe]
jwe
parents:
diff changeset
43 #include <unistd.h>
a51354c34bea [project @ 1996-01-23 03:33:34 by jwe]
jwe
parents:
diff changeset
44 #endif
a51354c34bea [project @ 1996-01-23 03:33:34 by jwe]
jwe
parents:
diff changeset
45
5476
941f0fc6b596 [project @ 2005-09-29 22:46:07 by jwe]
jwe
parents: 5307
diff changeset
46 #include "dir-ops.h"
1765
a51354c34bea [project @ 1996-01-23 03:33:34 by jwe]
jwe
parents:
diff changeset
47 #include "file-ops.h"
5476
941f0fc6b596 [project @ 2005-09-29 22:46:07 by jwe]
jwe
parents: 5307
diff changeset
48 #include "file-stat.h"
2926
66ef74ee5d9f [project @ 1997-05-05 03:20:52 by jwe]
jwe
parents: 2847
diff changeset
49 #include "oct-env.h"
2934
dddc1b5c324e [project @ 1997-05-05 22:56:37 by jwe]
jwe
parents: 2926
diff changeset
50 #include "oct-passwd.h"
3710
9a77deefb8c9 [project @ 2000-08-02 20:47:44 by jwe]
jwe
parents: 3504
diff changeset
51 #include "pathlen.h"
5476
941f0fc6b596 [project @ 2005-09-29 22:46:07 by jwe]
jwe
parents: 5307
diff changeset
52 #include "quit.h"
1775
d53c27b14236 [project @ 1996-01-23 08:21:22 by jwe]
jwe
parents: 1773
diff changeset
53 #include "statdefs.h"
2926
66ef74ee5d9f [project @ 1997-05-05 03:20:52 by jwe]
jwe
parents: 2847
diff changeset
54 #include "str-vec.h"
8377
25bc2d31e1bf improve OCTAVE_LOCAL_BUFFER
Jaroslav Hajek <highegg@gmail.com>
parents: 8327
diff changeset
55 #include "oct-locbuf.h"
1765
a51354c34bea [project @ 1996-01-23 03:33:34 by jwe]
jwe
parents:
diff changeset
56
8009
d936b21b3a6b file_ops: use singleton class for static data members
John W. Eaton <jwe@octave.org>
parents: 8007
diff changeset
57 file_ops::static_members *file_ops::static_members::instance = 0;
d936b21b3a6b file_ops: use singleton class for static data members
John W. Eaton <jwe@octave.org>
parents: 8007
diff changeset
58
d936b21b3a6b file_ops: use singleton class for static data members
John W. Eaton <jwe@octave.org>
parents: 8007
diff changeset
59 file_ops::static_members::static_members (void)
8007
a2ab20ba78f7 make file_ops a proper singleton class
John W. Eaton <jwe@octave.org>
parents: 7520
diff changeset
60 :
a2ab20ba78f7 make file_ops a proper singleton class
John W. Eaton <jwe@octave.org>
parents: 7520
diff changeset
61 #if (defined (OCTAVE_HAVE_WINDOWS_FILESYSTEM) && ! defined (OCTAVE_HAVE_POSIX_FILESYSTEM))
a2ab20ba78f7 make file_ops a proper singleton class
John W. Eaton <jwe@octave.org>
parents: 7520
diff changeset
62 xdir_sep_char ('\\'),
a2ab20ba78f7 make file_ops a proper singleton class
John W. Eaton <jwe@octave.org>
parents: 7520
diff changeset
63 xdir_sep_str ("\\"),
a2ab20ba78f7 make file_ops a proper singleton class
John W. Eaton <jwe@octave.org>
parents: 7520
diff changeset
64 #else
a2ab20ba78f7 make file_ops a proper singleton class
John W. Eaton <jwe@octave.org>
parents: 7520
diff changeset
65 xdir_sep_char ('/'),
a2ab20ba78f7 make file_ops a proper singleton class
John W. Eaton <jwe@octave.org>
parents: 7520
diff changeset
66 xdir_sep_str ("/"),
a2ab20ba78f7 make file_ops a proper singleton class
John W. Eaton <jwe@octave.org>
parents: 7520
diff changeset
67 #endif
a2ab20ba78f7 make file_ops a proper singleton class
John W. Eaton <jwe@octave.org>
parents: 7520
diff changeset
68 #if defined (OCTAVE_HAVE_WINDOWS_FILESYSTEM)
a2ab20ba78f7 make file_ops a proper singleton class
John W. Eaton <jwe@octave.org>
parents: 7520
diff changeset
69 xdir_sep_chars ("/\\")
a2ab20ba78f7 make file_ops a proper singleton class
John W. Eaton <jwe@octave.org>
parents: 7520
diff changeset
70 #else
a2ab20ba78f7 make file_ops a proper singleton class
John W. Eaton <jwe@octave.org>
parents: 7520
diff changeset
71 xdir_sep_chars (xdir_sep_str)
a2ab20ba78f7 make file_ops a proper singleton class
John W. Eaton <jwe@octave.org>
parents: 7520
diff changeset
72 #endif
a2ab20ba78f7 make file_ops a proper singleton class
John W. Eaton <jwe@octave.org>
parents: 7520
diff changeset
73 { }
a2ab20ba78f7 make file_ops a proper singleton class
John W. Eaton <jwe@octave.org>
parents: 7520
diff changeset
74
a2ab20ba78f7 make file_ops a proper singleton class
John W. Eaton <jwe@octave.org>
parents: 7520
diff changeset
75 bool
8009
d936b21b3a6b file_ops: use singleton class for static data members
John W. Eaton <jwe@octave.org>
parents: 8007
diff changeset
76 file_ops::static_members::instance_ok (void)
8007
a2ab20ba78f7 make file_ops a proper singleton class
John W. Eaton <jwe@octave.org>
parents: 7520
diff changeset
77 {
a2ab20ba78f7 make file_ops a proper singleton class
John W. Eaton <jwe@octave.org>
parents: 7520
diff changeset
78 bool retval = true;
a2ab20ba78f7 make file_ops a proper singleton class
John W. Eaton <jwe@octave.org>
parents: 7520
diff changeset
79
a2ab20ba78f7 make file_ops a proper singleton class
John W. Eaton <jwe@octave.org>
parents: 7520
diff changeset
80 if (! instance)
8009
d936b21b3a6b file_ops: use singleton class for static data members
John W. Eaton <jwe@octave.org>
parents: 8007
diff changeset
81 instance = new static_members ();
8007
a2ab20ba78f7 make file_ops a proper singleton class
John W. Eaton <jwe@octave.org>
parents: 7520
diff changeset
82
a2ab20ba78f7 make file_ops a proper singleton class
John W. Eaton <jwe@octave.org>
parents: 7520
diff changeset
83 if (! instance)
a2ab20ba78f7 make file_ops a proper singleton class
John W. Eaton <jwe@octave.org>
parents: 7520
diff changeset
84 {
a2ab20ba78f7 make file_ops a proper singleton class
John W. Eaton <jwe@octave.org>
parents: 7520
diff changeset
85 (*current_liboctave_error_handler)
8009
d936b21b3a6b file_ops: use singleton class for static data members
John W. Eaton <jwe@octave.org>
parents: 8007
diff changeset
86 ("unable to create file_ops::static_members object!");
8007
a2ab20ba78f7 make file_ops a proper singleton class
John W. Eaton <jwe@octave.org>
parents: 7520
diff changeset
87
a2ab20ba78f7 make file_ops a proper singleton class
John W. Eaton <jwe@octave.org>
parents: 7520
diff changeset
88 retval = false;
a2ab20ba78f7 make file_ops a proper singleton class
John W. Eaton <jwe@octave.org>
parents: 7520
diff changeset
89 }
a2ab20ba78f7 make file_ops a proper singleton class
John W. Eaton <jwe@octave.org>
parents: 7520
diff changeset
90
a2ab20ba78f7 make file_ops a proper singleton class
John W. Eaton <jwe@octave.org>
parents: 7520
diff changeset
91 return retval;
a2ab20ba78f7 make file_ops a proper singleton class
John W. Eaton <jwe@octave.org>
parents: 7520
diff changeset
92 }
a2ab20ba78f7 make file_ops a proper singleton class
John W. Eaton <jwe@octave.org>
parents: 7520
diff changeset
93
2937
9d26524e2869 [project @ 1997-05-06 05:49:53 by jwe]
jwe
parents: 2934
diff changeset
94 #define NOT_SUPPORTED(nm) \
4062
86e4baa81410 [project @ 2002-09-23 15:38:05 by jwe]
jwe
parents: 3769
diff changeset
95 nm ": not supported on this system"
2937
9d26524e2869 [project @ 1997-05-06 05:49:53 by jwe]
jwe
parents: 2934
diff changeset
96
2433
3952436ca2c2 [project @ 1996-10-27 04:39:00 by jwe]
jwe
parents: 2431
diff changeset
97 // We provide a replacement for mkdir().
3952436ca2c2 [project @ 1996-10-27 04:39:00 by jwe]
jwe
parents: 2431
diff changeset
98
1765
a51354c34bea [project @ 1996-01-23 03:33:34 by jwe]
jwe
parents:
diff changeset
99 int
10172
96ed9db3345c provide wrappers for mkdir and mkfifo
John W. Eaton <jwe@octave.org>
parents: 10170
diff changeset
100 file_ops::mkdir (const std::string& nm, mode_t md)
96ed9db3345c provide wrappers for mkdir and mkfifo
John W. Eaton <jwe@octave.org>
parents: 10170
diff changeset
101 {
96ed9db3345c provide wrappers for mkdir and mkfifo
John W. Eaton <jwe@octave.org>
parents: 10170
diff changeset
102 std::string msg;
96ed9db3345c provide wrappers for mkdir and mkfifo
John W. Eaton <jwe@octave.org>
parents: 10170
diff changeset
103 return mkdir (nm, md, msg);
96ed9db3345c provide wrappers for mkdir and mkfifo
John W. Eaton <jwe@octave.org>
parents: 10170
diff changeset
104 }
96ed9db3345c provide wrappers for mkdir and mkfifo
John W. Eaton <jwe@octave.org>
parents: 10170
diff changeset
105
96ed9db3345c provide wrappers for mkdir and mkfifo
John W. Eaton <jwe@octave.org>
parents: 10170
diff changeset
106 int
96ed9db3345c provide wrappers for mkdir and mkfifo
John W. Eaton <jwe@octave.org>
parents: 10170
diff changeset
107 file_ops::mkdir (const std::string& name, mode_t mode, std::string& msg)
2668
0d865ef7478f [project @ 1997-02-13 18:21:47 by jwe]
jwe
parents: 2492
diff changeset
108 {
3504
5eef8a2294bd [project @ 2000-02-01 10:06:51 by jwe]
jwe
parents: 3503
diff changeset
109 msg = std::string ();
2668
0d865ef7478f [project @ 1997-02-13 18:21:47 by jwe]
jwe
parents: 2492
diff changeset
110
2937
9d26524e2869 [project @ 1997-05-06 05:49:53 by jwe]
jwe
parents: 2934
diff changeset
111 int status = -1;
9d26524e2869 [project @ 1997-05-06 05:49:53 by jwe]
jwe
parents: 2934
diff changeset
112
10172
96ed9db3345c provide wrappers for mkdir and mkfifo
John W. Eaton <jwe@octave.org>
parents: 10170
diff changeset
113 status = octave_mkdir (name.c_str (), mode);
2668
0d865ef7478f [project @ 1997-02-13 18:21:47 by jwe]
jwe
parents: 2492
diff changeset
114
0d865ef7478f [project @ 1997-02-13 18:21:47 by jwe]
jwe
parents: 2492
diff changeset
115 if (status < 0)
3504
5eef8a2294bd [project @ 2000-02-01 10:06:51 by jwe]
jwe
parents: 3503
diff changeset
116 {
5eef8a2294bd [project @ 2000-02-01 10:06:51 by jwe]
jwe
parents: 3503
diff changeset
117 using namespace std;
5eef8a2294bd [project @ 2000-02-01 10:06:51 by jwe]
jwe
parents: 3503
diff changeset
118 msg = ::strerror (errno);
5eef8a2294bd [project @ 2000-02-01 10:06:51 by jwe]
jwe
parents: 3503
diff changeset
119 }
2668
0d865ef7478f [project @ 1997-02-13 18:21:47 by jwe]
jwe
parents: 2492
diff changeset
120
0d865ef7478f [project @ 1997-02-13 18:21:47 by jwe]
jwe
parents: 2492
diff changeset
121 return status;
0d865ef7478f [project @ 1997-02-13 18:21:47 by jwe]
jwe
parents: 2492
diff changeset
122 }
0d865ef7478f [project @ 1997-02-13 18:21:47 by jwe]
jwe
parents: 2492
diff changeset
123
2433
3952436ca2c2 [project @ 1996-10-27 04:39:00 by jwe]
jwe
parents: 2431
diff changeset
124 // I don't know how to emulate this on systems that don't provide it.
3952436ca2c2 [project @ 1996-10-27 04:39:00 by jwe]
jwe
parents: 2431
diff changeset
125
1765
a51354c34bea [project @ 1996-01-23 03:33:34 by jwe]
jwe
parents:
diff changeset
126 int
10172
96ed9db3345c provide wrappers for mkdir and mkfifo
John W. Eaton <jwe@octave.org>
parents: 10170
diff changeset
127 file_ops::mkfifo (const std::string& nm, mode_t md)
96ed9db3345c provide wrappers for mkdir and mkfifo
John W. Eaton <jwe@octave.org>
parents: 10170
diff changeset
128 {
96ed9db3345c provide wrappers for mkdir and mkfifo
John W. Eaton <jwe@octave.org>
parents: 10170
diff changeset
129 std::string msg;
96ed9db3345c provide wrappers for mkdir and mkfifo
John W. Eaton <jwe@octave.org>
parents: 10170
diff changeset
130 return mkfifo (nm, md, msg);
96ed9db3345c provide wrappers for mkdir and mkfifo
John W. Eaton <jwe@octave.org>
parents: 10170
diff changeset
131 }
96ed9db3345c provide wrappers for mkdir and mkfifo
John W. Eaton <jwe@octave.org>
parents: 10170
diff changeset
132
96ed9db3345c provide wrappers for mkdir and mkfifo
John W. Eaton <jwe@octave.org>
parents: 10170
diff changeset
133 int
96ed9db3345c provide wrappers for mkdir and mkfifo
John W. Eaton <jwe@octave.org>
parents: 10170
diff changeset
134 file_ops::mkfifo (const std::string& name, mode_t mode, std::string& msg)
2668
0d865ef7478f [project @ 1997-02-13 18:21:47 by jwe]
jwe
parents: 2492
diff changeset
135 {
3504
5eef8a2294bd [project @ 2000-02-01 10:06:51 by jwe]
jwe
parents: 3503
diff changeset
136 msg = std::string ();
2668
0d865ef7478f [project @ 1997-02-13 18:21:47 by jwe]
jwe
parents: 2492
diff changeset
137
2937
9d26524e2869 [project @ 1997-05-06 05:49:53 by jwe]
jwe
parents: 2934
diff changeset
138 int status = -1;
9d26524e2869 [project @ 1997-05-06 05:49:53 by jwe]
jwe
parents: 2934
diff changeset
139
10028
52a248732bb6 use mkfifo module from gnulib
John W. Eaton <jwe@octave.org>
parents: 10027
diff changeset
140 // With gnulib we will always have mkfifo, but some systems like MinGW
52a248732bb6 use mkfifo module from gnulib
John W. Eaton <jwe@octave.org>
parents: 10027
diff changeset
141 // don't have working mkfifo functions. On those systems, mkfifo will
52a248732bb6 use mkfifo module from gnulib
John W. Eaton <jwe@octave.org>
parents: 10027
diff changeset
142 // always return -1 and set errno.
52a248732bb6 use mkfifo module from gnulib
John W. Eaton <jwe@octave.org>
parents: 10027
diff changeset
143
10172
96ed9db3345c provide wrappers for mkdir and mkfifo
John W. Eaton <jwe@octave.org>
parents: 10170
diff changeset
144 status = octave_mkfifo (name.c_str (), mode);
2668
0d865ef7478f [project @ 1997-02-13 18:21:47 by jwe]
jwe
parents: 2492
diff changeset
145
0d865ef7478f [project @ 1997-02-13 18:21:47 by jwe]
jwe
parents: 2492
diff changeset
146 if (status < 0)
3504
5eef8a2294bd [project @ 2000-02-01 10:06:51 by jwe]
jwe
parents: 3503
diff changeset
147 {
5eef8a2294bd [project @ 2000-02-01 10:06:51 by jwe]
jwe
parents: 3503
diff changeset
148 using namespace std;
5eef8a2294bd [project @ 2000-02-01 10:06:51 by jwe]
jwe
parents: 3503
diff changeset
149 msg = ::strerror (errno);
5eef8a2294bd [project @ 2000-02-01 10:06:51 by jwe]
jwe
parents: 3503
diff changeset
150 }
2668
0d865ef7478f [project @ 1997-02-13 18:21:47 by jwe]
jwe
parents: 2492
diff changeset
151
0d865ef7478f [project @ 1997-02-13 18:21:47 by jwe]
jwe
parents: 2492
diff changeset
152 return status;
0d865ef7478f [project @ 1997-02-13 18:21:47 by jwe]
jwe
parents: 2492
diff changeset
153 }
0d865ef7478f [project @ 1997-02-13 18:21:47 by jwe]
jwe
parents: 2492
diff changeset
154
3710
9a77deefb8c9 [project @ 2000-08-02 20:47:44 by jwe]
jwe
parents: 3504
diff changeset
155 // I don't know how to emulate this on systems that don't provide it.
9a77deefb8c9 [project @ 2000-08-02 20:47:44 by jwe]
jwe
parents: 3504
diff changeset
156
9a77deefb8c9 [project @ 2000-08-02 20:47:44 by jwe]
jwe
parents: 3504
diff changeset
157 int
9a77deefb8c9 [project @ 2000-08-02 20:47:44 by jwe]
jwe
parents: 3504
diff changeset
158 file_ops::link (const std::string& old_name, const std::string& new_name)
9a77deefb8c9 [project @ 2000-08-02 20:47:44 by jwe]
jwe
parents: 3504
diff changeset
159 {
9a77deefb8c9 [project @ 2000-08-02 20:47:44 by jwe]
jwe
parents: 3504
diff changeset
160 std::string msg;
9a77deefb8c9 [project @ 2000-08-02 20:47:44 by jwe]
jwe
parents: 3504
diff changeset
161 return link (old_name, new_name, msg);
9a77deefb8c9 [project @ 2000-08-02 20:47:44 by jwe]
jwe
parents: 3504
diff changeset
162 }
9a77deefb8c9 [project @ 2000-08-02 20:47:44 by jwe]
jwe
parents: 3504
diff changeset
163
9a77deefb8c9 [project @ 2000-08-02 20:47:44 by jwe]
jwe
parents: 3504
diff changeset
164 int
9a77deefb8c9 [project @ 2000-08-02 20:47:44 by jwe]
jwe
parents: 3504
diff changeset
165 file_ops::link (const std::string& old_name,
9a77deefb8c9 [project @ 2000-08-02 20:47:44 by jwe]
jwe
parents: 3504
diff changeset
166 const std::string& new_name, std::string& msg)
9a77deefb8c9 [project @ 2000-08-02 20:47:44 by jwe]
jwe
parents: 3504
diff changeset
167 {
9a77deefb8c9 [project @ 2000-08-02 20:47:44 by jwe]
jwe
parents: 3504
diff changeset
168 msg = std::string ();
9a77deefb8c9 [project @ 2000-08-02 20:47:44 by jwe]
jwe
parents: 3504
diff changeset
169
9a77deefb8c9 [project @ 2000-08-02 20:47:44 by jwe]
jwe
parents: 3504
diff changeset
170 int status = -1;
9a77deefb8c9 [project @ 2000-08-02 20:47:44 by jwe]
jwe
parents: 3504
diff changeset
171
10175
d354be89b2c3 use link module from gnulib
John W. Eaton <jwe@octave.org>
parents: 10174
diff changeset
172 status = octave_link (old_name.c_str (), new_name.c_str ());
3710
9a77deefb8c9 [project @ 2000-08-02 20:47:44 by jwe]
jwe
parents: 3504
diff changeset
173
9a77deefb8c9 [project @ 2000-08-02 20:47:44 by jwe]
jwe
parents: 3504
diff changeset
174 if (status < 0)
9a77deefb8c9 [project @ 2000-08-02 20:47:44 by jwe]
jwe
parents: 3504
diff changeset
175 {
9a77deefb8c9 [project @ 2000-08-02 20:47:44 by jwe]
jwe
parents: 3504
diff changeset
176 using namespace std;
9a77deefb8c9 [project @ 2000-08-02 20:47:44 by jwe]
jwe
parents: 3504
diff changeset
177 msg = ::strerror (errno);
9a77deefb8c9 [project @ 2000-08-02 20:47:44 by jwe]
jwe
parents: 3504
diff changeset
178 }
9a77deefb8c9 [project @ 2000-08-02 20:47:44 by jwe]
jwe
parents: 3504
diff changeset
179
9a77deefb8c9 [project @ 2000-08-02 20:47:44 by jwe]
jwe
parents: 3504
diff changeset
180 return status;
9a77deefb8c9 [project @ 2000-08-02 20:47:44 by jwe]
jwe
parents: 3504
diff changeset
181 }
9a77deefb8c9 [project @ 2000-08-02 20:47:44 by jwe]
jwe
parents: 3504
diff changeset
182
9a77deefb8c9 [project @ 2000-08-02 20:47:44 by jwe]
jwe
parents: 3504
diff changeset
183 // I don't know how to emulate this on systems that don't provide it.
9a77deefb8c9 [project @ 2000-08-02 20:47:44 by jwe]
jwe
parents: 3504
diff changeset
184
9a77deefb8c9 [project @ 2000-08-02 20:47:44 by jwe]
jwe
parents: 3504
diff changeset
185 int
9a77deefb8c9 [project @ 2000-08-02 20:47:44 by jwe]
jwe
parents: 3504
diff changeset
186 file_ops::symlink (const std::string& old_name, const std::string& new_name)
9a77deefb8c9 [project @ 2000-08-02 20:47:44 by jwe]
jwe
parents: 3504
diff changeset
187 {
9a77deefb8c9 [project @ 2000-08-02 20:47:44 by jwe]
jwe
parents: 3504
diff changeset
188 std::string msg;
9a77deefb8c9 [project @ 2000-08-02 20:47:44 by jwe]
jwe
parents: 3504
diff changeset
189 return symlink (old_name, new_name, msg);
9a77deefb8c9 [project @ 2000-08-02 20:47:44 by jwe]
jwe
parents: 3504
diff changeset
190 }
9a77deefb8c9 [project @ 2000-08-02 20:47:44 by jwe]
jwe
parents: 3504
diff changeset
191
9a77deefb8c9 [project @ 2000-08-02 20:47:44 by jwe]
jwe
parents: 3504
diff changeset
192 int
9a77deefb8c9 [project @ 2000-08-02 20:47:44 by jwe]
jwe
parents: 3504
diff changeset
193 file_ops::symlink (const std::string& old_name,
9a77deefb8c9 [project @ 2000-08-02 20:47:44 by jwe]
jwe
parents: 3504
diff changeset
194 const std::string& new_name, std::string& msg)
9a77deefb8c9 [project @ 2000-08-02 20:47:44 by jwe]
jwe
parents: 3504
diff changeset
195 {
9a77deefb8c9 [project @ 2000-08-02 20:47:44 by jwe]
jwe
parents: 3504
diff changeset
196 msg = std::string ();
9a77deefb8c9 [project @ 2000-08-02 20:47:44 by jwe]
jwe
parents: 3504
diff changeset
197
9a77deefb8c9 [project @ 2000-08-02 20:47:44 by jwe]
jwe
parents: 3504
diff changeset
198 int status = -1;
9a77deefb8c9 [project @ 2000-08-02 20:47:44 by jwe]
jwe
parents: 3504
diff changeset
199
10176
a0665fa8798c use symlink module from gnulib
John W. Eaton <jwe@octave.org>
parents: 10175
diff changeset
200 status = octave_symlink (old_name.c_str (), new_name.c_str ());
3710
9a77deefb8c9 [project @ 2000-08-02 20:47:44 by jwe]
jwe
parents: 3504
diff changeset
201
9a77deefb8c9 [project @ 2000-08-02 20:47:44 by jwe]
jwe
parents: 3504
diff changeset
202 if (status < 0)
9a77deefb8c9 [project @ 2000-08-02 20:47:44 by jwe]
jwe
parents: 3504
diff changeset
203 {
9a77deefb8c9 [project @ 2000-08-02 20:47:44 by jwe]
jwe
parents: 3504
diff changeset
204 using namespace std;
9a77deefb8c9 [project @ 2000-08-02 20:47:44 by jwe]
jwe
parents: 3504
diff changeset
205 msg = ::strerror (errno);
9a77deefb8c9 [project @ 2000-08-02 20:47:44 by jwe]
jwe
parents: 3504
diff changeset
206 }
9a77deefb8c9 [project @ 2000-08-02 20:47:44 by jwe]
jwe
parents: 3504
diff changeset
207
9a77deefb8c9 [project @ 2000-08-02 20:47:44 by jwe]
jwe
parents: 3504
diff changeset
208 return status;
9a77deefb8c9 [project @ 2000-08-02 20:47:44 by jwe]
jwe
parents: 3504
diff changeset
209 }
9a77deefb8c9 [project @ 2000-08-02 20:47:44 by jwe]
jwe
parents: 3504
diff changeset
210
10177
cb3d926b4d9e use readlink module from gnulib
John W. Eaton <jwe@octave.org>
parents: 10176
diff changeset
211 // We provide a replacement for readlink().
3710
9a77deefb8c9 [project @ 2000-08-02 20:47:44 by jwe]
jwe
parents: 3504
diff changeset
212
9a77deefb8c9 [project @ 2000-08-02 20:47:44 by jwe]
jwe
parents: 3504
diff changeset
213 int
9a77deefb8c9 [project @ 2000-08-02 20:47:44 by jwe]
jwe
parents: 3504
diff changeset
214 file_ops::readlink (const std::string& path, std::string& result)
9a77deefb8c9 [project @ 2000-08-02 20:47:44 by jwe]
jwe
parents: 3504
diff changeset
215 {
9a77deefb8c9 [project @ 2000-08-02 20:47:44 by jwe]
jwe
parents: 3504
diff changeset
216 std::string msg;
9a77deefb8c9 [project @ 2000-08-02 20:47:44 by jwe]
jwe
parents: 3504
diff changeset
217 return readlink (path, result, msg);
9a77deefb8c9 [project @ 2000-08-02 20:47:44 by jwe]
jwe
parents: 3504
diff changeset
218 }
9a77deefb8c9 [project @ 2000-08-02 20:47:44 by jwe]
jwe
parents: 3504
diff changeset
219
9a77deefb8c9 [project @ 2000-08-02 20:47:44 by jwe]
jwe
parents: 3504
diff changeset
220 int
9a77deefb8c9 [project @ 2000-08-02 20:47:44 by jwe]
jwe
parents: 3504
diff changeset
221 file_ops::readlink (const std::string& path, std::string& result,
9a77deefb8c9 [project @ 2000-08-02 20:47:44 by jwe]
jwe
parents: 3504
diff changeset
222 std::string& msg)
9a77deefb8c9 [project @ 2000-08-02 20:47:44 by jwe]
jwe
parents: 3504
diff changeset
223 {
9a77deefb8c9 [project @ 2000-08-02 20:47:44 by jwe]
jwe
parents: 3504
diff changeset
224 int status = -1;
9a77deefb8c9 [project @ 2000-08-02 20:47:44 by jwe]
jwe
parents: 3504
diff changeset
225
9a77deefb8c9 [project @ 2000-08-02 20:47:44 by jwe]
jwe
parents: 3504
diff changeset
226 msg = std::string ();
9a77deefb8c9 [project @ 2000-08-02 20:47:44 by jwe]
jwe
parents: 3504
diff changeset
227
9a77deefb8c9 [project @ 2000-08-02 20:47:44 by jwe]
jwe
parents: 3504
diff changeset
228 char buf[MAXPATHLEN+1];
9a77deefb8c9 [project @ 2000-08-02 20:47:44 by jwe]
jwe
parents: 3504
diff changeset
229
10177
cb3d926b4d9e use readlink module from gnulib
John W. Eaton <jwe@octave.org>
parents: 10176
diff changeset
230 status = octave_readlink (path.c_str (), buf, MAXPATHLEN);
3710
9a77deefb8c9 [project @ 2000-08-02 20:47:44 by jwe]
jwe
parents: 3504
diff changeset
231
9a77deefb8c9 [project @ 2000-08-02 20:47:44 by jwe]
jwe
parents: 3504
diff changeset
232 if (status < 0)
9a77deefb8c9 [project @ 2000-08-02 20:47:44 by jwe]
jwe
parents: 3504
diff changeset
233 {
9a77deefb8c9 [project @ 2000-08-02 20:47:44 by jwe]
jwe
parents: 3504
diff changeset
234 using namespace std;
9a77deefb8c9 [project @ 2000-08-02 20:47:44 by jwe]
jwe
parents: 3504
diff changeset
235 msg = ::strerror (errno);
9a77deefb8c9 [project @ 2000-08-02 20:47:44 by jwe]
jwe
parents: 3504
diff changeset
236 }
9a77deefb8c9 [project @ 2000-08-02 20:47:44 by jwe]
jwe
parents: 3504
diff changeset
237 else
9a77deefb8c9 [project @ 2000-08-02 20:47:44 by jwe]
jwe
parents: 3504
diff changeset
238 {
9a77deefb8c9 [project @ 2000-08-02 20:47:44 by jwe]
jwe
parents: 3504
diff changeset
239 buf[status] = '\0';
3769
7c8e3c42ed04 [project @ 2001-01-31 22:15:51 by jwe]
jwe
parents: 3710
diff changeset
240 result = std::string (buf);
3710
9a77deefb8c9 [project @ 2000-08-02 20:47:44 by jwe]
jwe
parents: 3504
diff changeset
241 status = 0;
9a77deefb8c9 [project @ 2000-08-02 20:47:44 by jwe]
jwe
parents: 3504
diff changeset
242 }
9a77deefb8c9 [project @ 2000-08-02 20:47:44 by jwe]
jwe
parents: 3504
diff changeset
243
9a77deefb8c9 [project @ 2000-08-02 20:47:44 by jwe]
jwe
parents: 3504
diff changeset
244 return status;
9a77deefb8c9 [project @ 2000-08-02 20:47:44 by jwe]
jwe
parents: 3504
diff changeset
245 }
9a77deefb8c9 [project @ 2000-08-02 20:47:44 by jwe]
jwe
parents: 3504
diff changeset
246
2433
3952436ca2c2 [project @ 1996-10-27 04:39:00 by jwe]
jwe
parents: 2431
diff changeset
247 // We provide a replacement for rename().
3952436ca2c2 [project @ 1996-10-27 04:39:00 by jwe]
jwe
parents: 2431
diff changeset
248
1765
a51354c34bea [project @ 1996-01-23 03:33:34 by jwe]
jwe
parents:
diff changeset
249 int
3504
5eef8a2294bd [project @ 2000-02-01 10:06:51 by jwe]
jwe
parents: 3503
diff changeset
250 file_ops::rename (const std::string& from, const std::string& to)
1765
a51354c34bea [project @ 1996-01-23 03:33:34 by jwe]
jwe
parents:
diff changeset
251 {
3504
5eef8a2294bd [project @ 2000-02-01 10:06:51 by jwe]
jwe
parents: 3503
diff changeset
252 std::string msg;
2937
9d26524e2869 [project @ 1997-05-06 05:49:53 by jwe]
jwe
parents: 2934
diff changeset
253 return rename (from, to, msg);
1765
a51354c34bea [project @ 1996-01-23 03:33:34 by jwe]
jwe
parents:
diff changeset
254 }
a51354c34bea [project @ 1996-01-23 03:33:34 by jwe]
jwe
parents:
diff changeset
255
2668
0d865ef7478f [project @ 1997-02-13 18:21:47 by jwe]
jwe
parents: 2492
diff changeset
256 int
3504
5eef8a2294bd [project @ 2000-02-01 10:06:51 by jwe]
jwe
parents: 3503
diff changeset
257 file_ops::rename (const std::string& from, const std::string& to,
5eef8a2294bd [project @ 2000-02-01 10:06:51 by jwe]
jwe
parents: 3503
diff changeset
258 std::string& msg)
2668
0d865ef7478f [project @ 1997-02-13 18:21:47 by jwe]
jwe
parents: 2492
diff changeset
259 {
2937
9d26524e2869 [project @ 1997-05-06 05:49:53 by jwe]
jwe
parents: 2934
diff changeset
260 int status = -1;
9d26524e2869 [project @ 1997-05-06 05:49:53 by jwe]
jwe
parents: 2934
diff changeset
261
3504
5eef8a2294bd [project @ 2000-02-01 10:06:51 by jwe]
jwe
parents: 3503
diff changeset
262 msg = std::string ();
2668
0d865ef7478f [project @ 1997-02-13 18:21:47 by jwe]
jwe
parents: 2492
diff changeset
263
10170
1dffc8b2fca7 use rename module from gnulib
John W. Eaton <jwe@octave.org>
parents: 10169
diff changeset
264 status = octave_rename (from.c_str (), to.c_str ());
2668
0d865ef7478f [project @ 1997-02-13 18:21:47 by jwe]
jwe
parents: 2492
diff changeset
265
0d865ef7478f [project @ 1997-02-13 18:21:47 by jwe]
jwe
parents: 2492
diff changeset
266 if (status < 0)
3504
5eef8a2294bd [project @ 2000-02-01 10:06:51 by jwe]
jwe
parents: 3503
diff changeset
267 {
5eef8a2294bd [project @ 2000-02-01 10:06:51 by jwe]
jwe
parents: 3503
diff changeset
268 using namespace std;
5eef8a2294bd [project @ 2000-02-01 10:06:51 by jwe]
jwe
parents: 3503
diff changeset
269 msg = ::strerror (errno);
5eef8a2294bd [project @ 2000-02-01 10:06:51 by jwe]
jwe
parents: 3503
diff changeset
270 }
2668
0d865ef7478f [project @ 1997-02-13 18:21:47 by jwe]
jwe
parents: 2492
diff changeset
271
0d865ef7478f [project @ 1997-02-13 18:21:47 by jwe]
jwe
parents: 2492
diff changeset
272 return status;
0d865ef7478f [project @ 1997-02-13 18:21:47 by jwe]
jwe
parents: 2492
diff changeset
273 }
0d865ef7478f [project @ 1997-02-13 18:21:47 by jwe]
jwe
parents: 2492
diff changeset
274
2433
3952436ca2c2 [project @ 1996-10-27 04:39:00 by jwe]
jwe
parents: 2431
diff changeset
275 // We provide a replacement for rmdir().
3952436ca2c2 [project @ 1996-10-27 04:39:00 by jwe]
jwe
parents: 2431
diff changeset
276
1765
a51354c34bea [project @ 1996-01-23 03:33:34 by jwe]
jwe
parents:
diff changeset
277 int
3504
5eef8a2294bd [project @ 2000-02-01 10:06:51 by jwe]
jwe
parents: 3503
diff changeset
278 file_ops::rmdir (const std::string& name)
1765
a51354c34bea [project @ 1996-01-23 03:33:34 by jwe]
jwe
parents:
diff changeset
279 {
3504
5eef8a2294bd [project @ 2000-02-01 10:06:51 by jwe]
jwe
parents: 3503
diff changeset
280 std::string msg;
2937
9d26524e2869 [project @ 1997-05-06 05:49:53 by jwe]
jwe
parents: 2934
diff changeset
281 return rmdir (name, msg);
1765
a51354c34bea [project @ 1996-01-23 03:33:34 by jwe]
jwe
parents:
diff changeset
282 }
a51354c34bea [project @ 1996-01-23 03:33:34 by jwe]
jwe
parents:
diff changeset
283
2668
0d865ef7478f [project @ 1997-02-13 18:21:47 by jwe]
jwe
parents: 2492
diff changeset
284 int
3504
5eef8a2294bd [project @ 2000-02-01 10:06:51 by jwe]
jwe
parents: 3503
diff changeset
285 file_ops::rmdir (const std::string& name, std::string& msg)
2668
0d865ef7478f [project @ 1997-02-13 18:21:47 by jwe]
jwe
parents: 2492
diff changeset
286 {
3504
5eef8a2294bd [project @ 2000-02-01 10:06:51 by jwe]
jwe
parents: 3503
diff changeset
287 msg = std::string ();
2668
0d865ef7478f [project @ 1997-02-13 18:21:47 by jwe]
jwe
parents: 2492
diff changeset
288
2937
9d26524e2869 [project @ 1997-05-06 05:49:53 by jwe]
jwe
parents: 2934
diff changeset
289 int status = -1;
9d26524e2869 [project @ 1997-05-06 05:49:53 by jwe]
jwe
parents: 2934
diff changeset
290
10169
06bd6e57f889 use rmdir module from gnulib
John W. Eaton <jwe@octave.org>
parents: 10158
diff changeset
291 status = octave_rmdir (name.c_str ());
2668
0d865ef7478f [project @ 1997-02-13 18:21:47 by jwe]
jwe
parents: 2492
diff changeset
292
0d865ef7478f [project @ 1997-02-13 18:21:47 by jwe]
jwe
parents: 2492
diff changeset
293 if (status < 0)
3504
5eef8a2294bd [project @ 2000-02-01 10:06:51 by jwe]
jwe
parents: 3503
diff changeset
294 {
5eef8a2294bd [project @ 2000-02-01 10:06:51 by jwe]
jwe
parents: 3503
diff changeset
295 using namespace std;
5eef8a2294bd [project @ 2000-02-01 10:06:51 by jwe]
jwe
parents: 3503
diff changeset
296 msg = ::strerror (errno);
5eef8a2294bd [project @ 2000-02-01 10:06:51 by jwe]
jwe
parents: 3503
diff changeset
297 }
2668
0d865ef7478f [project @ 1997-02-13 18:21:47 by jwe]
jwe
parents: 2492
diff changeset
298
0d865ef7478f [project @ 1997-02-13 18:21:47 by jwe]
jwe
parents: 2492
diff changeset
299 return status;
0d865ef7478f [project @ 1997-02-13 18:21:47 by jwe]
jwe
parents: 2492
diff changeset
300 }
0d865ef7478f [project @ 1997-02-13 18:21:47 by jwe]
jwe
parents: 2492
diff changeset
301
5476
941f0fc6b596 [project @ 2005-09-29 22:46:07 by jwe]
jwe
parents: 5307
diff changeset
302 // And a version that works recursively.
941f0fc6b596 [project @ 2005-09-29 22:46:07 by jwe]
jwe
parents: 5307
diff changeset
303
941f0fc6b596 [project @ 2005-09-29 22:46:07 by jwe]
jwe
parents: 5307
diff changeset
304 int
941f0fc6b596 [project @ 2005-09-29 22:46:07 by jwe]
jwe
parents: 5307
diff changeset
305 file_ops::recursive_rmdir (const std::string& name)
941f0fc6b596 [project @ 2005-09-29 22:46:07 by jwe]
jwe
parents: 5307
diff changeset
306 {
941f0fc6b596 [project @ 2005-09-29 22:46:07 by jwe]
jwe
parents: 5307
diff changeset
307 std::string msg;
941f0fc6b596 [project @ 2005-09-29 22:46:07 by jwe]
jwe
parents: 5307
diff changeset
308 return recursive_rmdir (name, msg);
941f0fc6b596 [project @ 2005-09-29 22:46:07 by jwe]
jwe
parents: 5307
diff changeset
309 }
941f0fc6b596 [project @ 2005-09-29 22:46:07 by jwe]
jwe
parents: 5307
diff changeset
310
941f0fc6b596 [project @ 2005-09-29 22:46:07 by jwe]
jwe
parents: 5307
diff changeset
311 int
941f0fc6b596 [project @ 2005-09-29 22:46:07 by jwe]
jwe
parents: 5307
diff changeset
312 file_ops::recursive_rmdir (const std::string& name, std::string& msg)
941f0fc6b596 [project @ 2005-09-29 22:46:07 by jwe]
jwe
parents: 5307
diff changeset
313 {
941f0fc6b596 [project @ 2005-09-29 22:46:07 by jwe]
jwe
parents: 5307
diff changeset
314 msg = std::string ();
941f0fc6b596 [project @ 2005-09-29 22:46:07 by jwe]
jwe
parents: 5307
diff changeset
315
941f0fc6b596 [project @ 2005-09-29 22:46:07 by jwe]
jwe
parents: 5307
diff changeset
316 int status = 0;
941f0fc6b596 [project @ 2005-09-29 22:46:07 by jwe]
jwe
parents: 5307
diff changeset
317
941f0fc6b596 [project @ 2005-09-29 22:46:07 by jwe]
jwe
parents: 5307
diff changeset
318 dir_entry dir (name);
941f0fc6b596 [project @ 2005-09-29 22:46:07 by jwe]
jwe
parents: 5307
diff changeset
319
941f0fc6b596 [project @ 2005-09-29 22:46:07 by jwe]
jwe
parents: 5307
diff changeset
320 if (dir)
941f0fc6b596 [project @ 2005-09-29 22:46:07 by jwe]
jwe
parents: 5307
diff changeset
321 {
941f0fc6b596 [project @ 2005-09-29 22:46:07 by jwe]
jwe
parents: 5307
diff changeset
322 string_vector dirlist = dir.read ();
941f0fc6b596 [project @ 2005-09-29 22:46:07 by jwe]
jwe
parents: 5307
diff changeset
323
941f0fc6b596 [project @ 2005-09-29 22:46:07 by jwe]
jwe
parents: 5307
diff changeset
324 for (octave_idx_type i = 0; i < dirlist.length (); i++)
941f0fc6b596 [project @ 2005-09-29 22:46:07 by jwe]
jwe
parents: 5307
diff changeset
325 {
10142
829e69ec3110 make OCTAVE_QUIT a function
Jaroslav Hajek <highegg@gmail.com>
parents: 10038
diff changeset
326 octave_quit ();
5476
941f0fc6b596 [project @ 2005-09-29 22:46:07 by jwe]
jwe
parents: 5307
diff changeset
327
941f0fc6b596 [project @ 2005-09-29 22:46:07 by jwe]
jwe
parents: 5307
diff changeset
328 std::string nm = dirlist[i];
941f0fc6b596 [project @ 2005-09-29 22:46:07 by jwe]
jwe
parents: 5307
diff changeset
329
941f0fc6b596 [project @ 2005-09-29 22:46:07 by jwe]
jwe
parents: 5307
diff changeset
330 // Skip current directory and parent.
941f0fc6b596 [project @ 2005-09-29 22:46:07 by jwe]
jwe
parents: 5307
diff changeset
331 if (nm == "." || nm == "..")
941f0fc6b596 [project @ 2005-09-29 22:46:07 by jwe]
jwe
parents: 5307
diff changeset
332 continue;
941f0fc6b596 [project @ 2005-09-29 22:46:07 by jwe]
jwe
parents: 5307
diff changeset
333
8007
a2ab20ba78f7 make file_ops a proper singleton class
John W. Eaton <jwe@octave.org>
parents: 7520
diff changeset
334 std::string fullnm = name + file_ops::dir_sep_str () + nm;
5476
941f0fc6b596 [project @ 2005-09-29 22:46:07 by jwe]
jwe
parents: 5307
diff changeset
335
941f0fc6b596 [project @ 2005-09-29 22:46:07 by jwe]
jwe
parents: 5307
diff changeset
336 // Get info about the file. Don't follow links.
941f0fc6b596 [project @ 2005-09-29 22:46:07 by jwe]
jwe
parents: 5307
diff changeset
337 file_stat fs (fullnm, false);
941f0fc6b596 [project @ 2005-09-29 22:46:07 by jwe]
jwe
parents: 5307
diff changeset
338
941f0fc6b596 [project @ 2005-09-29 22:46:07 by jwe]
jwe
parents: 5307
diff changeset
339 if (fs)
941f0fc6b596 [project @ 2005-09-29 22:46:07 by jwe]
jwe
parents: 5307
diff changeset
340 {
941f0fc6b596 [project @ 2005-09-29 22:46:07 by jwe]
jwe
parents: 5307
diff changeset
341 if (fs.is_dir ())
941f0fc6b596 [project @ 2005-09-29 22:46:07 by jwe]
jwe
parents: 5307
diff changeset
342 {
941f0fc6b596 [project @ 2005-09-29 22:46:07 by jwe]
jwe
parents: 5307
diff changeset
343 status = recursive_rmdir (fullnm, msg);
941f0fc6b596 [project @ 2005-09-29 22:46:07 by jwe]
jwe
parents: 5307
diff changeset
344
941f0fc6b596 [project @ 2005-09-29 22:46:07 by jwe]
jwe
parents: 5307
diff changeset
345 if (status < 0)
941f0fc6b596 [project @ 2005-09-29 22:46:07 by jwe]
jwe
parents: 5307
diff changeset
346 break;
941f0fc6b596 [project @ 2005-09-29 22:46:07 by jwe]
jwe
parents: 5307
diff changeset
347 }
941f0fc6b596 [project @ 2005-09-29 22:46:07 by jwe]
jwe
parents: 5307
diff changeset
348 else
941f0fc6b596 [project @ 2005-09-29 22:46:07 by jwe]
jwe
parents: 5307
diff changeset
349 {
941f0fc6b596 [project @ 2005-09-29 22:46:07 by jwe]
jwe
parents: 5307
diff changeset
350 status = unlink (fullnm, msg);
941f0fc6b596 [project @ 2005-09-29 22:46:07 by jwe]
jwe
parents: 5307
diff changeset
351
941f0fc6b596 [project @ 2005-09-29 22:46:07 by jwe]
jwe
parents: 5307
diff changeset
352 if (status < 0)
941f0fc6b596 [project @ 2005-09-29 22:46:07 by jwe]
jwe
parents: 5307
diff changeset
353 break;
941f0fc6b596 [project @ 2005-09-29 22:46:07 by jwe]
jwe
parents: 5307
diff changeset
354 }
941f0fc6b596 [project @ 2005-09-29 22:46:07 by jwe]
jwe
parents: 5307
diff changeset
355 }
941f0fc6b596 [project @ 2005-09-29 22:46:07 by jwe]
jwe
parents: 5307
diff changeset
356 else
941f0fc6b596 [project @ 2005-09-29 22:46:07 by jwe]
jwe
parents: 5307
diff changeset
357 {
941f0fc6b596 [project @ 2005-09-29 22:46:07 by jwe]
jwe
parents: 5307
diff changeset
358 msg = fs.error ();
941f0fc6b596 [project @ 2005-09-29 22:46:07 by jwe]
jwe
parents: 5307
diff changeset
359 break;
941f0fc6b596 [project @ 2005-09-29 22:46:07 by jwe]
jwe
parents: 5307
diff changeset
360 }
941f0fc6b596 [project @ 2005-09-29 22:46:07 by jwe]
jwe
parents: 5307
diff changeset
361 }
941f0fc6b596 [project @ 2005-09-29 22:46:07 by jwe]
jwe
parents: 5307
diff changeset
362
941f0fc6b596 [project @ 2005-09-29 22:46:07 by jwe]
jwe
parents: 5307
diff changeset
363 if (status >= 0)
6363
e5227a46343d [project @ 2007-02-27 15:12:25 by jwe]
jwe
parents: 6273
diff changeset
364 {
e5227a46343d [project @ 2007-02-27 15:12:25 by jwe]
jwe
parents: 6273
diff changeset
365 dir.close ();
e5227a46343d [project @ 2007-02-27 15:12:25 by jwe]
jwe
parents: 6273
diff changeset
366 status = file_ops::rmdir (name, msg);
e5227a46343d [project @ 2007-02-27 15:12:25 by jwe]
jwe
parents: 6273
diff changeset
367 }
5476
941f0fc6b596 [project @ 2005-09-29 22:46:07 by jwe]
jwe
parents: 5307
diff changeset
368 }
941f0fc6b596 [project @ 2005-09-29 22:46:07 by jwe]
jwe
parents: 5307
diff changeset
369 else
941f0fc6b596 [project @ 2005-09-29 22:46:07 by jwe]
jwe
parents: 5307
diff changeset
370 {
941f0fc6b596 [project @ 2005-09-29 22:46:07 by jwe]
jwe
parents: 5307
diff changeset
371 status = -1;
941f0fc6b596 [project @ 2005-09-29 22:46:07 by jwe]
jwe
parents: 5307
diff changeset
372
941f0fc6b596 [project @ 2005-09-29 22:46:07 by jwe]
jwe
parents: 5307
diff changeset
373 msg = dir.error ();
941f0fc6b596 [project @ 2005-09-29 22:46:07 by jwe]
jwe
parents: 5307
diff changeset
374 }
941f0fc6b596 [project @ 2005-09-29 22:46:07 by jwe]
jwe
parents: 5307
diff changeset
375
941f0fc6b596 [project @ 2005-09-29 22:46:07 by jwe]
jwe
parents: 5307
diff changeset
376 return status;
941f0fc6b596 [project @ 2005-09-29 22:46:07 by jwe]
jwe
parents: 5307
diff changeset
377 }
941f0fc6b596 [project @ 2005-09-29 22:46:07 by jwe]
jwe
parents: 5307
diff changeset
378
5138
5fa9670b5956 [project @ 2005-02-09 23:13:03 by jwe]
jwe
parents: 4726
diff changeset
379 std::string
5fa9670b5956 [project @ 2005-02-09 23:13:03 by jwe]
jwe
parents: 4726
diff changeset
380 file_ops::canonicalize_file_name (const std::string& name)
5fa9670b5956 [project @ 2005-02-09 23:13:03 by jwe]
jwe
parents: 4726
diff changeset
381 {
5fa9670b5956 [project @ 2005-02-09 23:13:03 by jwe]
jwe
parents: 4726
diff changeset
382 std::string msg;
5fa9670b5956 [project @ 2005-02-09 23:13:03 by jwe]
jwe
parents: 4726
diff changeset
383 return canonicalize_file_name (name, msg);
5fa9670b5956 [project @ 2005-02-09 23:13:03 by jwe]
jwe
parents: 4726
diff changeset
384 }
5fa9670b5956 [project @ 2005-02-09 23:13:03 by jwe]
jwe
parents: 4726
diff changeset
385
5fa9670b5956 [project @ 2005-02-09 23:13:03 by jwe]
jwe
parents: 4726
diff changeset
386 std::string
5fa9670b5956 [project @ 2005-02-09 23:13:03 by jwe]
jwe
parents: 4726
diff changeset
387 file_ops::canonicalize_file_name (const std::string& name, std::string& msg)
5fa9670b5956 [project @ 2005-02-09 23:13:03 by jwe]
jwe
parents: 4726
diff changeset
388 {
5fa9670b5956 [project @ 2005-02-09 23:13:03 by jwe]
jwe
parents: 4726
diff changeset
389 msg = std::string ();
5fa9670b5956 [project @ 2005-02-09 23:13:03 by jwe]
jwe
parents: 4726
diff changeset
390
5fa9670b5956 [project @ 2005-02-09 23:13:03 by jwe]
jwe
parents: 4726
diff changeset
391 std::string retval;
5fa9670b5956 [project @ 2005-02-09 23:13:03 by jwe]
jwe
parents: 4726
diff changeset
392
5fa9670b5956 [project @ 2005-02-09 23:13:03 by jwe]
jwe
parents: 4726
diff changeset
393 #if defined (HAVE_CANONICALIZE_FILE_NAME)
5fa9670b5956 [project @ 2005-02-09 23:13:03 by jwe]
jwe
parents: 4726
diff changeset
394
5fa9670b5956 [project @ 2005-02-09 23:13:03 by jwe]
jwe
parents: 4726
diff changeset
395 char *tmp = ::canonicalize_file_name (name.c_str ());
5fa9670b5956 [project @ 2005-02-09 23:13:03 by jwe]
jwe
parents: 4726
diff changeset
396
5fa9670b5956 [project @ 2005-02-09 23:13:03 by jwe]
jwe
parents: 4726
diff changeset
397 if (tmp)
5fa9670b5956 [project @ 2005-02-09 23:13:03 by jwe]
jwe
parents: 4726
diff changeset
398 {
5fa9670b5956 [project @ 2005-02-09 23:13:03 by jwe]
jwe
parents: 4726
diff changeset
399 retval = tmp;
5fa9670b5956 [project @ 2005-02-09 23:13:03 by jwe]
jwe
parents: 4726
diff changeset
400 ::free (tmp);
5fa9670b5956 [project @ 2005-02-09 23:13:03 by jwe]
jwe
parents: 4726
diff changeset
401 }
5fa9670b5956 [project @ 2005-02-09 23:13:03 by jwe]
jwe
parents: 4726
diff changeset
402
5fa9670b5956 [project @ 2005-02-09 23:13:03 by jwe]
jwe
parents: 4726
diff changeset
403 #elif defined (HAVE_RESOLVEPATH)
5fa9670b5956 [project @ 2005-02-09 23:13:03 by jwe]
jwe
parents: 4726
diff changeset
404
5fa9670b5956 [project @ 2005-02-09 23:13:03 by jwe]
jwe
parents: 4726
diff changeset
405 #if !defined (errno)
5fa9670b5956 [project @ 2005-02-09 23:13:03 by jwe]
jwe
parents: 4726
diff changeset
406 extern int errno;
5fa9670b5956 [project @ 2005-02-09 23:13:03 by jwe]
jwe
parents: 4726
diff changeset
407 #endif
5fa9670b5956 [project @ 2005-02-09 23:13:03 by jwe]
jwe
parents: 4726
diff changeset
408
5fa9670b5956 [project @ 2005-02-09 23:13:03 by jwe]
jwe
parents: 4726
diff changeset
409 #if !defined (__set_errno)
5fa9670b5956 [project @ 2005-02-09 23:13:03 by jwe]
jwe
parents: 4726
diff changeset
410 # define __set_errno(Val) errno = (Val)
5fa9670b5956 [project @ 2005-02-09 23:13:03 by jwe]
jwe
parents: 4726
diff changeset
411 #endif
5fa9670b5956 [project @ 2005-02-09 23:13:03 by jwe]
jwe
parents: 4726
diff changeset
412
5fa9670b5956 [project @ 2005-02-09 23:13:03 by jwe]
jwe
parents: 4726
diff changeset
413 if (name.empty ())
5fa9670b5956 [project @ 2005-02-09 23:13:03 by jwe]
jwe
parents: 4726
diff changeset
414 {
5fa9670b5956 [project @ 2005-02-09 23:13:03 by jwe]
jwe
parents: 4726
diff changeset
415 __set_errno (ENOENT);
5fa9670b5956 [project @ 2005-02-09 23:13:03 by jwe]
jwe
parents: 4726
diff changeset
416 return retval;
5fa9670b5956 [project @ 2005-02-09 23:13:03 by jwe]
jwe
parents: 4726
diff changeset
417 }
5fa9670b5956 [project @ 2005-02-09 23:13:03 by jwe]
jwe
parents: 4726
diff changeset
418
5fa9670b5956 [project @ 2005-02-09 23:13:03 by jwe]
jwe
parents: 4726
diff changeset
419 // All known hosts with resolvepath (e.g. Solaris 7) don't turn
5fa9670b5956 [project @ 2005-02-09 23:13:03 by jwe]
jwe
parents: 4726
diff changeset
420 // relative names into absolute ones, so prepend the working
5fa9670b5956 [project @ 2005-02-09 23:13:03 by jwe]
jwe
parents: 4726
diff changeset
421 // directory if the path is not absolute.
5fa9670b5956 [project @ 2005-02-09 23:13:03 by jwe]
jwe
parents: 4726
diff changeset
422
5149
8b7b4ffab39c [project @ 2005-02-18 21:59:24 by jwe]
jwe
parents: 5138
diff changeset
423 std::string absolute_name
8b7b4ffab39c [project @ 2005-02-18 21:59:24 by jwe]
jwe
parents: 5138
diff changeset
424 = octave_env::make_absolute (name, octave_env::getcwd ());
5138
5fa9670b5956 [project @ 2005-02-09 23:13:03 by jwe]
jwe
parents: 4726
diff changeset
425
5149
8b7b4ffab39c [project @ 2005-02-18 21:59:24 by jwe]
jwe
parents: 5138
diff changeset
426 size_t resolved_size = absolute_name.length ();
5138
5fa9670b5956 [project @ 2005-02-09 23:13:03 by jwe]
jwe
parents: 4726
diff changeset
427
6208
323be5eeed1f [project @ 2006-12-06 20:23:18 by jwe]
jwe
parents: 5775
diff changeset
428 while (true)
5138
5fa9670b5956 [project @ 2005-02-09 23:13:03 by jwe]
jwe
parents: 4726
diff changeset
429 {
5fa9670b5956 [project @ 2005-02-09 23:13:03 by jwe]
jwe
parents: 4726
diff changeset
430 resolved_size = 2 * resolved_size + 1;
5fa9670b5956 [project @ 2005-02-09 23:13:03 by jwe]
jwe
parents: 4726
diff changeset
431
5fa9670b5956 [project @ 2005-02-09 23:13:03 by jwe]
jwe
parents: 4726
diff changeset
432 OCTAVE_LOCAL_BUFFER (char, resolved, resolved_size);
5fa9670b5956 [project @ 2005-02-09 23:13:03 by jwe]
jwe
parents: 4726
diff changeset
433
5149
8b7b4ffab39c [project @ 2005-02-18 21:59:24 by jwe]
jwe
parents: 5138
diff changeset
434 int resolved_len
8b7b4ffab39c [project @ 2005-02-18 21:59:24 by jwe]
jwe
parents: 5138
diff changeset
435 = ::resolvepath (absolute_name.c_str (), resolved, resolved_size);
5138
5fa9670b5956 [project @ 2005-02-09 23:13:03 by jwe]
jwe
parents: 4726
diff changeset
436
5fa9670b5956 [project @ 2005-02-09 23:13:03 by jwe]
jwe
parents: 4726
diff changeset
437 if (resolved_len < 0)
5fa9670b5956 [project @ 2005-02-09 23:13:03 by jwe]
jwe
parents: 4726
diff changeset
438 break;
5fa9670b5956 [project @ 2005-02-09 23:13:03 by jwe]
jwe
parents: 4726
diff changeset
439
5fa9670b5956 [project @ 2005-02-09 23:13:03 by jwe]
jwe
parents: 4726
diff changeset
440 if (resolved_len < resolved_size)
5fa9670b5956 [project @ 2005-02-09 23:13:03 by jwe]
jwe
parents: 4726
diff changeset
441 {
5fa9670b5956 [project @ 2005-02-09 23:13:03 by jwe]
jwe
parents: 4726
diff changeset
442 retval = resolved;
5fa9670b5956 [project @ 2005-02-09 23:13:03 by jwe]
jwe
parents: 4726
diff changeset
443 break;
5fa9670b5956 [project @ 2005-02-09 23:13:03 by jwe]
jwe
parents: 4726
diff changeset
444 }
5fa9670b5956 [project @ 2005-02-09 23:13:03 by jwe]
jwe
parents: 4726
diff changeset
445 }
5fa9670b5956 [project @ 2005-02-09 23:13:03 by jwe]
jwe
parents: 4726
diff changeset
446
6208
323be5eeed1f [project @ 2006-12-06 20:23:18 by jwe]
jwe
parents: 5775
diff changeset
447 #elif defined (__WIN32__)
323be5eeed1f [project @ 2006-12-06 20:23:18 by jwe]
jwe
parents: 5775
diff changeset
448
323be5eeed1f [project @ 2006-12-06 20:23:18 by jwe]
jwe
parents: 5775
diff changeset
449 int n = 1024;
323be5eeed1f [project @ 2006-12-06 20:23:18 by jwe]
jwe
parents: 5775
diff changeset
450
323be5eeed1f [project @ 2006-12-06 20:23:18 by jwe]
jwe
parents: 5775
diff changeset
451 std::string win_path (n, '\0');
323be5eeed1f [project @ 2006-12-06 20:23:18 by jwe]
jwe
parents: 5775
diff changeset
452
323be5eeed1f [project @ 2006-12-06 20:23:18 by jwe]
jwe
parents: 5775
diff changeset
453 while (true)
323be5eeed1f [project @ 2006-12-06 20:23:18 by jwe]
jwe
parents: 5775
diff changeset
454 {
7520
b166043585a8 use 0 instead of NULL
John W. Eaton <jwe@octave.org>
parents: 7272
diff changeset
455 int status = GetFullPathName (name.c_str (), n, &win_path[0], 0);
6208
323be5eeed1f [project @ 2006-12-06 20:23:18 by jwe]
jwe
parents: 5775
diff changeset
456
323be5eeed1f [project @ 2006-12-06 20:23:18 by jwe]
jwe
parents: 5775
diff changeset
457 if (status == 0)
323be5eeed1f [project @ 2006-12-06 20:23:18 by jwe]
jwe
parents: 5775
diff changeset
458 break;
323be5eeed1f [project @ 2006-12-06 20:23:18 by jwe]
jwe
parents: 5775
diff changeset
459 else if (status < n)
323be5eeed1f [project @ 2006-12-06 20:23:18 by jwe]
jwe
parents: 5775
diff changeset
460 {
323be5eeed1f [project @ 2006-12-06 20:23:18 by jwe]
jwe
parents: 5775
diff changeset
461 win_path.resize (status);
323be5eeed1f [project @ 2006-12-06 20:23:18 by jwe]
jwe
parents: 5775
diff changeset
462 retval = win_path;
323be5eeed1f [project @ 2006-12-06 20:23:18 by jwe]
jwe
parents: 5775
diff changeset
463 break;
323be5eeed1f [project @ 2006-12-06 20:23:18 by jwe]
jwe
parents: 5775
diff changeset
464 }
323be5eeed1f [project @ 2006-12-06 20:23:18 by jwe]
jwe
parents: 5775
diff changeset
465 else
323be5eeed1f [project @ 2006-12-06 20:23:18 by jwe]
jwe
parents: 5775
diff changeset
466 {
323be5eeed1f [project @ 2006-12-06 20:23:18 by jwe]
jwe
parents: 5775
diff changeset
467 n *= 2;
323be5eeed1f [project @ 2006-12-06 20:23:18 by jwe]
jwe
parents: 5775
diff changeset
468 win_path.resize (n);
323be5eeed1f [project @ 2006-12-06 20:23:18 by jwe]
jwe
parents: 5775
diff changeset
469 }
323be5eeed1f [project @ 2006-12-06 20:23:18 by jwe]
jwe
parents: 5775
diff changeset
470 }
323be5eeed1f [project @ 2006-12-06 20:23:18 by jwe]
jwe
parents: 5775
diff changeset
471
6271
6fab59e81b4e [project @ 2007-02-06 01:36:46 by jwe]
jwe
parents: 6208
diff changeset
472 #elif defined (HAVE_REALPATH)
6fab59e81b4e [project @ 2007-02-06 01:36:46 by jwe]
jwe
parents: 6208
diff changeset
473
6fab59e81b4e [project @ 2007-02-06 01:36:46 by jwe]
jwe
parents: 6208
diff changeset
474 #if !defined (__set_errno)
6fab59e81b4e [project @ 2007-02-06 01:36:46 by jwe]
jwe
parents: 6208
diff changeset
475 # define __set_errno(Val) errno = (Val)
6fab59e81b4e [project @ 2007-02-06 01:36:46 by jwe]
jwe
parents: 6208
diff changeset
476 #endif
6fab59e81b4e [project @ 2007-02-06 01:36:46 by jwe]
jwe
parents: 6208
diff changeset
477
6fab59e81b4e [project @ 2007-02-06 01:36:46 by jwe]
jwe
parents: 6208
diff changeset
478 if (name.empty ())
6fab59e81b4e [project @ 2007-02-06 01:36:46 by jwe]
jwe
parents: 6208
diff changeset
479 {
6fab59e81b4e [project @ 2007-02-06 01:36:46 by jwe]
jwe
parents: 6208
diff changeset
480 __set_errno (ENOENT);
6fab59e81b4e [project @ 2007-02-06 01:36:46 by jwe]
jwe
parents: 6208
diff changeset
481 return retval;
6fab59e81b4e [project @ 2007-02-06 01:36:46 by jwe]
jwe
parents: 6208
diff changeset
482 }
6fab59e81b4e [project @ 2007-02-06 01:36:46 by jwe]
jwe
parents: 6208
diff changeset
483
6fab59e81b4e [project @ 2007-02-06 01:36:46 by jwe]
jwe
parents: 6208
diff changeset
484 OCTAVE_LOCAL_BUFFER (char, buf, PATH_MAX);
6fab59e81b4e [project @ 2007-02-06 01:36:46 by jwe]
jwe
parents: 6208
diff changeset
485
6273
de81db175325 [project @ 2007-02-06 18:55:23 by jwe]
jwe
parents: 6271
diff changeset
486 if (::realpath (name.c_str (), buf))
de81db175325 [project @ 2007-02-06 18:55:23 by jwe]
jwe
parents: 6271
diff changeset
487 retval = buf;
6271
6fab59e81b4e [project @ 2007-02-06 01:36:46 by jwe]
jwe
parents: 6208
diff changeset
488
5138
5fa9670b5956 [project @ 2005-02-09 23:13:03 by jwe]
jwe
parents: 4726
diff changeset
489 #else
5fa9670b5956 [project @ 2005-02-09 23:13:03 by jwe]
jwe
parents: 4726
diff changeset
490
5775
ace8d8d26933 [project @ 2006-04-24 19:13:06 by jwe]
jwe
parents: 5476
diff changeset
491 // FIXME -- provide replacement here...
5138
5fa9670b5956 [project @ 2005-02-09 23:13:03 by jwe]
jwe
parents: 4726
diff changeset
492 retval = name;
5fa9670b5956 [project @ 2005-02-09 23:13:03 by jwe]
jwe
parents: 4726
diff changeset
493
5fa9670b5956 [project @ 2005-02-09 23:13:03 by jwe]
jwe
parents: 4726
diff changeset
494 #endif
5fa9670b5956 [project @ 2005-02-09 23:13:03 by jwe]
jwe
parents: 4726
diff changeset
495
5fa9670b5956 [project @ 2005-02-09 23:13:03 by jwe]
jwe
parents: 4726
diff changeset
496 if (retval.empty ())
5fa9670b5956 [project @ 2005-02-09 23:13:03 by jwe]
jwe
parents: 4726
diff changeset
497 {
5fa9670b5956 [project @ 2005-02-09 23:13:03 by jwe]
jwe
parents: 4726
diff changeset
498 using namespace std;
5fa9670b5956 [project @ 2005-02-09 23:13:03 by jwe]
jwe
parents: 4726
diff changeset
499 msg = ::strerror (errno);
5fa9670b5956 [project @ 2005-02-09 23:13:03 by jwe]
jwe
parents: 4726
diff changeset
500 }
5fa9670b5956 [project @ 2005-02-09 23:13:03 by jwe]
jwe
parents: 4726
diff changeset
501
5fa9670b5956 [project @ 2005-02-09 23:13:03 by jwe]
jwe
parents: 4726
diff changeset
502 return retval;
5fa9670b5956 [project @ 2005-02-09 23:13:03 by jwe]
jwe
parents: 4726
diff changeset
503 }
5fa9670b5956 [project @ 2005-02-09 23:13:03 by jwe]
jwe
parents: 4726
diff changeset
504
2433
3952436ca2c2 [project @ 1996-10-27 04:39:00 by jwe]
jwe
parents: 2431
diff changeset
505 // We provide a replacement for tempnam().
3952436ca2c2 [project @ 1996-10-27 04:39:00 by jwe]
jwe
parents: 2431
diff changeset
506
3504
5eef8a2294bd [project @ 2000-02-01 10:06:51 by jwe]
jwe
parents: 3503
diff changeset
507 std::string
5eef8a2294bd [project @ 2000-02-01 10:06:51 by jwe]
jwe
parents: 3503
diff changeset
508 file_ops::tempnam (const std::string& dir, const std::string& pfx)
1802
8173b1fa052d [project @ 1996-01-29 06:10:18 by jwe]
jwe
parents: 1779
diff changeset
509 {
3504
5eef8a2294bd [project @ 2000-02-01 10:06:51 by jwe]
jwe
parents: 3503
diff changeset
510 std::string msg;
2937
9d26524e2869 [project @ 1997-05-06 05:49:53 by jwe]
jwe
parents: 2934
diff changeset
511 return tempnam (dir, pfx, msg);
9d26524e2869 [project @ 1997-05-06 05:49:53 by jwe]
jwe
parents: 2934
diff changeset
512 }
9d26524e2869 [project @ 1997-05-06 05:49:53 by jwe]
jwe
parents: 2934
diff changeset
513
3504
5eef8a2294bd [project @ 2000-02-01 10:06:51 by jwe]
jwe
parents: 3503
diff changeset
514 std::string
5eef8a2294bd [project @ 2000-02-01 10:06:51 by jwe]
jwe
parents: 3503
diff changeset
515 file_ops::tempnam (const std::string& dir, const std::string& pfx,
5eef8a2294bd [project @ 2000-02-01 10:06:51 by jwe]
jwe
parents: 3503
diff changeset
516 std::string& msg)
2937
9d26524e2869 [project @ 1997-05-06 05:49:53 by jwe]
jwe
parents: 2934
diff changeset
517 {
3504
5eef8a2294bd [project @ 2000-02-01 10:06:51 by jwe]
jwe
parents: 3503
diff changeset
518 msg = std::string ();
2937
9d26524e2869 [project @ 1997-05-06 05:49:53 by jwe]
jwe
parents: 2934
diff changeset
519
3504
5eef8a2294bd [project @ 2000-02-01 10:06:51 by jwe]
jwe
parents: 3503
diff changeset
520 std::string retval;
2937
9d26524e2869 [project @ 1997-05-06 05:49:53 by jwe]
jwe
parents: 2934
diff changeset
521
9d26524e2869 [project @ 1997-05-06 05:49:53 by jwe]
jwe
parents: 2934
diff changeset
522 const char *pdir = dir.empty () ? 0 : dir.c_str ();
1802
8173b1fa052d [project @ 1996-01-29 06:10:18 by jwe]
jwe
parents: 1779
diff changeset
523
2937
9d26524e2869 [project @ 1997-05-06 05:49:53 by jwe]
jwe
parents: 2934
diff changeset
524 const char *ppfx = pfx.empty () ? 0 : pfx.c_str ();
9d26524e2869 [project @ 1997-05-06 05:49:53 by jwe]
jwe
parents: 2934
diff changeset
525
10178
6bd86b6287b1 provide wrapper for tempnam
John W. Eaton <jwe@octave.org>
parents: 10177
diff changeset
526 char *tmp = octave_tempnam (pdir, ppfx);
1802
8173b1fa052d [project @ 1996-01-29 06:10:18 by jwe]
jwe
parents: 1779
diff changeset
527
8173b1fa052d [project @ 1996-01-29 06:10:18 by jwe]
jwe
parents: 1779
diff changeset
528 if (tmp)
8173b1fa052d [project @ 1996-01-29 06:10:18 by jwe]
jwe
parents: 1779
diff changeset
529 {
8173b1fa052d [project @ 1996-01-29 06:10:18 by jwe]
jwe
parents: 1779
diff changeset
530 retval = tmp;
8173b1fa052d [project @ 1996-01-29 06:10:18 by jwe]
jwe
parents: 1779
diff changeset
531
2937
9d26524e2869 [project @ 1997-05-06 05:49:53 by jwe]
jwe
parents: 2934
diff changeset
532 ::free (tmp);
1802
8173b1fa052d [project @ 1996-01-29 06:10:18 by jwe]
jwe
parents: 1779
diff changeset
533 }
8173b1fa052d [project @ 1996-01-29 06:10:18 by jwe]
jwe
parents: 1779
diff changeset
534 else
3504
5eef8a2294bd [project @ 2000-02-01 10:06:51 by jwe]
jwe
parents: 3503
diff changeset
535 {
5eef8a2294bd [project @ 2000-02-01 10:06:51 by jwe]
jwe
parents: 3503
diff changeset
536 using namespace std;
5eef8a2294bd [project @ 2000-02-01 10:06:51 by jwe]
jwe
parents: 3503
diff changeset
537 msg = ::strerror (errno);
5eef8a2294bd [project @ 2000-02-01 10:06:51 by jwe]
jwe
parents: 3503
diff changeset
538 }
1802
8173b1fa052d [project @ 1996-01-29 06:10:18 by jwe]
jwe
parents: 1779
diff changeset
539
8173b1fa052d [project @ 1996-01-29 06:10:18 by jwe]
jwe
parents: 1779
diff changeset
540 return retval;
8173b1fa052d [project @ 1996-01-29 06:10:18 by jwe]
jwe
parents: 1779
diff changeset
541 }
8173b1fa052d [project @ 1996-01-29 06:10:18 by jwe]
jwe
parents: 1779
diff changeset
542
3040
443851377f3f [project @ 1997-06-06 09:29:28 by jwe]
jwe
parents: 2947
diff changeset
543 // The following tilde-expansion code was stolen and adapted from
443851377f3f [project @ 1997-06-06 09:29:28 by jwe]
jwe
parents: 2947
diff changeset
544 // readline.
2926
66ef74ee5d9f [project @ 1997-05-05 03:20:52 by jwe]
jwe
parents: 2847
diff changeset
545
3040
443851377f3f [project @ 1997-06-06 09:29:28 by jwe]
jwe
parents: 2947
diff changeset
546 // The default value of tilde_additional_prefixes. This is set to
443851377f3f [project @ 1997-06-06 09:29:28 by jwe]
jwe
parents: 2947
diff changeset
547 // whitespace preceding a tilde so that simple programs which do not
443851377f3f [project @ 1997-06-06 09:29:28 by jwe]
jwe
parents: 2947
diff changeset
548 // perform any word separation get desired behaviour.
443851377f3f [project @ 1997-06-06 09:29:28 by jwe]
jwe
parents: 2947
diff changeset
549 static const char *default_prefixes[] = { " ~", "\t~", ":~", 0 };
443851377f3f [project @ 1997-06-06 09:29:28 by jwe]
jwe
parents: 2947
diff changeset
550
443851377f3f [project @ 1997-06-06 09:29:28 by jwe]
jwe
parents: 2947
diff changeset
551 // The default value of tilde_additional_suffixes. This is set to
443851377f3f [project @ 1997-06-06 09:29:28 by jwe]
jwe
parents: 2947
diff changeset
552 // whitespace or newline so that simple programs which do not perform
443851377f3f [project @ 1997-06-06 09:29:28 by jwe]
jwe
parents: 2947
diff changeset
553 // any word separation get desired behaviour.
443851377f3f [project @ 1997-06-06 09:29:28 by jwe]
jwe
parents: 2947
diff changeset
554 static const char *default_suffixes[] = { " ", "\n", ":", 0 };
443851377f3f [project @ 1997-06-06 09:29:28 by jwe]
jwe
parents: 2947
diff changeset
555
443851377f3f [project @ 1997-06-06 09:29:28 by jwe]
jwe
parents: 2947
diff changeset
556 // If non-null, this contains the address of a function that the
443851377f3f [project @ 1997-06-06 09:29:28 by jwe]
jwe
parents: 2947
diff changeset
557 // application wants called before trying the standard tilde
443851377f3f [project @ 1997-06-06 09:29:28 by jwe]
jwe
parents: 2947
diff changeset
558 // expansions. The function is called with the text sans tilde, and
443851377f3f [project @ 1997-06-06 09:29:28 by jwe]
jwe
parents: 2947
diff changeset
559 // returns a malloc()'ed string which is the expansion, or a NULL
443851377f3f [project @ 1997-06-06 09:29:28 by jwe]
jwe
parents: 2947
diff changeset
560 // pointer if the expansion fails.
443851377f3f [project @ 1997-06-06 09:29:28 by jwe]
jwe
parents: 2947
diff changeset
561 file_ops::tilde_expansion_hook file_ops::tilde_expansion_preexpansion_hook = 0;
443851377f3f [project @ 1997-06-06 09:29:28 by jwe]
jwe
parents: 2947
diff changeset
562
443851377f3f [project @ 1997-06-06 09:29:28 by jwe]
jwe
parents: 2947
diff changeset
563 // If non-null, this contains the address of a function to call if the
443851377f3f [project @ 1997-06-06 09:29:28 by jwe]
jwe
parents: 2947
diff changeset
564 // standard meaning for expanding a tilde fails. The function is
443851377f3f [project @ 1997-06-06 09:29:28 by jwe]
jwe
parents: 2947
diff changeset
565 // called with the text (sans tilde, as in "foo"), and returns a
443851377f3f [project @ 1997-06-06 09:29:28 by jwe]
jwe
parents: 2947
diff changeset
566 // malloc()'ed string which is the expansion, or a NULL pointer if
443851377f3f [project @ 1997-06-06 09:29:28 by jwe]
jwe
parents: 2947
diff changeset
567 // there is no expansion.
443851377f3f [project @ 1997-06-06 09:29:28 by jwe]
jwe
parents: 2947
diff changeset
568 file_ops::tilde_expansion_hook file_ops::tilde_expansion_failure_hook = 0;
443851377f3f [project @ 1997-06-06 09:29:28 by jwe]
jwe
parents: 2947
diff changeset
569
443851377f3f [project @ 1997-06-06 09:29:28 by jwe]
jwe
parents: 2947
diff changeset
570 // When non-null, this is a NULL terminated array of strings which are
443851377f3f [project @ 1997-06-06 09:29:28 by jwe]
jwe
parents: 2947
diff changeset
571 // duplicates for a tilde prefix. Bash uses this to expand `=~' and
443851377f3f [project @ 1997-06-06 09:29:28 by jwe]
jwe
parents: 2947
diff changeset
572 // `:~'.
443851377f3f [project @ 1997-06-06 09:29:28 by jwe]
jwe
parents: 2947
diff changeset
573 string_vector file_ops::tilde_additional_prefixes = default_prefixes;
443851377f3f [project @ 1997-06-06 09:29:28 by jwe]
jwe
parents: 2947
diff changeset
574
443851377f3f [project @ 1997-06-06 09:29:28 by jwe]
jwe
parents: 2947
diff changeset
575 // When non-null, this is a NULL terminated array of strings which
443851377f3f [project @ 1997-06-06 09:29:28 by jwe]
jwe
parents: 2947
diff changeset
576 // match the end of a username, instead of just "/". Bash sets this
443851377f3f [project @ 1997-06-06 09:29:28 by jwe]
jwe
parents: 2947
diff changeset
577 // to `:' and `=~'.
443851377f3f [project @ 1997-06-06 09:29:28 by jwe]
jwe
parents: 2947
diff changeset
578 string_vector file_ops::tilde_additional_suffixes = default_suffixes;
443851377f3f [project @ 1997-06-06 09:29:28 by jwe]
jwe
parents: 2947
diff changeset
579
443851377f3f [project @ 1997-06-06 09:29:28 by jwe]
jwe
parents: 2947
diff changeset
580 // Find the start of a tilde expansion in S, and return the index
443851377f3f [project @ 1997-06-06 09:29:28 by jwe]
jwe
parents: 2947
diff changeset
581 // of the tilde which starts the expansion. Place the length of the
443851377f3f [project @ 1997-06-06 09:29:28 by jwe]
jwe
parents: 2947
diff changeset
582 // text which identified this tilde starter in LEN, excluding the
443851377f3f [project @ 1997-06-06 09:29:28 by jwe]
jwe
parents: 2947
diff changeset
583 // tilde itself.
443851377f3f [project @ 1997-06-06 09:29:28 by jwe]
jwe
parents: 2947
diff changeset
584
443851377f3f [project @ 1997-06-06 09:29:28 by jwe]
jwe
parents: 2947
diff changeset
585 static size_t
3504
5eef8a2294bd [project @ 2000-02-01 10:06:51 by jwe]
jwe
parents: 3503
diff changeset
586 tilde_find_prefix (const std::string& s, size_t& len)
3040
443851377f3f [project @ 1997-06-06 09:29:28 by jwe]
jwe
parents: 2947
diff changeset
587 {
443851377f3f [project @ 1997-06-06 09:29:28 by jwe]
jwe
parents: 2947
diff changeset
588 len = 0;
443851377f3f [project @ 1997-06-06 09:29:28 by jwe]
jwe
parents: 2947
diff changeset
589
443851377f3f [project @ 1997-06-06 09:29:28 by jwe]
jwe
parents: 2947
diff changeset
590 size_t s_len = s.length ();
443851377f3f [project @ 1997-06-06 09:29:28 by jwe]
jwe
parents: 2947
diff changeset
591
443851377f3f [project @ 1997-06-06 09:29:28 by jwe]
jwe
parents: 2947
diff changeset
592 if (s_len == 0 || s[0] == '~')
443851377f3f [project @ 1997-06-06 09:29:28 by jwe]
jwe
parents: 2947
diff changeset
593 return 0;
443851377f3f [project @ 1997-06-06 09:29:28 by jwe]
jwe
parents: 2947
diff changeset
594
443851377f3f [project @ 1997-06-06 09:29:28 by jwe]
jwe
parents: 2947
diff changeset
595 string_vector prefixes = file_ops::tilde_additional_prefixes;
443851377f3f [project @ 1997-06-06 09:29:28 by jwe]
jwe
parents: 2947
diff changeset
596
443851377f3f [project @ 1997-06-06 09:29:28 by jwe]
jwe
parents: 2947
diff changeset
597 if (! prefixes.empty ())
443851377f3f [project @ 1997-06-06 09:29:28 by jwe]
jwe
parents: 2947
diff changeset
598 {
443851377f3f [project @ 1997-06-06 09:29:28 by jwe]
jwe
parents: 2947
diff changeset
599 for (size_t i = 0; i < s_len; i++)
443851377f3f [project @ 1997-06-06 09:29:28 by jwe]
jwe
parents: 2947
diff changeset
600 {
443851377f3f [project @ 1997-06-06 09:29:28 by jwe]
jwe
parents: 2947
diff changeset
601 for (int j = 0; j < prefixes.length (); j++)
443851377f3f [project @ 1997-06-06 09:29:28 by jwe]
jwe
parents: 2947
diff changeset
602 {
443851377f3f [project @ 1997-06-06 09:29:28 by jwe]
jwe
parents: 2947
diff changeset
603 size_t pfx_len = prefixes[j].length ();
443851377f3f [project @ 1997-06-06 09:29:28 by jwe]
jwe
parents: 2947
diff changeset
604
443851377f3f [project @ 1997-06-06 09:29:28 by jwe]
jwe
parents: 2947
diff changeset
605 if (prefixes[j].compare (s.substr (i, pfx_len)) == 0)
443851377f3f [project @ 1997-06-06 09:29:28 by jwe]
jwe
parents: 2947
diff changeset
606 {
443851377f3f [project @ 1997-06-06 09:29:28 by jwe]
jwe
parents: 2947
diff changeset
607 len = pfx_len - 1;
443851377f3f [project @ 1997-06-06 09:29:28 by jwe]
jwe
parents: 2947
diff changeset
608 return i + len;
443851377f3f [project @ 1997-06-06 09:29:28 by jwe]
jwe
parents: 2947
diff changeset
609 }
443851377f3f [project @ 1997-06-06 09:29:28 by jwe]
jwe
parents: 2947
diff changeset
610 }
443851377f3f [project @ 1997-06-06 09:29:28 by jwe]
jwe
parents: 2947
diff changeset
611 }
443851377f3f [project @ 1997-06-06 09:29:28 by jwe]
jwe
parents: 2947
diff changeset
612 }
443851377f3f [project @ 1997-06-06 09:29:28 by jwe]
jwe
parents: 2947
diff changeset
613
443851377f3f [project @ 1997-06-06 09:29:28 by jwe]
jwe
parents: 2947
diff changeset
614 return s_len;
443851377f3f [project @ 1997-06-06 09:29:28 by jwe]
jwe
parents: 2947
diff changeset
615 }
443851377f3f [project @ 1997-06-06 09:29:28 by jwe]
jwe
parents: 2947
diff changeset
616
443851377f3f [project @ 1997-06-06 09:29:28 by jwe]
jwe
parents: 2947
diff changeset
617 // Find the end of a tilde expansion in S, and return the index
443851377f3f [project @ 1997-06-06 09:29:28 by jwe]
jwe
parents: 2947
diff changeset
618 // of the character which ends the tilde definition.
443851377f3f [project @ 1997-06-06 09:29:28 by jwe]
jwe
parents: 2947
diff changeset
619
443851377f3f [project @ 1997-06-06 09:29:28 by jwe]
jwe
parents: 2947
diff changeset
620 static size_t
3504
5eef8a2294bd [project @ 2000-02-01 10:06:51 by jwe]
jwe
parents: 3503
diff changeset
621 tilde_find_suffix (const std::string& s)
3040
443851377f3f [project @ 1997-06-06 09:29:28 by jwe]
jwe
parents: 2947
diff changeset
622 {
443851377f3f [project @ 1997-06-06 09:29:28 by jwe]
jwe
parents: 2947
diff changeset
623 size_t s_len = s.length ();
443851377f3f [project @ 1997-06-06 09:29:28 by jwe]
jwe
parents: 2947
diff changeset
624
443851377f3f [project @ 1997-06-06 09:29:28 by jwe]
jwe
parents: 2947
diff changeset
625 string_vector suffixes = file_ops::tilde_additional_suffixes;
443851377f3f [project @ 1997-06-06 09:29:28 by jwe]
jwe
parents: 2947
diff changeset
626
443851377f3f [project @ 1997-06-06 09:29:28 by jwe]
jwe
parents: 2947
diff changeset
627 size_t i = 0;
443851377f3f [project @ 1997-06-06 09:29:28 by jwe]
jwe
parents: 2947
diff changeset
628
443851377f3f [project @ 1997-06-06 09:29:28 by jwe]
jwe
parents: 2947
diff changeset
629 for ( ; i < s_len; i++)
443851377f3f [project @ 1997-06-06 09:29:28 by jwe]
jwe
parents: 2947
diff changeset
630 {
6694
3d913ba36b75 [project @ 2007-06-06 06:08:25 by jwe]
jwe
parents: 6363
diff changeset
631 if (file_ops::is_dir_sep (s[i]))
3040
443851377f3f [project @ 1997-06-06 09:29:28 by jwe]
jwe
parents: 2947
diff changeset
632 break;
443851377f3f [project @ 1997-06-06 09:29:28 by jwe]
jwe
parents: 2947
diff changeset
633
443851377f3f [project @ 1997-06-06 09:29:28 by jwe]
jwe
parents: 2947
diff changeset
634 if (! suffixes.empty ())
443851377f3f [project @ 1997-06-06 09:29:28 by jwe]
jwe
parents: 2947
diff changeset
635 {
443851377f3f [project @ 1997-06-06 09:29:28 by jwe]
jwe
parents: 2947
diff changeset
636 for (int j = 0; j < suffixes.length (); j++)
443851377f3f [project @ 1997-06-06 09:29:28 by jwe]
jwe
parents: 2947
diff changeset
637 {
443851377f3f [project @ 1997-06-06 09:29:28 by jwe]
jwe
parents: 2947
diff changeset
638 size_t sfx_len = suffixes[j].length ();
443851377f3f [project @ 1997-06-06 09:29:28 by jwe]
jwe
parents: 2947
diff changeset
639
443851377f3f [project @ 1997-06-06 09:29:28 by jwe]
jwe
parents: 2947
diff changeset
640 if (suffixes[j].compare (s.substr (i, sfx_len)) == 0)
443851377f3f [project @ 1997-06-06 09:29:28 by jwe]
jwe
parents: 2947
diff changeset
641 return i;
443851377f3f [project @ 1997-06-06 09:29:28 by jwe]
jwe
parents: 2947
diff changeset
642 }
443851377f3f [project @ 1997-06-06 09:29:28 by jwe]
jwe
parents: 2947
diff changeset
643 }
443851377f3f [project @ 1997-06-06 09:29:28 by jwe]
jwe
parents: 2947
diff changeset
644 }
443851377f3f [project @ 1997-06-06 09:29:28 by jwe]
jwe
parents: 2947
diff changeset
645
443851377f3f [project @ 1997-06-06 09:29:28 by jwe]
jwe
parents: 2947
diff changeset
646 return i;
443851377f3f [project @ 1997-06-06 09:29:28 by jwe]
jwe
parents: 2947
diff changeset
647 }
443851377f3f [project @ 1997-06-06 09:29:28 by jwe]
jwe
parents: 2947
diff changeset
648
443851377f3f [project @ 1997-06-06 09:29:28 by jwe]
jwe
parents: 2947
diff changeset
649 // Take FNAME and return the tilde prefix we want expanded.
443851377f3f [project @ 1997-06-06 09:29:28 by jwe]
jwe
parents: 2947
diff changeset
650
3504
5eef8a2294bd [project @ 2000-02-01 10:06:51 by jwe]
jwe
parents: 3503
diff changeset
651 static std::string
5eef8a2294bd [project @ 2000-02-01 10:06:51 by jwe]
jwe
parents: 3503
diff changeset
652 isolate_tilde_prefix (const std::string& fname)
3040
443851377f3f [project @ 1997-06-06 09:29:28 by jwe]
jwe
parents: 2947
diff changeset
653 {
443851377f3f [project @ 1997-06-06 09:29:28 by jwe]
jwe
parents: 2947
diff changeset
654 size_t f_len = fname.length ();
443851377f3f [project @ 1997-06-06 09:29:28 by jwe]
jwe
parents: 2947
diff changeset
655
443851377f3f [project @ 1997-06-06 09:29:28 by jwe]
jwe
parents: 2947
diff changeset
656 size_t len = 1;
443851377f3f [project @ 1997-06-06 09:29:28 by jwe]
jwe
parents: 2947
diff changeset
657
6694
3d913ba36b75 [project @ 2007-06-06 06:08:25 by jwe]
jwe
parents: 6363
diff changeset
658 while (len < f_len && ! file_ops::is_dir_sep (fname[len]))
3040
443851377f3f [project @ 1997-06-06 09:29:28 by jwe]
jwe
parents: 2947
diff changeset
659 len++;
443851377f3f [project @ 1997-06-06 09:29:28 by jwe]
jwe
parents: 2947
diff changeset
660
443851377f3f [project @ 1997-06-06 09:29:28 by jwe]
jwe
parents: 2947
diff changeset
661 return fname.substr (1, len);
443851377f3f [project @ 1997-06-06 09:29:28 by jwe]
jwe
parents: 2947
diff changeset
662 }
443851377f3f [project @ 1997-06-06 09:29:28 by jwe]
jwe
parents: 2947
diff changeset
663
443851377f3f [project @ 1997-06-06 09:29:28 by jwe]
jwe
parents: 2947
diff changeset
664 // Do the work of tilde expansion on FILENAME. FILENAME starts with a
443851377f3f [project @ 1997-06-06 09:29:28 by jwe]
jwe
parents: 2947
diff changeset
665 // tilde.
443851377f3f [project @ 1997-06-06 09:29:28 by jwe]
jwe
parents: 2947
diff changeset
666
3504
5eef8a2294bd [project @ 2000-02-01 10:06:51 by jwe]
jwe
parents: 3503
diff changeset
667 static std::string
5eef8a2294bd [project @ 2000-02-01 10:06:51 by jwe]
jwe
parents: 3503
diff changeset
668 tilde_expand_word (const std::string& filename)
3040
443851377f3f [project @ 1997-06-06 09:29:28 by jwe]
jwe
parents: 2947
diff changeset
669 {
443851377f3f [project @ 1997-06-06 09:29:28 by jwe]
jwe
parents: 2947
diff changeset
670 size_t f_len = filename.length ();
443851377f3f [project @ 1997-06-06 09:29:28 by jwe]
jwe
parents: 2947
diff changeset
671
443851377f3f [project @ 1997-06-06 09:29:28 by jwe]
jwe
parents: 2947
diff changeset
672 if (f_len == 0 || filename[0] != '~')
443851377f3f [project @ 1997-06-06 09:29:28 by jwe]
jwe
parents: 2947
diff changeset
673 return filename;
443851377f3f [project @ 1997-06-06 09:29:28 by jwe]
jwe
parents: 2947
diff changeset
674
443851377f3f [project @ 1997-06-06 09:29:28 by jwe]
jwe
parents: 2947
diff changeset
675 // A leading `~/' or a bare `~' is *always* translated to the value
443851377f3f [project @ 1997-06-06 09:29:28 by jwe]
jwe
parents: 2947
diff changeset
676 // of $HOME or the home directory of the current user, regardless of
443851377f3f [project @ 1997-06-06 09:29:28 by jwe]
jwe
parents: 2947
diff changeset
677 // any preexpansion hook.
443851377f3f [project @ 1997-06-06 09:29:28 by jwe]
jwe
parents: 2947
diff changeset
678
6694
3d913ba36b75 [project @ 2007-06-06 06:08:25 by jwe]
jwe
parents: 6363
diff changeset
679 if (f_len == 1 || file_ops::is_dir_sep (filename[1]))
3040
443851377f3f [project @ 1997-06-06 09:29:28 by jwe]
jwe
parents: 2947
diff changeset
680 return octave_env::get_home_directory () + filename.substr (1);
443851377f3f [project @ 1997-06-06 09:29:28 by jwe]
jwe
parents: 2947
diff changeset
681
3504
5eef8a2294bd [project @ 2000-02-01 10:06:51 by jwe]
jwe
parents: 3503
diff changeset
682 std::string username = isolate_tilde_prefix (filename);
3040
443851377f3f [project @ 1997-06-06 09:29:28 by jwe]
jwe
parents: 2947
diff changeset
683
443851377f3f [project @ 1997-06-06 09:29:28 by jwe]
jwe
parents: 2947
diff changeset
684 size_t user_len = username.length ();
443851377f3f [project @ 1997-06-06 09:29:28 by jwe]
jwe
parents: 2947
diff changeset
685
3504
5eef8a2294bd [project @ 2000-02-01 10:06:51 by jwe]
jwe
parents: 3503
diff changeset
686 std::string dirname;
3040
443851377f3f [project @ 1997-06-06 09:29:28 by jwe]
jwe
parents: 2947
diff changeset
687
443851377f3f [project @ 1997-06-06 09:29:28 by jwe]
jwe
parents: 2947
diff changeset
688 if (file_ops::tilde_expansion_preexpansion_hook)
443851377f3f [project @ 1997-06-06 09:29:28 by jwe]
jwe
parents: 2947
diff changeset
689 {
3504
5eef8a2294bd [project @ 2000-02-01 10:06:51 by jwe]
jwe
parents: 3503
diff changeset
690 std::string expansion
3040
443851377f3f [project @ 1997-06-06 09:29:28 by jwe]
jwe
parents: 2947
diff changeset
691 = file_ops::tilde_expansion_preexpansion_hook (username);
443851377f3f [project @ 1997-06-06 09:29:28 by jwe]
jwe
parents: 2947
diff changeset
692
443851377f3f [project @ 1997-06-06 09:29:28 by jwe]
jwe
parents: 2947
diff changeset
693 if (! expansion.empty ())
3074
42975c59d2a0 [project @ 1997-07-24 19:33:35 by jwe]
jwe
parents: 3040
diff changeset
694 return expansion + filename.substr (user_len+1);
3040
443851377f3f [project @ 1997-06-06 09:29:28 by jwe]
jwe
parents: 2947
diff changeset
695 }
443851377f3f [project @ 1997-06-06 09:29:28 by jwe]
jwe
parents: 2947
diff changeset
696
443851377f3f [project @ 1997-06-06 09:29:28 by jwe]
jwe
parents: 2947
diff changeset
697 // No preexpansion hook, or the preexpansion hook failed. Look in the
443851377f3f [project @ 1997-06-06 09:29:28 by jwe]
jwe
parents: 2947
diff changeset
698 // password database.
443851377f3f [project @ 1997-06-06 09:29:28 by jwe]
jwe
parents: 2947
diff changeset
699
443851377f3f [project @ 1997-06-06 09:29:28 by jwe]
jwe
parents: 2947
diff changeset
700 octave_passwd pw = octave_passwd::getpwnam (username);
443851377f3f [project @ 1997-06-06 09:29:28 by jwe]
jwe
parents: 2947
diff changeset
701
443851377f3f [project @ 1997-06-06 09:29:28 by jwe]
jwe
parents: 2947
diff changeset
702 if (! pw)
443851377f3f [project @ 1997-06-06 09:29:28 by jwe]
jwe
parents: 2947
diff changeset
703 {
443851377f3f [project @ 1997-06-06 09:29:28 by jwe]
jwe
parents: 2947
diff changeset
704 // If the calling program has a special syntax for expanding tildes,
443851377f3f [project @ 1997-06-06 09:29:28 by jwe]
jwe
parents: 2947
diff changeset
705 // and we couldn't find a standard expansion, then let them try.
443851377f3f [project @ 1997-06-06 09:29:28 by jwe]
jwe
parents: 2947
diff changeset
706
443851377f3f [project @ 1997-06-06 09:29:28 by jwe]
jwe
parents: 2947
diff changeset
707 if (file_ops::tilde_expansion_failure_hook)
443851377f3f [project @ 1997-06-06 09:29:28 by jwe]
jwe
parents: 2947
diff changeset
708 {
3504
5eef8a2294bd [project @ 2000-02-01 10:06:51 by jwe]
jwe
parents: 3503
diff changeset
709 std::string expansion
3040
443851377f3f [project @ 1997-06-06 09:29:28 by jwe]
jwe
parents: 2947
diff changeset
710 = file_ops::tilde_expansion_failure_hook (username);
443851377f3f [project @ 1997-06-06 09:29:28 by jwe]
jwe
parents: 2947
diff changeset
711
443851377f3f [project @ 1997-06-06 09:29:28 by jwe]
jwe
parents: 2947
diff changeset
712 if (! expansion.empty ())
3074
42975c59d2a0 [project @ 1997-07-24 19:33:35 by jwe]
jwe
parents: 3040
diff changeset
713 dirname = expansion + filename.substr (user_len+1);
3040
443851377f3f [project @ 1997-06-06 09:29:28 by jwe]
jwe
parents: 2947
diff changeset
714 }
443851377f3f [project @ 1997-06-06 09:29:28 by jwe]
jwe
parents: 2947
diff changeset
715
443851377f3f [project @ 1997-06-06 09:29:28 by jwe]
jwe
parents: 2947
diff changeset
716 // If we don't have a failure hook, or if the failure hook did not
443851377f3f [project @ 1997-06-06 09:29:28 by jwe]
jwe
parents: 2947
diff changeset
717 // expand the tilde, return a copy of what we were passed.
443851377f3f [project @ 1997-06-06 09:29:28 by jwe]
jwe
parents: 2947
diff changeset
718
443851377f3f [project @ 1997-06-06 09:29:28 by jwe]
jwe
parents: 2947
diff changeset
719 if (dirname.length () == 0)
443851377f3f [project @ 1997-06-06 09:29:28 by jwe]
jwe
parents: 2947
diff changeset
720 dirname = filename;
443851377f3f [project @ 1997-06-06 09:29:28 by jwe]
jwe
parents: 2947
diff changeset
721 }
443851377f3f [project @ 1997-06-06 09:29:28 by jwe]
jwe
parents: 2947
diff changeset
722 else
3074
42975c59d2a0 [project @ 1997-07-24 19:33:35 by jwe]
jwe
parents: 3040
diff changeset
723 dirname = pw.dir () + filename.substr (user_len+1);
3040
443851377f3f [project @ 1997-06-06 09:29:28 by jwe]
jwe
parents: 2947
diff changeset
724
443851377f3f [project @ 1997-06-06 09:29:28 by jwe]
jwe
parents: 2947
diff changeset
725 return dirname;
443851377f3f [project @ 1997-06-06 09:29:28 by jwe]
jwe
parents: 2947
diff changeset
726 }
443851377f3f [project @ 1997-06-06 09:29:28 by jwe]
jwe
parents: 2947
diff changeset
727
443851377f3f [project @ 1997-06-06 09:29:28 by jwe]
jwe
parents: 2947
diff changeset
728 // If NAME has a leading ~ or ~user, Unix-style, expand it to the
443851377f3f [project @ 1997-06-06 09:29:28 by jwe]
jwe
parents: 2947
diff changeset
729 // user's home directory. If no ~, or no <pwd.h>, just return NAME.
443851377f3f [project @ 1997-06-06 09:29:28 by jwe]
jwe
parents: 2947
diff changeset
730
3504
5eef8a2294bd [project @ 2000-02-01 10:06:51 by jwe]
jwe
parents: 3503
diff changeset
731 std::string
5eef8a2294bd [project @ 2000-02-01 10:06:51 by jwe]
jwe
parents: 3503
diff changeset
732 file_ops::tilde_expand (const std::string& name)
2926
66ef74ee5d9f [project @ 1997-05-05 03:20:52 by jwe]
jwe
parents: 2847
diff changeset
733 {
8327
4a7a943581d0 Fast return case for file_ops::tilde_expand
David Bateman <dbateman@free.fr>
parents: 8009
diff changeset
734 if (name.find ('~') == std::string::npos)
4a7a943581d0 Fast return case for file_ops::tilde_expand
David Bateman <dbateman@free.fr>
parents: 8009
diff changeset
735 return name;
4a7a943581d0 Fast return case for file_ops::tilde_expand
David Bateman <dbateman@free.fr>
parents: 8009
diff changeset
736 else
3040
443851377f3f [project @ 1997-06-06 09:29:28 by jwe]
jwe
parents: 2947
diff changeset
737 {
8327
4a7a943581d0 Fast return case for file_ops::tilde_expand
David Bateman <dbateman@free.fr>
parents: 8009
diff changeset
738 std::string result;
4a7a943581d0 Fast return case for file_ops::tilde_expand
David Bateman <dbateman@free.fr>
parents: 8009
diff changeset
739
4a7a943581d0 Fast return case for file_ops::tilde_expand
David Bateman <dbateman@free.fr>
parents: 8009
diff changeset
740 size_t name_len = name.length ();
2926
66ef74ee5d9f [project @ 1997-05-05 03:20:52 by jwe]
jwe
parents: 2847
diff changeset
741
8327
4a7a943581d0 Fast return case for file_ops::tilde_expand
David Bateman <dbateman@free.fr>
parents: 8009
diff changeset
742 // Scan through S expanding tildes as we come to them.
4a7a943581d0 Fast return case for file_ops::tilde_expand
David Bateman <dbateman@free.fr>
parents: 8009
diff changeset
743
4a7a943581d0 Fast return case for file_ops::tilde_expand
David Bateman <dbateman@free.fr>
parents: 8009
diff changeset
744 size_t pos = 0;
3040
443851377f3f [project @ 1997-06-06 09:29:28 by jwe]
jwe
parents: 2947
diff changeset
745
8327
4a7a943581d0 Fast return case for file_ops::tilde_expand
David Bateman <dbateman@free.fr>
parents: 8009
diff changeset
746 while (1)
4a7a943581d0 Fast return case for file_ops::tilde_expand
David Bateman <dbateman@free.fr>
parents: 8009
diff changeset
747 {
4a7a943581d0 Fast return case for file_ops::tilde_expand
David Bateman <dbateman@free.fr>
parents: 8009
diff changeset
748 if (pos > name_len)
4a7a943581d0 Fast return case for file_ops::tilde_expand
David Bateman <dbateman@free.fr>
parents: 8009
diff changeset
749 break;
3040
443851377f3f [project @ 1997-06-06 09:29:28 by jwe]
jwe
parents: 2947
diff changeset
750
8327
4a7a943581d0 Fast return case for file_ops::tilde_expand
David Bateman <dbateman@free.fr>
parents: 8009
diff changeset
751 size_t len;
4a7a943581d0 Fast return case for file_ops::tilde_expand
David Bateman <dbateman@free.fr>
parents: 8009
diff changeset
752
4a7a943581d0 Fast return case for file_ops::tilde_expand
David Bateman <dbateman@free.fr>
parents: 8009
diff changeset
753 // Make START point to the tilde which starts the expansion.
2926
66ef74ee5d9f [project @ 1997-05-05 03:20:52 by jwe]
jwe
parents: 2847
diff changeset
754
8327
4a7a943581d0 Fast return case for file_ops::tilde_expand
David Bateman <dbateman@free.fr>
parents: 8009
diff changeset
755 size_t start = tilde_find_prefix (name.substr (pos), len);
4a7a943581d0 Fast return case for file_ops::tilde_expand
David Bateman <dbateman@free.fr>
parents: 8009
diff changeset
756
4a7a943581d0 Fast return case for file_ops::tilde_expand
David Bateman <dbateman@free.fr>
parents: 8009
diff changeset
757 result.append (name.substr (pos, start));
3040
443851377f3f [project @ 1997-06-06 09:29:28 by jwe]
jwe
parents: 2947
diff changeset
758
8327
4a7a943581d0 Fast return case for file_ops::tilde_expand
David Bateman <dbateman@free.fr>
parents: 8009
diff changeset
759 // Advance STRING to the starting tilde.
2926
66ef74ee5d9f [project @ 1997-05-05 03:20:52 by jwe]
jwe
parents: 2847
diff changeset
760
8327
4a7a943581d0 Fast return case for file_ops::tilde_expand
David Bateman <dbateman@free.fr>
parents: 8009
diff changeset
761 pos += start;
4a7a943581d0 Fast return case for file_ops::tilde_expand
David Bateman <dbateman@free.fr>
parents: 8009
diff changeset
762
4a7a943581d0 Fast return case for file_ops::tilde_expand
David Bateman <dbateman@free.fr>
parents: 8009
diff changeset
763 // Make FINI be the index of one after the last character of the
4a7a943581d0 Fast return case for file_ops::tilde_expand
David Bateman <dbateman@free.fr>
parents: 8009
diff changeset
764 // username.
2926
66ef74ee5d9f [project @ 1997-05-05 03:20:52 by jwe]
jwe
parents: 2847
diff changeset
765
8327
4a7a943581d0 Fast return case for file_ops::tilde_expand
David Bateman <dbateman@free.fr>
parents: 8009
diff changeset
766 size_t fini = tilde_find_suffix (name.substr (pos));
2926
66ef74ee5d9f [project @ 1997-05-05 03:20:52 by jwe]
jwe
parents: 2847
diff changeset
767
8327
4a7a943581d0 Fast return case for file_ops::tilde_expand
David Bateman <dbateman@free.fr>
parents: 8009
diff changeset
768 // If both START and FINI are zero, we are all done.
2926
66ef74ee5d9f [project @ 1997-05-05 03:20:52 by jwe]
jwe
parents: 2847
diff changeset
769
8327
4a7a943581d0 Fast return case for file_ops::tilde_expand
David Bateman <dbateman@free.fr>
parents: 8009
diff changeset
770 if (! (start || fini))
4a7a943581d0 Fast return case for file_ops::tilde_expand
David Bateman <dbateman@free.fr>
parents: 8009
diff changeset
771 break;
2926
66ef74ee5d9f [project @ 1997-05-05 03:20:52 by jwe]
jwe
parents: 2847
diff changeset
772
8327
4a7a943581d0 Fast return case for file_ops::tilde_expand
David Bateman <dbateman@free.fr>
parents: 8009
diff changeset
773 // Expand the entire tilde word, and copy it into RESULT.
2947
cf676ff8b702 [project @ 1997-05-09 13:32:46 by jwe]
jwe
parents: 2937
diff changeset
774
8327
4a7a943581d0 Fast return case for file_ops::tilde_expand
David Bateman <dbateman@free.fr>
parents: 8009
diff changeset
775 std::string tilde_word = name.substr (pos, fini);
3040
443851377f3f [project @ 1997-06-06 09:29:28 by jwe]
jwe
parents: 2947
diff changeset
776
8327
4a7a943581d0 Fast return case for file_ops::tilde_expand
David Bateman <dbateman@free.fr>
parents: 8009
diff changeset
777 pos += fini;
2926
66ef74ee5d9f [project @ 1997-05-05 03:20:52 by jwe]
jwe
parents: 2847
diff changeset
778
8327
4a7a943581d0 Fast return case for file_ops::tilde_expand
David Bateman <dbateman@free.fr>
parents: 8009
diff changeset
779 std::string expansion = tilde_expand_word (tilde_word);
3040
443851377f3f [project @ 1997-06-06 09:29:28 by jwe]
jwe
parents: 2947
diff changeset
780
8327
4a7a943581d0 Fast return case for file_ops::tilde_expand
David Bateman <dbateman@free.fr>
parents: 8009
diff changeset
781 result.append (expansion);
4a7a943581d0 Fast return case for file_ops::tilde_expand
David Bateman <dbateman@free.fr>
parents: 8009
diff changeset
782 }
4a7a943581d0 Fast return case for file_ops::tilde_expand
David Bateman <dbateman@free.fr>
parents: 8009
diff changeset
783
4a7a943581d0 Fast return case for file_ops::tilde_expand
David Bateman <dbateman@free.fr>
parents: 8009
diff changeset
784 return result;
2926
66ef74ee5d9f [project @ 1997-05-05 03:20:52 by jwe]
jwe
parents: 2847
diff changeset
785 }
66ef74ee5d9f [project @ 1997-05-05 03:20:52 by jwe]
jwe
parents: 2847
diff changeset
786 }
66ef74ee5d9f [project @ 1997-05-05 03:20:52 by jwe]
jwe
parents: 2847
diff changeset
787
66ef74ee5d9f [project @ 1997-05-05 03:20:52 by jwe]
jwe
parents: 2847
diff changeset
788 // A vector version of the above.
66ef74ee5d9f [project @ 1997-05-05 03:20:52 by jwe]
jwe
parents: 2847
diff changeset
789
66ef74ee5d9f [project @ 1997-05-05 03:20:52 by jwe]
jwe
parents: 2847
diff changeset
790 string_vector
66ef74ee5d9f [project @ 1997-05-05 03:20:52 by jwe]
jwe
parents: 2847
diff changeset
791 file_ops::tilde_expand (const string_vector& names)
66ef74ee5d9f [project @ 1997-05-05 03:20:52 by jwe]
jwe
parents: 2847
diff changeset
792 {
66ef74ee5d9f [project @ 1997-05-05 03:20:52 by jwe]
jwe
parents: 2847
diff changeset
793 string_vector retval;
66ef74ee5d9f [project @ 1997-05-05 03:20:52 by jwe]
jwe
parents: 2847
diff changeset
794
66ef74ee5d9f [project @ 1997-05-05 03:20:52 by jwe]
jwe
parents: 2847
diff changeset
795 int n = names.length ();
66ef74ee5d9f [project @ 1997-05-05 03:20:52 by jwe]
jwe
parents: 2847
diff changeset
796
66ef74ee5d9f [project @ 1997-05-05 03:20:52 by jwe]
jwe
parents: 2847
diff changeset
797 retval.resize (n);
66ef74ee5d9f [project @ 1997-05-05 03:20:52 by jwe]
jwe
parents: 2847
diff changeset
798
66ef74ee5d9f [project @ 1997-05-05 03:20:52 by jwe]
jwe
parents: 2847
diff changeset
799 for (int i = 0; i < n; i++)
66ef74ee5d9f [project @ 1997-05-05 03:20:52 by jwe]
jwe
parents: 2847
diff changeset
800 retval[i] = file_ops::tilde_expand (names[i]);
66ef74ee5d9f [project @ 1997-05-05 03:20:52 by jwe]
jwe
parents: 2847
diff changeset
801
66ef74ee5d9f [project @ 1997-05-05 03:20:52 by jwe]
jwe
parents: 2847
diff changeset
802 return retval;
66ef74ee5d9f [project @ 1997-05-05 03:20:52 by jwe]
jwe
parents: 2847
diff changeset
803 }
1802
8173b1fa052d [project @ 1996-01-29 06:10:18 by jwe]
jwe
parents: 1779
diff changeset
804
1765
a51354c34bea [project @ 1996-01-23 03:33:34 by jwe]
jwe
parents:
diff changeset
805 int
2926
66ef74ee5d9f [project @ 1997-05-05 03:20:52 by jwe]
jwe
parents: 2847
diff changeset
806 file_ops::umask (mode_t mode)
1765
a51354c34bea [project @ 1996-01-23 03:33:34 by jwe]
jwe
parents:
diff changeset
807 {
10173
2b1f3f156aaf provide wrapper for umask
John W. Eaton <jwe@octave.org>
parents: 10172
diff changeset
808 return octave_umask (mode);
1765
a51354c34bea [project @ 1996-01-23 03:33:34 by jwe]
jwe
parents:
diff changeset
809 }
a51354c34bea [project @ 1996-01-23 03:33:34 by jwe]
jwe
parents:
diff changeset
810
1773
5215571ea783 [project @ 1996-01-23 08:10:26 by jwe]
jwe
parents: 1772
diff changeset
811 int
3504
5eef8a2294bd [project @ 2000-02-01 10:06:51 by jwe]
jwe
parents: 3503
diff changeset
812 file_ops::unlink (const std::string& name)
1773
5215571ea783 [project @ 1996-01-23 08:10:26 by jwe]
jwe
parents: 1772
diff changeset
813 {
3504
5eef8a2294bd [project @ 2000-02-01 10:06:51 by jwe]
jwe
parents: 3503
diff changeset
814 std::string msg;
2937
9d26524e2869 [project @ 1997-05-06 05:49:53 by jwe]
jwe
parents: 2934
diff changeset
815 return unlink (name, msg);
1773
5215571ea783 [project @ 1996-01-23 08:10:26 by jwe]
jwe
parents: 1772
diff changeset
816 }
5215571ea783 [project @ 1996-01-23 08:10:26 by jwe]
jwe
parents: 1772
diff changeset
817
2668
0d865ef7478f [project @ 1997-02-13 18:21:47 by jwe]
jwe
parents: 2492
diff changeset
818 int
3504
5eef8a2294bd [project @ 2000-02-01 10:06:51 by jwe]
jwe
parents: 3503
diff changeset
819 file_ops::unlink (const std::string& name, std::string& msg)
2668
0d865ef7478f [project @ 1997-02-13 18:21:47 by jwe]
jwe
parents: 2492
diff changeset
820 {
3504
5eef8a2294bd [project @ 2000-02-01 10:06:51 by jwe]
jwe
parents: 3503
diff changeset
821 msg = std::string ();
2668
0d865ef7478f [project @ 1997-02-13 18:21:47 by jwe]
jwe
parents: 2492
diff changeset
822
2937
9d26524e2869 [project @ 1997-05-06 05:49:53 by jwe]
jwe
parents: 2934
diff changeset
823 int status = -1;
9d26524e2869 [project @ 1997-05-06 05:49:53 by jwe]
jwe
parents: 2934
diff changeset
824
10174
eb64bf1c6107 use unlink module from gnulib
John W. Eaton <jwe@octave.org>
parents: 10173
diff changeset
825 status = octave_unlink (name.c_str ());
2668
0d865ef7478f [project @ 1997-02-13 18:21:47 by jwe]
jwe
parents: 2492
diff changeset
826
0d865ef7478f [project @ 1997-02-13 18:21:47 by jwe]
jwe
parents: 2492
diff changeset
827 if (status < 0)
3504
5eef8a2294bd [project @ 2000-02-01 10:06:51 by jwe]
jwe
parents: 3503
diff changeset
828 {
5eef8a2294bd [project @ 2000-02-01 10:06:51 by jwe]
jwe
parents: 3503
diff changeset
829 using namespace std;
5eef8a2294bd [project @ 2000-02-01 10:06:51 by jwe]
jwe
parents: 3503
diff changeset
830 msg = ::strerror (errno);
5eef8a2294bd [project @ 2000-02-01 10:06:51 by jwe]
jwe
parents: 3503
diff changeset
831 }
2668
0d865ef7478f [project @ 1997-02-13 18:21:47 by jwe]
jwe
parents: 2492
diff changeset
832
0d865ef7478f [project @ 1997-02-13 18:21:47 by jwe]
jwe
parents: 2492
diff changeset
833 return status;
0d865ef7478f [project @ 1997-02-13 18:21:47 by jwe]
jwe
parents: 2492
diff changeset
834 }
0d865ef7478f [project @ 1997-02-13 18:21:47 by jwe]
jwe
parents: 2492
diff changeset
835
7272
05ee52d7fad6 [project @ 2007-12-10 07:06:00 by jwe]
jwe
parents: 7017
diff changeset
836 std::string
05ee52d7fad6 [project @ 2007-12-10 07:06:00 by jwe]
jwe
parents: 7017
diff changeset
837 file_ops::concat (const std::string& dir, const std::string& file)
05ee52d7fad6 [project @ 2007-12-10 07:06:00 by jwe]
jwe
parents: 7017
diff changeset
838 {
05ee52d7fad6 [project @ 2007-12-10 07:06:00 by jwe]
jwe
parents: 7017
diff changeset
839 return dir.empty ()
05ee52d7fad6 [project @ 2007-12-10 07:06:00 by jwe]
jwe
parents: 7017
diff changeset
840 ? file
05ee52d7fad6 [project @ 2007-12-10 07:06:00 by jwe]
jwe
parents: 7017
diff changeset
841 : (is_dir_sep (dir[dir.length()-1])
05ee52d7fad6 [project @ 2007-12-10 07:06:00 by jwe]
jwe
parents: 7017
diff changeset
842 ? dir + file
8007
a2ab20ba78f7 make file_ops a proper singleton class
John W. Eaton <jwe@octave.org>
parents: 7520
diff changeset
843 : dir + file_ops::dir_sep_char () + file);
7272
05ee52d7fad6 [project @ 2007-12-10 07:06:00 by jwe]
jwe
parents: 7017
diff changeset
844 }