Analog buffer sharing crash by memcpying for the AnanlogSignal::paint

[pulseview.git] / main.cpp

diff --git a/main.cpp b/main.cpp
index a94f64c67b07b60b45cf2b96b5cb1fc264fbf8c6..9e8bfc7f9c83313510ca8b186102ecc4297f66c3 100644 (file)
--- a/main.cpp
+++ b/main.cpp
@@ -18,11 +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>
 
@@ -33,9 +32,46 @@ extern "C" {
 
 #include "config.h"
 
+// Global pointer to our QApplication
+QApplication *g_app = NULL;
+
+void usage()
+{
+       fprintf(stdout,
+               "Usage:\n"
+               "  %s [OPTION…] [FILE] — %s\n"
+               "\n"
+               "Help Options:\n"
+               "  -V, --version                   Show release version\n"
+               "  -h, -?, --help                  Show help option\n"
+               "\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;
+       const char *open_file = 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);
@@ -45,57 +81,76 @@ 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 int c = getopt_long(argc, argv,
+                       "Vh?", long_options, NULL);
                if (c == -1)
                        break;
 
                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':
+               case '?':
+                       usage();
                        return 0;
                }
        }
 
+       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_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(open_file);
+                       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;
 }