Update pipework and improve memory reporting.

Improve error handling for all new pipework inputs and outputs.

Change behaviour of ^C from VTY Terminal, so that will interrupt
output and terminate all running pipes -- including running
shell commands.

In pipe commands, recognise "~/..." and "~user/..." home directory
forms.

Changed "~/" to mean the usual home for the current user.  "~~/"
now means the configuration file directory.

Introduced "shdir DIR" command to show what is (currently) what.

Changed "<|" so that if the command has a path, it is expanded
using Quagga's rules (including "~~/" and "~./") and the
"here" directory is set to that path.

Fixed collection of stderr output from all pipes so that is
separate from stdout output, and is always sent to the base
output (eg VTY Terminal).

Increase amount of information about the heap that "show mem"
shows -- particularly if the "memory_tracker" is enabled.

Tested and applied resulting fixes.

1 files changed, 2 insertions, 21 deletions

diff --git a/lib/vty_cli.h b/lib/vty_cli.h
index 78ccc900..e366ecdf 100644
--- a/lib/vty_cli.h
+++ b/lib/vty_cli.h
@@ -63,9 +63,6 @@ struct vty_cli
   bool          monitor ;
   bool          monitor_busy ;
 
-  /* Terminal timeout in seconds -- 0 => none                           */
-  vty_timer_time v_timeout ;
-
   /* The incoming stuff                                                 */
   keystroke_stream key_stream ;
 
@@ -79,9 +76,7 @@ struct vty_cli
    *                     In particular, must be cleared before setting
    *                     out_active -- see below.
    *
-   * dirty           <=> the last command output did not end with a newline.
-   *
-   * tilde_enabled  <=> do not do the "~ " one command line ahead.
+   * tilde_enabled   <=> do the "~ " one command line ahead.
    *
    * If drawn is true, the following are valid:
    *
@@ -98,7 +93,6 @@ struct vty_cli
    * NB: echo_suppress is only used for password entry.
    */
   bool          drawn ;
-  bool          dirty ;
 
   bool          tilde_prompt ;
   bool          tilde_enabled ;
@@ -106,8 +100,6 @@ struct vty_cli
   int           prompt_len ;
   int           extra_len ;
 
-  bool          echo_suppress ;
-
   /* "cache" for prompt -- when node or host name changes, prompt does  */
   node_type_t   prompt_node ;
   name_gen_t    prompt_gen ;
@@ -130,14 +122,7 @@ struct vty_cli
    *                   While this flag is set, the CLI may not write to the
    *                   screen.
    *
-   *   flush        -- this flag => out_active.
-   *
-   *                   When the CLI is ready to read the next CLI command, it
-   *                   must wait for all command output to complete.  This
-   *                   flag is set, so that (a) any final but incomplete
-   *                   line of command output will be flushed, and (b) to
-   *                   signal that out_active must be cleared when all output
-   *                   has completed.
+   *                   Flag is cleared when obuf is empty, and is !in_progress.
    *
    *   more_wait    -- is in "--more--" wait state
    *   more_enter   -- more_wait and waiting for "--more--" prompt to be
@@ -150,7 +135,6 @@ struct vty_cli
 
   bool          mon_active ;
   bool          out_active ;
-  bool          flush ;
 
   bool          more_wait ;
   bool          more_enter ;
@@ -220,7 +204,6 @@ extern cmd_return_code_t uty_cli_want_command(vty_cli cli, cmd_action action,
 extern void uty_cli_out(vty_cli cli, const char *format, ...)
                                                         PRINTF_ATTRIBUTE(2, 3) ;
 extern void uty_cli_out_newline(vty_cli cli) ;
-extern void uty_cli_out_clear(vty_cli cli) ;
 extern void uty_cli_write(vty_cli cli, const char *this, int len) ;
 extern void uty_cli_wipe(vty_cli cli, int len) ;
 
@@ -229,8 +212,6 @@ extern void uty_cli_set_window(vty_cli cli, int width, int height) ;
 extern void uty_cli_enter_more_wait(vty_cli cli) ;
 extern void uty_cli_exit_more_wait(vty_cli cli) ;
 
-extern bool uty_cli_draw_if_required(vty_cli cli) ;
-
 extern void uty_cli_pre_monitor(vty_cli cli) ;
 extern void uty_cli_post_monitor(vty_cli cli) ;