Mercurial > octave
annotate liboctave/system/lo-sysdep.cc @ 21642:da9c75ffd1a3
Replace deprecated call to length () of a string_vector (bug #47773).
* lo-sysdep.cc (octave_popen2): Change length to numel.
author | Lachlan Andrew <lachlanbis@gmail.com> |
---|---|
date | Sun, 24 Apr 2016 23:15:57 +1000 |
parents | 40de9f8f23a6 |
children | aba2e6293dd8 |
rev | line source |
---|---|
2926 | 1 /* |
2 | |
19697
4197fc428c7d
maint: Update copyright notices for 2015.
John W. Eaton <jwe@octave.org>
parents:
17769
diff
changeset
|
3 Copyright (C) 1996-2015 John W. Eaton |
2926 | 4 |
5 This file is part of Octave. | |
6 | |
7 Octave is free software; you can redistribute it and/or modify it | |
8 under the terms of the GNU General Public License as published by the | |
7016 | 9 Free Software Foundation; either version 3 of the License, or (at your |
10 option) any later version. | |
2926 | 11 |
12 Octave is distributed in the hope that it will be useful, but WITHOUT | |
13 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or | |
14 FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License | |
15 for more details. | |
16 | |
17 You should have received a copy of the GNU General Public License | |
7016 | 18 along with Octave; see the file COPYING. If not, see |
19 <http://www.gnu.org/licenses/>. | |
2926 | 20 |
21 */ | |
22 | |
23 #ifdef HAVE_CONFIG_H | |
21301
40de9f8f23a6
Use '#include "config.h"' rather than <config.h>.
Rik <rik@octave.org>
parents:
21213
diff
changeset
|
24 # include "config.h" |
2926 | 25 #endif |
26 | |
3503 | 27 #include <iostream> |
2926 | 28 #include <string> |
6321 | 29 #include <vector> |
2926 | 30 |
31 #include <sys/types.h> | |
32 #include <unistd.h> | |
33 | |
6321 | 34 #include <fcntl.h> |
35 | |
7695
eacf87a24f55
lo-sysdep.cc: include windows.h if windows and not cygwin
John W. Eaton <jwe@octave.org>
parents:
7017
diff
changeset
|
36 #if defined (__WIN32__) && ! defined (__CYGWIN__) |
21213
f7d1050b9b53
maint: Clean up various usages of #ifdef.
Rik <rik@octave.org>
parents:
21202
diff
changeset
|
37 # define WIN32_LEAN_AND_MEAN 1 |
21202
f7121e111991
maint: indent #ifdef blocks in liboctave and src directories.
Rik <rik@octave.org>
parents:
21136
diff
changeset
|
38 # include <windows.h> |
7695
eacf87a24f55
lo-sysdep.cc: include windows.h if windows and not cygwin
John W. Eaton <jwe@octave.org>
parents:
7017
diff
changeset
|
39 #endif |
eacf87a24f55
lo-sysdep.cc: include windows.h if windows and not cygwin
John W. Eaton <jwe@octave.org>
parents:
7017
diff
changeset
|
40 |
5872 | 41 #include "file-ops.h" |
3069 | 42 #include "lo-error.h" |
2926 | 43 #include "pathlen.h" |
6123 | 44 #include "lo-sysdep.h" |
6321 | 45 #include "str-vec.h" |
8377
25bc2d31e1bf
improve OCTAVE_LOCAL_BUFFER
Jaroslav Hajek <highegg@gmail.com>
parents:
7732
diff
changeset
|
46 #include "oct-locbuf.h" |
2926 | 47 |
3504 | 48 std::string |
2926 | 49 octave_getcwd (void) |
50 { | |
3504 | 51 std::string retval; |
3069 | 52 |
10250 | 53 // Using the gnulib getcwd module ensures that we have a getcwd that |
54 // will allocate a buffer as large as necessary if buf and size are | |
55 // both 0. | |
3069 | 56 |
10411 | 57 char *tmp = gnulib::getcwd (0, 0); |
2926 | 58 |
21136
7cac4e7458f2
maint: clean up code around calls to current_liboctave_error_handler.
Rik <rik@octave.org>
parents:
19864
diff
changeset
|
59 if (! tmp) |
3069 | 60 (*current_liboctave_error_handler) ("unable to find current directory"); |
2926 | 61 |
21136
7cac4e7458f2
maint: clean up code around calls to current_liboctave_error_handler.
Rik <rik@octave.org>
parents:
19864
diff
changeset
|
62 retval = tmp; |
7cac4e7458f2
maint: clean up code around calls to current_liboctave_error_handler.
Rik <rik@octave.org>
parents:
19864
diff
changeset
|
63 free (tmp); |
7cac4e7458f2
maint: clean up code around calls to current_liboctave_error_handler.
Rik <rik@octave.org>
parents:
19864
diff
changeset
|
64 |
2926 | 65 return retval; |
66 } | |
67 | |
68 int | |
5872 | 69 octave_chdir (const std::string& path_arg) |
2926 | 70 { |
5872 | 71 std::string path = file_ops::tilde_expand (path_arg); |
72 | |
6244 | 73 #if defined (__WIN32__) && ! defined (__CYGWIN__) |
14846
460a3c6d8bf1
maint: Use Octave coding convention for cuddled parenthis in function calls with empty argument lists.
Rik <octave@nomad.inbox5.com>
parents:
14155
diff
changeset
|
74 if (path.length () == 2 && path[1] == ':') |
6244 | 75 path += "\\"; |
76 #endif | |
77 | |
14152
933bf1b4ab29
* lo-sysdep.cc (octave_chdir): Use gnulib::chdir.
John W. Eaton <jwe@octave.org>
parents:
14138
diff
changeset
|
78 return gnulib::chdir (path.c_str ()); |
2926 | 79 } |
80 | |
6321 | 81 #if defined (__WIN32__) && ! defined (__CYGWIN__) |
82 | |
83 pid_t | |
17769
49a5a4be04a1
maint: Use GNU style coding conventions for code in liboctave/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
84 octave_popen2 (const std::string& cmd, const string_vector& args, |
49a5a4be04a1
maint: Use GNU style coding conventions for code in liboctave/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
85 bool sync_mode, |
49a5a4be04a1
maint: Use GNU style coding conventions for code in liboctave/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
86 int *fildes, std::string& msg) |
6321 | 87 { |
88 pid_t pid; | |
89 PROCESS_INFORMATION pi; | |
90 STARTUPINFO si; | |
91 std::string command = "\"" + cmd + "\""; | |
17769
49a5a4be04a1
maint: Use GNU style coding conventions for code in liboctave/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
92 HANDLE hProcess = GetCurrentProcess (); |
49a5a4be04a1
maint: Use GNU style coding conventions for code in liboctave/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
93 HANDLE childRead, childWrite, parentRead, parentWrite; |
6321 | 94 DWORD pipeMode; |
95 | |
96 ZeroMemory (&pi, sizeof (pi)); | |
97 ZeroMemory (&si, sizeof (si)); | |
98 si.cb = sizeof (si); | |
99 | |
19864
17d647821d61
maint: More cleanup of C++ code to follow Octave coding conventions.
John W. Eaton <jwe@octave.org>
parents:
19697
diff
changeset
|
100 if (! CreatePipe (&childRead, &parentWrite, 0, 0) |
17d647821d61
maint: More cleanup of C++ code to follow Octave coding conventions.
John W. Eaton <jwe@octave.org>
parents:
19697
diff
changeset
|
101 || ! DuplicateHandle (hProcess, childRead, hProcess, &childRead, |
17d647821d61
maint: More cleanup of C++ code to follow Octave coding conventions.
John W. Eaton <jwe@octave.org>
parents:
19697
diff
changeset
|
102 0, TRUE, |
17d647821d61
maint: More cleanup of C++ code to follow Octave coding conventions.
John W. Eaton <jwe@octave.org>
parents:
19697
diff
changeset
|
103 DUPLICATE_SAME_ACCESS | DUPLICATE_CLOSE_SOURCE)) |
6321 | 104 { |
105 msg = "popen2: pipe creation failed"; | |
106 return -1; | |
107 } | |
19864
17d647821d61
maint: More cleanup of C++ code to follow Octave coding conventions.
John W. Eaton <jwe@octave.org>
parents:
19697
diff
changeset
|
108 if (! CreatePipe (&parentRead, &childWrite, 0, 0) |
17d647821d61
maint: More cleanup of C++ code to follow Octave coding conventions.
John W. Eaton <jwe@octave.org>
parents:
19697
diff
changeset
|
109 || ! DuplicateHandle (hProcess, childWrite, hProcess, &childWrite, |
17d647821d61
maint: More cleanup of C++ code to follow Octave coding conventions.
John W. Eaton <jwe@octave.org>
parents:
19697
diff
changeset
|
110 0, TRUE, |
17d647821d61
maint: More cleanup of C++ code to follow Octave coding conventions.
John W. Eaton <jwe@octave.org>
parents:
19697
diff
changeset
|
111 DUPLICATE_SAME_ACCESS | DUPLICATE_CLOSE_SOURCE)) |
6321 | 112 { |
113 msg = "popen2: pipe creation failed"; | |
114 return -1; | |
115 } | |
116 if (! sync_mode) | |
117 { | |
118 pipeMode = PIPE_NOWAIT; | |
119 SetNamedPipeHandleState (parentRead, &pipeMode, 0, 0); | |
120 } | |
17769
49a5a4be04a1
maint: Use GNU style coding conventions for code in liboctave/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
121 fildes[1] = _open_osfhandle (reinterpret_cast<intptr_t> (parentRead), |
49a5a4be04a1
maint: Use GNU style coding conventions for code in liboctave/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
122 _O_RDONLY | _O_BINARY); |
49a5a4be04a1
maint: Use GNU style coding conventions for code in liboctave/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
123 fildes[0] = _open_osfhandle (reinterpret_cast<intptr_t> (parentWrite), |
49a5a4be04a1
maint: Use GNU style coding conventions for code in liboctave/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
124 _O_WRONLY | _O_BINARY); |
6321 | 125 si.dwFlags |= STARTF_USESTDHANDLES; |
126 si.hStdInput = childRead; | |
127 si.hStdOutput = childWrite; | |
128 | |
129 // Ignore first arg as it is the command | |
21642
da9c75ffd1a3
Replace deprecated call to length () of a string_vector (bug #47773).
Lachlan Andrew <lachlanbis@gmail.com>
parents:
21301
diff
changeset
|
130 for (int k=1; k<args.numel (); k++) |
6321 | 131 command += " \"" + args[k] + "\""; |
132 OCTAVE_LOCAL_BUFFER (char, c_command, command.length () + 1); | |
133 strcpy (c_command, command.c_str ()); | |
134 if (! CreateProcess (0, c_command, 0, 0, TRUE, 0, 0, 0, &si, &pi)) | |
135 { | |
136 msg = "popen2: process creation failed"; | |
137 return -1; | |
138 } | |
139 pid = pi.dwProcessId; | |
140 | |
141 CloseHandle (childRead); | |
142 CloseHandle (childWrite); | |
143 CloseHandle (pi.hProcess); | |
144 CloseHandle (pi.hThread); | |
145 | |
146 return pid; | |
147 } | |
148 | |
149 #endif |