X-Git-Url: https://sigrok.org/gitweb/?p=sigrok-cli.git;a=blobdiff_plain;f=input.c;h=da4e21d14b2d9ad49916c32b3b3a67445c5d6308;hp=7bf133125987f4fa5e8fa87fce3598d328913d78;hb=88a195e431d1b0b45dab271966b2f44c217a9298;hpb=a8b4041ad4829aeb33e243d6a6a0c482be4658cd

diff --git a/input.c b/input.c
index 7bf1331..da4e21d 100644
--- 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;
 
@@ -74,15 +74,35 @@ static void load_input_file_module(void)
 			g_critical("Failed to load %s: %s.", opt_input_file,
 					strerror(errno));
 	} else {
-		/* Let the input modules try to identify the file. */
-		if ((fd = open(opt_input_file, O_RDONLY)) == -1)
-			g_critical("Failed to load %s: %s.", opt_input_file,
-					strerror(errno));
-		if ((len = read(fd, buf->str, BUFSIZE)) < 1)
-			g_critical("Failed to read %s: %s.", opt_input_file,
-					strerror(errno));
-		buf->len = len;
-		if (!(in = sr_input_scan_buffer(buf)))
+		if (strcmp(opt_input_file, "-")) {
+			/*
+			 * An actual filename: let the input modules try to
+			 * identify the file.
+			 */
+			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
+			 * to identify the stream content.
+			 */
+			if (!strcmp(opt_input_file, "-")) {
+				/* stdin */
+				fd = 0;
+			} else {
+				if ((fd = open(opt_input_file, O_RDONLY)) == -1)
+					g_critical("Failed to load %s: %s.", opt_input_file,
+							strerror(errno));
+			}
+			if ((len = read(fd, buf->str, BUFSIZE)) < 1)
+				g_critical("Failed to read %s: %s.", opt_input_file,
+						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);
@@ -121,13 +141,9 @@ void load_input_file(void)
 	struct sr_session *session;
 	struct sr_dev_inst *sdi;
 	GSList *devices;
-	struct stat st;
 	int ret;
 
-	if (stat(opt_input_file, &st) == -1)
-		g_critical("Failed to load %s: %s.", opt_input_file, strerror(errno));
-
-	if (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) {
@@ -144,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();
 	}