[Emacs-diffs] trunk r115307: msys-to-w32: Do not translate paths starting with %emacs_dir%.

[Juanma Barranquero]

------------------------------------------------------------
revno: 115307
revision-id: address@hidden
parent: address@hidden
author: Dani Moncayo <address@hidden>
committer: Juanma Barranquero <address@hidden>
branch nick: trunk
timestamp: Sat 2013-11-30 16:42:13 +0100
message:
  msys-to-w32: Do not translate paths starting with %emacs_dir%.
  * build-aux/msys-to-w32 (w32pathlist): Do not translate paths
    starting with %emacs_dir%.
modified:
  ChangeLog                      changelog-20091113204419-o5vbwnq5f7feedwu-1538
  build-aux/msys-to-w32          msystow32-20131120014415-6qbja8232hbv7kxz-1

=== modified file 'ChangeLog'
--- a/ChangeLog 2013-11-30 02:06:34 +0000
+++ b/ChangeLog 2013-11-30 15:42:13 +0000
@@ -1,3 +1,8 @@
+2013-11-30  Dani Moncayo  <address@hidden>
+
+       * build-aux/msys-to-w32 (w32pathlist): Do not translate paths
+       starting with %emacs_dir%.
+
 2013-11-30  Glenn Morris  <address@hidden>
 
        Stop keeping (most) generated cedet grammar files in the repository.

=== modified file 'build-aux/msys-to-w32'
--- a/build-aux/msys-to-w32     2013-11-26 20:22:17 +0000
+++ b/build-aux/msys-to-w32     2013-11-30 15:42:13 +0000
@@ -36,7 +36,8 @@
 3. Replace two consecutive slashes with single ones.
 4. Translate to Windows-native format those paths that are not in such
    format already. The translated paths will not end with a slash,
-   except for root directories (e.g. 'c:/' or 'c:/foo').
+   except for root directories (e.g. 'c:/' or 'c:/foo').  Paths
+   starting with '%emacs_dir%' will not be translated.
 5. Escape with backslashes every occurrence of SEPARATOR2 within the paths.
 6. Concatenate the translated paths with SEPARATOR2.
 
@@ -100,7 +101,11 @@
     p="${p//\\//}"
     p="${p//\/\///}"
 
-    if test -d "$p"
+    if test "${p:0:11}" = "%emacs_dir%"
+    then
+       # Paths starting with "%emacs_dir%" will not be translated
+       w32p=$p
+    elif test -d "$p"
     then
        # The path exists, so just translate it
        w32p=`cd "$p" && pwd -W`
@@ -162,4 +167,4 @@
 done
 
 # Write the translated pathlist to the standard output
-printf "${w32pathlist}"
+printf "%s" "${w32pathlist}"