[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] trunk r118327: Revert 118323.
From: |
Dani Moncayo |
Subject: |
[Emacs-diffs] trunk r118327: Revert 118323. |
Date: |
Sat, 08 Nov 2014 23:32:03 +0000 |
User-agent: |
Bazaar (2.6b2) |
------------------------------------------------------------
revno: 118327
revision-id: address@hidden
parent: address@hidden
committer: Dani Moncayo <address@hidden>
branch nick: trunk
timestamp: Sun 2014-11-09 00:31:44 +0100
message:
Revert 118323.
modified:
build-aux/msys-to-w32 msystow32-20131120014415-6qbja8232hbv7kxz-1
=== modified file 'build-aux/msys-to-w32'
--- a/build-aux/msys-to-w32 2014-11-08 21:17:00 +0000
+++ b/build-aux/msys-to-w32 2014-11-08 23:31:44 +0000
@@ -1,5 +1,5 @@
#!/bin/bash
-# Convert a MSYS path list to absolute, Windows-native format.
+# Convert a MSYS path list to Windows-native format.
# Status is zero if successful, nonzero otherwise.
# Copyright (C) 2013-2014 Free Software Foundation, Inc.
@@ -25,20 +25,20 @@
help="$usage
or: ${me} OPTION
-Convert a MSYS path list to absolute, Windows-native format.
+Convert a MSYS path list to Windows-native format.
PATHLIST should be a colon-separated list of MSYS paths, which will be
written to the standard output after performing these transformations:
1. Discard empty paths.
2. Replace: '\' with '/', '//' with '/' and ':' with ';'.
-3. Translate each path to absolute, Windows-native format.
-
-Paths starting with '%emacs_dir%' will be passed verbatim to the
-standard output.
-
-Each non existing path will be translated by looking for its deepest
-existing directory, which will be translated and the remainder
+3. Translate each path to Windows-native format.
+
+Relative paths or paths starting with '%emacs_dir%' will be passed
+verbatim to the standard output.
+
+Each non existing absolute path will be translated by looking for its
+deepest existing directory, which will be translated and the remainder
appended.
Options:
@@ -81,6 +81,9 @@
if [ "${p:0:11}" = "%emacs_dir%" ]
then
w32p=$p
+ elif [ "${p:0:1}" != "/" ]
+ then
+ w32p=$p
elif [ -d "$p" ]
then
w32p=$(cd "$p" && pwd -W)
@@ -92,23 +95,17 @@
p=${p//\/\///}
p=${p%/}
- p1=$p # last candidate tried
+ p1=$p
while :
do
- p2=${p1%/*} # next candidate to try
- [ "$p2" = "$p1" ] && {
- # No more candidates to try
- echo "Invalid path '$p'." >&2
- exit 1
- }
- [ -z "$p2" ] && p2="/" && break
- [ -d "$p2" ] && break
- p1=$p2
+ p1=${p1%/*}
+ [ -z "$p1" ] && p1="/" && break
+ [ -d "$p1" ] && break
done
# translate the existing part and append the rest
- w32p=$(cd "${p2}" && pwd -W)
- remainder=${p#$p2}
+ w32p=$(cd "${p1}" && pwd -W)
+ remainder=${p#$p1}
w32p+=/${remainder#/}
fi
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] trunk r118327: Revert 118323.,
Dani Moncayo <=