Mercurial > jwe > octave
view libinterp/corefcn/oct-procbuf.cc @ 24118:f87c9f5c0f43
maint: silence several compiler warnings when building for Windows
* sighandlers.cc (w32_interrupt_manager::do_jump_to_enclosing_context): Use
reinterpret_cast to silence compiler warning from -Wold-style-cast.
* welcome-wizard.cc (welcome_wizard::welcome_wizard): Likewise.
* oct-procbuf.cc (octave_procbuf_list): Only define on systems that use it to
silence compiler warning from -Wunused-variable.
* sysdep.cc (w32_shell_execute): Delete empty unused function to silence several
compiler warnings. (raw_mode): Use octave_unused_parameter to silence compiler
warnings from -Wunused-parameter on certain systems.
* cdisplay.c (octave_get_display_info): Use octave_unused_parameter to silence
compiler warning from -Wunused-parameter on certain systems.
* oct-group.cc (octave::sys::group::getgrgid, octave::sys::group::getgrnam,
octave::sys::group::group): Likewise.
* oct-passwd.cc (octave::sys::password::getpwuid,
octave::sys::password::getpwnam, octave::sys::password::password): Likewise.
* signal-wrappers.c (octave_kill_wrapper, block_or_unblock_signal): Likewise.
* wait-for-input.c (octave_wait_for_input): Likewise.
* unistd-wrappers.c (prepare_spawn): Add const-qualifier on argument to silence
compiler warning from -Wdiscarded-qualifiers.
* stat-wrappers.c: Use pragma to disable -Wunused-parameter warnings for wrapper
functions around macros that may discard their arguments on certain systems.
* wait-wrappers.c Use pragma to disable -Wunused-parameter warnings for wrapper
functions around macros that may discard their arguments on certain systems.
Reorder functions to group related wrappers.
(octave_waitpid_wrapper): Use octave_unused_parameter to silence compiler
warning from -Wunused-parameter on certain systems.
author | Mike Miller <mtmiller@octave.org> |
---|---|
date | Sun, 01 Oct 2017 14:52:33 -0700 |
parents | 980f39c3ab90 |
children | 194eb4bd202b |
line wrap: on
line source
/* Copyright (C) 1996-2017 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/>. */ #if defined (HAVE_CONFIG_H) # include "config.h" #endif #include <cerrno> #include <iostream> // FIXME: we would prefer to avoid including these directly in Octave // sources, but eliminating them is complicated by the mingling of // octave_procbuf_list and the calls to system library functions like // execl. #if defined (HAVE_UNISTD_H) # if defined (HAVE_SYS_TYPES_H) # include <sys/types.h> # endif # include <unistd.h> #endif #include "lo-mappers.h" #include "lo-utils.h" #include "oct-procbuf.h" #include "oct-syscalls.h" #include "sysdep.h" #include "unistd-wrappers.h" #include "variables.h" #include "defun.h" #include "errwarn.h" #include "utils.h" #if ! defined (SHELL_PATH) # define SHELL_PATH "/bin/sh" #endif // This class is based on the procbuf class from libg++, written by // Per Bothner, Copyright (C) 1993 Free Software Foundation. #if (! (defined (__CYGWIN__) || defined (__MINGW32__) || defined (_MSC_VER)) \ && defined (HAVE_UNISTD_H)) static octave_procbuf *octave_procbuf_list = nullptr; #endif #if ! defined (BUFSIZ) # define BUFSIZ 1024 #endif octave_procbuf * octave_procbuf::open (const char *command, int mode) { #if defined (__CYGWIN__) || defined (__MINGW32__) || defined (_MSC_VER) if (is_open ()) return 0; f = (octave_popen (command, (mode & std::ios::in) ? "r" : "w")); if (! f) return 0; // Oops... popen doesn't return the associated pid, so fake it for now proc_pid = 1; open_p = true; if (mode & std::ios::out) ::setvbuf (f, 0, _IOLBF, BUFSIZ); return this; #elif defined (HAVE_UNISTD_H) int pipe_fds[2]; volatile int child_std_end = (mode & std::ios::in) ? 1 : 0; volatile int parent_end, child_end; if (is_open ()) return nullptr; if (octave::sys::pipe (pipe_fds) < 0) return nullptr; if (mode & std::ios::in) { parent_end = pipe_fds[0]; child_end = pipe_fds[1]; } else { parent_end = pipe_fds[1]; child_end = pipe_fds[0]; } proc_pid = ::fork (); if (proc_pid == 0) { octave_close_wrapper (parent_end); if (child_end != child_std_end) { octave_dup2_wrapper (child_end, child_std_end); octave_close_wrapper (child_end); } while (octave_procbuf_list) { FILE *fp = octave_procbuf_list->f; if (fp) { std::fclose (fp); fp = nullptr; } octave_procbuf_list = octave_procbuf_list->next; } execl (SHELL_PATH, "sh", "-c", command, static_cast<void *> (nullptr)); exit (127); } octave_close_wrapper (child_end); if (proc_pid < 0) { octave_close_wrapper (parent_end); return nullptr; } f = (::fdopen (parent_end, (mode & std::ios::in) ? "r" : "w")); if (mode & std::ios::out) ::setvbuf (f, nullptr, _IOLBF, BUFSIZ); open_p = true; next = octave_procbuf_list; octave_procbuf_list = this; return this; #else return 0; #endif } octave_procbuf * octave_procbuf::close (void) { #if defined (__CYGWIN__) || defined (__MINGW32__) || defined (_MSC_VER) if (f) { wstatus = octave_pclose (f); f = 0; } open_p = false; return this; #elif defined (HAVE_UNISTD_H) if (f) { pid_t wait_pid; int status = -1; for (octave_procbuf **ptr = &octave_procbuf_list; *ptr != nullptr; ptr = &(*ptr)->next) { if (*ptr == this) { *ptr = (*ptr)->next; status = 0; break; } } if (status == 0 && std::fclose (f) == 0) { using namespace std; do { wait_pid = octave::sys::waitpid (proc_pid, &wstatus, 0); } while (wait_pid == -1 && errno == EINTR); } f = nullptr; } open_p = false; return this; #else return 0; #endif }