From c50bcbd6c28f2fd87f87b86bd5b215892daf46a6 Mon Sep 17 00:00:00 2001 From: Damjan Marion Date: Sun, 8 May 2022 20:48:37 +0200 Subject: vlib: process startup config exec scripts line by line This fixes long standing annoyance that CLIs with optional args cannot be executed from file, as they cannot distinguish between valid optional args and next line in the file. Multiline statements can be provided simply by using backslash before \n. Also comments are supported - everything after # is ignored up to the end of the line. Example: # multiline cli using backslash show version \ verbose # end of line comment packet-generator new { \ name x \ limit 5 \ # comment inside cmultiline cli \ size 128-128 \ interface local0 \ node null-node \ data { \ incrementing 30 \ } \ } Type: fix Change-Id: Ia6d588169bae14e6e3f18effe94820d05ace1dbf Signed-off-by: Damjan Marion --- src/vlib/unix/main.c | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) (limited to 'src/vlib/unix/main.c') diff --git a/src/vlib/unix/main.c b/src/vlib/unix/main.c index 3710d8e8b68..fd8a7e863a1 100644 --- a/src/vlib/unix/main.c +++ b/src/vlib/unix/main.c @@ -347,8 +347,20 @@ startup_config_process (vlib_main_t * vm, if (vec_len (buf)) { + unformat_input_t in; unformat_init_vector (&sub_input, buf); - vlib_cli_input (vm, &sub_input, 0, 0); + + while (unformat_user (&sub_input, unformat_vlib_cli_line, &in)) + { + if (vlib_cli_input (vm, &in, 0, 0) != 0) + { + /* cli failed - stop */ + unformat_free (&in); + break; + } + unformat_free (&in); + } + /* frees buf for us */ unformat_free (&sub_input); } -- cgit 1.2.3-korg