move filesize logic to path.cpp

Author: ludviggunne

Makefile

@@ -231,7 +231,6 @@ 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 \
@@ -582,9 +581,6 @@ $(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
-	$(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
 

lib/cppcheck.vcxproj

@@ -66,7 +66,6 @@
     <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" />
@@ -140,7 +139,6 @@
     <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" />

lib/filesettings.cpp

@@ -60,7 +60,14 @@ class FileWithDetails
         return mSize;
     }
 
-    std::string updateSize();
+    std::string updateSize()
+    {
+        ssize_t ssize = Path::fileSize(mPath);
+        if (ssize < 0)
+            return "could not stat file '" + mPath + "': (errno: " + std::to_string(errno) + ")";
+        mSize = ssize;
+        return "";
+    }
 
 private:
     std::string mPath;

lib/filesettings.h

@@ -435,3 +435,39 @@ std::string Path::join(const std::string& path1, const std::string& path2) {
         return path2;
     return ((path1.back() == '/') ? path1 : (path1 + "/")) + path2;
 }
+
+#ifdef _WIN32
+
+# ifdef _WIN64
+
+ssize_t Path::fileSize(const std::string &filePath) {
+    struct _stati64 buf;
+    if (_stati64(filePath.c_str(), &buf) < 0) {
+        return -1;
+    }
+    return buf.st_size;
+}
+
+# else
+
+ssize_t Path::fileSize(const std::string &filePath) {
+    struct _stat buf;
+    if (_stat(filePath.c_str(), &buf) < 0) {
+        return -1;
+    }
+    return buf.st_size;
+}
+
+# endif
+
+#else
+
+ssize_t Path::fileSize(const std::string &filePath) {
+    struct stat buf;
+    if (stat(filePath.c_str(), &buf) < 0) {
+        return -1;
+    }
+    return buf.st_size;
+}
+
+#endif

lib/path.cpp

@@ -201,6 +201,13 @@ class CPPCHECKLIB Path {
      * join 2 paths with '/' separators
      */
     static std::string join(const std::string& path1, const std::string& path2);
+
+    /**
+     * @brief Get the size of a file
+     * @param filePath path to the file, or -1 if the file cannot be accessed
+     * @return size of file
+     */
+    static ssize_t fileSize(const std::string &filePath);
 };
 
 /// @}

lib/path.h

@@ -74,7 +74,6 @@ 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 \
@@ -268,9 +267,6 @@ $(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
-	$(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