Fix printing of service versions

[project/uqmi.git] / commands.c

diff --git a/commands.c b/commands.c
index 54fcbb0..8c06503 100644 (file)
--- a/commands.c
+++ b/commands.c
@@ -11,6 +11,7 @@
 #include "commands.h"
 
 static struct blob_buf status;
+bool single_line = false;
 
 static void no_cb(struct qmi_dev *qmi, struct qmi_request *req, struct qmi_msg *msg)
 {
@@ -19,16 +20,20 @@ static void no_cb(struct qmi_dev *qmi, struct qmi_request *req, struct qmi_msg *
 static void cmd_version_cb(struct qmi_dev *qmi, struct qmi_request *req, struct qmi_msg *msg)
 {
        struct qmi_ctl_get_version_info_response res;
+       void *c;
        char name_buf[16];
        int i;
 
        qmi_parse_ctl_get_version_info_response(msg, &res);
+
+       c = blobmsg_open_table(&status, NULL);
        for (i = 0; i < res.data.service_list_n; i++) {
                sprintf(name_buf, "service_%d", res.data.service_list[i].service);
                blobmsg_printf(&status, name_buf, "%d,%d",
                        res.data.service_list[i].major_version,
                        res.data.service_list[i].minor_version);
        }
+       blobmsg_close_table(&status, c);
 }
 
 static enum qmi_cmd_result
@@ -131,7 +136,7 @@ static void uqmi_print_result(struct blob_attr *data)
        if (!blob_len(data))
                return;
 
-       str = blobmsg_format_json_indent(blob_data(data), false, 0);
+       str = blobmsg_format_json_indent(blob_data(data), false, single_line ? -1 : 0);
        if (!str)
                return;
 
@@ -180,9 +185,10 @@ static bool __uqmi_run_commands(struct qmi_dev *qmi, bool option)
        return true;
 }
 
-void uqmi_add_error(const char *msg)
+int uqmi_add_error(const char *msg)
 {
        blobmsg_add_string(&status, NULL, msg);
+       return QMI_CMD_EXIT;
 }
 
 bool uqmi_run_commands(struct qmi_dev *qmi)