mirror/ zsh
1
0
Fork 0
mirror of git://git.code.sf.net/p/zsh/code synced 2024-06-01 04:46:08 +02:00
Code

Eric Blake: 27151: cd handling with initial // for Cygwin

This commit is contained in:
Peter Stephenson 2009-07-15 08:43:25 +00:00
parent 443a64d489
commit 351f6541e9
2 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@ -1,3 +1,8 @@
2009-07-14 Eric Blake <ebb9@byu.net>
* Eric Blake: 27151: Src/builtin.c: Fix // handling in cd for
cygwin.
2009-07-14 Peter Stephenson <pws@csr.com>
* Andy Spencer: 27148: Completion/Linux/Command/_modutils:
@ -11986,5 +11991,5 @@
*****************************************************
* This is used by the shell to define $ZSH_PATCHLEVEL
* $Revision: 1.4740 $
* $Revision: 1.4741 $
*****************************************************

14
Src/builtin.c
View File

@ -1029,17 +1029,19 @@ cd_try_chdir(char *pfix, char *dest, int hard)
/* handle directory prefix */
if (pfix && *pfix) {
if (*pfix == '/')
if (*pfix == '/') {
#ifdef __CYGWIN__
/* NB: Don't turn "/"+"bin" into "//"+"bin" by mistake! "//bin" may *
* not be what user really wants (probably wants "/bin"), but *
* "//bin" could be valid too (see fixdir())! This is primarily for *
* handling CDPATH correctly. */
buf = tricat(pfix, ( pfix[1] == '\0' ? "" : "/" ), dest);
* handling CDPATH correctly. Likewise for "//"+"bin" not becoming *
* "///bin" (aka "/bin"). */
int root = pfix[1] == '\0' || (pfix[1] == '/' && pfix[2] == '\0');
buf = tricat(pfix, ( root ? "" : "/" ), dest);
#else
buf = tricat(pfix, "/", dest);
#endif
else {
} else {
int pfl = strlen(pfix);
dlen = strlen(pwd);
@ -1200,8 +1202,8 @@ fixdir(char *src)
/* compress multiple /es into single */
if (*src == '/') {
#ifdef __CYGWIN__
/* allow leading // under cygwin */
if (src == s0 && src[1] == '/')
/* allow leading // under cygwin, but /// still becomes / */
if (src == s0 && src[1] == '/' && src[2] != '/')
*dest++ = *src++;
#endif
*dest++ = *src++;