#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)
{
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
{
char *str;
- str = blobmsg_format_json_indent(data, true, 0);
+ if (!blob_len(data))
+ return;
+
+ str = blobmsg_format_json_indent(blob_data(data), false, single_line ? -1 : 0);
if (!str)
return;
blob_buf_init(&status, 0);
if (cmds[i].handler->type > QMI_SERVICE_CTL &&
qmi_service_connect(qmi, cmds[i].handler->type, -1)) {
- blobmsg_printf(&status, "error", "failed to connect to service");
+ uqmi_add_error("Failed to connect to service");
res = QMI_CMD_EXIT;
} else {
res = cmds[i].handler->prepare(qmi, &req, (void *) buf, cmds[i].arg);
if (res == QMI_CMD_REQUEST) {
qmi_request_start(qmi, &req, (void *) buf, cmds[i].handler->cb);
req.no_error_cb = true;
- if (qmi_request_wait(qmi, &req))
- blobmsg_add_string(&status, "error", qmi_get_error_str(req.ret));
+ if (qmi_request_wait(qmi, &req)) {
+ uqmi_add_error(qmi_get_error_str(req.ret));
+ do_break = true;
+ }
} else if (res == QMI_CMD_EXIT) {
do_break = true;
}
return true;
}
-void uqmi_run_commands(struct qmi_dev *qmi)
+int uqmi_add_error(const char *msg)
{
- if (__uqmi_run_commands(qmi, true))
- __uqmi_run_commands(qmi, false);
+ blobmsg_add_string(&status, NULL, msg);
+ return QMI_CMD_EXIT;
+}
+
+bool uqmi_run_commands(struct qmi_dev *qmi)
+{
+ bool ret;
+
+ ret = __uqmi_run_commands(qmi, true) &&
+ __uqmi_run_commands(qmi, false);
+
free(cmds);
cmds = NULL;
n_cmds = 0;
+
+ return ret;
}