Repair vlib API socket server

[vpp.git] / src / vlib / unix / cli.c

diff --git a/src/vlib/unix/cli.c b/src/vlib/unix/cli.c
index ffe5de6..3eb1d9e 100644 (file)
--- a/src/vlib/unix/cli.c
+++ b/src/vlib/unix/cli.c
@@ -2776,8 +2776,14 @@ unix_cli_config (vlib_main_t * vm, unformat_input_t * input)
          cf->height = ws.ws_row;
 
          if (cf->width == 0 || cf->height == 0)
-           /* We have a tty, but no size. Stick to line mode. */
-           goto notty;
+           {
+             /*
+              * We have a tty, but no size. Use defaults.
+              * vpp "unix interactive" inside emacs + gdb ends up here.
+              */
+             cf->width = 80;
+             cf->height = 24;
+           }
 
          /* Setup the history */
          cf->history_limit = um->cli_history_limit;
@@ -2816,7 +2822,6 @@ unix_cli_config (vlib_main_t * vm, unformat_input_t * input)
        }
       else
        {
-       notty:
          /* No tty, so make sure the session doesn't have tty-like features */
          unix_cli_set_session_noninteractive (cf);
        }
@@ -2986,7 +2991,7 @@ unix_cli_exec (vlib_main_t * vm,
       }
   }
 
-  unformat_init_unix_file (&sub_input, fd);
+  unformat_init_clib_file (&sub_input, fd);
 
   vlib_cli_input (vm, &sub_input, 0, 0);
   unformat_free (&sub_input);