move (most of the) file size logic to FileWithDetails

danmar · Nov 11, 2024 · de9c5a7 · de9c5a7
1 parent 1cffe12
commit de9c5a7
Show file tree

Hide file tree

Showing 8 changed files with 88 additions and 20 deletions.
diff --git a/Makefile b/Makefile
@@ -231,6 +231,7 @@ LIBOBJ =      $(libcppdir)/valueflow.o \
               $(libcppdir)/ctu.o \
               $(libcppdir)/errorlogger.o \
               $(libcppdir)/errortypes.o \
+              $(libcppdir)/filesettings.o \
               $(libcppdir)/forwardanalyzer.o \
               $(libcppdir)/fwdanalysis.o \
               $(libcppdir)/importproject.o \
@@ -605,6 +606,9 @@ $(libcppdir)/errorlogger.o: lib/errorlogger.cpp externals/tinyxml2/tinyxml2.h li
 $(libcppdir)/errortypes.o: lib/errortypes.cpp lib/config.h lib/errortypes.h lib/utils.h
 	$(CXX) ${INCLUDE_FOR_LIB} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $(libcppdir)/errortypes.cpp
 
+$(libcppdir)/filesettings.o: lib/filesettings.cpp lib/config.h lib/filesettings.h lib/path.h lib/platform.h lib/standards.h lib/utils.h
+	$(CXX) ${INCLUDE_FOR_LIB} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $(libcppdir)/filesettings.cpp
+
 $(libcppdir)/forwardanalyzer.o: lib/forwardanalyzer.cpp lib/addoninfo.h lib/analyzer.h lib/astutils.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/forwardanalyzer.h lib/library.h lib/mathlib.h lib/platform.h lib/settings.h lib/smallvector.h lib/sourcelocation.h lib/standards.h lib/suppressions.h lib/symboldatabase.h lib/templatesimplifier.h lib/token.h lib/tokenlist.h lib/utils.h lib/valueptr.h lib/vfvalue.h
 	$(CXX) ${INCLUDE_FOR_LIB} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $(libcppdir)/forwardanalyzer.cpp
 

diff --git a/cli/filelister.cpp b/cli/filelister.cpp
@@ -230,11 +230,11 @@ static std::string addFiles2(std::list<FileWithDetails> &files,
             }
         } else {
             if (Path::acceptFile(new_path, extra) && !ignored.match(new_path)) {
-                if (stat(new_path.c_str(), &file_stat) == -1) {
-                    const int err = errno;
-                    return "could not stat file '" + new_path + "' (errno: " + std::to_string(err) + ")";
+                files.emplace_back(new_path);
+                std::string err = files.back().updateSize();
+                if (!err.empty()) {
+                    return err;
                 }
-                files.emplace_back(new_path, file_stat.st_size);
             }
         }
     }

diff --git a/lib/cppcheck.vcxproj b/lib/cppcheck.vcxproj
@@ -66,6 +66,7 @@
     <ClCompile Include="ctu.cpp" />
     <ClCompile Include="errorlogger.cpp" />
     <ClCompile Include="errortypes.cpp" />
+    <ClCompile Include="filesettings.cpp" />
     <ClCompile Include="forwardanalyzer.cpp" />
     <ClCompile Include="fwdanalysis.cpp" />
     <ClCompile Include="importproject.cpp" />
@@ -164,6 +165,7 @@
     <ClInclude Include="errorlogger.h" />
     <ClInclude Include="errortypes.h" />
     <ClInclude Include="filesettings.h" />
+    <ClInclude Include="filesettings.h" />
     <ClInclude Include="findtoken.h" />
     <ClInclude Include="forwardanalyzer.h" />
     <ClInclude Include="fwdanalysis.h" />

diff --git a/lib/filesettings.cpp b/lib/filesettings.cpp
@@ -0,0 +1,62 @@
+/*
+ * Cppcheck - A tool for static C/C++ code analysis
+ * Copyright (C) 2007-2024 Cppcheck team.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "filesettings.h"
+
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <cerrno>
+
+#ifdef _WIN32
+
+#ifdef _WIN64
+
+std::string FileWithDetails::updateSize() {
+    struct _stati64 buf;
+    if (_stati64(mPath.c_str(), &buf) < 0) {
+        return "could not stat file '" + mPath + "': (errno: " + std::to_string(errno) + ")";
+    }
+    mSize = buf.st_size;
+    return "";
+}
+
+#else
+
+std::string FileWithDetails::updateSize() {
+    struct _stat buf;
+    if (_stat(mPath.c_str(), &buf) < 0) {
+        return "could not stat file '" + mPath + "': (errno: " + std::to_string(errno) + ")";
+    }
+    mSize = buf.st_size;
+    return "";
+}
+
+#endif
+
+#else
+
+std::string FileWithDetails::updateSize() {
+    struct stat buf;
+    if (stat(mPath.c_str(), &buf) < 0) {
+        return "could not stat file '" + mPath + "': (errno: " + std::to_string(errno) + ")";
+    }
+    mSize = buf.st_size;
+    return "";
+}
+
+#endif
diff --git a/lib/filesettings.h b/lib/filesettings.h
@@ -59,6 +59,9 @@ class FileWithDetails
     {
         return mSize;
     }
+
+    std::string updateSize();
+
 private:
     std::string mPath;
     std::string mPathSimplified;
@@ -90,6 +93,12 @@ struct CPPCHECKLIB FileSettings {
     {
         return file.size();
     }
+
+    std::string updateFileSize()
+    {
+        return file.updateSize();
+    }
+
     std::string defines;
     // TODO: handle differently
     std::string cppcheckDefines() const {

diff --git a/lib/importproject.cpp b/lib/importproject.cpp
@@ -1509,21 +1509,6 @@ bool ImportProject::sourceFileExists(const std::string &file)
 void ImportProject::setFileSizes()
 {
     for (auto &fs : fileSettings) {
-        int statResult;
-#ifdef _WIN32
-#ifdef _WIN64
-        struct _stati64 statBuf;
-        statResult = _stati64(fs.filename().c_str(), &statBuf);
-#else
-        struct _stat statBuf;
-        statResult = _stat(fs.filename().c_str(), &statBuf);
-#endif
-#else
-        struct stat statBuf;
-        statResult = stat(fs.filename().c_str(), &statBuf);
-#endif
-        if (statResult == 0) {
-            fs.file = FileWithDetails(fs.file.path(), statBuf.st_size);
-        }
+        fs.updateFileSize();
     }
 }
diff --git a/lib/lib.pri b/lib/lib.pri
@@ -45,6 +45,7 @@ HEADERS += $${PWD}/addoninfo.h \
            $${PWD}/errorlogger.h \
            $${PWD}/errortypes.h \
            $${PWD}/filesettings.h \
+           $${PWD}/filesettings.h \
            $${PWD}/findtoken.h \
            $${PWD}/forwardanalyzer.h \
            $${PWD}/fwdanalysis.h \
@@ -154,6 +155,7 @@ SOURCES += $${PWD}/valueflow.cpp \
            $${PWD}/ctu.cpp \
            $${PWD}/errorlogger.cpp \
            $${PWD}/errortypes.cpp \
+           $${PWD}/filesettings.cpp \
            $${PWD}/forwardanalyzer.cpp \
            $${PWD}/fwdanalysis.cpp \
            $${PWD}/importproject.cpp \

diff --git a/oss-fuzz/Makefile b/oss-fuzz/Makefile
@@ -74,6 +74,7 @@ LIBOBJ =      $(libcppdir)/valueflow.o \
               $(libcppdir)/ctu.o \
               $(libcppdir)/errorlogger.o \
               $(libcppdir)/errortypes.o \
+              $(libcppdir)/filesettings.o \
               $(libcppdir)/forwardanalyzer.o \
               $(libcppdir)/fwdanalysis.o \
               $(libcppdir)/importproject.o \
@@ -292,6 +293,9 @@ $(libcppdir)/errorlogger.o: ../lib/errorlogger.cpp ../externals/tinyxml2/tinyxml
 $(libcppdir)/errortypes.o: ../lib/errortypes.cpp ../lib/config.h ../lib/errortypes.h ../lib/utils.h
 	$(CXX) ${LIB_FUZZING_ENGINE} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $(libcppdir)/errortypes.cpp
 
+$(libcppdir)/filesettings.o: ../lib/filesettings.cpp ../lib/config.h ../lib/filesettings.h ../lib/path.h ../lib/platform.h ../lib/standards.h ../lib/utils.h
+	$(CXX) ${LIB_FUZZING_ENGINE} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $(libcppdir)/filesettings.cpp
+
 $(libcppdir)/forwardanalyzer.o: ../lib/forwardanalyzer.cpp ../lib/addoninfo.h ../lib/analyzer.h ../lib/astutils.h ../lib/color.h ../lib/config.h ../lib/errorlogger.h ../lib/errortypes.h ../lib/forwardanalyzer.h ../lib/library.h ../lib/mathlib.h ../lib/platform.h ../lib/settings.h ../lib/smallvector.h ../lib/sourcelocation.h ../lib/standards.h ../lib/suppressions.h ../lib/symboldatabase.h ../lib/templatesimplifier.h ../lib/token.h ../lib/tokenlist.h ../lib/utils.h ../lib/valueptr.h ../lib/vfvalue.h
 	$(CXX) ${LIB_FUZZING_ENGINE} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $(libcppdir)/forwardanalyzer.cpp