input: make read from stdin work with the presence of -I specs
authorGerhard Sittig <gerhard.sittig@gmx.net>
Tue, 15 May 2018 19:18:08 +0000 (21:18 +0200)
committerUwe Hermann <uwe@hermann-uwe.de>
Fri, 25 May 2018 21:39:46 +0000 (23:39 +0200)
The previous implementation supported reading from stdin, but only when
-I was not specified (i.e. with auto detectable input formats). Accept
stdin also when -I was specified, i.e. with the full set of supported
input formats (given they can get streamed).

input.c

diff --git a/input.c b/input.c
index 6425146e2b45123facded53756af6ea3b7a2a58c..8eeb94c869b57679eb75ca4494248740c52633a3 100644 (file)
--- a/input.c
+++ b/input.c
@@ -43,6 +43,7 @@ static void load_input_file_module(void)
        int fd;
        ssize_t len;
        char *mod_id;
+       gboolean is_stdin;
 
        if (!sr_input_list())
                g_critical("No supported input formats available.");
@@ -54,6 +55,7 @@ static void load_input_file_module(void)
                mod_id = g_hash_table_lookup(mod_args, "sigrok_key");
        }
 
+       is_stdin = strcmp(opt_input_file, "-") == 0;
        fd = 0;
        buf = g_string_sized_new(CHUNK_SIZE);
        if (mod_id) {
@@ -72,11 +74,11 @@ static void load_input_file_module(void)
                        g_hash_table_destroy(mod_opts);
                if (mod_args)
                        g_hash_table_destroy(mod_args);
-               if ((fd = open(opt_input_file, O_RDONLY)) == -1)
+               if (!is_stdin && (fd = open(opt_input_file, O_RDONLY)) < 0)
                        g_critical("Failed to load %s: %s.", opt_input_file,
                                        g_strerror(errno));
        } else {
-               if (strcmp(opt_input_file, "-")) {
+               if (!is_stdin) {
                        /*
                         * An actual filename: let the input modules try to
                         * identify the file.
@@ -90,11 +92,12 @@ static void load_input_file_module(void)
                         * Taking input from a pipe: let the input modules try
                         * to identify the stream content.
                         */
-                       if (!strcmp(opt_input_file, "-")) {
+                       if (is_stdin) {
                                /* stdin */
                                fd = 0;
                        } else {
-                               if ((fd = open(opt_input_file, O_RDONLY)) == -1)
+                               fd = open(opt_input_file, O_RDONLY);
+                               if (fd == -1)
                                        g_critical("Failed to load %s: %s.", opt_input_file,
                                                        g_strerror(errno));
                        }