diff options
| author | Christian Clason <c.clason@uni-graz.at> | 2024-07-25 09:25:56 +0200 |
|---|---|---|
| committer | Christian Clason <c.clason@uni-graz.at> | 2024-07-25 10:01:35 +0200 |
| commit | 90d40c68dcb91f30ad416e5d368cd230585c584d (patch) | |
| tree | 0b79b55cd155903b65b0dc01469bb6123eda96b6 | |
| parent | 0cdeb06db0062951f2f2d2998510e2fff7e0faee (diff) | |
| download | rneovim-90d40c68dcb91f30ad416e5d368cd230585c584d.tar.gz rneovim-90d40c68dcb91f30ad416e5d368cd230585c584d.tar.bz2 rneovim-90d40c68dcb91f30ad416e5d368cd230585c584d.zip | |
vim-patch:2cad941: runtime(zip): Use delete() for deleting directory
This is safer because we don't invoke the shell.
closes: vim/vim#15335
https://github.com/vim/vim/commit/2cad941dc0cb57bca577160eb3a349de2e667bcd
Co-authored-by: Damien <141588647+xrandomname@users.noreply.github.com>
| -rw-r--r-- | runtime/autoload/zip.vim | 29 |
1 files changed, 9 insertions, 20 deletions
diff --git a/runtime/autoload/zip.vim b/runtime/autoload/zip.vim index 34bcad3368..79f707fbd8 100644 --- a/runtime/autoload/zip.vim +++ b/runtime/autoload/zip.vim @@ -1,12 +1,13 @@ " zip.vim: Handles browsing zipfiles -" AUTOLOAD PORTION -" Date: Jul 23, 2024 +" AUTOLOAD PORTION +" Date: Jul 24, 2024 " Version: 33 " Maintainer: This runtime file is looking for a new maintainer. " Former Maintainer: Charles E Campbell " Last Change: -" 2024 Jun 16 by Vim Project: handle whitespace on Windows properly (#14998) -" 2024 Jul 23 by Vim Project: fix 'x' command +" 2024 Jun 16 by Vim Project: handle whitespace on Windows properly (#14998) +" 2024 Jul 23 by Vim Project: fix 'x' command +" 2024 Jul 24 by Vim Project: use delete() function " License: Vim License (see vim's :help license) " Copyright: Copyright (C) 2005-2019 Charles E. Campbell {{{1 " Permission is hereby granted to use and distribute this code, @@ -299,7 +300,7 @@ fun! zip#Write(fname) " place temporary files under .../_ZIPVIM_/ if isdirectory("_ZIPVIM_") - call s:Rmdir("_ZIPVIM_") + call delete("_ZIPVIM_", "rf") endif call mkdir("_ZIPVIM_") cd _ZIPVIM_ @@ -359,12 +360,12 @@ fun! zip#Write(fname) q! unlet s:zipfile_{winnr()} endif - + " cleanup and restore current directory cd .. - call s:Rmdir("_ZIPVIM_") + call delete("_ZIPVIM_", "rf") call s:ChgDir(curdir,s:WARNING,"(zip#Write) unable to return to ".curdir."!") - call s:Rmdir(tmpdir) + call delete(tmpdir, "rf") setlocal nomod let &report= repkeep @@ -456,18 +457,6 @@ fun! s:ChgDir(newdir,errlvl,errmsg) return 0 endfun -" --------------------------------------------------------------------- -" s:Rmdir: {{{2 -fun! s:Rmdir(fname) -" call Dfunc("Rmdir(fname<".a:fname.">)") - if (has("win32") || has("win95") || has("win64") || has("win16")) && &shell !~? 'sh$' - call system("rmdir /S/Q ".s:Escape(a:fname,0)) - else - call system("/bin/rm -rf ".s:Escape(a:fname,0)) - endif -" call Dret("Rmdir") -endfun - " ------------------------------------------------------------------------ " Modelines And Restoration: {{{1 let &cpo= s:keepcpo |