1 files changed, 5 insertions, 12 deletions

diff --git a/util/fluxbox-update_configs.cc b/util/fluxbox-update_configs.cc
index 96382da..85bbbfe 100644
--- a/util/fluxbox-update_configs.cc
+++ b/util/fluxbox-update_configs.cc
@@ -22,8 +22,9 @@
 #include "../src/FbTk/I18n.hh"
 #include "../src/FbTk/Resource.hh"
 #include "../src/FbTk/StringUtil.hh"
+#include "../src/FbTk/FileUtil.hh"
 
-#include "../src/defaults.hh"
+#include "defaults.hh"
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -463,7 +464,7 @@ set<string> modified_files;
 // we may want to put a size limit on this cache, so it doesn't grow too big
 map<string,string> file_cache;
 
-};
+}
 
 // returns the contents of the file given, either from the cache or by reading
 // the file from disk
@@ -473,11 +474,9 @@ string read_file(const string& filename) {
     if (it != file_cache.end())
         return it->second;
 
-    struct stat s;
-    stat(filename.c_str(), &s);
-
-    if (! (s.st_mode & S_IFREG))
+    if (!FbTk::FileUtil::isRegularFile(filename.c_str())) {
         return "";
+    }
 
     // nope, we'll have to read the file
     ifstream infile(filename.c_str());
@@ -489,12 +488,6 @@ string read_file(const string& filename) {
     string linebuffer;
     while (!infile.eof()) {
         getline(infile, linebuffer);
-
-        // check if we read something at all. if its 0, its a strange file
-        // (eg a directory) or we are at the end
-        if (infile.gcount() == 0) {
-            break;
-        }
         whole_file += linebuffer + "\n";
     }
     infile.close();