X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=main.cpp;h=9e8bfc7f9c83313510ca8b186102ecc4297f66c3;hp=fae6d5f20927149d4996aa0a161f07db8628580e;hb=306d43a7ab62b534bbc1a5d19a381f7e0b787dfe;hpb=e82fd481f744e0cccdad1d3552118280735ca8e5

diff --git a/main.cpp b/main.cpp
index fae6d5f2..9e8bfc7f 100644
--- a/main.cpp
+++ b/main.cpp
@@ -39,7 +39,7 @@ void usage()
 {
 	fprintf(stdout,
 		"Usage:\n"
-		"  %s — %s\n"
+		"  %s [OPTION…] [FILE] — %s\n"
 		"\n"
 		"Help Options:\n"
 		"  -V, --version                   Show release version\n"
@@ -64,6 +64,7 @@ int main(int argc, char *argv[])
 {
 	int ret = 0;
 	struct sr_context *sr_ctx = NULL;
+	const char *open_file = NULL;
 
 	// Register a SIGINT handler
 	signal(SIGINT, sigint_handler);
@@ -85,7 +86,7 @@ int main(int argc, char *argv[])
 			{0, 0, 0, 0}
 		};
 
-		const char c = getopt_long(argc, argv,
+		const int c = getopt_long(argc, argv,
 			"Vh?", long_options, NULL);
 		if (c == -1)
 			break;
@@ -103,6 +104,12 @@ int main(int argc, char *argv[])
 		}
 	}
 
+	if (argc - optind > 1) {
+		fprintf(stderr, "Only one file can be openened.\n");
+		return 1;
+	} else if (argc - optind == 1)
+		open_file = argv[argc - 1];
+
 	// Initialise libsigrok
 	if (sr_init(&sr_ctx) != SR_OK) {
 		qDebug() << "ERROR: libsigrok init failed.";
@@ -128,7 +135,7 @@ int main(int argc, char *argv[])
 
 		if (ret == 0) {
 			// Initialise the main window
-			pv::MainWindow w;
+			pv::MainWindow w(open_file);
 			w.show();
 
 			// Run the application