From: Andrea Corallo <akrl@sdf.org>
Date: Tue, 6 Apr 2021 19:13:47 +0000 (+0200)
Subject: * src/pdumper.c (dump_do_dump_relocation): Use `expand-file-name'.
X-Git-Tag: emacs-28.0.90~2727^2~32
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=65681982134d973ee6bc78b627866e2ca4e242e7;p=emacs.git

* src/pdumper.c (dump_do_dump_relocation): Use `expand-file-name'.
---

diff --git a/src/pdumper.c b/src/pdumper.c
index e266b35ca67..9b750a33f36 100644
--- a/src/pdumper.c
+++ b/src/pdumper.c
@@ -5277,7 +5277,7 @@ dump_do_dump_relocation (const uintptr_t dump_base,
 	if (installation_state == UNKNOWN)
 	  {
 	    Lisp_Object fname =
-	      concat2 (Vinvocation_directory, XCAR (comp_u->file));
+	      Fexpand_file_name (XCAR (comp_u->file), Vinvocation_directory);
 	    FILE *file;
 	    if ((file = emacs_fopen (SSDATA (ENCODE_FILE (fname)), "r")))
 	      {
@@ -5293,9 +5293,9 @@ dump_do_dump_relocation (const uintptr_t dump_base,
 	  }
 
 	comp_u->file =
-	  concat2 (Vinvocation_directory,
-		   installation_state == INSTALLED
-		   ? XCAR (comp_u->file) : XCDR (comp_u->file));
+	  Fexpand_file_name (installation_state == INSTALLED
+			     ? XCAR (comp_u->file) : XCDR (comp_u->file),
+			     Vinvocation_directory);
 	comp_u->handle = dynlib_open (SSDATA (comp_u->file));
 	if (!comp_u->handle)
 	  error ("%s", dynlib_error ());