diff libinterp/corefcn/sighandlers.cc @ 31607:aac27ad79be6 stable

maint: Re-indent code after switch to using namespace macros. * build-env.h, build-env.in.cc, Cell.h, __betainc__.cc, __eigs__.cc, __ftp__.cc, __ichol__.cc, __ilu__.cc, __isprimelarge__.cc, __magick_read__.cc, __pchip_deriv__.cc, amd.cc, base-text-renderer.cc, base-text-renderer.h, besselj.cc, bitfcns.cc, bsxfun.cc, c-file-ptr-stream.h, call-stack.cc, call-stack.h, ccolamd.cc, cellfun.cc, chol.cc, colamd.cc, dasrt.cc, data.cc, debug.cc, defaults.cc, defaults.h, det.cc, display.cc, display.h, dlmread.cc, dynamic-ld.cc, dynamic-ld.h, ellipj.cc, environment.cc, environment.h, error.cc, error.h, errwarn.h, event-manager.cc, event-manager.h, event-queue.cc, event-queue.h, fcn-info.cc, fcn-info.h, fft.cc, fft2.cc, file-io.cc, filter.cc, find.cc, ft-text-renderer.cc, ft-text-renderer.h, gcd.cc, gl-render.cc, gl-render.h, gl2ps-print.cc, gl2ps-print.h, graphics-toolkit.cc, graphics-toolkit.h, graphics.cc, gsvd.cc, gtk-manager.cc, gtk-manager.h, help.cc, help.h, hook-fcn.cc, hook-fcn.h, input.cc, input.h, interpreter-private.cc, interpreter-private.h, interpreter.cc, interpreter.h, inv.cc, jsondecode.cc, jsonencode.cc, latex-text-renderer.cc, latex-text-renderer.h, load-path.cc, load-path.h, load-save.cc, load-save.h, lookup.cc, ls-hdf5.cc, ls-mat4.cc, ls-mat5.cc, lsode.cc, lu.cc, mappers.cc, matrix_type.cc, max.cc, mex.cc, mexproto.h, mxarray.h, mxtypes.in.h, oct-errno.in.cc, oct-hdf5-types.cc, oct-hist.cc, oct-hist.h, oct-map.cc, oct-map.h, oct-opengl.h, oct-prcstrm.h, oct-process.cc, oct-process.h, oct-stdstrm.h, oct-stream.cc, oct-stream.h, oct-strstrm.h, octave-default-image.h, ordqz.cc, ordschur.cc, pager.cc, pager.h, pinv.cc, pow2.cc, pr-output.cc, psi.cc, qr.cc, quadcc.cc, rand.cc, regexp.cc, settings.cc, settings.h, sighandlers.cc, sighandlers.h, sparse-xpow.cc, sqrtm.cc, stack-frame.cc, stack-frame.h, stream-euler.cc, strfns.cc, svd.cc, syminfo.cc, syminfo.h, symrcm.cc, symrec.cc, symrec.h, symscope.cc, symscope.h, symtab.cc, symtab.h, sysdep.cc, sysdep.h, text-engine.cc, text-engine.h, text-renderer.cc, text-renderer.h, time.cc, toplev.cc, typecast.cc, url-handle-manager.cc, url-handle-manager.h, urlwrite.cc, utils.cc, utils.h, variables.cc, variables.h, xdiv.cc, __delaunayn__.cc, __init_fltk__.cc, __init_gnuplot__.cc, __ode15__.cc, __voronoi__.cc, audioread.cc, convhulln.cc, gzip.cc, cdef-class.cc, cdef-class.h, cdef-fwd.h, cdef-manager.cc, cdef-manager.h, cdef-method.cc, cdef-method.h, cdef-object.cc, cdef-object.h, cdef-package.cc, cdef-package.h, cdef-property.cc, cdef-property.h, cdef-utils.cc, cdef-utils.h, ov-base-diag.cc, ov-base-int.cc, ov-base-mat.cc, ov-base-mat.h, ov-base-scalar.cc, ov-base.cc, ov-base.h, ov-bool-mat.cc, ov-bool-mat.h, ov-bool-sparse.cc, ov-bool.cc, ov-builtin.h, ov-cell.cc, ov-ch-mat.cc, ov-class.cc, ov-class.h, ov-classdef.cc, ov-classdef.h, ov-complex.cc, ov-cx-diag.cc, ov-cx-mat.cc, ov-cx-sparse.cc, ov-dld-fcn.cc, ov-dld-fcn.h, ov-fcn-handle.cc, ov-fcn-handle.h, ov-fcn.h, ov-float.cc, ov-flt-complex.cc, ov-flt-cx-diag.cc, ov-flt-cx-mat.cc, ov-flt-re-diag.cc, ov-flt-re-mat.cc, ov-flt-re-mat.h, ov-intx.h, ov-java.cc, ov-lazy-idx.cc, ov-legacy-range.cc, ov-magic-int.cc, ov-mex-fcn.cc, ov-mex-fcn.h, ov-null-mat.cc, ov-perm.cc, ov-range.cc, ov-re-diag.cc, ov-re-mat.cc, ov-re-mat.h, ov-re-sparse.cc, ov-scalar.cc, ov-str-mat.cc, ov-struct.cc, ov-typeinfo.cc, ov-typeinfo.h, ov-usr-fcn.cc, ov-usr-fcn.h, ov.cc, ov.h, ovl.h, octave.cc, octave.h, op-b-sbm.cc, op-bm-sbm.cc, op-cs-scm.cc, op-fm-fcm.cc, op-fs-fcm.cc, op-s-scm.cc, op-scm-cs.cc, op-scm-s.cc, op-sm-cs.cc, ops.h, anon-fcn-validator.cc, anon-fcn-validator.h, bp-table.cc, bp-table.h, comment-list.cc, comment-list.h, filepos.h, lex.h, oct-lvalue.cc, oct-lvalue.h, parse.h, profiler.cc, profiler.h, pt-anon-scopes.cc, pt-anon-scopes.h, pt-arg-list.cc, pt-arg-list.h, pt-args-block.cc, pt-args-block.h, pt-array-list.cc, pt-array-list.h, pt-assign.cc, pt-assign.h, pt-binop.cc, pt-binop.h, pt-bp.cc, pt-bp.h, pt-cbinop.cc, pt-cbinop.h, pt-cell.cc, pt-cell.h, pt-check.cc, pt-check.h, pt-classdef.cc, pt-classdef.h, pt-cmd.h, pt-colon.cc, pt-colon.h, pt-const.cc, pt-const.h, pt-decl.cc, pt-decl.h, pt-eval.cc, pt-eval.h, pt-except.cc, pt-except.h, pt-exp.cc, pt-exp.h, pt-fcn-handle.cc, pt-fcn-handle.h, pt-id.cc, pt-id.h, pt-idx.cc, pt-idx.h, pt-jump.h, pt-loop.cc, pt-loop.h, pt-mat.cc, pt-mat.h, pt-misc.cc, pt-misc.h, pt-pr-code.cc, pt-pr-code.h, pt-select.cc, pt-select.h, pt-spmd.cc, pt-spmd.h, pt-stmt.cc, pt-stmt.h, pt-tm-const.cc, pt-tm-const.h, pt-unop.cc, pt-unop.h, pt-walk.cc, pt-walk.h, pt.cc, pt.h, token.cc, token.h, Range.cc, Range.h, idx-vector.cc, idx-vector.h, range-fwd.h, CollocWt.cc, CollocWt.h, aepbalance.cc, aepbalance.h, chol.cc, chol.h, gepbalance.cc, gepbalance.h, gsvd.cc, gsvd.h, hess.cc, hess.h, lo-mappers.cc, lo-mappers.h, lo-specfun.cc, lo-specfun.h, lu.cc, lu.h, oct-convn.cc, oct-convn.h, oct-fftw.cc, oct-fftw.h, oct-norm.cc, oct-norm.h, oct-rand.cc, oct-rand.h, oct-spparms.cc, oct-spparms.h, qr.cc, qr.h, qrp.cc, qrp.h, randgamma.cc, randgamma.h, randmtzig.cc, randmtzig.h, randpoisson.cc, randpoisson.h, schur.cc, schur.h, sparse-chol.cc, sparse-chol.h, sparse-lu.cc, sparse-lu.h, sparse-qr.cc, sparse-qr.h, svd.cc, svd.h, child-list.cc, child-list.h, dir-ops.cc, dir-ops.h, file-ops.cc, file-ops.h, file-stat.cc, file-stat.h, lo-sysdep.cc, lo-sysdep.h, lo-sysinfo.cc, lo-sysinfo.h, mach-info.cc, mach-info.h, oct-env.cc, oct-env.h, oct-group.cc, oct-group.h, oct-password.cc, oct-password.h, oct-syscalls.cc, oct-syscalls.h, oct-time.cc, oct-time.h, oct-uname.cc, oct-uname.h, action-container.cc, action-container.h, base-list.h, cmd-edit.cc, cmd-edit.h, cmd-hist.cc, cmd-hist.h, f77-fcn.h, file-info.cc, file-info.h, lo-array-errwarn.cc, lo-array-errwarn.h, lo-hash.cc, lo-hash.h, lo-ieee.h, lo-regexp.cc, lo-regexp.h, lo-utils.cc, lo-utils.h, oct-base64.cc, oct-base64.h, oct-glob.cc, oct-glob.h, oct-inttypes.h, oct-mutex.cc, oct-mutex.h, oct-refcount.h, oct-shlib.cc, oct-shlib.h, oct-sparse.cc, oct-sparse.h, oct-string.h, octave-preserve-stream-state.h, pathsearch.cc, pathsearch.h, quit.cc, quit.h, unwind-prot.cc, unwind-prot.h, url-transfer.cc, url-transfer.h: Re-indent code after switch to using namespace macros.
author Rik <rik@octave.org>
date Thu, 01 Dec 2022 18:02:15 -0800
parents e88a07dec498
children d9970470108a
line wrap: on
line diff
--- a/libinterp/corefcn/sighandlers.cc	Thu Dec 01 14:23:45 2022 -0800
+++ b/libinterp/corefcn/sighandlers.cc	Thu Dec 01 18:02:15 2022 -0800
@@ -60,436 +60,436 @@
 
 OCTAVE_BEGIN_NAMESPACE(octave)
 
-  // Nonzero means we have already printed a message for this series of
-  // SIGPIPES.  We assume that the writer will eventually give up.
-  int pipe_handler_error_count = 0;
+// Nonzero means we have already printed a message for this series of
+// SIGPIPES.  We assume that the writer will eventually give up.
+int pipe_handler_error_count = 0;
 
-  // TRUE means we can be interrupted.
-  bool can_interrupt = false;
+// TRUE means we can be interrupted.
+bool can_interrupt = false;
 
-  // TRUE means we should try to enter the debugger on SIGINT.
-  bool Vdebug_on_interrupt = false;
+// TRUE means we should try to enter the debugger on SIGINT.
+bool Vdebug_on_interrupt = false;
 
-  // Allow users to avoid writing octave-workspace for SIGHUP (sent by
-  // closing gnome-terminal, for example).  Note that this variable has
-  // no effect if Vcrash_dumps_octave_core is FALSE.
-  static bool Vsighup_dumps_octave_core = true;
+// Allow users to avoid writing octave-workspace for SIGHUP (sent by
+// closing gnome-terminal, for example).  Note that this variable has
+// no effect if Vcrash_dumps_octave_core is FALSE.
+static bool Vsighup_dumps_octave_core = true;
 
-  // Similar to Vsighup_dumps_octave_core, but for SIGQUIT signal.
-  static bool Vsigquit_dumps_octave_core = true;
+// Similar to Vsighup_dumps_octave_core, but for SIGQUIT signal.
+static bool Vsigquit_dumps_octave_core = true;
 
-  // Similar to Vsighup_dumps_octave_core, but for SIGTERM signal.
-  static bool Vsigterm_dumps_octave_core = true;
+// Similar to Vsighup_dumps_octave_core, but for SIGTERM signal.
+static bool Vsigterm_dumps_octave_core = true;
 
-  // List of signals we have caught since last call to signal_handler.
-  static bool *signals_caught = nullptr;
+// List of signals we have caught since last call to signal_handler.
+static bool *signals_caught = nullptr;
 
-  static void
-  my_friendly_exit (int sig, bool save_vars = true)
-  {
-    std::cerr << "fatal: caught signal "
-              << octave_strsignal_wrapper (sig)
-              << " -- stopping myself..." << std::endl;
+static void
+my_friendly_exit (int sig, bool save_vars = true)
+{
+  std::cerr << "fatal: caught signal "
+            << octave_strsignal_wrapper (sig)
+            << " -- stopping myself..." << std::endl;
 
-    if (save_vars)
-      {
-        load_save_system& load_save_sys = __get_load_save_system__ ();
+  if (save_vars)
+    {
+      load_save_system& load_save_sys = __get_load_save_system__ ();
 
-        load_save_sys.dump_octave_core ();
-      }
+      load_save_sys.dump_octave_core ();
+    }
 
-    sysdep_cleanup ();
+  sysdep_cleanup ();
 
-    throw exit_exception (1);
-  }
+  throw exit_exception (1);
+}
 
-  // Called from octave_quit () to actually do something about the signals
-  // we have caught.
+// Called from octave_quit () to actually do something about the signals
+// we have caught.
 
-  void
-  respond_to_pending_signals (void)
-  {
-    // The list of signals is relatively short, so we will just go
-    // linearly through the list.
+void
+respond_to_pending_signals (void)
+{
+  // The list of signals is relatively short, so we will just go
+  // linearly through the list.
 
-    // Interrupt signals are currently handled separately.
+  // Interrupt signals are currently handled separately.
 
-    static int sigint;
-    static const bool have_sigint
-      = octave_get_sig_number ("SIGINT", &sigint);
+  static int sigint;
+  static const bool have_sigint
+    = octave_get_sig_number ("SIGINT", &sigint);
 
-    static int sigbreak;
-    static const bool have_sigbreak
-      = octave_get_sig_number ("SIGBREAK", &sigbreak);
+  static int sigbreak;
+  static const bool have_sigbreak
+    = octave_get_sig_number ("SIGBREAK", &sigbreak);
 
-    // Termination signals.
+  // Termination signals.
 
-    static int sighup;
-    static const bool have_sighup
-      = octave_get_sig_number ("SIGHUP", &sighup);
+  static int sighup;
+  static const bool have_sighup
+    = octave_get_sig_number ("SIGHUP", &sighup);
 
-    static int sigquit;
-    static const bool have_sigquit
-      = octave_get_sig_number ("SIGQUIT", &sigquit);
+  static int sigquit;
+  static const bool have_sigquit
+    = octave_get_sig_number ("SIGQUIT", &sigquit);
 
-    static int sigterm;
-    static const bool have_sigterm
-      = octave_get_sig_number ("SIGTERM", &sigterm);
+  static int sigterm;
+  static const bool have_sigterm
+    = octave_get_sig_number ("SIGTERM", &sigterm);
 
-    // Alarm signals.
+  // Alarm signals.
 
-    static int sigalrm;
-    static const bool have_sigalrm
-      = octave_get_sig_number ("SIGALRM", &sigalrm);
+  static int sigalrm;
+  static const bool have_sigalrm
+    = octave_get_sig_number ("SIGALRM", &sigalrm);
 
-    static int sigvtalrm;
-    static const bool have_sigvtalrm
-      = octave_get_sig_number ("SIGVTALRM", &sigvtalrm);
+  static int sigvtalrm;
+  static const bool have_sigvtalrm
+    = octave_get_sig_number ("SIGVTALRM", &sigvtalrm);
 
-    // I/O signals.
+  // I/O signals.
 
-    static int sigio;
-    static const bool have_sigio
-      = octave_get_sig_number ("SIGIO", &sigio);
+  static int sigio;
+  static const bool have_sigio
+    = octave_get_sig_number ("SIGIO", &sigio);
 
-    static int siglost;
-    static const bool have_siglost
-      = octave_get_sig_number ("SIGLOST", &siglost);
+  static int siglost;
+  static const bool have_siglost
+    = octave_get_sig_number ("SIGLOST", &siglost);
 
-    static int sigpipe;
-    static const bool have_sigpipe
-      = octave_get_sig_number ("SIGPIPE", &sigpipe);
+  static int sigpipe;
+  static const bool have_sigpipe
+    = octave_get_sig_number ("SIGPIPE", &sigpipe);
 
-    // Job control signals.
+  // Job control signals.
 
-    static int sigchld;
-    static const bool have_sigchld
-      = octave_get_sig_number ("SIGCHLD", &sigchld);
+  static int sigchld;
+  static const bool have_sigchld
+    = octave_get_sig_number ("SIGCHLD", &sigchld);
 
-    static int sigcld;
-    static const bool have_sigcld
-      = octave_get_sig_number ("SIGCLD", &sigcld);
+  static int sigcld;
+  static const bool have_sigcld
+    = octave_get_sig_number ("SIGCLD", &sigcld);
 
-    // Resource limit signals.
+  // Resource limit signals.
 
-    static int sigxcpu;
-    static const bool have_sigxcpu
-      = octave_get_sig_number ("SIGXCPU", &sigxcpu);
+  static int sigxcpu;
+  static const bool have_sigxcpu
+    = octave_get_sig_number ("SIGXCPU", &sigxcpu);
 
-    static int sigxfsz;
-    static const bool have_sigxfsz
-      = octave_get_sig_number ("SIGXFSZ", &sigxfsz);
+  static int sigxfsz;
+  static const bool have_sigxfsz
+    = octave_get_sig_number ("SIGXFSZ", &sigxfsz);
 
-    // User signals.
+  // User signals.
 
-    static int sigusr1;
-    static const bool have_sigusr1
-      = octave_get_sig_number ("SIGUSR1", &sigusr1);
+  static int sigusr1;
+  static const bool have_sigusr1
+    = octave_get_sig_number ("SIGUSR1", &sigusr1);
 
-    static int sigusr2;
-    static const bool have_sigusr2
-      = octave_get_sig_number ("SIGUSR2", &sigusr2);
+  static int sigusr2;
+  static const bool have_sigusr2
+    = octave_get_sig_number ("SIGUSR2", &sigusr2);
 
-    child_list& kids = __get_child_list__ ();
+  child_list& kids = __get_child_list__ ();
 
-    for (int sig = 0; sig < octave_num_signals (); sig++)
-      {
-        if (signals_caught[sig])
-          {
-            signals_caught[sig] = false;
+  for (int sig = 0; sig < octave_num_signals (); sig++)
+    {
+      if (signals_caught[sig])
+        {
+          signals_caught[sig] = false;
 
-            if ((have_sigchld && sig == sigchld)
-                || (have_sigcld && sig == sigcld))
-              {
-                // FIXME: should we block or ignore?
-                volatile interrupt_handler saved_interrupt_handler
-                  = ignore_interrupts ();
+          if ((have_sigchld && sig == sigchld)
+              || (have_sigcld && sig == sigcld))
+            {
+              // FIXME: should we block or ignore?
+              volatile interrupt_handler saved_interrupt_handler
+                = ignore_interrupts ();
 
-                void *context = octave_block_child ();
+              void *context = octave_block_child ();
 
-                kids.wait ();
+              kids.wait ();
 
-                set_interrupt_handler (saved_interrupt_handler);
+              set_interrupt_handler (saved_interrupt_handler);
 
-                octave_unblock_child (context);
+              octave_unblock_child (context);
 
-                kids.reap ();
-              }
-            else if (have_sigpipe && sig == sigpipe)
-              {
-                std::cerr << "warning: broken pipe" << std::endl;
+              kids.reap ();
+            }
+          else if (have_sigpipe && sig == sigpipe)
+            {
+              std::cerr << "warning: broken pipe" << std::endl;
 
-                // Don't loop forever on account of this.
-                // FIXME: is this really needed?  Does it do anything
-                // useful now?
+              // Don't loop forever on account of this.
+              // FIXME: is this really needed?  Does it do anything
+              // useful now?
 
-                if (pipe_handler_error_count++ > 100
-                    && octave_interrupt_state >= 0)
-                  octave_interrupt_state++;
-              }
-            else if (have_sighup && sig == sighup)
-              my_friendly_exit (sighup, Vsighup_dumps_octave_core);
-            else if (have_sigquit && sig == sigquit)
-              my_friendly_exit (sigquit, Vsigquit_dumps_octave_core);
-            else if (have_sigterm && sig == sigterm)
-              my_friendly_exit (sigterm, Vsigterm_dumps_octave_core);
-            else if ((have_sigalrm && sig == sigalrm)
-                     || (have_sigvtalrm && sig == sigvtalrm)
-                     || (have_sigio && sig == sigio)
-                     || (have_siglost && sig == siglost)
-                     || (have_sigxcpu && sig == sigxcpu)
-                     || (have_sigxfsz && sig == sigxfsz)
-                     || (have_sigusr1 && sig == sigusr1)
-                     || (have_sigusr2 && sig == sigusr2))
-              std::cerr << "warning: ignoring signal: "
-                        << octave_strsignal_wrapper (sig)
-                        << std::endl;
-            else if ((have_sigint && sig == sigint)
-                     || (have_sigbreak && sig == sigbreak))
-              ; // Handled separately; do nothing.
-            else
-              std::cerr << "warning: ignoring unexpected signal: "
-                        << octave_strsignal_wrapper (sig)
-                        << std::endl;
-          }
-      }
-  }
+              if (pipe_handler_error_count++ > 100
+                  && octave_interrupt_state >= 0)
+                octave_interrupt_state++;
+            }
+          else if (have_sighup && sig == sighup)
+            my_friendly_exit (sighup, Vsighup_dumps_octave_core);
+          else if (have_sigquit && sig == sigquit)
+            my_friendly_exit (sigquit, Vsigquit_dumps_octave_core);
+          else if (have_sigterm && sig == sigterm)
+            my_friendly_exit (sigterm, Vsigterm_dumps_octave_core);
+          else if ((have_sigalrm && sig == sigalrm)
+                   || (have_sigvtalrm && sig == sigvtalrm)
+                   || (have_sigio && sig == sigio)
+                   || (have_siglost && sig == siglost)
+                   || (have_sigxcpu && sig == sigxcpu)
+                   || (have_sigxfsz && sig == sigxfsz)
+                   || (have_sigusr1 && sig == sigusr1)
+                   || (have_sigusr2 && sig == sigusr2))
+            std::cerr << "warning: ignoring signal: "
+                      << octave_strsignal_wrapper (sig)
+                      << std::endl;
+          else if ((have_sigint && sig == sigint)
+                   || (have_sigbreak && sig == sigbreak))
+            ; // Handled separately; do nothing.
+          else
+            std::cerr << "warning: ignoring unexpected signal: "
+                      << octave_strsignal_wrapper (sig)
+                      << std::endl;
+        }
+    }
+}
 
-  sig_handler *
-  set_signal_handler (int sig, sig_handler *handler, bool restart_syscalls)
-  {
-    return octave_set_signal_handler_internal (sig, handler, restart_syscalls);
-  }
+sig_handler *
+set_signal_handler (int sig, sig_handler *handler, bool restart_syscalls)
+{
+  return octave_set_signal_handler_internal (sig, handler, restart_syscalls);
+}
 
-  sig_handler *
-  set_signal_handler (const char *signame, sig_handler *handler,
-                      bool restart_syscalls)
-  {
-    return octave_set_signal_handler_by_name (signame, handler,
-                                              restart_syscalls);
-  }
+sig_handler *
+set_signal_handler (const char *signame, sig_handler *handler,
+                    bool restart_syscalls)
+{
+  return octave_set_signal_handler_by_name (signame, handler,
+         restart_syscalls);
+}
 
-  static void
-  generic_sig_handler (int sig)
-  {
-    // FIXME: this function may execute in a separate signal handler or
-    // signal watcher thread so it should probably be more careful about
-    // how it accesses global objects.
+static void
+generic_sig_handler (int sig)
+{
+  // FIXME: this function may execute in a separate signal handler or
+  // signal watcher thread so it should probably be more careful about
+  // how it accesses global objects.
 
-    octave_signal_caught = 1;
+  octave_signal_caught = 1;
 
-    signals_caught[sig] = true;
+  signals_caught[sig] = true;
 
-    static int sigint;
-    static const bool have_sigint
-      = octave_get_sig_number ("SIGINT", &sigint);
+  static int sigint;
+  static const bool have_sigint
+    = octave_get_sig_number ("SIGINT", &sigint);
 
-    static int sigbreak;
-    static const bool have_sigbreak
-      = octave_get_sig_number ("SIGBREAK", &sigbreak);
+  static int sigbreak;
+  static const bool have_sigbreak
+    = octave_get_sig_number ("SIGBREAK", &sigbreak);
 
-    if ((have_sigint && sig == sigint)
-        || (have_sigbreak && sig == sigbreak))
-      {
-        if (! octave_initialized)
-          exit (1);
+  if ((have_sigint && sig == sigint)
+      || (have_sigbreak && sig == sigbreak))
+    {
+      if (! octave_initialized)
+        exit (1);
 
-        if (can_interrupt)
-          {
-            octave_signal_caught = 1;
-            octave_interrupt_state++;
-          }
-      }
-  }
+      if (can_interrupt)
+        {
+          octave_signal_caught = 1;
+          octave_interrupt_state++;
+        }
+    }
+}
 
-  static void
-  deadly_sig_handler (int sig)
-  {
-    std::cerr << "fatal: caught signal "
-              << octave_strsignal_wrapper (sig)
-              << " -- stopping myself..." << std::endl;
+static void
+deadly_sig_handler (int sig)
+{
+  std::cerr << "fatal: caught signal "
+            << octave_strsignal_wrapper (sig)
+            << " -- stopping myself..." << std::endl;
 
-    octave_set_default_signal_handler (sig);
+  octave_set_default_signal_handler (sig);
 
-    octave_raise_wrapper (sig);
-  }
+  octave_raise_wrapper (sig);
+}
 
-  static void
-  fpe_sig_handler (int)
-  {
-    // FIXME: is there something better we can do?
+static void
+fpe_sig_handler (int)
+{
+  // FIXME: is there something better we can do?
 
-    std::cerr << "warning: floating point exception" << std::endl;
-  }
+  std::cerr << "warning: floating point exception" << std::endl;
+}
 
-  interrupt_handler
-  catch_interrupts (void)
-  {
-    interrupt_handler retval;
+interrupt_handler
+catch_interrupts (void)
+{
+  interrupt_handler retval;
 
-    retval.int_handler = set_signal_handler ("SIGINT", generic_sig_handler);
-    retval.brk_handler = set_signal_handler ("SIGBREAK", generic_sig_handler);
+  retval.int_handler = set_signal_handler ("SIGINT", generic_sig_handler);
+  retval.brk_handler = set_signal_handler ("SIGBREAK", generic_sig_handler);
 
-    return retval;
-  }
+  return retval;
+}
 
-  interrupt_handler
-  ignore_interrupts (void)
-  {
-    interrupt_handler retval;
+interrupt_handler
+ignore_interrupts (void)
+{
+  interrupt_handler retval;
 
-    retval.int_handler = set_signal_handler ("SIGINT", SIG_IGN);
-    retval.brk_handler = set_signal_handler ("SIGBREAK", SIG_IGN);
+  retval.int_handler = set_signal_handler ("SIGINT", SIG_IGN);
+  retval.brk_handler = set_signal_handler ("SIGBREAK", SIG_IGN);
 
-    return retval;
-  }
+  return retval;
+}
 
-  interrupt_handler
-  set_interrupt_handler (const volatile interrupt_handler& h,
-                         bool restart_syscalls)
-  {
-    interrupt_handler retval;
+interrupt_handler
+set_interrupt_handler (const volatile interrupt_handler& h,
+                       bool restart_syscalls)
+{
+  interrupt_handler retval;
 
-    retval.int_handler = set_signal_handler ("SIGINT", h.int_handler,
-                                             restart_syscalls);
+  retval.int_handler = set_signal_handler ("SIGINT", h.int_handler,
+                       restart_syscalls);
 
-    retval.brk_handler = set_signal_handler ("SIGBREAK", h.brk_handler,
-                                             restart_syscalls);
+  retval.brk_handler = set_signal_handler ("SIGBREAK", h.brk_handler,
+                       restart_syscalls);
 
-    return retval;
-  }
+  return retval;
+}
 
-  // Install all the handlers for the signals we might care about.
+// Install all the handlers for the signals we might care about.
 
-  void
-  install_signal_handlers (void)
-  {
-    if (! signals_caught)
-      signals_caught = new bool [octave_num_signals ()];
+void
+install_signal_handlers (void)
+{
+  if (! signals_caught)
+    signals_caught = new bool [octave_num_signals ()];
 
-    for (int i = 0; i < octave_num_signals (); i++)
-      signals_caught[i] = false;
+  for (int i = 0; i < octave_num_signals (); i++)
+    signals_caught[i] = false;
 
-    // Interrupt signals.
+  // Interrupt signals.
 
-    catch_interrupts ();
+  catch_interrupts ();
 
-    // Program Error signals.  These are most likely unrecoverable for
-    // us.
+  // Program Error signals.  These are most likely unrecoverable for
+  // us.
 
-    set_signal_handler ("SIGABRT", deadly_sig_handler);
-    set_signal_handler ("SIGBUS", deadly_sig_handler);
-    set_signal_handler ("SIGEMT", deadly_sig_handler);
-    set_signal_handler ("SIGILL", deadly_sig_handler);
-    // SIGIOT is normally another name for SIGABRT.
-    set_signal_handler ("SIGIOT", deadly_sig_handler);
-    set_signal_handler ("SIGSEGV", deadly_sig_handler);
-    set_signal_handler ("SIGSYS", deadly_sig_handler);
-    set_signal_handler ("SIGTRAP", deadly_sig_handler);
+  set_signal_handler ("SIGABRT", deadly_sig_handler);
+  set_signal_handler ("SIGBUS", deadly_sig_handler);
+  set_signal_handler ("SIGEMT", deadly_sig_handler);
+  set_signal_handler ("SIGILL", deadly_sig_handler);
+  // SIGIOT is normally another name for SIGABRT.
+  set_signal_handler ("SIGIOT", deadly_sig_handler);
+  set_signal_handler ("SIGSEGV", deadly_sig_handler);
+  set_signal_handler ("SIGSYS", deadly_sig_handler);
+  set_signal_handler ("SIGTRAP", deadly_sig_handler);
 
-    // Handle SIGFPE separately.
+  // Handle SIGFPE separately.
 
-    set_signal_handler ("SIGFPE", fpe_sig_handler);
+  set_signal_handler ("SIGFPE", fpe_sig_handler);
 
-    // Handle other signals for which the default action is to terminate
-    // the program.
+  // Handle other signals for which the default action is to terminate
+  // the program.
 
-    // Termination signals.
+  // Termination signals.
 
-    set_signal_handler ("SIGHUP", generic_sig_handler);
-    set_signal_handler ("SIGQUIT", generic_sig_handler);
-    set_signal_handler ("SIGTERM", generic_sig_handler);
+  set_signal_handler ("SIGHUP", generic_sig_handler);
+  set_signal_handler ("SIGQUIT", generic_sig_handler);
+  set_signal_handler ("SIGTERM", generic_sig_handler);
 
-    // Alarm signals.
+  // Alarm signals.
 
-    set_signal_handler ("SIGALRM", generic_sig_handler);
-    set_signal_handler ("SIGVTALRM", generic_sig_handler);
+  set_signal_handler ("SIGALRM", generic_sig_handler);
+  set_signal_handler ("SIGVTALRM", generic_sig_handler);
 
-    // I/O signals.
+  // I/O signals.
 
-    set_signal_handler ("SIGLOST", generic_sig_handler);
-    set_signal_handler ("SIGPIPE", generic_sig_handler);
+  set_signal_handler ("SIGLOST", generic_sig_handler);
+  set_signal_handler ("SIGPIPE", generic_sig_handler);
 
-    // Job control signals.  We only recognize signals about child
-    // processes.
+  // Job control signals.  We only recognize signals about child
+  // processes.
 
-    set_signal_handler ("SIGCHLD", generic_sig_handler);
-    set_signal_handler ("SIGCLD", generic_sig_handler);
+  set_signal_handler ("SIGCHLD", generic_sig_handler);
+  set_signal_handler ("SIGCLD", generic_sig_handler);
 
-    // Resource limit signals.
+  // Resource limit signals.
 
-    // FIXME: does it really make sense to try to handle the CPU limit
-    // signal?
+  // FIXME: does it really make sense to try to handle the CPU limit
+  // signal?
 
-    set_signal_handler ("SIGXCPU", generic_sig_handler);
-    set_signal_handler ("SIGXFSZ", generic_sig_handler);
+  set_signal_handler ("SIGXCPU", generic_sig_handler);
+  set_signal_handler ("SIGXFSZ", generic_sig_handler);
 
-    // User signals.
+  // User signals.
 
-    set_signal_handler ("SIGUSR1", generic_sig_handler);
-    set_signal_handler ("SIGUSR2", generic_sig_handler);
+  set_signal_handler ("SIGUSR1", generic_sig_handler);
+  set_signal_handler ("SIGUSR2", generic_sig_handler);
 
-    // This does nothing on Windows systems.
-    octave_create_interrupt_watcher_thread (generic_sig_handler);
-  }
+  // This does nothing on Windows systems.
+  octave_create_interrupt_watcher_thread (generic_sig_handler);
+}
 
-  static void
-  set_sig_struct_field (octave_scalar_map& m, const char *signame)
-  {
-    int signum;
+static void
+set_sig_struct_field (octave_scalar_map& m, const char *signame)
+{
+  int signum;
 
-    // The names in the struct do not include the leading "SIG" prefix.
+  // The names in the struct do not include the leading "SIG" prefix.
 
-    if (octave_get_sig_number (signame, &signum))
-      m.assign (&signame[3], signum);
-  }
+  if (octave_get_sig_number (signame, &signum))
+    m.assign (&signame[3], signum);
+}
 
-  static octave_scalar_map
-  make_sig_struct (void)
-  {
-    octave_scalar_map m;
+static octave_scalar_map
+make_sig_struct (void)
+{
+  octave_scalar_map m;
 
-    set_sig_struct_field (m, "SIGABRT");
-    set_sig_struct_field (m, "SIGALRM");
-    set_sig_struct_field (m, "SIGBUS");
-    set_sig_struct_field (m, "SIGCHLD");
-    set_sig_struct_field (m, "SIGCLD");
-    set_sig_struct_field (m, "SIGCONT");
-    set_sig_struct_field (m, "SIGEMT");
-    set_sig_struct_field (m, "SIGFPE");
-    set_sig_struct_field (m, "SIGHUP");
-    set_sig_struct_field (m, "SIGILL");
-    set_sig_struct_field (m, "SIGINFO");
-    set_sig_struct_field (m, "SIGINT");
-    set_sig_struct_field (m, "SIGIO");
-    set_sig_struct_field (m, "SIGIOT");
-    set_sig_struct_field (m, "SIGKILL");
-    set_sig_struct_field (m, "SIGLOST");
-    set_sig_struct_field (m, "SIGPIPE");
-    set_sig_struct_field (m, "SIGPOLL");
-    set_sig_struct_field (m, "SIGPROF");
-    set_sig_struct_field (m, "SIGPWR");
-    set_sig_struct_field (m, "SIGQUIT");
-    set_sig_struct_field (m, "SIGSEGV");
-    set_sig_struct_field (m, "SIGSTKFLT");
-    set_sig_struct_field (m, "SIGSTOP");
-    set_sig_struct_field (m, "SIGSYS");
-    set_sig_struct_field (m, "SIGTERM");
-    set_sig_struct_field (m, "SIGTRAP");
-    set_sig_struct_field (m, "SIGTSTP");
-    set_sig_struct_field (m, "SIGTTIN");
-    set_sig_struct_field (m, "SIGTTOU");
-    set_sig_struct_field (m, "SIGUNUSED");
-    set_sig_struct_field (m, "SIGURG");
-    set_sig_struct_field (m, "SIGUSR1");
-    set_sig_struct_field (m, "SIGUSR2");
-    set_sig_struct_field (m, "SIGVTALRM");
-    set_sig_struct_field (m, "SIGWINCH");
-    set_sig_struct_field (m, "SIGXCPU");
-    set_sig_struct_field (m, "SIGXFSZ");
+  set_sig_struct_field (m, "SIGABRT");
+  set_sig_struct_field (m, "SIGALRM");
+  set_sig_struct_field (m, "SIGBUS");
+  set_sig_struct_field (m, "SIGCHLD");
+  set_sig_struct_field (m, "SIGCLD");
+  set_sig_struct_field (m, "SIGCONT");
+  set_sig_struct_field (m, "SIGEMT");
+  set_sig_struct_field (m, "SIGFPE");
+  set_sig_struct_field (m, "SIGHUP");
+  set_sig_struct_field (m, "SIGILL");
+  set_sig_struct_field (m, "SIGINFO");
+  set_sig_struct_field (m, "SIGINT");
+  set_sig_struct_field (m, "SIGIO");
+  set_sig_struct_field (m, "SIGIOT");
+  set_sig_struct_field (m, "SIGKILL");
+  set_sig_struct_field (m, "SIGLOST");
+  set_sig_struct_field (m, "SIGPIPE");
+  set_sig_struct_field (m, "SIGPOLL");
+  set_sig_struct_field (m, "SIGPROF");
+  set_sig_struct_field (m, "SIGPWR");
+  set_sig_struct_field (m, "SIGQUIT");
+  set_sig_struct_field (m, "SIGSEGV");
+  set_sig_struct_field (m, "SIGSTKFLT");
+  set_sig_struct_field (m, "SIGSTOP");
+  set_sig_struct_field (m, "SIGSYS");
+  set_sig_struct_field (m, "SIGTERM");
+  set_sig_struct_field (m, "SIGTRAP");
+  set_sig_struct_field (m, "SIGTSTP");
+  set_sig_struct_field (m, "SIGTTIN");
+  set_sig_struct_field (m, "SIGTTOU");
+  set_sig_struct_field (m, "SIGUNUSED");
+  set_sig_struct_field (m, "SIGURG");
+  set_sig_struct_field (m, "SIGUSR1");
+  set_sig_struct_field (m, "SIGUSR2");
+  set_sig_struct_field (m, "SIGVTALRM");
+  set_sig_struct_field (m, "SIGWINCH");
+  set_sig_struct_field (m, "SIGXCPU");
+  set_sig_struct_field (m, "SIGXFSZ");
 
-    return m;
-  }
+  return m;
+}
 
 DEFUN (SIG, args, ,
        doc: /* -*- texinfo -*-