From dc534b060c791a7ddeb2458132cf0ae7511bd97f Mon Sep 17 00:00:00 2001 From: tomo Date: Wed, 6 Dec 2000 04:43:32 +0000 Subject: [PATCH] Sync with semi-1_14_0-pre1. --- mime/mime-edit.el | 6 +- mime/mime-image.el | 29 +++++---- mime/mime-play.el | 2 +- mime/mime-view.el | 6 +- mime/pgg-gpg.el | 168 ++++++++++++++++++++-------------------------------- mime/pgg-pgp.el | 1 + mime/pgg-pgp5.el | 1 + mime/semi-def.el | 2 +- 8 files changed, 90 insertions(+), 125 deletions(-) diff --git a/mime/mime-edit.el b/mime/mime-edit.el index 885d4fe..9e6d449 100644 --- a/mime/mime-edit.el +++ b/mime/mime-edit.el @@ -317,7 +317,7 @@ To insert a signature file automatically, call the function ;; Octect binary text ("\\.doc$" ;MS Word - "application" "winword" nil + "application" "msword" nil "base64" "attachment" (("filename" . file)) ) @@ -2470,7 +2470,9 @@ and insert data encoded as ENCODING." (mime-edit-insert-tag "application" "pgp-keys") (mime-edit-define-encoding "7bit") (pgg-insert-key) - ) + (if (and (not (eobp)) + (not (looking-at mime-edit-single-part-tag-regexp))) + (insert (mime-make-text-tag) "\n"))) ;;; @ flag setting diff --git a/mime/mime-image.el b/mime/mime-image.el index 588d228..76c2335 100644 --- a/mime/mime-image.el +++ b/mime/mime-image.el @@ -85,19 +85,21 @@ (insert file-or-data) (setq file-or-data (mime-image-normalize-xbm-buffer (current-buffer))))) - (let ((instance - (make-image-instance + (let ((glyph + (make-glyph (if (and type (mime-image-type-available-p type)) (vconcat (list type (if data-p :data :file) file-or-data) props) - file-or-data) - nil nil 'noerror))) - (if (nothing-image-instance-p instance) nil - (make-glyph instance)))) - - (defun mime-image-insert (image string &optional area) - (let ((extent (make-extent (point) (progn (insert string)(point))))) + file-or-data)))) + (if (nothing-image-instance-p (glyph-image-instance glyph)) nil + glyph))) + + (defun mime-image-insert (image &optional string area) + (let ((extent (make-extent (point) + (progn (and string + (insert string)) + (point))))) (set-extent-property extent 'invisible t) (set-extent-end-glyph extent image)))) (condition-case nil @@ -129,12 +131,12 @@ (bitmap-read-xbm-buffer (current-buffer))) nil) "\n") (error nil))) - (defun mime-image-insert (image string &optional area) + (defun mime-image-insert (image &optional string area) (insert image))) (error (defalias 'mime-image-read-xbm-buffer 'mime-image-normalize-xbm-buffer) - (defun mime-image-insert (image string &optional area) + (defun mime-image-insert (image &optional string area) (save-restriction (narrow-to-region (point)(point)) (let ((face (gensym "mii"))) @@ -192,11 +194,8 @@ (if (null image) (message "Invalid glyph!") (save-excursion - (mime-image-insert image "x") + (mime-image-insert image) (insert "\n") - (save-window-excursion - (set-window-buffer (selected-window)(current-buffer)) - (sit-for 0)) (message "Decoding image... done"))))) ;;; @ end diff --git a/mime/mime-play.el b/mime/mime-play.el index e43b872..1b1b869 100644 --- a/mime/mime-play.el +++ b/mime/mime-play.el @@ -148,7 +148,7 @@ specified, play as it. Default MODE is \"play\"." (message "External method is starting...") (let ((process (let ((command - (mailcap-format-command + (mime-format-mailcap-command method (cons (cons 'filename name) situation)))) (start-process command mime-echo-buffer-name diff --git a/mime/mime-view.el b/mime/mime-view.el index 24678d0..26836ac 100644 --- a/mime/mime-view.el +++ b/mime/mime-view.el @@ -32,7 +32,7 @@ (require 'semi-def) (require 'calist) (require 'alist) -(require 'mailcap) +(require 'mime-conf) ;;; @ version @@ -870,8 +870,8 @@ MEDIA-TYPE must be (TYPE . SUBTYPE), TYPE or t. t means default." (defvar mime-acting-condition nil "Condition-tree about how to process entity.") -(if (file-readable-p mailcap-file) - (let ((entries (mailcap-parse-file))) +(if (file-readable-p mime-mailcap-file) + (let ((entries (mime-parse-mailcap-file))) (while entries (let ((entry (car entries)) view print shared) diff --git a/mime/pgg-gpg.el b/mime/pgg-gpg.el index 0a715db..5ac69f6 100644 --- a/mime/pgg-gpg.el +++ b/mime/pgg-gpg.el @@ -2,7 +2,7 @@ ;; Copyright (C) 1999,2000 Daiki Ueno -;; Author: Daiki Ueno +;; Author: Daiki Ueno ;; Created: 1999/10/28 ;; Keywords: PGP, OpenPGP, GnuPG @@ -36,17 +36,6 @@ :group 'pgg-gpg :type 'string) -(defcustom pgg-gpg-shell-file-name "/bin/sh" - "File name to load inferior shells from. -Bourne shell or its equivalent \(not tcsh) is needed for \"2>\"." - :group 'pgg-gpg - :type 'string) - -(defcustom pgg-gpg-shell-command-switch "-c" - "Switch used to have the shell execute its command line argument." - :group 'pgg-gpg - :type 'string) - (defcustom pgg-gpg-extra-args nil "Extra arguments for every GnuPG invocation." :group 'pgg-gpg @@ -67,36 +56,27 @@ Bourne shell or its equivalent \(not tcsh) is needed for \"2>\"." (luna-make-entity 'pgg-scheme-gpg)))) (defun pgg-gpg-process-region (start end passphrase program args) - (let* ((errors-file-name - (concat temporary-file-directory - (make-temp-name "pgg-errors"))) - (status-file-name - (concat temporary-file-directory - (make-temp-name "pgg-status"))) + (let* ((output-file-name + (concat temporary-file-directory (make-temp-name "pgg-output"))) (args - (append - `("--status-fd" "3" - ,@(if passphrase '("--passphrase-fd" "0")) - ,@pgg-gpg-extra-args) - args - (list (concat "2>" errors-file-name) - (concat "3>" status-file-name)))) - (shell-file-name pgg-gpg-shell-file-name) - (shell-command-switch pgg-gpg-shell-command-switch) + `("--status-fd" "2" + ,@(if passphrase '("--passphrase-fd" "0")) + "--output" ,output-file-name + ,@pgg-gpg-extra-args ,@args)) (output-buffer pgg-output-buffer) (errors-buffer pgg-errors-buffer) - (status-buffer pgg-status-buffer) + (orig-mode (default-file-modes)) (process-connection-type nil) process status exit-status) - (with-current-buffer (get-buffer-create output-buffer) + (with-current-buffer (get-buffer-create errors-buffer) (buffer-disable-undo) (erase-buffer)) (unwind-protect (progn - (as-binary-process + (set-default-file-modes 448) + (as-binary-output-file (setq process - (apply #'start-process-shell-command "*GnuPG*" output-buffer - program args))) + (apply #'start-process "*GnuPG*" errors-buffer program args))) (set-process-sentinel process #'ignore) (when passphrase (process-send-string process (concat passphrase "\n"))) @@ -107,48 +87,49 @@ Bourne shell or its equivalent \(not tcsh) is needed for \"2>\"." (setq status (process-status process) exit-status (process-exit-status process)) (delete-process process) - (with-current-buffer output-buffer - (pgg-convert-lbt-region (point-min)(point-max) 'LF) - + (with-current-buffer (get-buffer-create output-buffer) + (buffer-disable-undo) + (erase-buffer) + (if (file-exists-p output-file-name) + (insert-file-contents-as-raw-text-CRLF output-file-name)) + (set-buffer errors-buffer) (if (memq status '(stop signal)) (error "%s exited abnormally: '%s'" program exit-status)) (if (= 127 exit-status) - (error "%s could not be found" program)) - - (set-buffer (get-buffer-create errors-buffer)) - (buffer-disable-undo) - (erase-buffer) - (insert-file-contents errors-file-name) - - (set-buffer (get-buffer-create status-buffer)) - (buffer-disable-undo) - (erase-buffer) - (insert-file-contents status-file-name))) + (error "%s could not be found" program)))) (if (and process (eq 'run (process-status process))) (interrupt-process process)) - (condition-case nil - (progn - (delete-file status-file-name) - (delete-file errors-file-name)) - (file-error nil))))) + (if (file-exists-p output-file-name) + (delete-file output-file-name)) + (set-default-file-modes orig-mode)))) + +(defun pgg-gpg-possibly-cache-passphrase (passphrase) + (if (and pgg-cache-passphrase + (progn + (goto-char (point-min)) + (re-search-forward "^\\[GNUPG:] GOOD_PASSPHRASE\\>" nil t))) + (pgg-add-passphrase-cache + (progn + (goto-char (point-min)) + (if (re-search-forward + "^\\[GNUPG:] NEED_PASSPHRASE \\w+ ?\\w*" nil t) + (substring (match-string 0) -8))) + passphrase))) (luna-define-method pgg-scheme-lookup-key ((scheme pgg-scheme-gpg) string &optional type) (let ((args (list "--with-colons" "--no-greeting" "--batch" (if type "--list-secret-keys" "--list-keys") string))) - (with-current-buffer (get-buffer-create pgg-output-buffer) - (buffer-disable-undo) - (erase-buffer) + (with-temp-buffer (apply #'call-process pgg-gpg-program nil t nil args) (goto-char (point-min)) - (when (re-search-forward "^\\(sec\\|pub\\):" nil t) - (substring - (nth 3 (split-string - (buffer-substring (match-end 0) - (progn (end-of-line)(point))) - ":")) - 8))))) + (if (re-search-forward "^\\(sec\\|pub\\):" nil t) + (substring + (nth 3 (split-string + (buffer-substring (match-end 0) + (progn (end-of-line)(point))) + ":")) 8))))) (luna-define-method pgg-scheme-encrypt-region ((scheme pgg-scheme-gpg) start end recipients) @@ -156,17 +137,15 @@ Bourne shell or its equivalent \(not tcsh) is needed for \"2>\"." (args `("--batch" "--armor" "--always-trust" "--encrypt" ,@(if recipients - (apply #'append + (apply #'nconc (mapcar (lambda (rcpt) - (list "--remote-user" - (concat "\"" rcpt "\""))) + (list "--remote-user" rcpt)) (append recipients (if pgg-encrypt-for-me (list pgg-gpg-user-id))))))))) (pgg-as-lbt start end 'CRLF (pgg-gpg-process-region start end nil pgg-gpg-program args)) - (pgg-process-when-success - (pgg-convert-lbt-region (point-min)(point-max) 'LF)))) + (pgg-process-when-success))) (luna-define-method pgg-scheme-decrypt-region ((scheme pgg-scheme-gpg) start end) @@ -177,7 +156,10 @@ Bourne shell or its equivalent \(not tcsh) is needed for \"2>\"." (pgg-scheme-lookup-key scheme pgg-gpg-user-id 'encrypt))) (args '("--batch" "--decrypt"))) (pgg-gpg-process-region start end passphrase pgg-gpg-program args) - (pgg-process-when-success nil))) + (with-current-buffer pgg-errors-buffer + (pgg-gpg-possibly-cache-passphrase passphrase) + (goto-char (point-min)) + (re-search-forward "^\\[GNUPG:] DECRYPTION_OKAY\\>" nil t)))) (luna-define-method pgg-scheme-sign-region ((scheme pgg-scheme-gpg) start end &optional cleartext) @@ -194,18 +176,9 @@ Bourne shell or its equivalent \(not tcsh) is needed for \"2>\"." buffer-read-only) (pgg-as-lbt start end 'CRLF (pgg-gpg-process-region start end passphrase pgg-gpg-program args)) - (pgg-process-when-success - (pgg-convert-lbt-region (point-min)(point-max) 'LF) - (when (re-search-forward "^-+BEGIN PGP SIGNATURE" nil t);XXX - (let ((packet - (cdr (assq 2 (pgg-parse-armor-region - (progn (beginning-of-line 2) - (point)) - (point-max)))))) - (if pgg-cache-passphrase - (pgg-add-passphrase-cache - (cdr (assq 'key-identifier packet)) - passphrase))))))) + (with-current-buffer pgg-errors-buffer + (pgg-gpg-possibly-cache-passphrase passphrase)) + (pgg-process-when-success))) (luna-define-method pgg-scheme-verify-region ((scheme pgg-scheme-gpg) start end &optional signature) @@ -213,29 +186,21 @@ Bourne shell or its equivalent \(not tcsh) is needed for \"2>\"." (when (stringp signature) (setq args (append args (list signature)))) (pgg-gpg-process-region start end nil pgg-gpg-program args) - (save-excursion - (set-buffer pgg-errors-buffer) + (with-current-buffer pgg-errors-buffer (goto-char (point-min)) (while (re-search-forward "^gpg: " nil t) (replace-match "")) (goto-char (point-min)) - (let ((case-fold-search t)) - (while (re-search-forward "^warning: " nil t) - (delete-region (match-beginning 0) - (progn (beginning-of-line 2) (point))))) - (set-buffer pgg-status-buffer) - (goto-char (point-min)) - (if (re-search-forward "^\\[GNUPG:] +GOODSIG +" nil t) - (progn - (set-buffer pgg-output-buffer) - (insert-buffer-substring pgg-errors-buffer) - t) - nil)))) + (prog1 (re-search-forward "^\\[GNUPG:] GOODSIG\\>" nil t) + (goto-char (point-min)) + (delete-matching-lines "^warning\\|\\[GNUPG:]") + (set-buffer pgg-output-buffer) + (insert-buffer-substring pgg-errors-buffer))))) (luna-define-method pgg-scheme-insert-key ((scheme pgg-scheme-gpg)) (let* ((pgg-gpg-user-id (or pgg-gpg-user-id pgg-default-user-id)) (args (list "--batch" "--export" "--armor" - (concat "\"" pgg-gpg-user-id "\"")))) + pgg-gpg-user-id))) (pgg-gpg-process-region (point)(point) nil pgg-gpg-program args) (insert-buffer-substring pgg-output-buffer))) @@ -243,14 +208,12 @@ Bourne shell or its equivalent \(not tcsh) is needed for \"2>\"." start end) (let ((args '("--import" "--batch" "-")) status) (pgg-gpg-process-region start end nil pgg-gpg-program args) - (set-buffer pgg-status-buffer) + (set-buffer pgg-errors-buffer) (goto-char (point-min)) - (when (re-search-forward "^\\[GNUPG:] +IMPORT_RES +" nil t) + (when (re-search-forward "^\\[GNUPG:] IMPORT_RES\\>" nil t) (setq status (buffer-substring (match-end 0) - (progn (end-of-line) - (point))) - status (vconcat (mapcar #'string-to-int - (split-string status)))) + (progn (end-of-line)(point))) + status (vconcat (mapcar #'string-to-int (split-string status)))) (erase-buffer) (insert (format "Imported %d key(s). \tArmor contains %d key(s) [%d bad, %d old].\n" @@ -263,9 +226,8 @@ Bourne shell or its equivalent \(not tcsh) is needed for \"2>\"." (if (zerop (aref status 9)) "" "\tSecret keys are imported.\n"))) - (append-to-buffer pgg-output-buffer - (point-min)(point-max)) - (pgg-process-when-success nil))) + (append-to-buffer pgg-output-buffer (point-min)(point-max)) + (pgg-process-when-success))) (provide 'pgg-gpg) diff --git a/mime/pgg-pgp.el b/mime/pgg-pgp.el index 4b033e5..4f3fbd7 100644 --- a/mime/pgg-pgp.el +++ b/mime/pgg-pgp.el @@ -76,6 +76,7 @@ Bourne shell or its equivalent \(not tcsh) is needed for \"2>\"." (list (concat "2>" errors-file-name)))) (shell-file-name pgg-pgp-shell-file-name) (shell-command-switch pgg-pgp-shell-command-switch) + (process-environment process-environment) (output-buffer pgg-output-buffer) (errors-buffer pgg-errors-buffer) (process-connection-type nil) diff --git a/mime/pgg-pgp5.el b/mime/pgg-pgp5.el index cde2b6f..83e8187 100644 --- a/mime/pgg-pgp5.el +++ b/mime/pgg-pgp5.el @@ -91,6 +91,7 @@ Bourne shell or its equivalent \(not tcsh) is needed for \"2>\"." (list (concat "2>" errors-file-name)))) (shell-file-name pgg-pgp5-shell-file-name) (shell-command-switch pgg-pgp5-shell-command-switch) + (process-environment process-environment) (output-buffer pgg-output-buffer) (errors-buffer pgg-errors-buffer) (process-connection-type nil) diff --git a/mime/semi-def.el b/mime/semi-def.el index 483fd1b..a9aed93 100644 --- a/mime/semi-def.el +++ b/mime/semi-def.el @@ -30,7 +30,7 @@ (require 'custom) -(defconst mime-user-interface-product ["REMI" (1 14 3) "Matsudai"] +(defconst mime-user-interface-product ["SEMI" (1 14 0) "Iburihashi"] "Product name, version number and code name of MIME-kernel package.") (autoload 'mule-caesar-region "mule-caesar" -- 1.7.10.4