From: David Bremner <david@tethera.net>
To: David Bremner <david@tethera.net>,
Tomi Ollila <tomi.ollila@iki.fi>,
Matt Armstrong <marmstrong@google.com>,
notmuch@notmuchmail.org
Subject: [PATCH 8/9] emacs: wrap call-process
Date: Sun, 29 Aug 2021 12:23:34 -0700 [thread overview]
Message-ID: <20210829192335.4192305-9-david@tethera.net> (raw)
In-Reply-To: <20210829192335.4192305-1-david@tethera.net>
Provide a safe working directory
---
emacs/notmuch-crypto.el | 6 +++---
emacs/notmuch-draft.el | 2 +-
emacs/notmuch-lib.el | 14 +++++++++-----
emacs/notmuch-mua.el | 2 +-
emacs/notmuch-show.el | 6 +++---
emacs/notmuch-tag.el | 2 +-
test/T450-emacs-show.sh | 1 -
7 files changed, 18 insertions(+), 15 deletions(-)
diff --git a/emacs/notmuch-crypto.el b/emacs/notmuch-crypto.el
index 3ffb5654..a1cf3ddd 100644
--- a/emacs/notmuch-crypto.el
+++ b/emacs/notmuch-crypto.el
@@ -164,7 +164,7 @@ mode."
(goto-char (point-max))
(insert (format "-- Key %s in message %s:\n"
fingerprint id))
- (call-process notmuch-crypto-gpg-program nil t t
+ (notmuch--call-process notmuch-crypto-gpg-program nil t t
"--batch" "--no-tty" "--list-keys" fingerprint))
(recenter -1))))
@@ -240,9 +240,9 @@ corresponding key when the status button is pressed."
(with-current-buffer buffer
(goto-char (point-max))
(insert (format "--- Retrieving key %s:\n" keyid))
- (call-process notmuch-crypto-gpg-program nil t t "--recv-keys" keyid)
+ (notmuch--call-process notmuch-crypto-gpg-program nil t t "--recv-keys" keyid)
(insert "\n")
- (call-process notmuch-crypto-gpg-program nil t t "--list-keys" keyid))
+ (notmuch--call-process notmuch-crypto-gpg-program nil t t "--list-keys" keyid))
(recenter -1))
(notmuch-show-refresh-view)))))
diff --git a/emacs/notmuch-draft.el b/emacs/notmuch-draft.el
index 1f156746..d87a4805 100644
--- a/emacs/notmuch-draft.el
+++ b/emacs/notmuch-draft.el
@@ -249,7 +249,7 @@ applied to newly inserted messages)."
(setq buffer-read-only nil)
(erase-buffer)
(let ((coding-system-for-read 'no-conversion))
- (call-process notmuch-command nil t nil "show" "--format=raw" id))
+ (notmuch--call-process notmuch-command nil t nil "show" "--format=raw" id))
(mime-to-mml)
(goto-char (point-min))
(when (re-search-forward "^$" nil t)
diff --git a/emacs/notmuch-lib.el b/emacs/notmuch-lib.el
index 9693185f..9afdc165 100644
--- a/emacs/notmuch-lib.el
+++ b/emacs/notmuch-lib.el
@@ -195,7 +195,7 @@ will be signaled.
Otherwise the output will be returned."
(with-temp-buffer
- (let ((status (apply #'call-process notmuch-command nil t nil args))
+ (let ((status (apply #'notmuch--call-process notmuch-command nil t nil args))
(output (buffer-string)))
(notmuch-check-exit-status status (cons notmuch-command args) output)
output)))
@@ -206,7 +206,7 @@ Otherwise the output will be returned."
(defun notmuch-cli-sane-p ()
"Return t if the cli seems to be configured sanely."
(unless notmuch--cli-sane-p
- (let ((status (call-process notmuch-command nil nil nil
+ (let ((status (notmuch--call-process notmuch-command nil nil nil
"config" "get" "user.primary_email")))
(setq notmuch--cli-sane-p (= status 0))))
notmuch--cli-sane-p)
@@ -286,7 +286,7 @@ depending on the value of `notmuch-poll-script'."
(message "Polling mail...")
(if (stringp notmuch-poll-script)
(unless (string-empty-p notmuch-poll-script)
- (unless (equal (call-process notmuch-poll-script nil nil) 0)
+ (unless (equal (notmuch--call-process notmuch-poll-script nil nil) 0)
(error "Notmuch: poll script `%s' failed!" notmuch-poll-script)))
(notmuch-call-notmuch-process "new"))
(message "Polling mail...done"))
@@ -639,7 +639,7 @@ the given type."
;; charset is US-ASCII. RFC6657
;; complicates this somewhat.
'us-ascii)))))
- (apply #'call-process
+ (apply #'notmuch--call-process
notmuch-command nil '(t nil) nil args)
(buffer-string))))))
(when (and cache data)
@@ -882,6 +882,10 @@ default"
(notmuch--apply-with-env
#'call-process-region start end program delete buffer display args))
+(defun notmuch--call-process (program &optional infile destination display &rest args)
+ (notmuch--apply-with-env
+ #'call-process program infile destination display args))
+
(defun notmuch-call-notmuch--helper (destination args)
"Helper for synchronous notmuch invocation commands.
@@ -896,7 +900,7 @@ for `call-process'. ARGS is as described for
(otherwise
(error "Unknown keyword argument: %s" (car args)))))
(if (null stdin-string)
- (apply #'call-process notmuch-command nil destination nil args)
+ (apply #'notmuch--call-process notmuch-command nil destination nil args)
(insert stdin-string)
(apply #'notmuch--call-process-region (point-min) (point-max)
notmuch-command t destination nil args))))
diff --git a/emacs/notmuch-mua.el b/emacs/notmuch-mua.el
index f510c043..c679373b 100644
--- a/emacs/notmuch-mua.el
+++ b/emacs/notmuch-mua.el
@@ -474,7 +474,7 @@ the From: address."
(with-current-buffer temp-buffer
(erase-buffer)
(let ((coding-system-for-read 'no-conversion))
- (call-process notmuch-command nil t nil
+ (notmuch--call-process notmuch-command nil t nil
"show" "--format=raw" id))
;; Because we process the messages in reverse order,
;; always generate a forwarded subject, then use the
diff --git a/emacs/notmuch-show.el b/emacs/notmuch-show.el
index 0f96c4fe..aea72e74 100644
--- a/emacs/notmuch-show.el
+++ b/emacs/notmuch-show.el
@@ -279,7 +279,7 @@ position of the message in the thread."
(let ((buf (generate-new-buffer (concat "*notmuch-msg-" id "*"))))
(with-current-buffer buf
(let ((coding-system-for-read 'no-conversion))
- (call-process notmuch-command nil t nil "show" "--format=raw" id))
+ (notmuch--call-process notmuch-command nil t nil "show" "--format=raw" id))
,@body)
(kill-buffer buf)))))
@@ -2032,7 +2032,7 @@ to show, nil otherwise."
(pop-to-buffer-same-window buf)
(erase-buffer)
(let ((coding-system-for-read 'no-conversion))
- (call-process notmuch-command nil t nil "show" "--format=raw" id))
+ (notmuch--call-process notmuch-command nil t nil "show" "--format=raw" id))
(goto-char (point-min))
(set-buffer-modified-p nil)
(setq buffer-read-only t)
@@ -2083,7 +2083,7 @@ message."
;; Use the originating buffer's working directory instead of
;; that of the pipe buffer.
(cd cwd)
- (let ((exit-code (call-process-shell-command shell-command nil buf)))
+ (let ((exit-code (notmuch--call-process-shell-command shell-command nil buf)))
(goto-char (point-max))
(set-buffer-modified-p nil)
(setq buffer-read-only t)
diff --git a/emacs/notmuch-tag.el b/emacs/notmuch-tag.el
index ebccb5a0..6d9fc2f9 100644
--- a/emacs/notmuch-tag.el
+++ b/emacs/notmuch-tag.el
@@ -397,7 +397,7 @@ Return all tags if no search terms are given."
(split-string
(with-output-to-string
(with-current-buffer standard-output
- (apply 'call-process notmuch-command nil t
+ (apply 'notmuch--call-process notmuch-command nil t
nil "search" "--output=tags" "--exclude=false" search-terms)))
"\n+" t))
diff --git a/test/T450-emacs-show.sh b/test/T450-emacs-show.sh
index 05e3692e..7cb142fa 100755
--- a/test/T450-emacs-show.sh
+++ b/test/T450-emacs-show.sh
@@ -232,7 +232,6 @@ test_expect_equal_file $EXPECTED/notmuch-show-decrypted-message-no-crypto OUTPUT
test_begin_subtest "notmuch-show with nonexistent CWD"
tid=$(notmuch search --limit=1 --output=threads '*' | sed s/thread://)
-test_subtest_known_broken
test_emacs "(test-log-error
(let ((default-directory \"/nonexistent\"))
(notmuch-show \"$tid\")))"
--
2.33.0
next prev parent reply other threads:[~2021-08-29 19:24 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-02-17 21:03 [Joerg Jaspert] Bug#922536: notmuch-emacs: notmuch breaks on directory removal David Bremner
2019-02-18 22:18 ` Tomi Ollila
2019-02-20 18:12 ` Matt Armstrong
2019-02-21 17:18 ` Tomi Ollila
2019-02-26 12:34 ` David Bremner
2021-08-29 19:23 ` Wrap process creating primitives with safe CWD David Bremner
2021-08-29 19:23 ` [PATCH 1/9] test/emacs: provide macro test-log-error David Bremner
2021-08-29 19:23 ` [PATCH 2/9] test/emacs: run notmuch-hello with a nonexisting default dir David Bremner
2021-08-29 19:23 ` [PATCH 3/9] emacs: wrap process-lines David Bremner
2021-08-29 19:23 ` [PATCH 4/9] emacs: wrap call-process-region David Bremner
2021-08-29 19:23 ` [PATCH 5/9] test/emacs: test for notmuch-search with nonexistent CWD David Bremner
2021-08-29 19:23 ` [PATCH 6/9] emacs: wrap make-process David Bremner
2021-08-29 19:23 ` [PATCH 7/9] test/emacs: test for notmuch-show with nonexistent CWD David Bremner
2021-08-29 19:23 ` David Bremner [this message]
2021-08-29 19:23 ` [PATCH 9/9] test/emacs: tests for notmuch-{tree,unthreaded} with bad CWD David Bremner
2021-09-11 14:35 ` Wrap process creating primitives with safe CWD David Bremner
2021-09-11 14:49 ` [Joerg Jaspert] Bug#922536: notmuch-emacs: notmuch breaks on directory removal David Bremner
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://notmuchmail.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210829192335.4192305-9-david@tethera.net \
--to=david@tethera.net \
--cc=marmstrong@google.com \
--cc=notmuch@notmuchmail.org \
--cc=tomi.ollila@iki.fi \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://yhetil.org/notmuch.git/
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).