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>
diff --git a/src/testdir/samples/testa.zip b/src/testdir/samples/testa.zip
new file mode 100644
index 0000000..10b0346
--- /dev/null
+++ b/src/testdir/samples/testa.zip
Binary files differ
diff --git a/src/testdir/test_zip_plugin.vim b/src/testdir/test_zip_plugin.vim
index 3579a46..e831f26 100644
--- a/src/testdir/test_zip_plugin.vim
+++ b/src/testdir/test_zip_plugin.vim
@@ -40,7 +40,8 @@
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 @@
: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 @@
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
diff --git a/src/version.c b/src/version.c
index c0f0dff..0aa9683 100644
--- a/src/version.c
+++ b/src/version.c
@@ -705,6 +705,8 @@
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 686,
+/**/
685,
/**/
684,