alx/mu4e
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

* mu4e: mu4e~proc: make sure parameters are not treated as format strings

Browse Source
This commit is contained in:
djcb
2013-03-22 08:01:50 +02:00
parent 045ad92545
commit ca90c99e85
1 changed files with 13 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
mu4e/mu4e-proc.el
View File

@ -337,19 +337,18 @@ result found, a function is called, depending on the kind of
result. The variables `mu4e-error-func' contain the function that result. The variables `mu4e-error-func' contain the function that
will be called for, resp., a message (header row) or an error." will be called for, resp., a message (header row) or an error."
(mu4e~proc-send-command (mu4e~proc-send-command
(format (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 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)) ;; TODO: use ascending/descending in backend too (it's clearer than 'reverse'
;; TODO: use ascending/descending in backend too (it's clearer than 'reverse' (if (eq sortdir 'descending) "true" "false")
(if (eq sortdir 'descending) "true" "false") (if maxnum maxnum -1)
(if maxnum maxnum -1) (if skip-dups "true" "false")
(if skip-dups "true" "false") (if include-related "true" "false")))
(if include-related "true" "false"))))
(defun mu4e~proc-move (docid-or-msgid &optional maildir flags) (defun mu4e~proc-move (docid-or-msgid &optional maildir flags)
"Move message identified by DOCID-OR-MSGID. "Move message identified by DOCID-OR-MSGID.
@ -464,7 +463,7 @@ mean:
docid partidx what docid partidx what
(if param (format " param:\"%s\"" param) ""))) (if param (format " param:\"%s\"" param) "")))
(otherwise (mu4e-error "Unsupported action %S" action)))))) (otherwise (mu4e-error "Unsupported action %S" action))))))
(mu4e~proc-send-command cmd))) (mu4e~proc-send-command "%s" cmd)))
(defun mu4e~proc-ping () (defun mu4e~proc-ping ()