Store original working directory before changing, for later turning user args into absolute paths

src/common/rclconfig.cpp

@@ -23,6 +23,7 @@
 #include <errno.h>
 #include <langinfo.h>
 #include <limits.h>
+#include <sys/param.h>
 
 #include <algorithm>
 #include <list>
@@ -60,6 +61,7 @@ typedef pair<int,int> RclPII;
 bool o_index_stripchars = true;
 
 string RclConfig::o_localecharset; 
+string RclConfig::o_origcwd; 
 
 bool ParamStale::needrecompute()
 {
@@ -118,6 +120,16 @@ bool RclConfig::isDefaultConfig() const
 RclConfig::RclConfig(const string *argcnf)
 {
     zeroMe();
+
+    if (o_origcwd.empty()) {
+	char buf[MAXPATHLEN];
+	if (getcwd(buf, MAXPATHLEN)) {
+	    o_origcwd = string(buf);
+	} else {
+	    fprintf(stderr, "recollxx: can't retrieve current working directory: relative path translations will fail\n");
+	}
+    }
+
     // Compute our data dir name, typically /usr/local/share/recoll
     const char *cdatadir = getenv("RECOLL_DATADIR");
     if (cdatadir == 0) {

src/common/rclconfig.h

@@ -257,6 +257,11 @@ class RclConfig {
 	call it after primary init */
     void initThrConf();
 
+    const string& getOrigCwd() 
+    {
+	return o_origcwd;
+    }
+
     ~RclConfig() {
 	freeAll();
     }
@@ -302,6 +307,10 @@ class RclConfig {
     ParamStale   m_skpnstate;
     vector<string> m_skpnlist;
 
+    // Original current working directory. Set once at init before we do any
+    // chdir'ing and used for converting user args to absolute paths.
+    static string o_origcwd;
+
     // Parameters auto-fetched on setkeydir
     string m_defcharset;
     static string o_localecharset;