From f6319b258bb478e19d4a17852a8406e6b1119b87 Mon Sep 17 00:00:00 2001
From: Boris Kolpackov <boris@codesynthesis.com>
Date: Sat, 30 Jan 2021 11:06:22 +0200
Subject: Rework include translation support

See the config.cxx.translate_include variable documentation in cxx/init.cxx
for details.
---
 libbuild2/cc/utility.cxx | 53 ++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 53 insertions(+)

(limited to 'libbuild2/cc/utility.cxx')

diff --git a/libbuild2/cc/utility.cxx b/libbuild2/cc/utility.cxx
index 283e1b4..ffe3e03 100644
--- a/libbuild2/cc/utility.cxx
+++ b/libbuild2/cc/utility.cxx
@@ -17,5 +17,58 @@ namespace build2
     const dir_path module_build_dir (dir_path (module_dir) /= "build");
     const dir_path module_build_modules_dir (
       dir_path (module_build_dir) /= "modules");
+
+    void
+    normalize_header (path& f)
+    {
+      // Interestingly, on most paltforms and with most compilers (Clang on
+      // Linux being a notable exception) most system/compiler headers are
+      // already normalized.
+      //
+      path_abnormality a (f.abnormalities ());
+      if (a != path_abnormality::none)
+      {
+        // While we can reasonably expect this path to exit, things do go
+        // south from time to time (like compiling under wine with file
+        // wlantypes.h included as WlanTypes.h).
+        //
+        try
+        {
+          // If we have any parent components, then we have to verify the
+          // normalized path matches realized.
+          //
+          path r;
+          if ((a & path_abnormality::parent) == path_abnormality::parent)
+          {
+            r = f;
+            r.realize ();
+          }
+
+          try
+          {
+            f.normalize ();
+
+            // Note that we might still need to resolve symlinks in the
+            // normalized path.
+            //
+            if (!r.empty () && f != r && path (f).realize () != r)
+              f = move (r);
+          }
+          catch (const invalid_path&)
+          {
+            assert (!r.empty ()); // Shouldn't have failed if no `..`.
+            f = move (r);         // Fallback to realize.
+          }
+        }
+        catch (const invalid_path&)
+        {
+          fail << "invalid header path '" << f.string () << "'";
+        }
+        catch (const system_error& e)
+        {
+          fail << "invalid header path '" << f.string () << "': " << e;
+        }
+      }
+    }
   }
 }
-- 
cgit v1.1