X-Git-Url: https://sigrok.org/gitweb/?p=sigrok-cli.git;a=blobdiff_plain;f=input.c;h=a4206e0e220bde32803566e56dfc73b4b617a976;hp=da4e21d14b2d9ad49916c32b3b3a67445c5d6308;hb=3addebb2440550f9b34a39629bdb7c1ab1d05fc3;hpb=c5136a5439708d2fc3a1cbe1e1bcc7ea17a6feac

diff --git a/input.c b/input.c
index da4e21d..a4206e0 100644
--- a/input.c
+++ b/input.c
@@ -17,8 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "sigrok-cli.h"
-#include "config.h"
+#include <config.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <fcntl.h>
@@ -27,8 +26,9 @@
 #include <stdlib.h>
 #include <string.h>
 #include <glib.h>
+#include "sigrok-cli.h"
 
-#define BUFSIZE 16384
+#define BUFSIZE (16 * 1024)
 
 static void load_input_file_module(void)
 {
@@ -39,7 +39,8 @@ static void load_input_file_module(void)
 	struct sr_dev_inst *sdi;
 	GHashTable *mod_args, *mod_opts;
 	GString *buf;
-	int fd = 0;
+	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. */
@@ -72,7 +74,7 @@ static void load_input_file_module(void)
 			g_hash_table_destroy(mod_args);
 		if ((fd = open(opt_input_file, O_RDONLY)) == -1)
 			g_critical("Failed to load %s: %s.", opt_input_file,
-					strerror(errno));
+					g_strerror(errno));
 	} else {
 		if (strcmp(opt_input_file, "-")) {
 			/*
@@ -94,41 +96,47 @@ static void load_input_file_module(void)
 			} else {
 				if ((fd = open(opt_input_file, O_RDONLY)) == -1)
 					g_critical("Failed to load %s: %s.", opt_input_file,
-							strerror(errno));
+							g_strerror(errno));
 			}
 			if ((len = read(fd, buf->str, BUFSIZE)) < 1)
 				g_critical("Failed to read %s: %s.", opt_input_file,
-						strerror(errno));
+						g_strerror(errno));
 			buf->len = len;
 			sr_input_scan_buffer(buf, &in);
 		}
 		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_new(sr_ctx, &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;
-	}
 
-	while(TRUE) {
+	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));
+			g_critical("Read failed: %s", g_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,25 +151,34 @@ void load_input_file(void)
 	GSList *devices;
 	int ret;
 
-	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) {
-			g_critical("Failed to access session device.");
-			sr_session_destroy(session);
-			return;
-		}
-		sdi = devices->data;
-		if (select_channels(sdi) != SR_OK) {
-			sr_session_destroy(session);
-			return;
-		}
-		sr_session_datafeed_callback_add(session, datafeed_in, NULL);
-		sr_session_start(session);
-		sr_session_run(session);
-		sr_session_stop(session);
-	} else {
-		/* fall back on input modules */
+	if (!strcmp(opt_input_file, "-")) {
+		/* Input from stdin is never a session file. */
 		load_input_file_module();
+	} else {
+		if ((ret = sr_session_load(sr_ctx, opt_input_file,
+				&session)) == SR_OK) {
+			/* sigrok session file */
+			ret = sr_session_dev_list(session, &devices);
+			if (ret != SR_OK || !devices || !devices->data) {
+				g_critical("Failed to access session device.");
+				sr_session_destroy(session);
+				return;
+			}
+			sdi = devices->data;
+			if (select_channels(sdi) != SR_OK) {
+				sr_session_destroy(session);
+				return;
+			}
+			sr_session_datafeed_callback_add(session, datafeed_in, NULL);
+			sr_session_start(session);
+			sr_session_run(session);
+			sr_session_stop(session);
+		} else if (ret != SR_ERR) {
+			/* It's a session file, but it didn't work out somehow. */
+			g_critical("Failed to load session file.");
+		} else {
+			/* Fall back on input modules. */
+			load_input_file_module();
+		}
 	}
 }