runtime(tar): use readblob() instead of shelling out to file(1)
Commit:
https://github.com/vim/vim/commit/a250738303f85132335d69fd1936501b189eebce
Author: Christian Brabandt <c...@256bit.org>
Date: Sun Mar 2 22:23:28 2025 +0100
runtime(tar): use readblob() instead of shelling out to file(1)
fixes: #https://github.com/vim/vim/issues/16761
closes: https://github.com/vim/vim/issues/16769
Co-authored-by: Jim Zhou <jimzhou...@gmail.com>
Signed-off-by: Christian Brabandt <c...@256bit.org>
diff --git a/runtime/autoload/tar.vim b/runtime/autoload/tar.vim
index 14e68b789..4aab91566 100644
--- a/runtime/autoload/tar.vim
+++ b/runtime/autoload/tar.vim
@@ -12,6 +12,8 @@
" 2025 Feb 28 by Vim Project: add support for bzip3 (#16755)
" 2025 Mar 01 by Vim Project: fix syntax error in tar#Read()
" 2025 Mar 02 by Vim Project: escape the filename before using :read
+" 2025 Mar 02 by Vim Project: determine the compression using readblob()
+" instead of shelling out to file(1)
"
" Contains many ideas from Michael Toren's <tar.vim>
"
@@ -161,23 +163,19 @@ fun! tar#Browse(tarfile)
elseif tarfile =~# '\.\(tgz\)$' || tarfile =~# '\.\(tbz\)$' || tarfile =~#
'\.\(txz\)$' ||
\ tarfile =~# '\.\(tzst\)$' || tarfile =~#
'\.\(tlz4\)$'
- if has("unix") && executable("file")
- let filekind= system("file ".shellescape(tarfile,1))
- else
- let filekind= ""
- endif
+ let header= s:Header(tarfile)
- if filekind =~ "bzip2"
+ if header =~? 'bzip2'
exe "sil! r! bzip2 -d -c -- ".shellescape(tarfile,1)." | ".g:tar_cmd."
-".g:tar_browseoptions." - "
- elseif filekind =~ "bzip3"
+ elseif header =~? 'bzip3'
exe "sil! r! bzip3 -d -c -- ".shellescape(tarfile,1)." | ".g:tar_cmd."
-".g:tar_browseoptions." - "
- elseif filekind =~ "XZ"
+ elseif header =~? 'xz'
exe "sil! r! xz -d -c -- ".shellescape(tarfile,1)." | ".g:tar_cmd."
-".g:tar_browseoptions." - "
- elseif filekind =~ "Zstandard"
+ elseif header =~? 'zstd'
exe "sil! r! zstd --decompress --stdout -- ".shellescape(tarfile,1)." |
".g:tar_cmd." -".g:tar_browseoptions." - "
- elseif filekind =~ "LZ4"
+ elseif header =~? 'lz4'
exe "sil! r! lz4 --decompress --stdout -- ".shellescape(tarfile,1)." |
".g:tar_cmd." -".g:tar_browseoptions." - "
- else
+ elseif header =~? 'gzip'
exe "sil! r! gzip -d -c -- ".shellescape(tarfile,1)." | ".g:tar_cmd."
-".g:tar_browseoptions." - "
endif
@@ -372,24 +370,20 @@ fun! tar#Read(fname,mode)
exe "sil! r! gzip -d -c -- ".shellescape(tarfile,1)."| ".g:tar_cmd."
-".g:tar_readoptions." - ".tar_secure.shellescape(fname,1).decmp
exe "read ".escape_file
elseif tarfile =~# '\(\.tgz\|\.tbz\|\.txz\)'
- if has("unix") && executable("file")
- let filekind= system("file ".shellescape(tarfile,1))
- else
- let filekind= ""
- endif
- if filekind =~ "bzip2"
+ let filekind= s:Header(tarfile)
+ if filekind =~? "bzip2"
exe "sil! r! bzip2 -d -c -- ".shellescape(tarfile,1)."| ".g:tar_cmd."
-".g:tar_readoptions." - ".tar_secure.shellescape(fname,1).decmp
exe "read ".escape_file
elseif filekind =~ "bzip3"
exe "sil! r! bzip3 -d -c -- ".shellescape(tarfile,1)."| ".g:tar_cmd."
-".g:tar_readoptions." - ".tar_secure.shellescape(fname,1).decmp
exe "read ".escape_file
- elseif filekind =~ "XZ"
+ elseif filekind =~? "xz"
exe "sil! r! xz -d -c -- ".shellescape(tarfile,1)."| ".g:tar_cmd."
-".g:tar_readoptions." - ".tar_secure.shellescape(fname,1).decmp
exe "read ".escape_file
- elseif filekind =~ "Zstandard"
+ elseif filekind =~? "zstd"
exe "sil! r! zstd --decompress --stdout -- ".shellescape(tarfile,1)."|
".g:tar_cmd." -".g:tar_readoptions." - ".tar_secure.shellescape(fname,1).decmp
exe "read ".escape_file
- else
+ elseif filekind =~? "gzip"
exe "sil! r! gzip -d -c -- ".shellescape(tarfile,1)."| ".g:tar_cmd."
-".g:tar_readoptions." - ".tar_secure.shellescape(fname,1).decmp
exe "read ".escape_file
endif
@@ -499,6 +493,7 @@ fun! tar#Write(fname)
let tarfile = substitute(tarfile,'\.lzma','','e')
let compress= "lzma -- ".shellescape(tarfile,0)
endif
+ " Note: no support for name.tar.tbz/.txz/.tgz/.tlz4/.tzst
if v:shell_error != 0
redraw!
@@ -747,6 +742,29 @@ fun! s:Rmdir(fname)
endif
endfun
+" s:FileHeader: {{{2
+fun! s:Header(fname)
+ let header= readblob(a:fname, 0, 6)
+ if header[0:2] == str2blob(['BZh']) " bzip2 header
+ return "bzip2"
+ elseif header[0:2] == str2blob(['BZ3']) " bzip3 header
+ return "bzip3"
+ elseif header == str2blob(["ý7zXZ
"]) " xz header
+ return "xz"
+ elseif header[0:3] == str2blob(["\x28\xB5\x2F\xFD"]) " zstd header
+ return "zstd"
+ elseif header[0:3] == str2blob([" \"M "]) " lz4 header
+ return "lz4"
+ elseif (header[0:1] == str2blob([" "]) ||
+ \ header[0:1] == str2blob([" ‹"]) ||
+ \ header[0:1] == str2blob([" ž"]) ||
+ \ header[0:1] == str2blob([" "]) ||
+ \ header[0:1] == str2blob([" "]))
+ return "gzip"
+ endif
+ return "unknown"
+endfun
+
" ---------------------------------------------------------------------
" tar#Vimuntar: installs a tarball in the user's .vim / vimfiles directory {{{2
fun! tar#Vimuntar(...)
--
--
You received this message from the "vim_dev" maillist.
Do not top-post! Type your reply below the text you are replying to.
For more information, visit http://www.vim.org/maillist.php
---
You received this message because you are subscribed to the Google Groups
"vim_dev" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to vim_dev+unsubscr...@googlegroups.com.
To view this discussion visit
https://groups.google.com/d/msgid/vim_dev/E1toqst-004yhb-4Y%40256bit.org.
