Changeset 20080 for trunk

Timestamp:

04/16/21 10:08:50 (4 years ago)

Author:

tbretz

Message:

Updated where the program looks for fact++.rc: 1) current working directory, 2) executable location, 3) sysconfdir (if available)

File:

• trunk/FACT++/src/Configuration.cc (modified) (3 diffs)

trunk/FACT++/src/Configuration.cc

@@ -31 +31 @@
    - (3) Database entries
    - (4) Options from the default configuration-file (given by \b --default, defaults to \b program_name.rc)
-   - (5) Options from the global configuration-file (constructor path + \b fact++.rc)
+   - (5) Options from the global configuration-file (\b fact++.rc)
    - (6) Environment variables
+
+The global configuration-file fact++.rc is search in 1) the current working
+directory, 2) the directory in which the executable is located, 3) the sysconfdir
+(defined during compile time).
 
 Which options are accepted is defined by the program. To get a list
@@ -886 +890 @@
 //!  - (5)  Read and parse the global configuration file, which is compiled
 //!         from the path corresponding to the argument given in the
-//!         constructor + "/fact++.rc" (or sysconf-prefix + fact++.rc
-//!         if not found), unrecognized options are always
+//!         "/fact++.rc", unrecognized options are always
 //!         allowed. Note that in contradiction to all other options
 //!         the options in this file are not checked at all. Hence,
@@ -1050 +1053 @@
 
     const boost::filesystem::path path(GetName());
-    string globalfile = (path.parent_path()/boost::filesystem::path("fact++.rc")).string();
+    string globalfile = (boost::filesystem::current_path()/boost::filesystem::path("fact++.rc")).string();
+    cerr << "Searching global options in  '" << globalfile << "'" << endl;
+
+    if (!boost::filesystem::exists(globalfile) && boost::filesystem::current_path()!=path.parent_path())
+    {
+        globalfile = (path.parent_path()/boost::filesystem::path("fact++.rc")).string();
+        cerr << "Searching global options in  '" << globalfile << "'" << endl;
+    }
 
 #ifdef PACKAGE_INSTALL_SYSCONFDIR
     if (!boost::filesystem::exists(globalfile))
+    {
         globalfile = (boost::filesystem::path(PACKAGE_INSTALL_SYSCONFDIR)/boost::filesystem::path("fact++.rc")).string();
+        cerr << "Searching global options in  '" << globalfile << "'" << endl;
+    }
 #endif