[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
feature/native-comp 312deba: * Canonicalize filenames on Windows before
From: |
Andrea Corallo |
Subject: |
feature/native-comp 312deba: * Canonicalize filenames on Windows before hashing (bug#46256) |
Date: |
Sat, 27 Feb 2021 14:03:15 -0500 (EST) |
branch: feature/native-comp
commit 312deba5302a8136fa104b054af54572cc64ea5e
Author: Andrea Corallo <akrl@sdf.org>
Commit: Andrea Corallo <akrl@sdf.org>
* Canonicalize filenames on Windows before hashing (bug#46256)
* src/comp.c (Fcomp_el_to_eln_filename): On Windowns
canonicalize filenames before hashing.
---
src/comp.c | 11 +++++++++--
1 file changed, 9 insertions(+), 2 deletions(-)
diff --git a/src/comp.c b/src/comp.c
index a8b8ef9..1a89e4e 100644
--- a/src/comp.c
+++ b/src/comp.c
@@ -3983,6 +3983,10 @@ If BASE-DIR is nil use the first entry in
`comp-eln-load-path'. */)
if (NILP (Ffile_exists_p (filename)))
xsignal1 (Qfile_missing, filename);
+#ifdef WINDOWSNT
+ filename = Fw32_long_file_name (filename);
+#endif
+
Lisp_Object content_hash = comp_hash_source_file (filename);
if (suffix_p (filename, ".gz"))
@@ -4014,8 +4018,11 @@ If BASE-DIR is nil use the first entry in
`comp-eln-load-path'. */)
Lisp_Object sys_re =
concat2 (build_string ("\\`[[:ascii:]]+"),
Fregexp_quote (build_string ("/" PATH_REL_LOADSEARCH "/")));
- loadsearch_re_list =
- list2 (sys_re, Fregexp_quote (build_string (PATH_DUMPLOADSEARCH "/")));
+ Lisp_Object dump_load_search = build_string (PATH_DUMPLOADSEARCH "/");
+#ifdef WINDOWSNT
+ dump_load_search = Fw32_long_file_name (dump_load_search);
+#endif
+ loadsearch_re_list = list2 (sys_re, Fregexp_quote (dump_load_search));
}
Lisp_Object lds_re_tail = loadsearch_re_list;
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- feature/native-comp 312deba: * Canonicalize filenames on Windows before hashing (bug#46256),
Andrea Corallo <=