5 files changed, 26 insertions, 14 deletions

diff --git a/src/FbTk/App.cc b/src/FbTk/App.cc
index 8157839..f494a0e 100644
--- a/src/FbTk/App.cc
+++ b/src/FbTk/App.cc
@@ -60,8 +60,13 @@ App::App(const char *displayname):m_done(false), m_display(0) {
     if (displayname != 0 && displayname[0] == '\0')
         displayname = 0;
     m_display = XOpenDisplay(displayname);
-    if (!m_display)
-        throw std::string("Couldn't connect to XServer");
+    if (!m_display) {
+        if (displayname) {
+            throw std::string("Couldn't connect to XServer") + displayname;
+        } else {
+            throw std::string("Couldn't connect to XServer passing null display");
+        }
+    }
 
     FbStringUtil::init();
 }
diff --git a/src/FbTk/FileUtil.cc b/src/FbTk/FileUtil.cc
index 5de560b..c92b336 100644
--- a/src/FbTk/FileUtil.cc
+++ b/src/FbTk/FileUtil.cc
@@ -63,9 +63,14 @@ bool FileUtil::isExecutable(const char* filename) {
     if (!filename || stat(filename, &buf))
         return false;
 
-    return buf.st_mode & S_IXUSR || 
-           buf.st_mode & S_IXGRP ||
-           buf.st_mode & S_IXOTH;
+    return buf.st_mode & S_IXUSR
+#ifdef S_IXGRP
+        || buf.st_mode & S_IXGRP
+#endif
+#ifdef S_IXOTH
+        || buf.st_mode & S_IXOTH
+#endif
+    ;
 }
 
 bool FileUtil::copyFile(const char* from, const char* to) {
diff --git a/src/FbTk/StringUtil.cc b/src/FbTk/StringUtil.cc
index 0a7ebd3..f76a1f9 100644
--- a/src/FbTk/StringUtil.cc
+++ b/src/FbTk/StringUtil.cc
@@ -176,7 +176,7 @@ string expandFilename(const string &filename) {
     size_t pos = filename.find_first_not_of(" \t");
     if (pos != string::npos && filename[pos] == '~') {
         retval = getenv("HOME");
-        if (pos != filename.size()) {
+        if (pos + 1 < filename.size()) {
             // copy from the character after '~'
             retval += static_cast<const char *>(filename.c_str() + pos + 1);
         }
diff --git a/src/Makefile.am b/src/Makefile.am
index 8c204db..1a04e4e 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -63,6 +63,7 @@ defaults.hh: Makefile
 defaults.cc: force
         @( \
                 GITDIR=$(top_srcdir)/.git; \
+                echo '// This file is generated from Makefile. Do not edit!'; \
                 echo '#include "defaults.hh"'; \
                 echo ''; \
                 echo 'std::string realProgramName(const std::string& name) {'; \
diff --git a/src/main.cc b/src/main.cc
index aab583f..7541a28 100644
--- a/src/main.cc
+++ b/src/main.cc
@@ -34,6 +34,7 @@
 #include "FbTk/I18n.hh"
 #include "FbTk/CommandParser.hh"
 #include "FbTk/FileUtil.hh"
+#include "FbTk/StringUtil.hh"
 
 //use GNU extensions
 #ifndef  _GNU_SOURCE
@@ -114,22 +115,22 @@ static void showInfo(ostream &ostr) {
 
     ostr <<_FB_CONSOLETEXT(Common, DefaultMenuFile, "    menu", "default menu file (right aligned - make sure same width as other default values)")
         << ": "
-        << DEFAULTMENU << endl;
+        << FbTk::StringUtil::expandFilename(DEFAULTMENU) << endl;
     ostr << _FB_CONSOLETEXT(Common, DefaultStyle, "   style", "default style (right aligned - make sure same width as other default values)")
         << ": "
-        << DEFAULTSTYLE << endl;
+        << FbTk::StringUtil::expandFilename(DEFAULTSTYLE) << endl;
 
     ostr << _FB_CONSOLETEXT(Common, DefaultKeyFile, "    keys", "default key file (right aligned - make sure same width as other default values)")
         << ": "
-        << DEFAULTKEYSFILE << endl;
+        << FbTk::StringUtil::expandFilename(DEFAULTKEYSFILE) << endl;
     ostr << _FB_CONSOLETEXT(Common, DefaultInitFile, "    init", "default init file (right aligned - make sure same width as other default values)")
         << ": "
-        << DEFAULT_INITFILE << endl;
+        << FbTk::StringUtil::expandFilename(DEFAULT_INITFILE) << endl;
 
 #ifdef NLS
     ostr << _FB_CONSOLETEXT(Common, DefaultLocalePath, "    nls", "location for localization files (right aligned - make sure same width as other default values)")
         << ": "
-        << LOCALEPATH << endl;
+        << FbTk::StringUtil::expandFilename(LOCALEPATH) << endl;
 #endif
 
     const char NOT[] = "-";
@@ -220,12 +221,12 @@ struct Options {
         const char* env;
 
         env = getenv("DISPLAY");
-        if (env) {
+        if (env && strlen(env) > 0) {
             session_display.assign(env);
         }
 
         env = getenv("HOME");
-        if (env) {
+        if (env && strlen(env) > 0) {
             rc_path.assign(std::string(env) + "/." + realProgramName("fluxbox"));
             rc_file = rc_path + "/init";
         }
@@ -369,7 +370,7 @@ void setupConfigFiles(const std::string& dirname, const std::string& rc) {
     // copy default files if needed
     for (size_t i = 0; i < nr_of_cfiles; ++i) {
         if (cfiles[i].create_file) {
-            FbTk::FileUtil::copyFile(cfiles[i].default_name, cfiles[i].filename.c_str());
+            FbTk::FileUtil::copyFile(FbTk::StringUtil::expandFilename(cfiles[i].default_name).c_str(), cfiles[i].filename.c_str());
             sync_fs = true;
         }
     }