emacs
/
mu
mirror of https://github.com/djcb/mu.git
1
0
Fork 0
Code Issues Releases Wiki Activity

* mu4e: add some more quoting to commands

This commit is contained in:
djcb 2013-05-13 23:02:26 +03:00
parent 9c614afa86
commit 0bb56e5558
2 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
mu4e/mu4e-headers.el
View File

@ -1359,7 +1359,8 @@ maildir)."
(list maildir))) (list maildir)))
(when maildir (when maildir
(mu4e-mark-handle-when-leaving) (mu4e-mark-handle-when-leaving)
(mu4e-headers-search (concat "\"maildir:" maildir "\"")))) (mu4e-headers-search
(format "\\\"maildir:%s\\\"\"" maildir))))
(defun mu4e-headers-split-view-grow (&optional n) (defun mu4e-headers-split-view-grow (&optional n)
"In split-view, grow the headers window. "In split-view, grow the headers window.

23
mu4e/mu4e-proc.el
View File

@ -257,7 +257,7 @@ The server output is as follows:
(funcall mu4e-error-func (funcall mu4e-error-func
(plist-get sexp :error) (plist-get sexp :error)
(plist-get sexp :message))) (plist-get sexp :message)))
(t (mu4e-message "Unexpected data from server [%S]" sexp))) (t (mu4e-message "Unexpected data from server [%S]" sexp)))
(setq sexp (mu4e~proc-eat-sexp-from-buf)))))) (setq sexp (mu4e~proc-eat-sexp-from-buf))))))
@ -314,7 +314,7 @@ The results are reporter through either (:update ... ) or (:error)
sexp, which are handled my `mu4e-error-func', respectively." sexp, which are handled my `mu4e-error-func', respectively."
(mu4e~proc-send-command "remove docid:%d" docid)) (mu4e~proc-send-command "remove docid:%d" docid))
(defun mu4e~proc-escape-query (query) (defun mu4e~proc-escape (query)
"Escape the query QUERY for transport. "Escape the query QUERY for transport.
In particular, backslashes and double-quotes." In particular, backslashes and double-quotes."
(let ((esc (replace-regexp-in-string "\\\\" "\\\\\\\\" query))) (let ((esc (replace-regexp-in-string "\\\\" "\\\\\\\\" query)))
@ -340,7 +340,7 @@ will be called for, resp., a message (header row) or an error."
(concat (concat
"find query:\"%s\" threads:%s sortfield:%s reverse:%s maxnum:%d " "find query:\"%s\" threads:%s sortfield:%s reverse:%s maxnum:%d "
"skip-dups:%s include-related:%s") "skip-dups:%s include-related:%s")
(mu4e~proc-escape-query query) (mu4e~proc-escape query)
(if threads "true" "false") (if threads "true" "false")
;; sortfield is e.g. ':subject'; this removes the ':' ;; sortfield is e.g. ':subject'; this removes the ':'
(if (null sortfield) "nil" (substring (symbol-name sortfield) 1)) (if (null sortfield) "nil" (substring (symbol-name sortfield) 1))
@ -390,7 +390,7 @@ or (:error ) sexp, which are handled my `mu4e-update-func' and
(if (stringp flags) flags (mu4e-flags-to-string flags))))) (if (stringp flags) flags (mu4e-flags-to-string flags)))))
(path (path
(when maildir (when maildir
(format " maildir:\"%s\"" maildir)))) (format " maildir:\"%s\"" (mu4e~proc-escape maildir)))))
(mu4e~proc-send-command "move %s %s %s" (mu4e~proc-send-command "move %s %s %s"
idparam (or flagstr "") (or path "")))) idparam (or flagstr "") (or path ""))))
@ -398,12 +398,10 @@ or (:error ) sexp, which are handled my `mu4e-update-func' and
"Update the message database for filesystem PATH, which should "Update the message database for filesystem PATH, which should
point to some maildir directory structure. MY-ADDRESSES is a list point to some maildir directory structure. MY-ADDRESSES is a list
of 'my' email addresses (see `mu4e-user-mail-address-list')." of 'my' email addresses (see `mu4e-user-mail-address-list')."
(let ((addrs (let ((path (mu4e~proc-escape path))
(when my-addresses (addrs (when my-addresses (mapconcat 'identity my-addresses ","))))
(mapconcat 'identity my-addresses ","))))
(if addrs (if addrs
(mu4e~proc-send-command "index path:\"%s\" my-addresses:%s" (mu4e~proc-send-command "index path:\"%s\" my-addresses:%s" path addrs)
path addrs)
(mu4e~proc-send-command "index path:\"%s\"" path)))) (mu4e~proc-send-command "index path:\"%s\"" path))))
(defun mu4e~proc-add (path maildir) (defun mu4e~proc-add (path maildir)
@ -412,7 +410,7 @@ With MAILDIR set to the maildir this message resides in,
e.g. '/drafts'; if this works, we will receive (:info add :path e.g. '/drafts'; if this works, we will receive (:info add :path
<path> :docid <docid>) as well as (:update <msg-sexp>)." <path> :docid <docid>) as well as (:update <msg-sexp>)."
(mu4e~proc-send-command "add path:\"%s\" maildir:\"%s\"" (mu4e~proc-send-command "add path:\"%s\" maildir:\"%s\""
path maildir)) (mu4e~proc-escape path) (mu4e~proc-escape maildir)))
(defun mu4e~proc-sent (path maildir) (defun mu4e~proc-sent (path maildir)
"Add the message at PATH to the database. "Add the message at PATH to the database.
@ -422,7 +420,8 @@ e.g. '/drafts'.
if this works, we will receive (:info add :path <path> :docid if this works, we will receive (:info add :path <path> :docid
<docid> :fcc <path>)." <docid> :fcc <path>)."
(mu4e~proc-send-command "sent path:\"%s\" maildir:\"%s\"" (mu4e~proc-send-command "sent path:\"%s\" maildir:\"%s\""
path maildir)) (mu4e~proc-escape path) (mu4e~proc-escape maildir)))
(defun mu4e~proc-compose (type &optional docid) (defun mu4e~proc-compose (type &optional docid)
"Start composing a message of certain TYPE (a symbol, either "Start composing a message of certain TYPE (a symbol, either
@ -500,7 +499,7 @@ result will be delivered to the function registered as
`mu4e-message-func'." `mu4e-message-func'."
(mu4e~proc-send-command (mu4e~proc-send-command
"view path:\"%s\" extract-images:%s extract-encrypted:%s use-agent:true" "view path:\"%s\" extract-images:%s extract-encrypted:%s use-agent:true"
path (shell-quote-argument path)
(if images "true" "false") (if images "true" "false")
(if decrypt "true" "false"))) (if decrypt "true" "false")))