From caa2b3e9bd8dc1be0052693bb9bb1a9d4d3e00d8 Mon Sep 17 00:00:00 2001
From: Soeren Apel <soeren@apelpie.net>
Date: Tue, 5 Jun 2018 18:49:12 +0200
Subject: [PATCH] Fix #1040 by allowing multiple files to be loaded from
 command line

---
 main.cpp | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/main.cpp b/main.cpp
index cebeca3..cdc750a 100644
--- a/main.cpp
+++ b/main.cpp
@@ -24,6 +24,7 @@
 #include <cstdint>
 #include <fstream>
 #include <getopt.h>
+#include <vector>
 
 #include <libsigrokcxx/libsigrokcxx.hpp>
 
@@ -162,7 +163,8 @@ int main(int argc, char *argv[])
 {
 	int ret = 0;
 	shared_ptr<sigrok::Context> context;
-	string open_file, open_file_format, driver;
+	string open_file_format, driver;
+	vector<string> open_files;
 	bool restore_sessions = true;
 	bool do_scan = true;
 	bool do_logging = true;
@@ -236,7 +238,7 @@ int main(int argc, char *argv[])
 			break;
 
 		case 'i':
-			open_file = optarg;
+			open_files.push_back(optarg);
 			break;
 
 		case 'I':
@@ -253,14 +255,11 @@ int main(int argc, char *argv[])
 		}
 	}
 
-	if (argc - optind > 1) {
-		fprintf(stderr, "Only one file can be opened.\n");
-		return 1;
+	while (argc - optind > 0) {
+		open_files.push_back(argv[optind]);
+		optind++;
 	}
 
-	if (argc - optind == 1)
-		open_file = argv[argc - 1];
-
 	// Prepare the global settings since logging needs them early on
 	pv::GlobalSettings settings;
 	settings.set_defaults_where_needed();
@@ -315,10 +314,11 @@ int main(int argc, char *argv[])
 		if (restore_sessions)
 			w.restore_sessions();
 
-		if (!open_file.empty())
-			w.add_session_with_file(open_file, open_file_format);
-		else
+		if (open_files.empty())
 			w.add_default_session();
+		else
+			for (string open_file : open_files)
+				w.add_session_with_file(open_file, open_file_format);
 
 #ifdef ENABLE_SIGNALS
 		if (SignalHandler::prepare_signals()) {
-- 
2.30.2