msys2-runtime: Stop trying convert any quoted strings. Not convert strings containing "@"

This commit is contained in:
Alexpux
2014-10-01 12:53:12 +04:00
parent a20fb2ba46
commit 663f59cd4f
2 changed files with 13 additions and 26 deletions

View File

@@ -32,7 +32,7 @@ new file mode 100644
index 0000000..549a42e
--- /dev/null
+++ b/winsup/cygwin/msys2_path_conv.cc
@@ -0,0 +1,607 @@
@@ -0,0 +1,614 @@
+/*
+ The MSYS2 Path conversion source code is licensed under:
+
@@ -294,6 +294,10 @@ index 0000000..549a42e
+
+ int need_convert = false;
+ for (const char* it = src; *it != '\0'; ++it) {
+ if (*it == '@' || *it == '"' || *it == '\'') {
+ need_convert = false;
+ break;
+ }
+ if (*it == '\\' || *it == '/') {
+ need_convert = true;
+ break;
@@ -403,6 +407,9 @@ index 0000000..549a42e
+ return URL;
+ }
+
+ if (double_slashed && *it == '/') {
+ return ESCAPE_WINDOWS_PATH;
+ }
+
+ for (; *it != '\0' && it != end; ++it) {
+ switch(*it) {

View File

@@ -3,8 +3,8 @@
pkgname=('msys2-runtime' 'msys2-runtime-devel')
_ver_base=2.0
pkgver=2.0.16216.28f24b3
pkgrel=1
pkgver=2.0.16224.6393980
pkgrel=2
pkgdesc="Cygwin POSIX emulation engine"
arch=('i686' 'x86_64')
url=""
@@ -20,9 +20,9 @@ source=('msys2-runtime'::'git+https://github.com/Alexpux/Cygwin.git#branch=devel
'0005-mount-Add-longest_native_sorted-and-longest_posix_so.patch')
md5sums=('SKIP'
'6981bc9722f8b4342c318577edfb559c'
'c71f48546d81a76cad0daf552bbb5da8'
'1232e2263fb64b4b2d1d9367fdd5d968'
'05fb05fe24d39b47162dfaa71146bd3b'
'eaffd1281a8a8d6b971c077d4b5b9e59')
'09e5636e21bb7f6aa1c67ee9ab1c0b5a')
pkgver() {
cd "$srcdir/msys2-runtime"
#printf "%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
@@ -36,7 +36,7 @@ prepare() {
# This is the new code, but it doesn't handle Unix PATH lists very well.
git am ${srcdir}/0003-Add-msys2_path_conv.patch
git am ${srcdir}/0004-Fix-cygwin-path_conv-of-root.patch
git am ${srcdir}/0005-mount-Add-longest_native_sorted-and-longest_posix_so.patch
# git am ${srcdir}/0005-mount-Add-longest_native_sorted-and-longest_posix_so.patch
}
build() {
@@ -92,23 +92,3 @@ package_msys2-runtime-devel() {
rm -f $pkgdir/usr/include/unctrl.h
cp -rLf ${srcdir}/dest/usr/${CHOST}/lib $pkgdir/usr/
}
return 0
# Please keep this until the new mount table sorting is proven 'correct'.
# from cmd.exe
# E:/msys64/usr/bin/bash.exe --login -i -c "pacman -U /var/cache/pacman/pkg/msys2-runtime*.xz"
# E:/msys64/usr/bin/bash.exe --login -i -c "LANG=C cd /e/m2/repo-MSYS2/msys2-runtime && pushd src/build-x86_64-pc-msys && make && make -j1 DESTDIR=/e/m2/repo-MSYS2/msys2-runtime/src/dest install && rm -rf /e/m2/repo-MSYS2/msys2-runtime/src/dest/etc && popd && makepkg -RLf && pacman -U msys2-runtime*.xz && exit"
# E:/msys64/usr/bin/strace.exe E:/msys64/usr/bin/ls.exe /bin > E:/meh-bin-bad.txt
# E:/msys64/usr/bin/strace.exe E:/msys64/usr/bin/g++ > E:/meh-g++-bad.txt
# call tests/do_old.bat E:/msys64 /e/m2/repo-MSYS2
# E:/msys64/usr/bin/bash.exe --login -i -c "pacman -U /var/cache/pacman/pkg/msys2-runtime*.xz"
# E:/msys64/usr/bin/strace.exe E:/msys64/usr/bin/ls.exe /bin > E:/meh-bin-good.txt
# E:/msys64/usr/bin/strace.exe E:/msys64/usr/bin/g++ > E:/meh-g++-good.txt
# call tests/do_new.bat E:/msys64 /e/m2/repo-MSYS2
# Mounts:
# E:/msys64/usr/bin /bin
# C:/git/mingw /build
# C:/git/msys2 /build2
# E:/msys64 /
# call tests/do_new2.bat E:/msys64 /e/m2/repo-MSYS2