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

diff --git a/main.cpp b/main.cpp
index ba8e7870..9e8bfc7f 100644
--- a/main.cpp
+++ b/main.cpp
@@ -18,12 +18,10 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-extern "C" {
 #include <sigrokdecode.h> /* First, so we avoid a _POSIX_C_SOURCE warning. */
 #include <signal.h>
 #include <stdint.h>
 #include <libsigrok/libsigrok.h>
-}
 
 #include <getopt.h>
 
@@ -39,9 +37,9 @@ QApplication *g_app = NULL;
 
 void usage()
 {
-	fprintf(stderr,
+	fprintf(stdout,
 		"Usage:\n"
-		"  %s — %s\n"
+		"  %s [OPTION…] [FILE] — %s\n"
 		"\n"
 		"Help Options:\n"
 		"  -V, --version                   Show release version\n"
@@ -66,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);
@@ -87,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;
@@ -95,7 +94,7 @@ int main(int argc, char *argv[])
 		switch (c) {
 		case 'V':
 			// Print version info
-			fprintf(stderr, "%s %s\n", PV_TITLE, PV_VERSION_STRING);
+			fprintf(stdout, "%s %s\n", PV_TITLE, PV_VERSION_STRING);
 			return 0;
 
 		case 'h':
@@ -105,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.";
@@ -130,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