1
0
forked from aniani/vim

patch 9.1.0686: zip-plugin has problems with special characters

Problem:  zip-plugin has problems with special characters
          (user202729)
Solution: escape '*?[\' on Unix and handle those chars
          a bit differently on MS-Windows, add a test, check
          before overwriting files

runtime(zip): small fixes for zip plugin

This does the following:
- verify the unzip plugin is executable when loading the autoload plugin
- handle extracting file names with '[*?\' in its name correctly by
  escaping those characters for the unzip command (and handle those
  characters a bit differently on MS-Windows, since the quoting is different)
- verify, that the extract plugin is not overwriting a file (could cause
  a hang, because unzip asking for confirmation)
- add a test zip file which contains those special file names

fixes: #15505
closes: #15519

Signed-off-by: Christian Brabandt <cb@256bit.org>
This commit is contained in:
Christian Brabandt
2024-08-20 22:41:52 +02:00
parent 5f5f2832f5
commit 7790ea0c68
5 changed files with 131 additions and 5 deletions

Binary file not shown.

View File

@@ -40,7 +40,8 @@ def Test_zip_basic()
execute("normal \<CR>"))
### Check ENTER on file
:1|:/^$//file/
:1
search('file.txt')
exe ":normal \<cr>"
assert_match('zipfile://.*/X.zip::Xzip/file.txt', @%)
assert_equal('one', getline(1))
@@ -65,6 +66,10 @@ def Test_zip_basic()
:1|:/^$//file/
normal x
assert_true(filereadable("Xzip/file.txt"))
## Check not overwriting existing file
assert_match('<Xzip/file.txt> .* not overwriting!', execute("normal x"))
delete("Xzip", "rf")
### Check extracting directory
@@ -131,5 +136,102 @@ def Test_zip_basic()
assert_match('File not readable', execute("e Xnot_exists.zip"))
bw
enddef
def Test_zip_glob_fname()
CheckNotMSWindows
# does not work on Windows, why?
### copy sample zip file
if !filecopy("samples/testa.zip", "X.zip")
assert_report("Can't copy samples/testa.zip")
return
endif
defer delete("X.zip")
defer delete('zipglob', 'rf')
e X.zip
### 1) Check extracting strange files
:1
var fname = 'a[a].txt'
search('\V' .. fname)
normal x
assert_true(filereadable('zipglob/' .. fname))
delete('zipglob', 'rf')
:1
fname = 'a*.txt'
search('\V' .. fname)
normal x
assert_true(filereadable('zipglob/' .. fname))
delete('zipglob', 'rf')
:1
fname = 'a?.txt'
search('\V' .. fname)
normal x
assert_true(filereadable('zipglob/' .. fname))
delete('zipglob', 'rf')
:1
fname = 'a\.txt'
search('\V' .. escape(fname, '\\'))
normal x
assert_true(filereadable('zipglob/' .. fname))
delete('zipglob', 'rf')
:1
fname = 'a\\.txt'
search('\V' .. escape(fname, '\\'))
normal x
assert_true(filereadable('zipglob/' .. fname))
delete('zipglob', 'rf')
### 2) Check entering strange file names
:1
fname = 'a[a].txt'
search('\V' .. fname)
exe ":normal \<cr>"
assert_match('zipfile://.*/X.zip::zipglob/a\[a\].txt', @%)
assert_equal('a test file with []', getline(1))
bw
e X.zip
:1
fname = 'a*.txt'
search('\V' .. fname)
exe ":normal \<cr>"
assert_match('zipfile://.*/X.zip::zipglob/a\*.txt', @%)
assert_equal('a test file with a*', getline(1))
bw
e X.zip
:1
fname = 'a?.txt'
search('\V' .. fname)
exe ":normal \<cr>"
assert_match('zipfile://.*/X.zip::zipglob/a?.txt', @%)
assert_equal('a test file with a?', getline(1))
bw
e X.zip
:1
fname = 'a\.txt'
search('\V' .. escape(fname, '\\'))
exe ":normal \<cr>"
assert_match('zipfile://.*/X.zip::zipglob/a\\.txt', @%)
assert_equal('a test file with a\', getline(1))
bw
e X.zip
:1
fname = 'a\\.txt'
search('\V' .. escape(fname, '\\'))
exe ":normal \<cr>"
assert_match('zipfile://.*/X.zip::zipglob/a\\\\.txt', @%)
assert_equal('a test file with a double \', getline(1))
bw
bw
enddef