Print --help/--version output to stdout (not stderr).

[pulseview.git] / main.cpp

diff --git a/main.cpp b/main.cpp
index f4506787364fa11ea01286cf2e569ffed5587c15..e98506fcc0ea19d2d0dc2572252d3ab85748eca4 100644 (file)
--- a/main.cpp
+++ b/main.cpp
@@ -20,6 +20,7 @@
 
 extern "C" {
 #include <sigrokdecode.h> /* First, so we avoid a _POSIX_C_SOURCE warning. */
+#include <signal.h>
 #include <stdint.h>
 #include <libsigrok/libsigrok.h>
 }
@@ -33,9 +34,12 @@ extern "C" {
 
 #include "config.h"
 
+// Global pointer to our QApplication
+QApplication *g_app = NULL;
+
 void usage()
 {
-       fprintf(stderr,
+       fprintf(stdout,
                "Usage:\n"
                "  %s — %s\n"
                "\n"
@@ -45,12 +49,30 @@ void usage()
                "\n", PV_BIN_NAME, PV_DESCRIPTION);
 }
 
+/*
+ * SIGINT handler (likely received Ctrl-C from terminal)
+ */
+void sigint_handler(int param)
+{
+       (void)param;
+
+       qDebug("Received SIGINT.");
+
+       if (g_app)
+               g_app->quit();
+}
+
 int main(int argc, char *argv[])
 {
        int ret = 0;
        struct sr_context *sr_ctx = NULL;
 
+       // Register a SIGINT handler
+       signal(SIGINT, sigint_handler);
+
        QApplication a(argc, argv);
+       // Now we have an application to populate our global pointer
+       g_app = &a;
 
        // Set some application metadata
        QApplication::setApplicationVersion(PV_VERSION_STRING);
@@ -73,7 +95,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':