X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=lisp%2Fuudecode.el;h=b7168c68309cfb6cf3054e6575908f45409ee5b4;hb=a707b63af25b91cb730c12e65156ca364bf49a44;hp=3b548a3717ab94f0e4d5e66af9c1e1a8e00c4959;hpb=db857b4d28af9b2cacb93c1017afb70184375ca4;p=elisp%2Fgnus.git- diff --git a/lisp/uudecode.el b/lisp/uudecode.el index 3b548a3..b7168c6 100644 --- a/lisp/uudecode.el +++ b/lisp/uudecode.el @@ -1,12 +1,11 @@ ;;; uudecode.el -- elisp native uudecode -;; Copyright (c) 1998 by Shenghuo Zhu + +;; Copyright (c) 1998, 1999, 2000 Free Software Foundation, Inc. ;; Author: Shenghuo Zhu -;; $Revision: 5.3 $ -;; Keywords: uudecode +;; Keywords: uudecode news -;; This file is not part of GNU Emacs, but the same permissions -;; apply. +;; This file is a part of GNU Emacs. ;; GNU Emacs is free software; you can redistribute it and/or modify ;; it under the terms of the GNU General Public License as published by @@ -28,18 +27,44 @@ ;; Lots of codes are stolen from mm-decode.el, gnus-uu.el and ;; base64.el +;; This looks as though it could be made rather more efficient for +;; internal working. Encoding could use a lookup table and decoding +;; should presumably use a vector or list buffer for partial results +;; rather than with-current-buffer. -- fx + +;; Only `uudecode-decode-region' should be advertised, and whether or +;; not that uses a program should be customizable, but I guess it's +;; too late now. -- fx + ;;; Code: -(if (not (fboundp 'char-int)) - (fset 'char-int 'identity)) +(eval-when-compile (require 'cl)) + +(eval-and-compile + (defalias 'uudecode-char-int + (if (fboundp 'char-int) + 'char-int + 'identity)) -(defvar uudecode-decoder-program "uudecode" + (if (featurep 'xemacs) + (defalias 'uudecode-insert-char 'insert-char) + (defun uudecode-insert-char (char &optional count ignored buffer) + (if (or (null buffer) (eq buffer (current-buffer))) + (insert-char char count) + (with-current-buffer buffer + (insert-char char count)))))) + +(defcustom uudecode-decoder-program "uudecode" "*Non-nil value should be a string that names a uu decoder. The program should expect to read uu data on its standard -input and write the converted data to its standard output.") +input and write the converted data to its standard output." + :type 'string + :group 'gnus-extract) -(defvar uudecode-decoder-switches nil - "*List of command line flags passed to the command named by uudecode-decoder-program.") +(defcustom uudecode-decoder-switches nil + "*List of command line flags passed to `uudecode-decoder-program'." + :group 'gnus-extract + :type '(repeat string)) (defconst uudecode-alphabet "\040-\140") @@ -52,15 +77,18 @@ input and write the converted data to its standard output.") (setq str (concat str "[^a-z]"))) (concat str ".?$"))) -(defvar uudecode-temporary-file-directory "/tmp/") +(defvar uudecode-temporary-file-directory + (cond ((fboundp 'temp-directory) (temp-directory)) + ((boundp 'temporary-file-directory) temporary-file-directory) + ("/tmp"))) ;;;###autoload (defun uudecode-decode-region-external (start end &optional file-name) - "uudecode region between START and END with external decoder. - -If FILE-NAME is non-nil, save the result to FILE-NAME." + "Uudecode region between START and END using external program. +If FILE-NAME is non-nil, save the result to FILE-NAME. The program +used is specified by `uudecode-decoder-program'." (interactive "r\nP") - (let ((cbuf (current-buffer)) tempfile firstline work-buffer status) + (let ((cbuf (current-buffer)) tempfile firstline status) (save-excursion (goto-char start) (when (re-search-forward uudecode-begin-line nil t) @@ -68,26 +96,30 @@ If FILE-NAME is non-nil, save the result to FILE-NAME." (setq firstline (point)) (cond ((null file-name)) ((stringp file-name)) - (t - (setq file-name (read-file-name "File to Name:" - nil nil nil + (t + (setq file-name (read-file-name "File to Name:" + nil nil nil (match-string 1))))) - (setq tempfile (expand-file-name - (or file-name (concat uudecode-temporary-file-directory - (make-temp-name "uu"))))) - (let ((cdir default-directory) default-process-coding-system) + (setq tempfile (if file-name + (expand-file-name file-name) + (if (fboundp 'make-temp-file) + (let ((temporary-file-directory + uudecode-temporary-file-directory)) + (make-temp-file "uu")) + (expand-file-name + (make-temp-name "uu") + uudecode-temporary-file-directory)))) + (let ((cdir default-directory) + default-process-coding-system) (unwind-protect - (progn - (set-buffer (setq work-buffer - (generate-new-buffer " *uudecode-work*"))) - (buffer-disable-undo work-buffer) + (with-temp-buffer (insert "begin 600 " (file-name-nondirectory tempfile) "\n") (insert-buffer-substring cbuf firstline end) (cd (file-name-directory tempfile)) (apply 'call-process-region (point-min) (point-max) - uudecode-decoder-program + uudecode-decoder-program nil nil nil @@ -100,24 +132,11 @@ If FILE-NAME is non-nil, save the result to FILE-NAME." (let (format-alist) (insert-file-contents-literally tempfile))) (message "Can not uudecode"))) - (and work-buffer (kill-buffer work-buffer)) - (condition-case () - (or file-name (delete-file tempfile)) - (error)) - ))) - -(if (string-match "XEmacs" emacs-version) - (defalias 'uudecode-insert-char 'insert-char) - (defun uudecode-insert-char (char &optional count ignored buffer) - (if (or (null buffer) (eq buffer (current-buffer))) - (insert-char char count) - (with-current-buffer buffer - (insert-char char count))))) + (ignore-errors (or file-name (delete-file tempfile)))))) ;;;###autoload - (defun uudecode-decode-region (start end &optional file-name) - "uudecode region between START and END. + "Uudecode region between START and END without using an external program. If FILE-NAME is non-nil, save the result to FILE-NAME." (interactive "r\nP") (let ((work-buffer nil) @@ -133,13 +152,12 @@ If FILE-NAME is non-nil, save the result to FILE-NAME." (when (re-search-forward uudecode-begin-line nil t) (cond ((null file-name)) ((stringp file-name)) - (t - (setq file-name (expand-file-name - (read-file-name "File to Name:" - nil nil nil + (t + (setq file-name (expand-file-name + (read-file-name "File to Name:" + nil nil nil (match-string 1)))))) (setq work-buffer (generate-new-buffer " *uudecode-work*")) - (buffer-disable-undo work-buffer) (forward-line 1) (skip-chars-forward non-data-chars end) (while (not done) @@ -148,43 +166,45 @@ If FILE-NAME is non-nil, save the result to FILE-NAME." (cond ((> (skip-chars-forward uudecode-alphabet end) 0) (setq lim (point)) - (setq remain - (logand (- (char-int (char-after inputpos)) 32) 63)) + (setq remain + (logand (- (uudecode-char-int (char-after inputpos)) 32) + 63)) (setq inputpos (1+ inputpos)) (if (= remain 0) (setq done t)) (while (and (< inputpos lim) (> remain 0)) - (setq bits (+ bits - (logand - (- - (char-int (char-after inputpos)) 32) 63))) + (setq bits (+ bits + (logand + (- + (uudecode-char-int (char-after inputpos)) 32) + 63))) (if (/= counter 0) (setq remain (1- remain))) (setq counter (1+ counter) inputpos (1+ inputpos)) (cond ((= counter 4) - (uudecode-insert-char + (uudecode-insert-char (lsh bits -16) 1 nil work-buffer) - (uudecode-insert-char + (uudecode-insert-char (logand (lsh bits -8) 255) 1 nil work-buffer) (uudecode-insert-char (logand bits 255) 1 nil - work-buffer) + work-buffer) (setq bits 0 counter 0)) (t (setq bits (lsh bits 6))))))) (cond - (done) - ((> 0 remain) - (error "uucode line ends unexpectly") - (setq done t)) - ((and (= (point) end) (not done)) - ;(error "uucode ends unexpectly") - (setq done t)) - ((= counter 3) - (uudecode-insert-char (logand (lsh bits -16) 255) 1 nil - work-buffer) - (uudecode-insert-char (logand (lsh bits -8) 255) 1 nil - work-buffer)) - ((= counter 2) - (uudecode-insert-char (logand (lsh bits -10) 255) 1 nil - work-buffer))) + (done) + ((> 0 remain) + (error "uucode line ends unexpectly") + (setq done t)) + ((and (= (point) end) (not done)) + ;;(error "uucode ends unexpectly") + (setq done t)) + ((= counter 3) + (uudecode-insert-char (logand (lsh bits -16) 255) 1 nil + work-buffer) + (uudecode-insert-char (logand (lsh bits -8) 255) 1 nil + work-buffer)) + ((= counter 2) + (uudecode-insert-char (logand (lsh bits -10) 255) 1 nil + work-buffer))) (skip-chars-forward non-data-chars end)) (if file-name (save-excursion