String type: Not include \0 in show_version

[vpp.git] / src / vat / api_format.c

diff --git a/src/vat/api_format.c b/src/vat/api_format.c
index 25d2dd3..4c43fcf 100644 (file)
--- a/src/vat/api_format.c
+++ b/src/vat/api_format.c
@@ -1302,18 +1302,30 @@ static void vl_api_show_version_reply_t_handler
 
   if (retval >= 0)
     {
+      char *s;
       char *p = (char *) &mp->program;
-      errmsg ("        program: %s\n",
-             vl_api_from_api_string ((vl_api_string_t *) p));
-      p += vl_api_string_len ((vl_api_string_t *) p) + sizeof (u32);
-      errmsg ("        version: %s\n",
-             vl_api_from_api_string ((vl_api_string_t *) p));
-      p += vl_api_string_len ((vl_api_string_t *) p) + sizeof (u32);
-      errmsg ("     build date: %s\n",
-             vl_api_from_api_string ((vl_api_string_t *) p));
-      p += vl_api_string_len ((vl_api_string_t *) p) + sizeof (u32);
-      errmsg ("build directory: %s\n",
-             vl_api_from_api_string ((vl_api_string_t *) p));
+
+      s = vl_api_from_api_string_c ((vl_api_string_t *) p);
+      errmsg ("        program: %s\n", s);
+      free (s);
+
+      p +=
+       vl_api_string_len ((vl_api_string_t *) p) + sizeof (vl_api_string_t);
+      s = vl_api_from_api_string_c ((vl_api_string_t *) p);
+      errmsg ("        version: %s\n", s);
+      free (s);
+
+      p +=
+       vl_api_string_len ((vl_api_string_t *) p) + sizeof (vl_api_string_t);
+      s = vl_api_from_api_string_c ((vl_api_string_t *) p);
+      errmsg ("     build date: %s\n", s);
+      free (s);
+
+      p +=
+       vl_api_string_len ((vl_api_string_t *) p) + sizeof (vl_api_string_t);
+      s = vl_api_from_api_string_c ((vl_api_string_t *) p);
+      errmsg ("build directory: %s\n", s);
+      free (s);
     }
   vam->retval = retval;
   vam->result_ready = 1;
@@ -6360,7 +6372,7 @@ exec_inband (vat_main_t * vam)
    */
   u32 len = vec_len (vam->input->buffer);
   M2 (CLI_INBAND, mp, len);
-  vl_api_to_api_string (len, (const char *) vam->input->buffer, &mp->cmd);
+  vl_api_to_api_string (len - 1, (const char *) vam->input->buffer, &mp->cmd);
 
   S (mp);
   W (ret);