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).
int fd;
ssize_t len;
char *mod_id;
int fd;
ssize_t len;
char *mod_id;
if (!sr_input_list())
g_critical("No supported input formats available.");
if (!sr_input_list())
g_critical("No supported input formats available.");
mod_id = g_hash_table_lookup(mod_args, "sigrok_key");
}
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) {
fd = 0;
buf = g_string_sized_new(CHUNK_SIZE);
if (mod_id) {
g_hash_table_destroy(mod_opts);
if (mod_args)
g_hash_table_destroy(mod_args);
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 {
g_critical("Failed to load %s: %s.", opt_input_file,
g_strerror(errno));
} else {
- if (strcmp(opt_input_file, "-")) {
/*
* An actual filename: let the input modules try to
* identify the file.
/*
* An actual filename: let the input modules try to
* identify the file.
* Taking input from a pipe: let the input modules try
* to identify the stream content.
*/
* Taking input from a pipe: let the input modules try
* to identify the stream content.
*/
- if (!strcmp(opt_input_file, "-")) {
/* stdin */
fd = 0;
} else {
/* 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));
}
g_critical("Failed to load %s: %s.", opt_input_file,
g_strerror(errno));
}