vim/vim-gnupg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Better escaping file names with spaces

Browse Source
This commit is contained in:
Markus Braun 2006-12-14 07:34:09 +00:00
parent 9a15ce7ef1
commit ac21a24b3d
1 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
plugin/gnupg.vim
View File

@ -77,7 +77,7 @@ autocmd BufReadPost,FileReadPost *.\(gpg\|asc\|pgp\) call s:GPGDec
" Switch to normal mode for editing " Switch to normal mode for editing
autocmd BufReadPost,FileReadPost *.\(gpg\|asc\|pgp\) set nobin autocmd BufReadPost,FileReadPost *.\(gpg\|asc\|pgp\) set nobin
" Call the autocommand for the file minus .gpg$ " Call the autocommand for the file minus .gpg$
autocmd BufReadPost,FileReadPost *.\(gpg\|asc\|pgp\) execute ":doautocmd BufReadPost " . expand("%:r") autocmd BufReadPost,FileReadPost *.\(gpg\|asc\|pgp\) execute ":doautocmd BufReadPost " . escape(expand("%:r"), ' *?\"'."'")
autocmd BufReadPost,FileReadPost *.\(gpg\|asc\|pgp\) execute ":redraw!" autocmd BufReadPost,FileReadPost *.\(gpg\|asc\|pgp\) execute ":redraw!"
" Switch to binary mode before encrypt the file " Switch to binary mode before encrypt the file
@ -153,7 +153,7 @@ endf
" "
fun s:GPGDecrypt() fun s:GPGDecrypt()
" get the filename of the current buffer " get the filename of the current buffer
let filename=escape(expand("%:p"), ' *?\"'."'") let filename=escape(expand("%:p"), '\"')
" clear GPGEncrypted, GPGRecipients, GPGUnknownRecipients and GPGOptions " clear GPGEncrypted, GPGRecipients, GPGUnknownRecipients and GPGOptions
let b:GPGEncrypted=0 let b:GPGEncrypted=0
@ -164,10 +164,12 @@ fun s:GPGDecrypt()
" find the recipients of the file " find the recipients of the file
let &shellredir=s:shellredir let &shellredir=s:shellredir
let &shell=s:shell let &shell=s:shell
let output=system(s:GPGCommand . " --decrypt --dry-run --batch --no-use-agent --logger-fd 1 " . filename) let output=system(s:GPGCommand . " --decrypt --dry-run --batch --no-use-agent --logger-fd 1 \"" . filename . "\"")
let &shellredir=s:shellredir let &shellredir=s:shellredir
let &shell=s:shellsave let &shell=s:shellsave
echom ">>>" . s:GPGCommand . " --decrypt --dry-run --batch --no-use-agent --logger-fd 1 \"" . filename . "\"" . "<<<"
echom ">>>" . output . "<<<"
" check if the file is symmetric/asymmetric encrypted " check if the file is symmetric/asymmetric encrypted
if (match(output, "gpg: [^ ]\\+ encrypted data") >= 0) if (match(output, "gpg: [^ ]\\+ encrypted data") >= 0)
" file is symmetric encrypted " file is symmetric encrypted
@ -377,7 +379,7 @@ fun s:GPGEditRecipients()
if (match(bufname("%"), "^\\(GPGRecipients_\\|GPGOptions_\\)") != 0 && match(bufname("%"), "\.\\(gpg\\|asc\\|pgp\\)$") >= 0) if (match(bufname("%"), "^\\(GPGRecipients_\\|GPGOptions_\\)") != 0 && match(bufname("%"), "\.\\(gpg\\|asc\\|pgp\\)$") >= 0)
" save buffer name " save buffer name
let buffername=bufname("%") let buffername=escape(bufname("%"), ' *?\"'."'")
let editbuffername="GPGRecipients_" . buffername let editbuffername="GPGRecipients_" . buffername
" create scratch buffer " create scratch buffer
@ -479,7 +481,7 @@ fun s:GPGFinishRecipientsBuffer()
let GPGUnknownRecipients="" let GPGUnknownRecipients=""
" delete the autocommand " delete the autocommand
exe "au! GPGEditRecipients * " . bufname("%") exe "au! GPGEditRecipients * " . escape(bufname("%"), ' *?\"'."'")
let currentline=1 let currentline=1
let recipient=getline(currentline) let recipient=getline(currentline)
@ -510,10 +512,11 @@ fun s:GPGFinishRecipientsBuffer()
endw endw
" write back the new recipient list to the corresponding buffer and mark it " write back the new recipient list to the corresponding buffer and mark it
" as modified " as modified. Buffer is now for sure a encrypted buffer.
call setbufvar(b:corresponding_to, "GPGRecipients", GPGRecipients) call setbufvar(b:corresponding_to, "GPGRecipients", GPGRecipients)
call setbufvar(b:corresponding_to, "GPGUnknownRecipients", GPGUnknownRecipients) call setbufvar(b:corresponding_to, "GPGUnknownRecipients", GPGUnknownRecipients)
call setbufvar(b:corresponding_to, "&mod", 1) call setbufvar(b:corresponding_to, "&mod", 1)
call setbufvar(b:corresponding_to, "GPGEncrypted", 1)
" check if there is any known recipient " check if there is any known recipient
if (strlen(s:GetField(GPGRecipients, ":", 0)) == 0) if (strlen(s:GetField(GPGRecipients, ":", 0)) == 0)
@ -567,7 +570,7 @@ fun s:GPGEditOptions()
if (match(bufname("%"), "^\\(GPGRecipients_\\|GPGOptions_\\)") != 0 && match(bufname("%"), "\.\\(gpg\\|asc\\|pgp\\)$") >= 0) if (match(bufname("%"), "^\\(GPGRecipients_\\|GPGOptions_\\)") != 0 && match(bufname("%"), "\.\\(gpg\\|asc\\|pgp\\)$") >= 0)
" save buffer name " save buffer name
let buffername=bufname("%") let buffername=escape(bufname("%"), ' *?\"'."'")
let editbuffername="GPGOptions_" . buffername let editbuffername="GPGOptions_" . buffername
" create scratch buffer " create scratch buffer
@ -649,7 +652,7 @@ fun s:GPGFinishOptionsBuffer()
let GPGUnknownOptions="" let GPGUnknownOptions=""
" delete the autocommand " delete the autocommand
exe "au! GPGEditOptions * " . bufname("%") exe "au! GPGEditOptions * " . escape(bufname("%"), ' *?\"'."'")
let currentline=1 let currentline=1
let option=getline(currentline) let option=getline(currentline)