X-Git-Url: https://sigrok.org/gitweb/?p=sigrok-cli.git;a=blobdiff_plain;f=input.c;h=b81e84b47a5ab94541636dc02008aa256add3608;hp=c4f41bf4f57a9a1ea0b70dba02f484ee4c26a1b1;hb=67a00747d638fad479a69533e190446975643d6a;hpb=b66260b90ab0dc9a4c3df56fba4ea794f74fdec5

diff --git a/input.c b/input.c
index c4f41bf..b81e84b 100644
--- a/input.c
+++ b/input.c
@@ -39,6 +39,7 @@ static void load_input_file_module(void)
 	struct sr_dev_inst *sdi;
 	GHashTable *mod_args, *mod_opts;
 	GString *buf;
+	gboolean got_sdi;
 	int fd;
 	ssize_t len;
 	char *mod_id;
@@ -53,6 +54,7 @@ static void load_input_file_module(void)
 		mod_id = g_hash_table_lookup(mod_args, "sigrok_key");
 	}
 
+	fd = 0;
 	buf = g_string_sized_new(BUFSIZE);
 	if (mod_id) {
 		/* User specified an input module to use. */
@@ -105,30 +107,37 @@ static void load_input_file_module(void)
 		if (!in)
 			g_critical("Error: no input module found for this file.");
 	}
-	sdi = sr_input_dev_inst_get(in);
-
-	if (select_channels(sdi) != SR_OK)
-		return;
-
 	sr_session_new(&session);
 	sr_session_datafeed_callback_add(session, &datafeed_in, NULL);
-	if (sr_session_dev_add(session, sdi) != SR_OK) {
-		g_critical("Failed to use device.");
-		sr_session_destroy(session);
-		return;
-	}
 
+	got_sdi = FALSE;
 	while(TRUE) {
 		g_string_truncate(buf, 0);
 		len = read(fd, buf->str, BUFSIZE);
 		if (len < 0)
 			g_critical("Read failed: %s", strerror(errno));
+		if (len == 0)
+			/* End of file or stream. */
+			break;
 		buf->len = len;
 		if (sr_input_send(in, buf) != SR_OK)
 			break;
-		if (len < BUFSIZE)
-			break;
+
+		sdi = sr_input_dev_inst_get(in);
+		if(!got_sdi && sdi) {
+			/* First time we got a valid sdi. */
+			if (select_channels(sdi) != SR_OK)
+				return;
+			if (sr_session_dev_add(session, sdi) != SR_OK) {
+				g_critical("Failed to use device.");
+				sr_session_destroy(session);
+				return;
+			}
+			got_sdi = TRUE;
+		}
+
 	}
+	sr_input_end(in);
 	sr_input_free(in);
 	g_string_free(buf, TRUE);
 
@@ -143,7 +152,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) {
@@ -160,8 +169,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();
 	}