main.cpp: error out when file/path provided by -I or -include=, or the input do not exist

Author: firewave

main.cpp

@@ -9,9 +9,19 @@
 #include <cstring>
 #include <fstream>
 #include <iostream>
+#include <sys/stat.h>
 #include <string>
 #include <vector>
 
+static bool isDir(const std::string& path)
+{
+    struct stat file_stat;
+    if (stat(path.c_str(), &file_stat) == -1)
+        return false;
+
+    return (file_stat.st_mode & S_IFMT) == S_IFDIR;
+}
+
 int main(int argc, char **argv)
 {
     bool error = false;
@@ -21,6 +31,7 @@ int main(int argc, char **argv)
 
     // Settings..
     simplecpp::DUI dui;
+    dui.removeComments = true;
     bool quiet = false;
     bool error_only = false;
     for (int i = 1; i < argc; i++) {
@@ -110,29 +121,51 @@ int main(int argc, char **argv)
         return 0;
     }
 
-    dui.removeComments = true;
+    // TODO: move this logic into simplecpp
+    bool inp_missing = false;
+
+    for (const std::string& inc : dui.includes) {
+        std::ifstream f(inc);
+        if (!f.is_open() || isDir(inc)) {
+            inp_missing = true;
+            std::cout << "error: could not open include '" << inc << "'" << std::endl;
+        }
+    }
+
+    for (const std::string& inc : dui.includePaths) {
+        if (!isDir(inc)) {
+            inp_missing = true;
+            std::cout << "error: could not find include path '" << inc << "'" << std::endl;
+        }
+    }
+
+    std::ifstream f(filename);
+    if (!f.is_open() || isDir(filename)) {
+        inp_missing = true;
+        std::cout << "error: could not open file '" << filename << "'" << std::endl;
+    }
+
+    if (inp_missing)
+        return 1;
 
     // Perform preprocessing
     simplecpp::OutputList outputList;
     std::vector<std::string> files;
-    simplecpp::TokenList *rawtokens;
-    if (use_istream) {
-        std::ifstream f(filename);
-        if (!f.is_open()) {
-            std::cout << "error: could not open file '" << filename << "'" << std::endl;
-            return 1;
+    simplecpp::TokenList outputTokens(files);
+    {
+        simplecpp::TokenList *rawtokens;
+        if (use_istream) {
+            rawtokens = new simplecpp::TokenList(f, files,filename,&outputList);
+        } else {
+            f.close();
+            rawtokens = new simplecpp::TokenList(filename,files,&outputList);
         }
-        rawtokens = new simplecpp::TokenList(f, files,filename,&outputList);
-    } else {
-        rawtokens = new simplecpp::TokenList(filename,files,&outputList);
+        rawtokens->removeComments();
+        simplecpp::FileDataCache filedata;
+        simplecpp::preprocess(outputTokens, *rawtokens, files, filedata, dui, &outputList);
+        simplecpp::cleanup(filedata);
+        delete rawtokens;
     }
-    rawtokens->removeComments();
-    simplecpp::TokenList outputTokens(files);
-    simplecpp::FileDataCache filedata;
-    simplecpp::preprocess(outputTokens, *rawtokens, files, filedata, dui, &outputList);
-    simplecpp::cleanup(filedata);
-    delete rawtokens;
-    rawtokens = nullptr;
 
     // Output
     if (!quiet) {