update z.lua to 1.8.11

commit new z.lua
fix: pushd leak in windows cmd
2026-03-22 07:39:48 +00:00 · 2020-12-31 02:11:09 +08:00 · 2020-12-31 02:05:46 +08:00 · 2020-12-31 01:47:18 +08:00 · 2020-12-30 23:01:17 +08:00 · 2020-12-30 05:00:26 -08:00
2 changed files with 19 additions and 3 deletions
--- a/z.cmd
+++ b/z.cmd
@@ -106,13 +106,23 @@ if /i "%RunMode%"=="-n" (
 			pushd !NewPath!
 			pushd !NewPath!
 			endlocal
-			popd
+			goto popdir
 		)
 	)
 )	else (
 	call "%LuaExe%" "%LuaScript%" "%RunMode%" %MatchType% %StrictSub% %InterMode% %StripMode% %*
 )

+goto end
+
+:popdir
+rem -- Exploits variable expansion and the pushd stack to set the current
+rem -- directory without leaking a pushd.
+popd
+setlocal
+set NewPath=%CD%
+endlocal & popd & cd /d "%NewPath%"
+
 :end
 echo.

--- a/z.lua
+++ b/z.lua
@@ -4,7 +4,7 @@
 -- z.lua - a cd command that learns, by skywind 2018, 2019, 2020
 -- Licensed under MIT license.
 --
-- Version 1.8.10, Last Modified: 2020/12/23 16:37
+-- Version 1.8.11, Last Modified: 2020/12/31 02:05
 --
 -- * 10x faster than fasd and autojump, 3x faster than z.sh
 -- * available for posix shells: bash, zsh, sh, ash, dash, busybox
@@ -2548,12 +2548,18 @@ if /i "%RunMode%"=="-n" (
 			pushd !NewPath!
 			pushd !NewPath!
 			endlocal
-			popd
+			goto popdir
 		)
 	)
 )	else (
 	call "%LuaExe%" "%LuaScript%" "%RunMode%" %MatchType% %StrictSub% %InterMode% %StripMode% %*
 )
+goto end
+:popdir
+popd
+setlocal
+set "NewPath=%CD%"
+endlocal & popd & cd /d "%NewPath%"
 :end
 ]]
Author	SHA1	Message	Date
skywind3000	7a8acd469d	update z.lua to 1.8.11	2020-12-31 02:11:09 +08:00
skywind3000	52e066aae7	commit new z.lua	2020-12-31 02:05:46 +08:00
skywind3000	e1a44ee9a5	fix: pushd leak in windows cmd	2020-12-31 01:47:18 +08:00
Linwei	9c0eb6cfbc	Merge pull request #127 from chrisant996/fixpushd Fix leaked pushd	2020-12-30 23:01:17 +08:00
Chris Antos	e646d5baa5	A better fix for the final blank line.	2020-12-30 05:00:26 -08:00
Chris Antos	be90b1a528	Match original output. Originally `z foo` printed a blank line after the command. My recent change accidentally changed how CMD interpreted the end of the file such that CMD stopped printing the blank line. This change adjusts the end of the file to once again cause CMD to print a blank line on finish.	2020-12-30 04:50:29 -08:00
Chris Antos	bda94435fc	Fix leaked pushd. `z somedir` uses double `pushd` to tunnel the new path out past the endlocal that restores the environment state. But it ended up leaving a pushd on the dir stack. This change exploits normal variable expansion to restore the dir stack to its initial state while still successfully tunneling the new path out past the endlocal.	2020-12-30 04:42:05 -08:00