X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=main.cpp;h=f4506787364fa11ea01286cf2e569ffed5587c15;hp=a94f64c67b07b60b45cf2b96b5cb1fc264fbf8c6;hb=2a032dcb6151bd8b019c88f6ef1db1a8c1e5b61e;hpb=f7951df4a17a5c7e831dd20d43049137b5761e85

diff --git a/main.cpp b/main.cpp
index a94f64c6..f4506787 100644
--- a/main.cpp
+++ b/main.cpp
@@ -33,8 +33,23 @@ extern "C" {
 
 #include "config.h"
 
+void usage()
+{
+	fprintf(stderr,
+		"Usage:\n"
+		"  %s — %s\n"
+		"\n"
+		"Help Options:\n"
+		"  -V, --version                   Show release version\n"
+		"  -h, -?, --help                  Show help option\n"
+		"\n", PV_BIN_NAME, PV_DESCRIPTION);
+}
+
 int main(int argc, char *argv[])
 {
+	int ret = 0;
+	struct sr_context *sr_ctx = NULL;
+
 	QApplication a(argc, argv);
 
 	// Set some application metadata
@@ -45,11 +60,13 @@ int main(int argc, char *argv[])
 	// Parse arguments
 	while (1) {
 		static const struct option long_options[] = {
-			{"version", no_argument, 0,  'V'},
+			{"version", no_argument, 0, 'V'},
+			{"help", no_argument, 0, 'h'},
 			{0, 0, 0, 0}
 		};
 
-		const char c = getopt_long(argc, argv, "V", long_options, NULL);
+		const char c = getopt_long(argc, argv,
+			"Vh?", long_options, NULL);
 		if (c == -1)
 			break;
 
@@ -58,44 +75,55 @@ int main(int argc, char *argv[])
 			// Print version info
 			fprintf(stderr, "%s %s\n", PV_TITLE, PV_VERSION_STRING);
 			return 0;
+
+		case 'h':
+		case '?':
+			usage();
+			return 0;
 		}
 	}
 
 	// Initialise libsigrok
-	if (sr_init() != SR_OK) {
+	if (sr_init(&sr_ctx) != SR_OK) {
 		qDebug() << "ERROR: libsigrok init failed.";
 		return 1;
 	}
 
 	// Initialise libsigrokdecode
-	if (srd_init(NULL) != SRD_OK) {
-		qDebug() << "ERROR: libsigrokdecode init failed.";
-		return 1;
-	}
+	if (srd_init(NULL) == SRD_OK) {
+
+		// Load the protocol decoders
+		srd_decoder_load_all();
+
+		// Initialize all libsigrok drivers
+		sr_dev_driver **const drivers = sr_driver_list();
+		for (sr_dev_driver **driver = drivers; *driver; driver++) {
+			if (sr_driver_init(sr_ctx, *driver) != SR_OK) {
+				qDebug("Failed to initialize driver %s",
+					(*driver)->name);
+				ret = 1;
+				break;
+			}
+		}
 
-	// Load the protocol decoders
-	srd_decoder_load_all();
+		if (ret == 0) {
+			// Initialise the main window
+			pv::MainWindow w;
+			w.show();
 
-	// Initialize all libsigrok drivers
-	sr_dev_driver **const drivers = sr_driver_list();
-	for (sr_dev_driver **driver = drivers; *driver; driver++) {
-		if (sr_driver_init(*driver) != SR_OK) {
-			qDebug("Failed to initialize driver %s",
-				(*driver)->name);
-			return 1;
+			// Run the application
+			ret = a.exec();
 		}
-	}
 
-	// Initialise the main window
-	pv::MainWindow w;
-	w.show();
+		// Destroy libsigrokdecode and libsigrok
+		srd_exit();
 
-	// Run the application
-	const int ret = a.exec();
+	} else {
+		qDebug() << "ERROR: libsigrokdecode init failed.";
+	}
 
-	// Destroy libsigrokdecode and libsigrok
-	srd_exit();
-	sr_exit();
+	if (sr_ctx)
+		sr_exit(sr_ctx);
 
 	return ret;
 }