4 files changed, 39 insertions, 18 deletions

diff --git a/util/fbrun/FbRun.cc b/util/fbrun/FbRun.cc
index f98a02e..3bf83aa 100644
--- a/util/fbrun/FbRun.cc
+++ b/util/fbrun/FbRun.cc
@@ -21,11 +21,11 @@
 
 #include "FbRun.hh"
 
-#include "App.hh"
-#include "EventManager.hh"
-#include "Color.hh"
-#include "KeyUtil.hh"
-#include "FileUtil.hh"
+#include "FbTk/App.hh"
+#include "FbTk/EventManager.hh"
+#include "FbTk/Color.hh"
+#include "FbTk/KeyUtil.hh"
+#include "FbTk/FileUtil.hh"
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
diff --git a/util/fbrun/main.cc b/util/fbrun/main.cc
index 0bb8456..edb88ff 100644
--- a/util/fbrun/main.cc
+++ b/util/fbrun/main.cc
@@ -20,9 +20,9 @@
 // DEALINGS IN THE SOFTWARE.
 
 #include "FbRun.hh"
-#include "App.hh"
-#include "StringUtil.hh"
-#include "Color.hh"
+#include "FbTk/App.hh"
+#include "FbTk/StringUtil.hh"
+#include "FbTk/Color.hh"
 
 #ifdef XINERAMA
 extern  "C" {
diff --git a/util/fbsetbg b/util/fbsetbg
index a12d427..47aa33b 100644
--- a/util/fbsetbg
+++ b/util/fbsetbg
@@ -308,6 +308,7 @@ while [ $# -gt 0 ]; do
                 remember=false
                 break
             fi
+            ignore_missing_wallpaper=true
             style="style"
             shift ;;
         -Z)
@@ -521,6 +522,9 @@ fi
 
 
 if [ ! -r "$wallpaper" ]; then
+        if [ "$ignore_missing_wallpaper" == "true" ]; then
+                exit 0
+        fi
     message "Can't find wallpaper $wallpaper"
     exit 1
 fi
diff --git a/util/fluxbox-update_configs.cc b/util/fluxbox-update_configs.cc
index 43dd1f2..77b3ff7 100644
--- a/util/fluxbox-update_configs.cc
+++ b/util/fluxbox-update_configs.cc
@@ -23,7 +23,7 @@
 #include "../src/FbTk/Resource.hh"
 #include "../src/FbTk/StringUtil.hh"
 
-#include "../src/defaults.hh"
+#include "defaults.hh"
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -44,6 +44,8 @@
   #include <string.h>
 #endif
 
+#include <sys/stat.h>
+
 #include <iostream>
 #include <fstream>
 #include <set>
@@ -63,8 +65,8 @@ using std::list;
 using std::exit;
 using std::getenv;
 
-string read_file(string filename);
-void write_file(string filename, string &contents);
+string read_file(const string& filename);
+void write_file(const string& filename, const string &contents);
 void save_all_files();
 
 int run_updates(int old_version, FbTk::ResourceManager &rm) {
@@ -455,18 +457,28 @@ int main(int argc, char **argv) {
     return 0;
 }
 
-static set<string> modified_files;
+namespace {
+
+set<string> modified_files;
 // we may want to put a size limit on this cache, so it doesn't grow too big
-static map<string,string> file_cache;
+map<string,string> file_cache;
+
+};
 
 // returns the contents of the file given, either from the cache or by reading
 // the file from disk
-string read_file(string filename) {
+string read_file(const string& filename) {
     // check if we already have the file in memory
     map<string,string>::iterator it = file_cache.find(filename);
     if (it != file_cache.end())
         return it->second;
 
+    struct stat s;
+    stat(filename.c_str(), &s);
+
+    if (! (s.st_mode & S_IFREG))
+        return "";
+
     // nope, we'll have to read the file
     ifstream infile(filename.c_str());
     string whole_file = "";
@@ -474,10 +486,15 @@ string read_file(string filename) {
     if (!infile) // failed to open file
         return whole_file;
 
+    string linebuffer;
     while (!infile.eof()) {
-        string linebuffer;
-
         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();
@@ -488,7 +505,7 @@ string read_file(string filename) {
 
 #ifdef NOT_USED
 // remove the file from the cache, writing to disk if it's been changed
-void forget_file(string filename) {
+void forget_file(const string& filename) {
     map<string,string>::iterator cache_it = file_cache.find(filename);
     // check if we knew about the file to begin with
     if (cache_it == file_cache.end())
@@ -511,7 +528,7 @@ void forget_file(string filename) {
 
 // updates the file contents in the cache and marks the file as modified so it
 // gets saved later
-void write_file(string filename, string &contents) {
+void write_file(const string& filename, const string &contents) {
     modified_files.insert(filename);
     file_cache[filename] = contents;
 }