2 files changed, 41 insertions, 0 deletions
diff --git a/src/vlib/cli.c b/src/vlib/cli.c
index dcabe8dfbaf..01409b8b677 100644
--- a/src/vlib/cli.c
+++ b/src/vlib/cli.c
@@ -159,6 +159,46 @@ done:
   return match;
 }
 
+/* Get current command args */
+uword
+unformat_vlib_cli_args (unformat_input_t *i, va_list *va)
+{
+  unformat_input_t *result = va_arg (*va, unformat_input_t *);
+  u8 *line;
+  uword last_c;
+  u32 index = i->index;
+
+  if (unformat_is_eof (i))
+    {
+      unformat_init (result, 0, 0);
+      return 0;
+    }
+
+  /* try to find last non-space character */
+  do
+    {
+      ASSERT (index > 0);
+      last_c = i->buffer[--index];
+    }
+  while (last_c == ' ');
+
+  if (last_c == '\t' || last_c == '\n' || last_c == '\r' || last_c == '\f' ||
+      last_c == '}')
+    {
+      /* current command has no args */
+      unformat_init (result, 0, 0);
+      return 0;
+    }
+
+  if (!unformat_user (i, unformat_line, &line))
+    {
+      unformat_init (result, 0, 0);
+      return 0;
+    }
+  unformat_init_vector (result, line);
+  return 1;
+}
+
 /* Looks for string based sub-input formatted { SUB-INPUT }. */
 uword
 unformat_vlib_cli_sub_input (unformat_input_t * i, va_list * args)
diff --git a/src/vlib/cli.h b/src/vlib/cli.h
index 83b4eab1851..32e46f9e0da 100644
--- a/src/vlib/cli.h
+++ b/src/vlib/cli.h
@@ -204,6 +204,7 @@ clib_error_t *vlib_cli_register (struct vlib_main_t *vm,
 clib_error_t *vlib_cli_register_parse_rule (struct vlib_main_t *vm,
 					    vlib_cli_parse_rule_t * c);
 
+uword unformat_vlib_cli_args (unformat_input_t *i, va_list *va);
 uword unformat_vlib_cli_sub_input (unformat_input_t * i, va_list * args);
 
 /* Return an vector of strings consisting of possible auto-completions