From 398c7ad035b4c9afb261dacce38f9ac74822e8ca Mon Sep 17 00:00:00 2001
From: Karen Arutyunov <karen@codesynthesis.com>
Date: Tue, 8 Dec 2020 18:15:14 +0300
Subject: Regenerate options parsing code

---
 odb/options.cxx | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

diff --git a/odb/options.cxx b/odb/options.cxx
index a6dd710..9065abc 100644
--- a/odb/options.cxx
+++ b/odb/options.cxx
@@ -460,12 +460,28 @@ namespace cli
 
           if (oi->search_func != 0)
           {
-            std::string f (oi->search_func (s2.c_str (), oi->arg));
+            string f (oi->search_func (s2.c_str (), oi->arg));
             if (!f.empty ())
               load (f);
           }
           else
+          {
+            // If the path of the file being parsed is not simple and the
+            // path of the file that needs to be loaded is relative, then
+            // complete the latter using the former as a base.
+            //
+#ifndef _WIN32
+            string::size_type p (file.find_last_of ('/'));
+            bool c (p != string::npos && s2[0] != '/');
+#else
+            string::size_type p (file.find_last_of ("/\\"));
+            bool c (p != string::npos && s2[1] != ':');
+#endif
+            if (c)
+              s2.insert (0, file, 0, p + 1);
+
             load (s2);
+          }
 
           continue;
         }
-- 
cgit v1.1