]> git.eshelyaron.com Git - emacs.git/commitdiff
* src/pdumper.c (dump_do_dump_relocation): Use `expand-file-name'.
authorAndrea Corallo <akrl@sdf.org>
Tue, 6 Apr 2021 19:13:47 +0000 (21:13 +0200)
committerAndrea Corallo <akrl@sdf.org>
Tue, 6 Apr 2021 19:13:47 +0000 (21:13 +0200)
src/pdumper.c

index e266b35ca670bc0398543433a572380867663f84..9b750a33f36683542d37a55668220f187693939a 100644 (file)
@@ -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 ());