Exit with an error if an empty file is opened from the command line.

The old behaviour was to crash.
Kst-plot · Jul 8, 2021 · a66bbde · a66bbde
1 parent 50b5995
commit a66bbde
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 24 deletions.
diff --git a/devel-docs/BugsAndFeatures b/devel-docs/BugsAndFeatures
@@ -18,10 +18,6 @@ Icons are very small by default in UHD ubuntu 20.04
 
 --------------
 
-kst seems to crash with zero sized data files.
-
-------------
-
 Save a kst session.  File dialog recent files doesn't include ".kst" if it was
 automatically added on save.
 

diff --git a/src/libkstapp/commandlineparser.cpp b/src/libkstapp/commandlineparser.cpp
@@ -432,6 +432,21 @@ QString CommandLineParser::kstFileName() {
   }
 }
 
+bool CommandLineParser::checkFile(QString filename) {
+  QFileInfo info(filename);
+  if (!info.exists()) {
+    printUsage(tr("file %1 does not exist.\n").arg(filename));
+    return false;
+  }
+  if (info.isFile()) {
+    if (info.size() == 0) {
+      printUsage(tr("file %1 is empty.\n").arg(filename));
+      return false;
+    }
+  }
+  return true;
+}
+
 bool CommandLineParser::processCommandLine(bool *ok) {
   QString arg, param;
   *ok=true;
@@ -520,10 +535,8 @@ bool CommandLineParser::processCommandLine(bool *ok) {
       *ok = _setStringArg(_xField,tr("Usage: -x <xfieldname>\n"));
       for (int i_file=0; i_file<_fileNames.size(); i_file++) {
         QString file = _fileNames.at(i_file);
-        QFileInfo info(file);
-        if (!info.exists()) {
-          printUsage(tr("file %1 does not exist\n").arg(file));
-          *ok = false;
+        *ok = checkFile(file);
+        if (*ok ==  false) {
           break;
         }
 
@@ -547,10 +560,8 @@ bool CommandLineParser::processCommandLine(bool *ok) {
       }
       for (int i_file=0; i_file<_fileNames.size(); i_file++) { 
         QString file = _fileNames.at(i_file);
-        QFileInfo info(file);
-        if (!info.exists()) {
-          printUsage(tr("file %1 does not exist\n").arg(file));
-          *ok = false;
+        *ok = checkFile(file);
+        if (*ok ==  false) {
           break;
         }
 
@@ -601,10 +612,8 @@ bool CommandLineParser::processCommandLine(bool *ok) {
       if (*ok) {
         for (int i_file=0; i_file<_fileNames.size(); i_file++) {
           QString file = _fileNames.at(i_file);
-          QFileInfo info(file);
-          if (!info.exists()) {
-            printUsage(tr("file %1 does not exist\n").arg(file));
-            *ok = false;
+          *ok = checkFile(file);
+          if (*ok ==  false) {
             break;
           }
 
@@ -650,10 +659,8 @@ bool CommandLineParser::processCommandLine(bool *ok) {
       if (*ok) {
         for ( int i_file=0; i_file<_fileNames.size(); i_file++ ) {
           QString file = _fileNames.at ( i_file );
-          QFileInfo info ( file );
-          if ( !info.exists() || !info.isFile() ) {
-            printUsage ( tr ( "file %1 does not exist\n" ).arg ( file ) );
-            *ok = false;
+          *ok = checkFile(file);
+          if (*ok ==  false) {
             break;
           }
 
@@ -690,10 +697,8 @@ bool CommandLineParser::processCommandLine(bool *ok) {
       if (*ok) {
         for (int i_file=0; i_file<_fileNames.size(); i_file++) {
           QString file = _fileNames.at(i_file);
-          QFileInfo info(file);
-          if (!info.exists() || !info.isFile()) {
-            printUsage(tr("file %1 does not exist\n").arg(file));
-            *ok = false;
+          *ok = checkFile(file);
+          if (*ok ==  false) {
             break;
           }
 

diff --git a/src/libkstapp/commandlineparser.h b/src/libkstapp/commandlineparser.h
@@ -35,6 +35,7 @@ class CommandLineParser:QObject
   ~CommandLineParser();
 
   bool processCommandLine(bool *ok);
+  bool checkFile(QString filename);
   QString kstFileName();
   QString pngFile() const {return _pngFile;}
   int pngWidth() const {return _pngWidth;}