[PATCH] Fix file recursion problem for NaCl

[PATCH] Fix file recursion problem for NaCl

[Pete Williamson]

[-- Attachment #1.1: Type: text/plain, Size: 411 bytes --]

When building for Chromium native client (NaCl), we get an infinite
recursion when checking for a file truename sometimes.  This fixes that by
using the ms-dos way of checking the file truename when nacl is defined.

Since this is a 20% project, an existing agreement between my employer and
FSF governs attributions, and copyright-clerk@fsf.org has signed off on my
contributions under the existing agreement.

[-- Attachment #1.2: Type: text/html, Size: 519 bytes --]

[-- Attachment #2: 0001-Fix-file-recursion-problem-for-NaCl-by-using-the-ms-.patch --]
[-- Type: text/x-patch, Size: 1358 bytes --]

From 3441b5a4250063cd3c7fbecb1d85f4eecf2af319 Mon Sep 17 00:00:00 2001
From: Pete Williamson <petewil@chromium.org>
Date: Fri, 3 Apr 2015 16:48:34 -0700
Subject: [PATCH] Fix file recursion problem for NaCl by using the ms-dos
 check.

---
 ChangeLog     | 5 +++++
 lisp/files.el | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 7746605..97e55cd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2015-04-03  Pete Williamson <petewil@chromium.org>  (tiny-change)
+
+	Fix .emacs and .emacs.d/init file recursion problem for NaCl.
+	* lisp/files.el: Add NaCl to the exception list ms-dos uses.
+
 2015-04-03  Paul Eggert  <eggert@cs.ucla.edu>
 
 	Port 'configure' to clang 3.5
diff --git a/lisp/files.el b/lisp/files.el
index 42b00ac..0fdf004 100644
--- a/lisp/files.el
+++ b/lisp/files.el
@@ -1192,7 +1192,7 @@ containing it, until no links are left at any level.
 	    (setq dirfile (directory-file-name dir))
 	    ;; If these are equal, we have the (or a) root directory.
 	    (or (string= dir dirfile)
-		(and (memq system-type '(windows-nt ms-dos cygwin))
+		(and (memq system-type '(windows-nt ms-dos cygwin nacl))
 		     (eq (compare-strings dir 0 nil dirfile 0 nil t) t))
 		;; If this is the same dir we last got the truename for,
 		;; save time--don't recalculate.
-- 
2.2.0.rc0.207.ga3a616c

Re: [PATCH] Fix file recursion problem for NaCl

[Paul Eggert]

Thanks, I installed that with a slightly tweaked ChangeLog entry.  Please don't 
worry about the details, as they're nearly obsolete: next week we're changing 
how ChangeLogs are done, as described in Bug#19113.