Mercurial > octave
view liboctave/system/oct-syscalls.cc @ 21136:7cac4e7458f2
maint: clean up code around calls to current_liboctave_error_handler.
Remove statements after call to handler that are no longer reachable.
Place input validation first and immediately call handler if necessary.
Change if/error_handler/else to if/error_handler and re-indent code.
* Array-util.cc, Array.cc, CColVector.cc, CDiagMatrix.cc, CMatrix.cc,
CNDArray.cc, CRowVector.cc, CSparse.cc, DiagArray2.cc, MArray.cc,
PermMatrix.cc, Sparse.cc, Sparse.h, chMatrix.cc, chNDArray.cc, dColVector.cc,
dDiagMatrix.cc, dMatrix.cc, dNDArray.cc, dRowVector.cc, dSparse.cc,
fCColVector.cc, fCDiagMatrix.cc, fCMatrix.cc, fCNDArray.cc, fCRowVector.cc,
fColVector.cc, fDiagMatrix.cc, fMatrix.cc, fNDArray.cc, fRowVector.cc,
idx-vector.cc, CmplxAEPBAL.cc, CmplxCHOL.cc, CmplxGEPBAL.cc, CmplxHESS.cc,
CmplxLU.cc, CmplxQR.cc, CmplxSCHUR.cc, CmplxSVD.cc, DASPK.cc, EIG.cc, LSODE.cc,
Quad.cc, SparseCmplxCHOL.cc, SparseCmplxLU.cc, SparseCmplxQR.cc, SparseQR.cc,
SparsedbleCHOL.cc, SparsedbleLU.cc, base-lu.cc, bsxfun-defs.cc, dbleAEPBAL.cc,
dbleCHOL.cc, dbleGEPBAL.cc, dbleHESS.cc, dbleLU.cc, dbleQR.cc, dbleSCHUR.cc,
dbleSVD.cc, eigs-base.cc, fCmplxAEPBAL.cc, fCmplxCHOL.cc, fCmplxLU.cc,
fCmplxQR.cc, fCmplxSCHUR.cc, fEIG.cc, floatAEPBAL.cc, floatCHOL.cc,
floatGEPBAL.cc, floatHESS.cc, floatLU.cc, floatQR.cc, floatSCHUR.cc,
floatSVD.cc, lo-specfun.cc, oct-fftw.cc, oct-rand.cc, oct-spparms.cc,
sparse-base-chol.cc, sparse-dmsolve.cc, file-ops.cc, lo-sysdep.cc,
mach-info.cc, oct-env.cc, oct-syscalls.cc, cmd-edit.cc, cmd-hist.cc,
data-conv.cc, lo-ieee.cc, lo-regexp.cc, oct-base64.cc, oct-shlib.cc,
pathsearch.cc, singleton-cleanup.cc, sparse-util.cc, unwind-prot.cc:
Remove statements after call to handler that are no longer reachable.
Place input validation first and immediately call handler if necessary.
Change if/error_handler/else to if/error_handler and re-indent code.
author | Rik <rik@octave.org> |
---|---|
date | Sat, 23 Jan 2016 13:52:03 -0800 |
parents | 93748bcaec17 |
children | f7121e111991 |
line wrap: on
line source
/* Copyright (C) 1996-2015 John W. Eaton This file is part of Octave. Octave is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 3 of the License, or (at your option) any later version. Octave is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with Octave; see the file COPYING. If not, see <http://www.gnu.org/licenses/>. */ #ifdef HAVE_CONFIG_H #include <config.h> #endif #include <cerrno> #include <cstdlib> #include <string.h> #include <sys/types.h> #include <unistd.h> #include <fcntl.h> // We can't use csignal as kill is not in the std namespace, and picky // compiler runtimes will also exclude it from global scope as well. #include <signal.h> #include "lo-utils.h" #include "lo-sysdep.h" #include "oct-syscalls.h" #include "str-vec.h" #define NOT_SUPPORTED(nm) \ nm ": not supported on this system" int octave_syscalls::dup2 (int old_fd, int new_fd) { std::string msg; return dup2 (old_fd, new_fd, msg); } int octave_syscalls::dup2 (int old_fd, int new_fd, std::string& msg) { msg = ""; int status = -1; #if defined (HAVE_DUP2) status = gnulib::dup2 (old_fd, new_fd); if (status < 0) msg = gnulib::strerror (errno); #else msg = NOT_SUPPORTED ("dup2"); #endif return status; } int octave_syscalls::execvp (const std::string& file, const string_vector& argv) { std::string msg; return execvp (file, argv, msg); } int octave_syscalls::execvp (const std::string& file, const string_vector& args, std::string& msg) { msg = ""; int status = -1; #if defined (HAVE_EXECVP) char **argv = args.c_str_vec (); status = ::execvp (file.c_str (), argv); string_vector::delete_c_str_vec (argv); if (status < 0) msg = gnulib::strerror (errno); #else msg = NOT_SUPPORTED ("execvp"); #endif return status; } pid_t octave_syscalls::fork (std::string& msg) { pid_t status = -1; #if defined (HAVE_FORK) status = ::fork (); if (status < 0) msg = gnulib::strerror (errno); #else msg = NOT_SUPPORTED ("fork"); #endif return status; } pid_t octave_syscalls::vfork (std::string& msg) { pid_t status = -1; #if defined (HAVE_VFORK) || defined (HAVE_FORK) #if defined (HAVE_VFORK) status = ::vfork (); #else status = ::fork (); #endif if (status < 0) msg = gnulib::strerror (errno); #else msg = NOT_SUPPORTED ("vfork"); #endif return status; } pid_t octave_syscalls::getpgrp (std::string& msg) { pid_t status = -1; #if defined (HAVE_GETPGRP) status = ::getpgrp (); if (status < 0) msg = gnulib::strerror (errno); #else msg = NOT_SUPPORTED ("getpgrp"); #endif return status; } pid_t octave_syscalls::getpid (void) { #if defined (HAVE_GETPID) return ::getpid (); #else return 0; #endif } pid_t octave_syscalls::getppid (void) { #if defined (HAVE_GETPPID) return ::getppid (); #else return 0; #endif } gid_t octave_syscalls::getgid (void) { #if defined (HAVE_GETGID) return ::getgid (); #else return 0; #endif } gid_t octave_syscalls::getegid (void) { #if defined (HAVE_GETEGID) return ::getegid (); #else return 0; #endif } uid_t octave_syscalls::getuid (void) { #if defined (HAVE_GETUID) return ::getuid (); #else return 0; #endif } uid_t octave_syscalls::geteuid (void) { #if defined (HAVE_GETEUID) return ::geteuid (); #else return 0; #endif } int octave_syscalls::pipe (int *fildes) { std::string msg; return pipe (fildes, msg); } int octave_syscalls::pipe (int *fildes, std::string& msg) { msg = ""; int status = -1; #if defined (HAVE_PIPE) status = ::pipe (fildes); if (status < 0) msg = gnulib::strerror (errno); #else msg = NOT_SUPPORTED ("pipe"); #endif return status; } pid_t octave_syscalls::waitpid (pid_t pid, int *status, int options) { std::string msg; return waitpid (pid, status, options, msg); } pid_t octave_syscalls::waitpid (pid_t pid, int *status, int options, std::string& msg) { pid_t retval = -1; msg = ""; #if defined (HAVE_WAITPID) retval = ::octave_waitpid (pid, status, options); if (retval < 0) msg = gnulib::strerror (errno); #else msg = NOT_SUPPORTED ("waitpid"); #endif return retval; } int octave_syscalls::kill (pid_t pid, int sig) { std::string msg; return kill (pid, sig, msg); } int octave_syscalls::kill (pid_t pid, int sig, std::string& msg) { msg = ""; int status = -1; #if defined (HAVE_KILL) status = ::kill (pid, sig); if (status < 0) msg = gnulib::strerror (errno); #else msg = NOT_SUPPORTED ("kill"); #endif return status; } pid_t octave_syscalls::popen2 (const std::string& cmd, const string_vector& args, bool sync_mode, int *fildes) { std::string msg; bool interactive = false; return popen2 (cmd, args, sync_mode, fildes, msg, interactive); } pid_t octave_syscalls::popen2 (const std::string& cmd, const string_vector& args, bool sync_mode, int *fildes, std::string& msg) { bool interactive = false; return popen2 (cmd, args, sync_mode, fildes, msg, interactive); } pid_t octave_syscalls::popen2 (const std::string& cmd, const string_vector& args, bool sync_mode, int *fildes, std::string& msg, bool &interactive) { #if defined (__WIN32__) && ! defined (__CYGWIN__) return ::octave_popen2 (cmd, args, sync_mode, fildes, msg); #else pid_t pid; int child_stdin[2], child_stdout[2]; if (pipe (child_stdin, msg) == 0) { if (pipe (child_stdout, msg) == 0) { pid = fork (msg); if (pid < 0) msg = "popen2: process creation failed -- " + msg; else if (pid == 0) { std::string child_msg; interactive = false; // Child process gnulib::close (child_stdin[1]); gnulib::close (child_stdout[0]); if (dup2 (child_stdin[0], STDIN_FILENO) >= 0) { gnulib::close (child_stdin[0]); if (dup2 (child_stdout[1], STDOUT_FILENO) >= 0) { gnulib::close (child_stdout[1]); if (execvp (cmd, args, child_msg) < 0) child_msg = "popen2 (child): unable to start process -- " + child_msg; } else child_msg = "popen2 (child): file handle duplication failed -- " + child_msg; } else child_msg = "popen2 (child): file handle duplication failed -- " + child_msg; (*current_liboctave_error_handler) (child_msg.c_str ()); exit (0); } else { // Parent process gnulib::close (child_stdin[0]); gnulib::close (child_stdout[1]); #if defined (F_SETFL) && defined (O_NONBLOCK) if (! sync_mode && octave_fcntl (child_stdout[0], F_SETFL, O_NONBLOCK, msg) < 0) msg = "popen2: error setting file mode -- " + msg; else #endif { fildes[0] = child_stdin[1]; fildes[1] = child_stdout[0]; return pid; } } gnulib::close (child_stdout[0]); gnulib::close (child_stdout[1]); } else msg = "popen2: pipe creation failed -- " + msg; gnulib::close (child_stdin[0]); gnulib::close (child_stdin[1]); } else msg = "popen2: pipe creation failed -- " + msg; return -1; #endif } int octave_fcntl (int fd, int cmd, long arg) { std::string msg; return octave_fcntl (fd, cmd, arg, msg); } int octave_fcntl (int fd, int cmd, long arg, std::string& msg) { msg = ""; int status = -1; status = gnulib::fcntl (fd, cmd, arg); if (status < 0) msg = gnulib::strerror (errno); return status; }