Set device options when called with --get.

[sigrok-cli.git] / input.c

diff --git a/input.c b/input.c
index f143cf9b513f10b01575413f990bb3e8b8e33e35..da4e21d14b2d9ad49916c32b3b3a67445c5d6308 100644 (file)
--- a/input.c
+++ b/input.c
@@ -39,7 +39,7 @@ static void load_input_file_module(void)
        struct sr_dev_inst *sdi;
        GHashTable *mod_args, *mod_opts;
        GString *buf;
-       int fd;
+       int fd = 0;
        ssize_t len;
        char *mod_id;
 
@@ -79,9 +79,10 @@ static void load_input_file_module(void)
                         * An actual filename: let the input modules try to
                         * identify the file.
                         */
-                       in = sr_input_scan_file(opt_input_file);
-                       /* That worked, reopen the file for reading. */
-                       fd = open(opt_input_file, O_RDONLY);
+                       if (sr_input_scan_file(opt_input_file, &in) == SR_OK) {
+                               /* That worked, reopen the file for reading. */
+                               fd = open(opt_input_file, O_RDONLY);
+                       }
                } else {
                        /*
                         * Taking input from a pipe: let the input modules try
@@ -99,7 +100,7 @@ static void load_input_file_module(void)
                                g_critical("Failed to read %s: %s.", opt_input_file,
                                                strerror(errno));
                        buf->len = len;
-                       in = sr_input_scan_buffer(buf);
+                       sr_input_scan_buffer(buf, &in);
                }
                if (!in)
                        g_critical("Error: no input module found for this file.");
@@ -142,7 +143,7 @@ void load_input_file(void)
        GSList *devices;
        int ret;
 
-       if (strcmp(opt_input_file, "-") || sr_session_load(opt_input_file, &session) == SR_OK) {
+       if (strcmp(opt_input_file, "-") && sr_session_load(opt_input_file, &session) == SR_OK) {
                /* sigrok session file */
                ret = sr_session_dev_list(session, &devices);
                if (ret != SR_OK || !devices->data) {
@@ -159,8 +160,7 @@ void load_input_file(void)
                sr_session_start(session);
                sr_session_run(session);
                sr_session_stop(session);
-       }
-       else {
+       } else {
                /* fall back on input modules */
                load_input_file_module();
        }