xemacs-beta: lisp/gnus/gnus-uu.el comparison

comparison lisp/gnus/gnus-uu.el @ 16:0293115a14e9 r19-15b91

Import from CVS: tag r19-15b91

author	cvs
date	Mon, 13 Aug 2007 08:49:20 +0200
parents	ac2d302a0011
children	d95e72db5c07

comparison

equal deleted inserted replaced

-:ad457d5f7d04
+:0293115a14e9
 ;;; gnus-uu.el --- extract (uu)encoded files in Gnus
-;; Copyright (C) 1985,86,87,93,94,95,96 Free Software Foundation, Inc.
+;; Copyright (C) 1985,86,87,93,94,95,96,97 Free Software Foundation, Inc.
 ;; Author: Lars Magne Ingebrigtsen <larsi@ifi.uio.no>
 ;; Created: 2 Oct 1993
 ;; Keyword: news
 ;;; Commentary:
 ;;; Code:
 (require 'gnus)
+(require 'gnus-art)
+(require 'message)
 (require 'gnus-msg)
-(eval-when-compile (require 'cl))
+(defgroup gnus-extract nil
+"Extracting encoded files."
+:prefix "gnus-uu-"
+:group 'gnus)
+(defgroup gnus-extract-view nil
+"Viewwing extracted files."
+:group 'gnus-extract)
+(defgroup gnus-extract-archive nil
+"Extracting encoded archives."
+:group 'gnus-extract)
+(defgroup gnus-extract-post nil
+"Extracting encoded archives."
+:prefix "gnus-uu-post"
+:group 'gnus-extract)
 ;; Default viewing action rules
-(defvar gnus-uu-default-view-rules
+(defcustom gnus-uu-default-view-rules
 '(("\\.te?xt$\\|\\.doc$\\|read.*me\\|\\.c?$\\|\\.h$\\|\\.bat$\\|\\.asm$\\|makefile" "cat %s | sed s/\r//g")
 ("\\.pas$" "cat %s | sed s/\r//g")
 ("\\.[1-9]$" "groff -mandoc -Tascii %s | sed s/\b.//g")
 ("\\.\\(jpe?g\\|gif\\|tiff?\\|p[pgb]m\\|xwd\\|xbm\\|pcx\\)$" "xv")
 ("\\.tga$" "tgatoppm %s | xv -")
 ("\\.html$" "xmosaic")
 ("\\.mpe?g$" "mpeg_play")
 ("\\.\\(flc\\|fli\\|rle\\|iff\\|pfx\\|avi\\|sme\\|rpza\\|dl\\|qt\\|rsrc\\|mov\\)$" "xanim")
 ("\\.\\(tar\\|arj\\|zip\\|zoo\\|arc\\|gz\\|Z\\|lzh\\|ar\\|lha\\)$"
 "gnus-uu-archive"))
-"*Default actions to be taken when the user asks to view a file.
+"Default actions to be taken when the user asks to view a file.
 To change the behaviour, you can either edit this variable or set
 `gnus-uu-user-view-rules' to something useful.
 For example:
 To make gnus-uu use 'xli' to display JPEG and GIF files, put the
 following in your .emacs file:
 (setq gnus-uu-user-view-rules '((\"jpg$\\\\|gif$\" \"xli\")))
-Both these variables are lists of lists with two string elements. The
+Both these variables are lists of lists with two string elements.  The
-first string is a regular expression. If the file name matches this
+first string is a regular expression.  If the file name matches this
 regular expression, the command in the second string is executed with
 the file as an argument.
 If the command string contains \"%s\", the file name will be inserted
-at that point in the command string. If there's no \"%s\" in the
+at that point in the command string.  If there's no \"%s\" in the
 command string, the file name will be appended to the command string
 before executing.
 There are several user variables to tailor the behaviour of gnus-uu to
-your needs. First we have `gnus-uu-user-view-rules', which is the
+your needs.  First we have `gnus-uu-user-view-rules', which is the
 variable gnus-uu first consults when trying to decide how to view a
-file. If this variable contains no matches, gnus-uu examines the
+file.  If this variable contains no matches, gnus-uu examines the
-default rule variable provided in this package. If gnus-uu finds no
+default rule variable provided in this package.  If gnus-uu finds no
 match here, it uses `gnus-uu-user-view-rules-end' to try to make a
-match.")
+match."
+:group 'gnus-extract-view
-(defvar gnus-uu-user-view-rules nil
+:type '(repeat (group regexp (string :tag "Command"))))
-"*Variable detailing what actions are to be taken to view a file.
+(defcustom gnus-uu-user-view-rules nil
+"What actions are to be taken to view a file.
 See the documentation on the `gnus-uu-default-view-rules' variable for
-details.")
+details."
+:group 'gnus-extract-view
-(defvar gnus-uu-user-view-rules-end
+:type '(repeat (group regexp (string :tag "Command"))))
+(defcustom gnus-uu-user-view-rules-end
 '(("" "file"))
-"*Variable saying what actions are to be taken if no rule matched the file name.
+"What actions are to be taken if no rule matched the file name.
 See the documentation on the `gnus-uu-default-view-rules' variable for
-details.")
+details."
+:group 'gnus-extract-view
+:type '(repeat (group regexp (string :tag "Command"))))
 ;; Default unpacking commands
-(defvar gnus-uu-default-archive-rules
+(defcustom gnus-uu-default-archive-rules
 '(("\\.tar$" "tar xf")
 ("\\.zip$" "unzip -o")
 ("\\.ar$" "ar x")
 ("\\.arj$" "unarj x")
 ("\\.zoo$" "zoo -e")
 ("\\.\\(lzh\\|lha\\)$" "lha x")
 ("\\.Z$" "uncompress")
 ("\\.gz$" "gunzip")
-("\\.arc$" "arc -x")))
+("\\.arc$" "arc -x"))
+"See `gnus-uu-user-archive-rules'."
+:group 'gnus-extract-archive
+:type '(repeat (group regexp (string :tag "Command"))))
 (defvar gnus-uu-destructive-archivers
 (list "uncompress" "gunzip"))
-(defvar gnus-uu-user-archive-rules nil
+(defcustom gnus-uu-user-archive-rules nil
-"*A list that can be set to override the default archive unpacking commands.
+"A list that can be set to override the default archive unpacking commands.
 To use, for instance, 'untar' to unpack tar files and 'zip -x' to
 unpack zip files, say the following:
 (setq gnus-uu-user-archive-rules
 '((\"\\\\.tar$\" \"untar\")
-(\"\\\\.zip$\" \"zip -x\")))")
+(\"\\\\.zip$\" \"zip -x\")))"
+:group 'gnus-extract-archive
-(defvar gnus-uu-ignore-files-by-name nil
+:type '(repeat (group regexp (string :tag "Command"))))
+(defcustom gnus-uu-ignore-files-by-name nil
 "*A regular expression saying what files should not be viewed based on name.
 If, for instance, you want gnus-uu to ignore all .au and .wav files,
 you could say something like
 (setq gnus-uu-ignore-files-by-name \"\\\\.au$\\\\|\\\\.wav$\")
 Note that this variable can be used in conjunction with the
-`gnus-uu-ignore-files-by-type' variable.")
+`gnus-uu-ignore-files-by-type' variable."
+:group 'gnus-extract
-(defvar gnus-uu-ignore-files-by-type nil
+:type '(choice (const :tag "off" nil)
+		 (regexp :format "%v")))
+(defcustom gnus-uu-ignore-files-by-type nil
 "*A regular expression saying what files that shouldn't be viewed, based on MIME file type.
 If, for instance, you want gnus-uu to ignore all audio files and all mpegs,
 you could say something like
 (setq gnus-uu-ignore-files-by-type \"audio/\\\\|video/mpeg\")
 Note that this variable can be used in conjunction with the
-`gnus-uu-ignore-files-by-name' variable.")
+`gnus-uu-ignore-files-by-name' variable."
+:group 'gnus-extract
+:type '(choice (const :tag "off" nil)
+		 (regexp :format "%v")))
 ;; Pseudo-MIME support
 (defconst gnus-uu-ext-to-mime-list
 '(("\\.gif$" "image/gif")
 ("\\.rsrc$" "video/rsrc")
 ("\\..*$" "unknown/unknown")))
 ;; Various variables users may set
-(defvar gnus-uu-tmp-dir "/tmp/"
+(defcustom gnus-uu-tmp-dir "/tmp/"
 "*Variable saying where gnus-uu is to do its work.
-Default is \"/tmp/\".")
+Default is \"/tmp/\"."
+:group 'gnus-extract
-(defvar gnus-uu-do-not-unpack-archives nil
+:type 'directory)
+(defcustom gnus-uu-do-not-unpack-archives nil
 "*Non-nil means that gnus-uu won't peek inside archives looking for files to display.
-Default is nil.")
+Default is nil."
+:group 'gnus-extract-archive
-(defvar gnus-uu-ignore-default-view-rules nil
+:type 'boolean)
+(defcustom gnus-uu-ignore-default-view-rules nil
 "*Non-nil means that gnus-uu will ignore the default viewing rules.
-Only the user viewing rules will be consulted. Default is nil.")
+Only the user viewing rules will be consulted.  Default is nil."
+:group 'gnus-extract-view
-(defvar gnus-uu-grabbed-file-functions nil
+:type 'boolean)
-"*Functions run on each file after successful decoding.
+(defcustom gnus-uu-grabbed-file-functions nil
+"Functions run on each file after successful decoding.
 They will be called with the name of the file as the argument.
 Likely functions you can use in this list are `gnus-uu-grab-view'
-and `gnus-uu-grab-move'.")
+and `gnus-uu-grab-move'."
+:group 'gnus-extract
-(defvar gnus-uu-ignore-default-archive-rules nil
+:options '(gnus-uu-grab-view gnus-uu-grab-move)
+:type 'hook)
+(defcustom gnus-uu-ignore-default-archive-rules nil
 "*Non-nil means that gnus-uu will ignore the default archive unpacking commands.
-Only the user unpacking commands will be consulted. Default is nil.")
+Only the user unpacking commands will be consulted.  Default is nil."
+:group 'gnus-extract-archive
-(defvar gnus-uu-kill-carriage-return t
+:type 'boolean)
+(defcustom gnus-uu-kill-carriage-return t
 "*Non-nil means that gnus-uu will strip all carriage returns from articles.
-Default is t.")
+Default is t."
+:group 'gnus-extract
-(defvar gnus-uu-view-with-metamail nil
+:type 'boolean)
+(defcustom gnus-uu-view-with-metamail nil
 "*Non-nil means that files will be viewed with metamail.
 The gnus-uu viewing functions will be ignored and gnus-uu will try
-to guess at a content-type based on file name suffixes. Default
+to guess at a content-type based on file name suffixes.  Default
-it nil.")
+it nil."
+:group 'gnus-extract
-(defvar gnus-uu-unmark-articles-not-decoded nil
+:type 'boolean)
+(defcustom gnus-uu-unmark-articles-not-decoded nil
 "*Non-nil means that gnus-uu will mark articles that were unsuccessfully decoded as unread.
-Default is nil.")
+Default is nil."
+:group 'gnus-extract
-(defvar gnus-uu-correct-stripped-uucode nil
+:type 'boolean)
+(defcustom gnus-uu-correct-stripped-uucode nil
 "*Non-nil means that gnus-uu will *try* to fix uuencoded files that have had trailing spaces deleted.
-Default is nil.")
+Default is nil."
+:group 'gnus-extract
-(defvar gnus-uu-save-in-digest nil
+:type 'boolean)
+(defcustom gnus-uu-save-in-digest nil
 "*Non-nil means that gnus-uu, when asked to save without decoding, will save in digests.
 If this variable is nil, gnus-uu will just save everything in a
-file without any embellishments. The digesting almost conforms to RFC1153 -
+file without any embellishments.  The digesting almost conforms to RFC1153 -
 no easy way to specify any meaningful volume and issue numbers were found,
-so I simply dropped them.")
+so I simply dropped them."
+:group 'gnus-extract
-(defvar gnus-uu-digest-headers
+:type 'boolean)
+(defcustom gnus-uu-digest-headers
 '("^Date:" "^From:" "^To:" "^Cc:" "^Subject:" "^Message-ID:" "^Keywords:"
 "^Summary:" "^References:")
-"*List of regexps to match headers included in digested messages.
+"List of regexps to match headers included in digested messages.
-The headers will be included in the sequence they are matched.")
+The headers will be included in the sequence they are matched."
+:group 'gnus-extract
-(defvar gnus-uu-save-separate-articles nil
+:type '(repeat regexp))
-"*Non-nil means that gnus-uu will save articles in separate files.")
+(defcustom gnus-uu-save-separate-articles nil
+"*Non-nil means that gnus-uu will save articles in separate files."
+:group 'gnus-extract
+:type 'boolean)
+(defcustom gnus-uu-be-dangerous 'ask
+"*Specifies what to do if unusual situations arise during decoding.
+If nil, be as conservative as possible.  If t, ignore things that
+didn't work, and overwrite existing files.  Otherwise, ask each time."
+:group 'gnus-extract
+:type '(choice (const :tag "conservative" nil)
+		 (const :tag "ask" ask)
+		 (const :tag "liberal" t)))
 ;; Internal variables
 (defvar gnus-uu-saved-article-name nil)
 (defvar gnus-uu-default-dir gnus-article-save-directory)
 (defvar gnus-uu-digest-from-subject nil)
 ;; Keymaps
-(gnus-define-keys
+(gnus-define-keys (gnus-uu-mark-map "P" gnus-summary-mark-map)
-(gnus-uu-mark-map "P" gnus-summary-mark-map)
+"p" gnus-summary-mark-as-processable
-"p" gnus-summary-mark-as-processable
+"u" gnus-summary-unmark-as-processable
-"u" gnus-summary-unmark-as-processable
+"U" gnus-summary-unmark-all-processable
-"U" gnus-summary-unmark-all-processable
+"v" gnus-uu-mark-over
-"v" gnus-uu-mark-over
+"s" gnus-uu-mark-series
-"s" gnus-uu-mark-series
+"r" gnus-uu-mark-region
-"r" gnus-uu-mark-region
+"R" gnus-uu-mark-by-regexp
-"R" gnus-uu-mark-by-regexp
+"t" gnus-uu-mark-thread
-"t" gnus-uu-mark-thread
+"T" gnus-uu-unmark-thread
-"T" gnus-uu-unmark-thread
+"a" gnus-uu-mark-all
-"a" gnus-uu-mark-all
+"b" gnus-uu-mark-buffer
-"b" gnus-uu-mark-buffer
+"S" gnus-uu-mark-sparse
-"S" gnus-uu-mark-sparse)
+"k" gnus-summary-kill-process-mark
+"y" gnus-summary-yank-process-mark
-(gnus-define-keys
+"w" gnus-summary-save-process-mark
-(gnus-uu-extract-map "X" gnus-summary-mode-map)
+"i" gnus-uu-invert-processable)
-;;"x" gnus-uu-extract-any
-;;"m" gnus-uu-extract-mime
+(gnus-define-keys (gnus-uu-extract-map "X" gnus-summary-mode-map)
-"u" gnus-uu-decode-uu
+;;"x" gnus-uu-extract-any
-"U" gnus-uu-decode-uu-and-save
+;;"m" gnus-uu-extract-mime
-"s" gnus-uu-decode-unshar
+"u" gnus-uu-decode-uu
-"S" gnus-uu-decode-unshar-and-save
+"U" gnus-uu-decode-uu-and-save
-"o" gnus-uu-decode-save
+"s" gnus-uu-decode-unshar
-"O" gnus-uu-decode-save
+"S" gnus-uu-decode-unshar-and-save
-"b" gnus-uu-decode-binhex
+"o" gnus-uu-decode-save
-"B" gnus-uu-decode-binhex
+"O" gnus-uu-decode-save
-"p" gnus-uu-decode-postscript
+"b" gnus-uu-decode-binhex
-"P" gnus-uu-decode-postscript-and-save)
+"B" gnus-uu-decode-binhex
+"p" gnus-uu-decode-postscript
+"P" gnus-uu-decode-postscript-and-save)
 (gnus-define-keys
 (gnus-uu-extract-view-map "v" gnus-uu-extract-map)
 "u" gnus-uu-decode-uu-view
 "U" gnus-uu-decode-uu-and-save-view
 ;; Commands.
 (defun gnus-uu-decode-uu (&optional n)
 "Uudecodes the current article."
 (interactive "P")
 (gnus-uu-decode-with-method 'gnus-uu-uustrip-article n))
 (defun gnus-uu-decode-uu-and-save (n dir)
 "Decodes and saves the resulting file."
 (interactive
 (defun gnus-uu-digest-mail-forward (&optional n post)
 "Digests and forwards all articles in this series."
 (interactive "P")
 (let ((gnus-uu-save-in-digest t)
-	(file (make-temp-name (concat gnus-uu-tmp-dir "forward")))
+	(file (make-temp-name (nnheader-concat gnus-uu-tmp-dir "forward")))
-	buf subject from)
+	buf subject from newsgroups)
 (setq gnus-uu-digest-from-subject nil)
 (gnus-uu-decode-save n file)
 (setq buf (switch-to-buffer (get-buffer-create " *gnus-uu-forward*")))
 (gnus-add-current-to-buffer-list)
 (erase-buffer)
 (delete-other-windows)
 (insert-file file)
 (let ((fs gnus-uu-digest-from-subject))
-(if (not fs)
+(when fs
-	  ()
 	(setq from (caar fs)
 	      subject (gnus-simplify-subject-fuzzy (cdar fs))
 	      fs (cdr fs))
 	(while (and fs (or from subject))
-	  (and from
+	  (when from
-	       (or (string= from (caar fs))
+	    (unless (string= from (caar fs))
-		   (setq from nil)))
+	      (setq from nil)))
-	  (and subject
+	  (when subject
-	       (or (string= (gnus-simplify-subject-fuzzy (cdar fs))
+	    (unless (string= (gnus-simplify-subject-fuzzy (cdar fs))
-			    subject)
+			     subject)
-		   (setq subject nil)))
+	      (setq subject nil)))
 	  (setq fs (cdr fs))))
-(or subject (setq subject "Digested Articles"))
+(unless subject
-(or from (setq from "Various")))
+	(setq subject "Digested Articles"))
+(unless from
+	(setq from
+	      (if (gnus-news-group-p gnus-newsgroup-name)
+		  gnus-newsgroup-name
+		"Various"))))
 (goto-char (point-min))
-(and (re-search-forward "^Subject: ")
+(when (re-search-forward "^Subject: ")
-	 (progn
+(delete-region (point) (point-at-eol))
-	   (delete-region (point) (gnus-point-at-eol))
+(insert subject))
-	   (insert subject)))
 (goto-char (point-min))
-(and (re-search-forward "^From: ")
+(when (re-search-forward "^From: ")
-	 (progn
+(delete-region (point) (point-at-eol))
-	   (delete-region (point) (gnus-point-at-eol))
+(insert from))
-	   (insert from)))
 (message-forward post)
 (delete-file file)
 (kill-buffer buf)
 (setq gnus-uu-digest-from-subject nil)))
 		 (gnus-summary-article-number))
 		(zerop (gnus-summary-next-subject 1))
 		(> (gnus-summary-thread-level) level))))
 (gnus-summary-position-point))
+(defun gnus-uu-invert-processable ()
+"Invert the list of process-marked articles."
+(let ((data gnus-newsgroup-data)
+	d number)
+(save-excursion
+(while data
+	(if (memq (setq number (gnus-data-number (pop data)))
+		  gnus-newsgroup-processable)
+	    (gnus-summary-remove-process-mark number)
+	  (gnus-summary-set-process-mark number)))))
+(gnus-summary-position-point))
 (defun gnus-uu-mark-over (&optional score)
 "Mark all articles with a score over SCORE (the prefix.)"
 (interactive "P")
 (let ((score (gnus-score-default score))
 	(data gnus-newsgroup-data))
 "Mark all series that have some articles marked."
 (interactive)
 (gnus-set-global-variables)
 (let ((marked (nreverse gnus-newsgroup-processable))
 	subject articles total headers)
-(or marked (error "No articles marked with the process mark"))
+(unless marked
+(error "No articles marked with the process mark"))
 (setq gnus-newsgroup-processable nil)
 (save-excursion
 (while marked
 	(and (vectorp (setq headers
 			    (gnus-summary-article-header (car marked))))
 ;; Internal functions.
 (defun gnus-uu-decode-with-method (method n &optional save not-insert
 					  scan cdir)
 (gnus-uu-initialize scan)
-(if save (setq gnus-uu-default-dir save))
+(when save
+(setq gnus-uu-default-dir save))
 ;; Create the directory we save to.
 (when (and scan cdir save
 	     (not (file-exists-p save)))
 (make-directory save t))
 (let ((articles (gnus-uu-get-list-of-articles n))
 	files)
 (setq files (gnus-uu-grab-articles articles method t))
 (let ((gnus-current-article (car articles)))
-(and scan (setq files (gnus-uu-scan-directory gnus-uu-work-dir))))
+(when scan
-(and save (gnus-uu-save-files files save))
+	(setq files (gnus-uu-scan-directory gnus-uu-work-dir))))
-(if (eq gnus-uu-do-not-unpack-archives nil)
+(when save
+(gnus-uu-save-files files save))
+(when (eq gnus-uu-do-not-unpack-archives nil)
 (setq files (gnus-uu-unpack-files files)))
 (setq files (nreverse (gnus-uu-get-actions files)))
 (or not-insert (not gnus-insert-pseudo-articles)
 	(gnus-summary-insert-pseudos files save))))
 (while (setq file (cdr (assq 'name (pop files))))
 (when (file-exists-p file)
 	(string-match reg file)
 	(setq fromdir (substring file (match-end 0)))
 	(if (file-directory-p file)
-	    (unless (file-exists-p (concat dir fromdir))
+	    (gnus-make-directory (concat dir fromdir))
-	      (make-directory (concat dir fromdir) t))
 	  (setq to-file (concat dir fromdir))
 	  (when (or (not (file-exists-p to-file))
-		    (gnus-y-or-n-p (format "%s exists; overwrite? " to-file)))
+		    (eq gnus-uu-be-dangerous t)
+		    (and gnus-uu-be-dangerous
+			 (gnus-y-or-n-p (format "%s exists; overwrite? "
+						to-file))))
 	    (copy-file file to-file t t)))))
 (gnus-message 5 "Saved %d file%s" len (if (= len 1) "" "s"))))
 ;; Functions for saving and possibly digesting articles without
 ;; any decoding.
 (defun gnus-uu-save-article (buffer in-state)
 (cond
 (gnus-uu-save-separate-articles
 (save-excursion
 (set-buffer buffer)
-(write-region 1 (point-max) (concat gnus-uu-saved-article-name
+(gnus-write-buffer
-					  gnus-current-article))
+(concat gnus-uu-saved-article-name gnus-current-article))
 (cond ((eq in-state 'first) (list gnus-uu-saved-article-name 'begin))
 	    ((eq in-state 'first-and-last) (list gnus-uu-saved-article-name
 						 'begin 'end))
 	    ((eq in-state 'last) (list 'end))
 	    (t (list 'middle)))))
 ((not gnus-uu-save-in-digest)
 (save-excursion
 (set-buffer buffer)
-(write-region 1 (point-max) gnus-uu-saved-article-name t)
+(write-region (point-min) (point-max) gnus-uu-saved-article-name t)
 (cond ((eq in-state 'first) (list gnus-uu-saved-article-name 'begin))
 	    ((eq in-state 'first-and-last) (list gnus-uu-saved-article-name
 						 'begin 'end))
 	    ((eq in-state 'last) (list 'end))
 	    (t (list 'middle)))))
 (t
 (let ((header (gnus-summary-article-header)))
-(setq gnus-uu-digest-from-subject
+(push (cons (mail-header-from header)
-	    (cons (cons (mail-header-from header)
+		  (mail-header-subject header))
-			(mail-header-subject header))
+	    gnus-uu-digest-from-subject))
-		  gnus-uu-digest-from-subject)))
 (let ((name (file-name-nondirectory gnus-uu-saved-article-name))
 	  (delim (concat "^" (make-string 30 ?-) "$"))
 	  beg subj headers headline sorthead body end-string state)
 (if (or (eq in-state 'first)
 	      (eq in-state 'first-and-last))
 	  (progn
 	    (setq state (list 'begin))
 	    (save-excursion (set-buffer (get-buffer-create "*gnus-uu-body*"))
 			    (erase-buffer))
 	      (set-buffer (get-buffer-create "*gnus-uu-pre*"))
 	      (erase-buffer)
 	      (insert (format
 		       "Date: %s\nFrom: %s\nSubject: %s Digest\n\nTopics:\n"
 		       (current-time-string) name name))))
-	(if (not (eq in-state 'end))
+	(when (not (eq in-state 'end))
-	    (setq state (list 'middle))))
+	  (setq state (list 'middle))))
 (save-excursion
 	(set-buffer (get-buffer "*gnus-uu-body*"))
 	(goto-char (setq beg (point-max)))
 	(save-excursion
 	  (save-restriction
 	    (widen)))
 	(insert sorthead) (goto-char (point-max))
 	(insert body) (goto-char (point-max))
 	(insert (concat "\n" (make-string 30 ?-) "\n\n"))
 	(goto-char beg)
-	(if (re-search-forward "^Subject: \\(.*\\)$" nil t)
+	(when (re-search-forward "^Subject: \\(.*\\)$" nil t)
-	    (progn
+	  (setq subj (buffer-substring (match-beginning 1) (match-end 1)))
-	      (setq subj (buffer-substring (match-beginning 1) (match-end 1)))
+	  (save-excursion
-	      (save-excursion
+	    (set-buffer (get-buffer "*gnus-uu-pre*"))
-		(set-buffer (get-buffer "*gnus-uu-pre*"))
+	    (insert (format "   %s\n" subj)))))
-		(insert (format "   %s\n" subj))))))
+(when (or (eq in-state 'last)
-(if (or (eq in-state 'last)
+		(eq in-state 'first-and-last))
-	      (eq in-state 'first-and-last))
+	(save-excursion
-	  (progn
+	  (set-buffer (get-buffer "*gnus-uu-pre*"))
-	    (save-excursion
+	  (insert (format "\n\n%s\n\n" (make-string 70 ?-)))
-	      (set-buffer (get-buffer "*gnus-uu-pre*"))
+	  (gnus-write-buffer gnus-uu-saved-article-name))
-	      (insert (format "\n\n%s\n\n" (make-string 70 ?-)))
+	(save-excursion
-	      (write-region 1 (point-max) gnus-uu-saved-article-name))
+	  (set-buffer (get-buffer "*gnus-uu-body*"))
-	    (save-excursion
+	  (goto-char (point-max))
-	      (set-buffer (get-buffer "*gnus-uu-body*"))
+	  (insert
-	      (goto-char (point-max))
+	   (concat (setq end-string (format "End of %s Digest" name))
-	      (insert
+		   "\n"))
-	       (concat (setq end-string (format "End of %s Digest" name))
+	  (insert (concat (make-string (length end-string) ?*) "\n"))
-		       "\n"))
+	  (write-region
-	      (insert (concat (make-string (length end-string) ?*) "\n"))
+	   (point-min) (point-max) gnus-uu-saved-article-name t))
-	      (write-region 1 (point-max) gnus-uu-saved-article-name t))
+	(kill-buffer (get-buffer "*gnus-uu-pre*"))
-	    (kill-buffer (get-buffer "*gnus-uu-pre*"))
+	(kill-buffer (get-buffer "*gnus-uu-body*"))
-	    (kill-buffer (get-buffer "*gnus-uu-body*"))
+	(push 'end state))
-	    (setq state (cons 'end state))))
 (if (memq 'begin state)
 	  (cons gnus-uu-saved-article-name state)
 	state)))))
 ;; Binhex treatment - not very advanced.
 (let (state start-char)
 (save-excursion
 (set-buffer buffer)
 (widen)
 (goto-char (point-min))
-(if (not (re-search-forward gnus-uu-binhex-begin-line nil t))
+(when (not (re-search-forward gnus-uu-binhex-begin-line nil t))
-	  (if (not (re-search-forward gnus-uu-binhex-body-line nil t))
+	(when (not (re-search-forward gnus-uu-binhex-body-line nil t))
-	      (setq state (list 'wrong-type))))
+	  (setq state (list 'wrong-type))))
 (if (memq 'wrong-type state)
 	  ()
 	(beginning-of-line)
 	(setq start-char (point))
 	      (setq state (list 'begin))
 	      (write-region 1 1 gnus-uu-binhex-article-name))
 	  (setq state (list 'middle)))
 	(goto-char (point-max))
 	(re-search-backward (concat gnus-uu-binhex-body-line "\\|"
-				    gnus-uu-binhex-end-line) nil t)
+				    gnus-uu-binhex-end-line)
-	(if (looking-at gnus-uu-binhex-end-line)
+			    nil t)
-	    (setq state (if (memq 'begin state)
+	(when (looking-at gnus-uu-binhex-end-line)
-			    (cons 'end state)
+	  (setq state (if (memq 'begin state)
-			  (list 'end))))
+			  (cons 'end state)
+			(list 'end))))
 	(beginning-of-line)
 	(forward-line 1)
-	(if (file-exists-p gnus-uu-binhex-article-name)
+	(when (file-exists-p gnus-uu-binhex-article-name)
-	    (append-to-file start-char (point) gnus-uu-binhex-article-name))))
+	  (append-to-file start-char (point) gnus-uu-binhex-article-name))))
 (if (memq 'begin state)
 	(cons gnus-uu-binhex-article-name state)
 state)))
 ;; PostScript
 	    gnus-uu-user-view-rules
 	    (if gnus-uu-ignore-default-view-rules
 		nil
 	      gnus-uu-default-view-rules)
 	    gnus-uu-user-view-rules-end)))
-(if (and (not (string= (or action "") "gnus-uu-archive"))
+(when (and (not (string= (or action "") "gnus-uu-archive"))
-	     gnus-uu-view-with-metamail)
+	       gnus-uu-view-with-metamail)
-	(if (setq action
+(when (setq action
 		  (gnus-uu-choose-action file-name gnus-uu-ext-to-mime-list))
-	    (setq action (format "metamail -d -b -c \"%s\"" action))))
+	(setq action (format "metamail -d -b -c \"%s\"" action))))
 action))
 ;; Functions for treating subjects and collecting series.
 (defun gnus-uu-reginize-string (string)
 ;; Takes a string and puts a \ in front of every special character;
 ;; ignores any leading "version numbers" thingies that they use in
 ;; the comp.binaries groups, and either replaces anything that looks
 ;; like "2/3" with "[0-9]+/[0-9]+" or, if it can't find something
-;; like that, replaces the last two numbers with "[0-9]+". This, in
+;; like that, replaces the last two numbers with "[0-9]+".  This, in
 ;; my experience, should get most postings of a series.
 (let ((count 2)
 	(vernum "v[0-9]+[a-z][0-9]+:")
 	beg)
 (save-excursion
 (insert (regexp-quote string))
 (setq beg 1)
 (setq case-fold-search nil)
 (goto-char (point-min))
-(if (looking-at vernum)
+(when (looking-at vernum)
-	  (progn
+	(replace-match vernum t t)
-	    (replace-match vernum t t)
+	(setq beg (length vernum)))
-	    (setq beg (length vernum))))
 (goto-char beg)
 (if (re-search-forward "[ \t]*[0-9]+/[0-9]+" nil t)
 	  (replace-match " [0-9]+/[0-9]+")
 	(goto-char beg)
 	(if (re-search-forward "[0-9]+[ \t]*of[ \t]*[0-9]+" nil t)
 	    (replace-match "[0-9]+ of [0-9]+")
 	  (end-of-line)
-	  (while (and (re-search-backward "[0-9]" nil t) (> count 0))
+(if (re-search-backward "\\([^0-9]\\)[0-9]+\\([^0-9]+\\)[0-9]+"
-(while (and
+nil t)
-		    (looking-at "[0-9]")
+(replace-match "\\1[0-9]+\\2[0-9]+" t nil nil nil))))
-		    (< 1 (goto-char (1- (point))))))
-(re-search-forward "[0-9]+" nil t)
-	    (replace-match "[0-9]+")
-	    (backward-char 5)
-	    (setq count (1- count)))))
 (goto-char beg)
 (while (re-search-forward "[ \t]+" nil t)
 	(replace-match "[ \t]*" t t))
 (buffer-substring 1 (point-max)))))
 ;; Failing that, articles that have subjects that are part of the
 ;; same "series" as the current will be returned.
 (let (articles)
 (cond
 (n
+(setq n (prefix-numeric-value n))
 (let ((backward (< n 0))
 	    (n (abs n)))
 	(save-excursion
 	  (while (and (> n 0)
-		      (setq articles (cons (gnus-summary-article-number)
+		      (push (gnus-summary-article-number)
-					   articles))
+			    articles)
 		      (gnus-summary-search-forward nil nil backward))
 	    (setq n (1- n))))
 	(nreverse articles)))
 (gnus-newsgroup-processable
 (reverse gnus-newsgroup-processable))
 (string< (car l1) (car l2)))
 (defun gnus-uu-find-articles-matching
 (&optional subject only-unread do-not-translate)
 ;; Finds all articles that matches the regexp SUBJECT.  If it is
-;; nil, the current article name will be used. If ONLY-UNREAD is
+;; nil, the current article name will be used.  If ONLY-UNREAD is
-;; non-nil, only unread articles are chosen. If DO-NOT-TRANSLATE is
+;; non-nil, only unread articles are chosen.  If DO-NOT-TRANSLATE is
 ;; non-nil, article names are not equalized before sorting.
 (let ((subject (or subject
 		     (gnus-uu-reginize-string (gnus-summary-article-subject))))
 	list-of-subjects)
 (save-excursion
 			gnus-unread-mark)
 		     (= mark gnus-ticked-mark)
 		     (= mark gnus-dormant-mark))
 		 (setq subj (mail-header-subject (gnus-data-header d)))
 		 (string-match subject subj)
-		 (setq list-of-subjects
+		 (push (cons subj (gnus-data-number d))
-		       (cons (cons subj (gnus-data-number d))
+		       list-of-subjects))))
-			     list-of-subjects)))))
 	;; Expand numbers, sort, and return the list of article
 	;; numbers.
 	(mapcar (lambda (sub) (cdr sub))
 		(sort (gnus-uu-expand-numbers
 		       list-of-subjects
 		       (not do-not-translate))
 		      'gnus-uu-string<))))))
 (defun gnus-uu-expand-numbers (string-list &optional translate)
 ;; Takes a list of strings and "expands" all numbers in all the
 ;; strings.  That is, this function makes all numbers equal length by
-;; prepending lots of zeroes before each number. This is to ease later
+;; prepending lots of zeroes before each number.  This is to ease later
 ;; sorting to find out what sequence the articles are supposed to be
-;; decoded in. Returns the list of expanded strings.
+;; decoded in.  Returns the list of expanded strings.
 (let ((out-list string-list)
 	string)
 (save-excursion
 (set-buffer (get-buffer-create gnus-uu-output-buffer-name))
 (buffer-disable-undo (current-buffer))
 	(goto-char (point-min))
 	(while (re-search-forward "[ \t]+" nil t)
 	  (replace-match " "))
 	;; Translate all characters to "a".
 	(goto-char (point-min))
-	(if translate
+	(when translate
-	    (while (re-search-forward "[A-Za-z]" nil t)
+	  (while (re-search-forward "[A-Za-z]" nil t)
-	      (replace-match "a" t t)))
+	    (replace-match "a" t t)))
 	;; Expand numbers.
 	(goto-char (point-min))
 	(while (re-search-forward "[0-9]+" nil t)
 	  (replace-match
 	   (format "%06d"
 ;; `gnus-uu-grab-articles' is the general multi-article treatment
 ;; function.  It takes a list of articles to be grabbed and a function
 ;; to apply to each article.
 ;;
 ;; The function to be called should take two parameters.  The first
-;; parameter is the article buffer. The function should leave the
+;; parameter is the article buffer.  The function should leave the
-;; result, if any, in this buffer. Most treatment functions will just
+;; result, if any, in this buffer.  Most treatment functions will just
 ;; generate files...
 ;;
 ;; The second parameter is the state of the list of articles, and can
 ;; have four values: `first', `middle', `last' and `first-and-last'.
 ;;
-;; The function should return a list. The list may contain the
+;; The function should return a list.  The list may contain the
 ;; following symbols:
 ;; `error' if an error occurred
 ;; `begin' if the beginning of an encoded file has been received
 ;;   If the list returned contains a `begin', the first element of
 ;;   the list *must* be a string with the file name of the decoded
 (defun gnus-uu-unmark-list-of-grabbed (&optional dont-unmark-last-article)
 (let (art)
 (if (not (and gnus-uu-has-been-grabbed
 		  gnus-uu-unmark-articles-not-decoded))
 	()
-(if dont-unmark-last-article
+(when dont-unmark-last-article
-	  (progn
+	(setq art (car gnus-uu-has-been-grabbed))
-	    (setq art (car gnus-uu-has-been-grabbed))
+	(setq gnus-uu-has-been-grabbed (cdr gnus-uu-has-been-grabbed)))
-	    (setq gnus-uu-has-been-grabbed (cdr gnus-uu-has-been-grabbed))))
 (while gnus-uu-has-been-grabbed
 	(gnus-summary-tick-article (car gnus-uu-has-been-grabbed) t)
 	(setq gnus-uu-has-been-grabbed (cdr gnus-uu-has-been-grabbed)))
-(if dont-unmark-last-article
+(when dont-unmark-last-article
-	  (setq gnus-uu-has-been-grabbed (list art))))))
+	(setq gnus-uu-has-been-grabbed (list art))))))
 ;; This function takes a list of articles and a function to apply to
 ;; each article grabbed.
 ;;
 ;; This function returns a list of files decoded if the grabbing and
 ;; the process-function has been successful and nil otherwise.
 (defun gnus-uu-grab-articles (articles process-function
 				       &optional sloppy limit no-errors)
 (let ((state 'first)
+	(gnus-asynchronous nil)
 	has-been-begin article result-file result-files process-state
 	gnus-summary-display-article-function
 	gnus-article-display-hook gnus-article-prepare-hook
 	article-series files)
 (gnus-summary-remove-process-mark article)
 ;; If this is the beginning of a decoded file, we push it
 ;; on to a list.
 (when (or (memq 'begin process-state)
 		(and (or (eq state 'first)
 			 (eq state 'first-and-last))
 		     (memq 'ok process-state)))
-	(if has-been-begin
+	(when has-been-begin
-	    ;; If there is a `result-file' here, that means that the
+	  ;; If there is a `result-file' here, that means that the
-	    ;; file was unsuccessfully decoded, so we delete it.
+	  ;; file was unsuccessfully decoded, so we delete it.
-	    (when (and result-file
+	  (when (and result-file
-		       (file-exists-p result-file))
+		     (file-exists-p result-file)
-	      (delete-file result-file)))
+		     (not gnus-uu-be-dangerous)
+		     (or (eq gnus-uu-be-dangerous t)
+			 (gnus-y-or-n-p
+			  (format "Delete unsuccessfully decoded file %s"
+				  result-file))))
+	    (delete-file result-file)))
 	(when (memq 'begin process-state)
 	  (setq result-file (car process-state)))
 	(setq has-been-begin t))
 ;; Check whether we have decoded one complete file.
 	  (let ((funcs gnus-uu-grabbed-file-functions))
 	    (unless (listp funcs)
 	      (setq funcs (list funcs)))
 	    (while funcs
 	      (funcall (pop funcs) result-file))))
+	(setq result-file nil)
 	;; Check whether we have decoded enough articles.
 	(and limit (= (length result-files) limit)
 	     (setq articles nil)))
 ;; If this is the last article to be decoded, and
 ;; the partially decoded file.
 (and (or (eq state 'last) (eq state 'first-and-last))
 	   (not (memq 'end process-state))
 	   result-file
 	   (file-exists-p result-file)
+	   (not gnus-uu-be-dangerous)
+	   (or (eq gnus-uu-be-dangerous t)
+	       (gnus-y-or-n-p (format "Delete incomplete file %s? " result-file)))
 	   (delete-file result-file))
 ;; If this was a file of the wrong sort, then
 (when (and (or (memq 'wrong-type process-state)
 		     (memq 'error process-state))
 (cond
 ((not has-been-begin)
 	(gnus-message 2 "Wrong type file"))
 ((memq 'error process-state)
 	(gnus-message 2 "An error occurred during decoding"))
 ((not (or (memq 'ok process-state)
 		 (memq 'end process-state)))
 	(gnus-message 2 "End of articles reached before end of file")))
 ;; Make unsuccessfully decoded articles unread.
 (when gnus-uu-unmark-articles-not-decoded
 	(while article-series
 	  ;; We replace certain characters that could make things messy.
 	  (setq gnus-uu-file-name
 		(let ((nnheader-file-name-translation-alist
 		       '((?/ . ?,) (? . ?_) (?* . ?_) (?$ . ?_))))
 		  (nnheader-translate-file-chars (match-string 1))))
+(replace-match (concat "begin 644 " gnus-uu-file-name) t t)
 	  ;; Remove any non gnus-uu-body-line right after start.
 	  (forward-line 1)
 	  (while (and (not (eobp))
 		      (not (looking-at gnus-uu-body-line)))
 	    (gnus-delete-line))
 	  ;; If a process is running, we kill it.
 	  (when (and gnus-uu-uudecode-process
 		     (memq (process-status gnus-uu-uudecode-process)
 			   '(run stop)))
 	    (delete-process gnus-uu-uudecode-process)
 	    (gnus-uu-unmark-list-of-grabbed t))
 	  ;; Start a new uudecoding process.
 	  (setq state (list 'begin))
 	  (push (concat gnus-uu-work-dir gnus-uu-file-name) files))
 	;; We look for the end of the thing to be decoded.
 	(if (re-search-forward gnus-uu-end-string nil t)
-	    (setq state (cons 'end state))
+	    (push 'end state)
 	  (goto-char (point-max))
 	  (re-search-backward gnus-uu-body-line nil t))
 	(forward-line 1)
 		 (setq state (list 'wrong-type)))))
 	    (if (memq 'end state)
 		(progn
 		  ;; Send an EOF, just in case.
-		  (condition-case ()
+		  (ignore-errors
-		      (process-send-eof gnus-uu-uudecode-process)
+		    (process-send-eof gnus-uu-uudecode-process))
-		    (error nil))
 		  (while (memq (process-status gnus-uu-uudecode-process)
 			       '(open run))
 		    (accept-process-output gnus-uu-uudecode-process 1)))
 	      (when (or (not gnus-uu-uudecode-process)
 			(not (memq (process-status gnus-uu-uudecode-process)
 	(beginning-of-line)
 	(setq start-char (point))
 	(call-process-region
 	 start-char (point-max) shell-file-name nil
 	 (get-buffer-create gnus-uu-output-buffer-name) nil
-	 shell-command-switch (concat "cd " gnus-uu-work-dir " ; sh"))))
+	 shell-command-switch
+	 (concat "cd " gnus-uu-work-dir " "
+		 gnus-shell-command-separator  " sh"))))
 state))
 ;; Returns the name of what the shar file is going to unpack.
 (defun gnus-uu-find-name-in-shar ()
 (let ((oldpoint (point))
 	res)
 (goto-char (point-min))
-(if (re-search-forward gnus-uu-shar-name-marker nil t)
+(when (re-search-forward gnus-uu-shar-name-marker nil t)
-	(setq res (buffer-substring (match-beginning 1) (match-end 1))))
+(setq res (buffer-substring (match-beginning 1) (match-end 1))))
 (goto-char oldpoint)
 res))
 ;; `gnus-uu-choose-action' chooses what action to perform given the name
 ;; and `gnus-uu-file-action-list'.  Returns either nil if no action is
 (defun gnus-uu-choose-action (file-name file-action-list &optional no-ignore)
 (let ((action-list (copy-sequence file-action-list))
 	(case-fold-search t)
 	rule action)
 (and
-(or no-ignore
+(unless no-ignore
-	 (and (not
+(and (not
-	       (and gnus-uu-ignore-files-by-name
+	     (and gnus-uu-ignore-files-by-name
-		    (string-match gnus-uu-ignore-files-by-name file-name)))
+		  (string-match gnus-uu-ignore-files-by-name file-name)))
-	      (not
+	    (not
-	       (and gnus-uu-ignore-files-by-type
+	     (and gnus-uu-ignore-files-by-type
-		    (string-match gnus-uu-ignore-files-by-type
+		  (string-match gnus-uu-ignore-files-by-type
-				  (or (gnus-uu-choose-action
+				(or (gnus-uu-choose-action
-				       file-name gnus-uu-ext-to-mime-list t)
+				     file-name gnus-uu-ext-to-mime-list t)
-				      ""))))))
+				    ""))))))
 (while (not (or (eq action-list ()) action))
 (setq rule (car action-list))
 (setq action-list (cdr action-list))
-(if (string-match (car rule) file-name)
+(when (string-match (car rule) file-name)
-	   (setq action (cadr rule)))))
+	 (setq action (cadr rule)))))
 action))
 (defun gnus-uu-treat-archive (file-path)
-;; Unpacks an archive. Returns t if unpacking is successful.
+;; Unpacks an archive.  Returns t if unpacking is successful.
 (let ((did-unpack t)
 	action command dir)
 (setq action (gnus-uu-choose-action
 		  file-path (append gnus-uu-user-archive-rules
 				    (if gnus-uu-ignore-default-archive-rules
 					nil
 				      gnus-uu-default-archive-rules))))
-(if (not action) (error "No unpackers for the file %s" file-path))
+(when (not action)
+(error "No unpackers for the file %s" file-path))
 (string-match "/[^/]*$" file-path)
 (setq dir (substring file-path 0 (match-beginning 0)))
-(if (member action gnus-uu-destructive-archivers)
+(when (member action gnus-uu-destructive-archivers)
-	(copy-file file-path (concat file-path "~") t))
+(copy-file file-path (concat file-path "~") t))
 (setq command (format "cd %s ; %s" dir (gnus-uu-command action file-path)))
 (save-excursion
 (set-buffer (get-buffer-create gnus-uu-output-buffer-name))
 			   nil shell-command-switch command))
 	(message "")
 (gnus-message 2 "Error during unpacking of archive")
 (setq did-unpack nil))
-(if (member action gnus-uu-destructive-archivers)
+(when (member action gnus-uu-destructive-archivers)
-	(rename-file (concat file-path "~") file-path t))
+(rename-file (concat file-path "~") file-path t))
 did-unpack))
 (defun gnus-uu-dir-files (dir)
 (let ((dirs (directory-files dir t "[^/][^\\.][^\\.]?$"))
 	files file)
 (while dirs
 (if (file-directory-p (setq file (car dirs)))
 	  (setq files (append files (gnus-uu-dir-files file)))
-	(setq files (cons file files)))
+	(push file files))
 (setq dirs (cdr dirs)))
 files))
 (defun gnus-uu-unpack-files (files &optional ignore)
 ;; Go through FILES and look for files to unpack.
 (let* ((totfiles (gnus-uu-ls-r gnus-uu-work-dir))
 	 (ofiles files)
 	 file did-unpack)
 (while files
 (setq file (cdr (assq 'name (car files))))
-(if (and (not (member file ignore))
+(when (and (not (member file ignore))
-	       (equal (gnus-uu-get-action (file-name-nondirectory file))
+		 (equal (gnus-uu-get-action (file-name-nondirectory file))
-		      "gnus-uu-archive"))
+			"gnus-uu-archive"))
-	  (progn
+	(push file did-unpack)
-	    (setq did-unpack (cons file did-unpack))
+	(unless (gnus-uu-treat-archive file)
-	    (or (gnus-uu-treat-archive file)
+	  (gnus-message 2 "Error during unpacking of %s" file))
-		(gnus-message 2 "Error during unpacking of %s" file))
+	(let* ((newfiles (gnus-uu-ls-r gnus-uu-work-dir))
-	    (let* ((newfiles (gnus-uu-ls-r gnus-uu-work-dir))
+	       (nfiles newfiles))
-		   (nfiles newfiles))
+	  (while nfiles
-	      (while nfiles
+	    (unless (member (car nfiles) totfiles)
-		(or (member (car nfiles) totfiles)
+	      (push (list (cons 'name (car nfiles))
-		    (setq ofiles (cons (list (cons 'name (car nfiles))
+			  (cons 'original file))
-					     (cons 'original file))
+		    ofiles))
-				       ofiles)))
+	    (setq nfiles (cdr nfiles)))
-		(setq nfiles (cdr nfiles)))
+	  (setq totfiles newfiles)))
-	      (setq totfiles newfiles))))
 (setq files (cdr files)))
 (if did-unpack
 	(gnus-uu-unpack-files ofiles (append did-unpack ignore))
 ofiles)))
 (defun gnus-uu-ls-r (dir)
 (let* ((files (gnus-uu-directory-files dir t))
 	 (ofiles files))
 (while files
-(if (file-directory-p (car files))
+(when (file-directory-p (car files))
-	  (progn
+	(setq ofiles (delete (car files) ofiles))
-	    (setq ofiles (delete (car files) ofiles))
+	(setq ofiles (append ofiles (gnus-uu-ls-r (car files)))))
-	    (setq ofiles (append ofiles (gnus-uu-ls-r (car files))))))
 (setq files (cdr files)))
 ofiles))
 ;; Various stuff
 (let (files out file)
 (setq files (directory-files dir full))
 (while files
 (setq file (car files))
 (setq files (cdr files))
-(or (member (file-name-nondirectory file) '("." ".."))
+(unless (member (file-name-nondirectory file) '("." ".."))
-	  (setq out (cons file out))))
+	(push file out)))
 (setq out (nreverse out))
 out))
 (defun gnus-uu-check-correct-stripped-uucode (start end)
 (save-excursion
 	(if (re-search-forward " \\|`" end t)
 	    (progn
 	      (goto-char start)
 	      (while (not (eobp))
 		(progn
-		  (if (looking-at "\n") (replace-match ""))
+		  (when (looking-at "\n")
+		    (replace-match ""))
 		  (forward-line 1))))
 	  (while (not (eobp))
 	    (if (looking-at (concat gnus-uu-begin-string "\\|"
 				    gnus-uu-end-string))
 		()
-	      (if (not found)
+	      (when (not found)
-		  (progn
+		(beginning-of-line)
-		    (beginning-of-line)
+		(setq beg (point))
-		    (setq beg (point))
+		(end-of-line)
-		    (end-of-line)
+		(setq length (- (point) beg)))
-		    (setq length (- (point) beg))))
 	      (setq found t)
 	      (beginning-of-line)
 	      (setq beg (point))
 	      (end-of-line)
-	      (if (not (= length (- (point) beg)))
+	      (when (not (= length (- (point) beg)))
-		  (insert (make-string (- length (- (point) beg)) ? ))))
+		(insert (make-string (- length (- (point) beg)) ? ))))
 	    (forward-line 1)))))))
 (defvar gnus-uu-tmp-alist nil)
 (defun gnus-uu-initialize (&optional scan)
 (let (entry)
 (if (and (not scan)
-	     (if (setq entry (assoc gnus-newsgroup-name gnus-uu-tmp-alist))
+	     (when (setq entry (assoc gnus-newsgroup-name gnus-uu-tmp-alist))
-		 (if (file-exists-p (cdr entry))
+	       (if (file-exists-p (cdr entry))
-		     (setq gnus-uu-work-dir (cdr entry))
+		   (setq gnus-uu-work-dir (cdr entry))
-		   (setq gnus-uu-tmp-alist (delq entry gnus-uu-tmp-alist))
+		 (setq gnus-uu-tmp-alist (delq entry gnus-uu-tmp-alist))
-		   nil)))
+		 nil)))
 	t
 (setq gnus-uu-tmp-dir (file-name-as-directory
 			     (expand-file-name gnus-uu-tmp-dir)))
 (if (not (file-directory-p gnus-uu-tmp-dir))
 	  (error "Temp directory %s doesn't exist" gnus-uu-tmp-dir)
-	(if (not (file-writable-p gnus-uu-tmp-dir))
+	(when (not (file-writable-p gnus-uu-tmp-dir))
-	    (error "Temp directory %s can't be written to"
+	  (error "Temp directory %s can't be written to"
-		   gnus-uu-tmp-dir)))
+		 gnus-uu-tmp-dir)))
 (setq gnus-uu-work-dir
 	    (make-temp-name (concat gnus-uu-tmp-dir "gnus")))
-(if (not (file-directory-p gnus-uu-work-dir))
+(gnus-make-directory gnus-uu-work-dir)
-	  (gnus-make-directory gnus-uu-work-dir))
 (set-file-modes gnus-uu-work-dir 448)
 (setq gnus-uu-work-dir (file-name-as-directory gnus-uu-work-dir))
-(setq gnus-uu-tmp-alist (cons (cons gnus-newsgroup-name gnus-uu-work-dir)
+(push (cons gnus-newsgroup-name gnus-uu-work-dir)
-				    gnus-uu-tmp-alist)))))
+	    gnus-uu-tmp-alist))))
 ;; Kills the temporary uu buffers, kills any processes, etc.
 (defun gnus-uu-clean-up ()
 (let (buf)
 (and gnus-uu-uudecode-process
 	 (memq (process-status (or gnus-uu-uudecode-process "nevair"))
 	       '(stop run))
 	 (delete-process gnus-uu-uudecode-process))
-(and (setq buf (get-buffer gnus-uu-output-buffer-name))
+(when (setq buf (get-buffer gnus-uu-output-buffer-name))
-	 (kill-buffer buf))))
+(kill-buffer buf))))
-;; Inputs an action and a file and returns a full command, putting
+(defun gnus-quote-arg-for-sh-or-csh (arg)
-;; quotes round the file name and escaping any quotes in the file name.
+(let ((pos 0) new-pos accum)
+;; *** bug: we don't handle newline characters properly
+(while (setq new-pos (string-match "[!`\"$\\& \t]" arg pos))
+(push (substring arg pos new-pos) accum)
+(push "\\" accum)
+(push (list (aref arg new-pos)) accum)
+(setq pos (1+ new-pos)))
+(if (= pos 0)
+arg
+(apply 'concat (nconc (nreverse accum) (list (substring arg pos)))))))
+;; Inputs an action and a filename and returns a full command, making sure
+;; that the filename will be treated as a single argument when the shell
+;; executes the command.
 (defun gnus-uu-command (action file)
-(let ((ofile ""))
+(let ((quoted-file (gnus-quote-arg-for-sh-or-csh file)))
-(while (string-match "!\\|`\\|\"\\|\\$\\|\\\\\\|&" file)
-(progn
-	(setq ofile
-	      (concat ofile (substring file 0 (match-beginning 0)) "\\"
-		      (substring file (match-beginning 0) (match-end 0))))
-	(setq file (substring file (1+ (match-beginning 0))))))
-(setq ofile (concat "\"" ofile file "\""))
 (if (string-match "%s" action)
-	(format action ofile)
+	(format action quoted-file)
-(concat action " " ofile))))
+(concat action " " quoted-file))))
 (defun gnus-uu-delete-work-dir (&optional dir)
 "Delete recursively all files and directories under `gnus-uu-work-dir'."
 (if dir
 (gnus-message 7 "Deleting directory %s..." dir)
 ;;;
 ;;; uuencoded posting
 ;;;
 ;; Any function that is to be used as and encoding method will take two
-;; parameters: PATH-NAME and FILE-NAME. (E.g. "/home/gaga/spiral.jpg"
+;; parameters: PATH-NAME and FILE-NAME.  (E.g. "/home/gaga/spiral.jpg"
 ;; and "spiral.jpg", respectively.) The function should return nil if
 ;; the encoding wasn't successful.
-(defvar gnus-uu-post-encode-method 'gnus-uu-post-encode-uuencode
+(defcustom gnus-uu-post-encode-method 'gnus-uu-post-encode-uuencode
 "Function used for encoding binary files.
 There are three functions supplied with gnus-uu for encoding files:
 `gnus-uu-post-encode-uuencode', which does straight uuencoding;
 `gnus-uu-post-encode-mime', which encodes with base64 and adds MIME
 headers; and `gnus-uu-post-encode-mime-uuencode', which encodes with
-uuencode and adds MIME headers.")
+uuencode and adds MIME headers."
+:group 'gnus-extract-post
-(defvar gnus-uu-post-include-before-composing nil
+:type '(radio (function-item gnus-uu-post-encode-uuencode)
+		(function-item gnus-uu-post-encode-mime)
+		(function-item gnus-uu-post-encode-mime-uuencode)
+		(function :tag "Other")))
+(defcustom gnus-uu-post-include-before-composing nil
 "Non-nil means that gnus-uu will ask for a file to encode before you compose the article.
 If this variable is t, you can either include an encoded file with
-\\[gnus-uu-post-insert-binary-in-article] or have one included for you when you post the article.")
+\\[gnus-uu-post-insert-binary-in-article] or have one included for you when you post the article."
+:group 'gnus-extract-post
-(defvar gnus-uu-post-length 990
+:type 'boolean)
+(defcustom gnus-uu-post-length 990
 "Maximum length of an article.
 The encoded file will be split into how many articles it takes to
-post the entire file.")
+post the entire file."
+:group 'gnus-extract-post
-(defvar gnus-uu-post-threaded nil
+:type 'integer)
+(defcustom gnus-uu-post-threaded nil
 "Non-nil means that gnus-uu will post the encoded file in a thread.
 This may not be smart, as no other decoder I have seen are able to
-follow threads when collecting uuencoded articles. (Well, I have seen
+follow threads when collecting uuencoded articles.  (Well, I have seen
 one package that does that - gnus-uu, but somehow, I don't think that
-counts...) Default is nil.")
+counts...) Default is nil."
+:group 'gnus-extract-post
-(defvar gnus-uu-post-separate-description t
+:type 'boolean)
+(defcustom gnus-uu-post-separate-description t
 "Non-nil means that the description will be posted in a separate article.
-The first article will typically be numbered (0/x). If this variable
+The first article will typically be numbered (0/x).  If this variable
 is nil, the description the user enters will be included at the
-beginning of the first article, which will be numbered (1/x). Default
+beginning of the first article, which will be numbered (1/x).  Default
-is t.")
+is t."
+:group 'gnus-extract-post
+:type 'boolean)
 (defvar gnus-uu-post-binary-separator "--binary follows this line--")
 (defvar gnus-uu-post-message-id nil)
 (defvar gnus-uu-post-inserted-file-name nil)
 (defvar gnus-uu-winconf-post-news nil)
 (local-set-key "\C-c\C-c" 'gnus-summary-edit-article-done)
 (local-set-key "\C-c\C-c" 'gnus-uu-post-news-inews)
 (local-set-key "\C-c\C-s" 'gnus-uu-post-news-inews)
 (local-set-key "\C-c\C-i" 'gnus-uu-post-insert-binary-in-article)
-(if gnus-uu-post-include-before-composing
+(when gnus-uu-post-include-before-composing
 (save-excursion (setq gnus-uu-post-inserted-file-name
-			    (gnus-uu-post-insert-binary)))))
+			  (gnus-uu-post-insert-binary)))))
 (defun gnus-uu-post-insert-binary-in-article ()
 "Inserts an encoded file in the buffer.
 The user will be asked for a file name."
 (interactive)
 (save-excursion
 (setq gnus-uu-post-inserted-file-name (gnus-uu-post-insert-binary))))
 ;; Encodes with uuencode and substitutes all spaces with backticks.
 (defun gnus-uu-post-encode-uuencode (path file-name)
-(if (gnus-uu-post-encode-file "uuencode" path file-name)
+(when (gnus-uu-post-encode-file "uuencode" path file-name)
-(progn
+(goto-char (point-min))
-	(goto-char (point-min))
+(forward-line 1)
-	(forward-line 1)
+(while (re-search-forward " " nil t)
-	(while (re-search-forward " " nil t)
+(replace-match "`"))
-	  (replace-match "`"))
+t))
-	t)))
 ;; Encodes with uuencode and adds MIME headers.
 (defun gnus-uu-post-encode-mime-uuencode (path file-name)
-(if (gnus-uu-post-encode-uuencode path file-name)
+(when (gnus-uu-post-encode-uuencode path file-name)
-(progn
+(gnus-uu-post-make-mime file-name "x-uue")
-	(gnus-uu-post-make-mime file-name "x-uue")
+t))
-	t)))
 ;; Encodes with base64 and adds MIME headers
 (defun gnus-uu-post-encode-mime (path file-name)
-(if (gnus-uu-post-encode-file "mmencode" path file-name)
+(when (gnus-uu-post-encode-file "mmencode" path file-name)
-(progn
+(gnus-uu-post-make-mime file-name "base64")
-	(gnus-uu-post-make-mime file-name "base64")
+t))
-	t)))
 ;; Adds MIME headers.
 (defun gnus-uu-post-make-mime (file-name encoding)
 (goto-char (point-min))
 (insert (format "Content-Type: %s; name=\"%s\"\n"
 		  (gnus-uu-choose-action file-name gnus-uu-ext-to-mime-list)
 		  file-name))
 (insert (format "Content-Transfer-Encoding: %s\n\n" encoding))
 (save-restriction
 (set-buffer gnus-message-buffer)
 (goto-char (point-min))
 (re-search-forward (concat "^" (regexp-quote mail-header-separator) "$"))
 (forward-line -1)
 (narrow-to-region 1 (point))
-(or (mail-fetch-field "mime-version")
+(unless (mail-fetch-field "mime-version")
-	(progn
+(widen)
-	  (widen)
+(insert "MIME-Version: 1.0\n"))
-	  (insert "MIME-Version: 1.0\n")))
 (widen)))
 ;; Encodes a file PATH with COMMAND, leaving the result in the
 ;; current buffer.
 (defun gnus-uu-post-encode-file (command path file-name)
 	      gnus-inews-article-hook)
 	  (setq gnus-inews-article-hook (if (listp gnus-inews-article-hook)
 					    gnus-inews-article-hook
 					  (list gnus-inews-article-hook)))
-	  (setq gnus-inews-article-hook
+	  (push
-		(cons
+	   '(lambda ()
-		 '(lambda ()
+	      (save-excursion
-		    (save-excursion
+		(goto-char (point-min))
-		      (goto-char (point-min))
+		(if (re-search-forward "^Message-ID: \\(.*\\)$" nil t)
-		      (if (re-search-forward "^Message-ID: \\(.*\\)$" nil t)
+		    (setq gnus-uu-post-message-id
-			  (setq gnus-uu-post-message-id
+			  (buffer-substring
-				(buffer-substring
+			   (match-beginning 1) (match-end 1)))
-				 (match-beginning 1) (match-end 1)))
+		  (setq gnus-uu-post-message-id nil))))
-			(setq gnus-uu-post-message-id nil))))
+	   gnus-inews-article-hook)
-		 gnus-inews-article-hook))
 	  (gnus-uu-post-encoded file-name t))
 (gnus-uu-post-encoded file-name nil)))
 (setq gnus-uu-post-inserted-file-name nil)
-(and gnus-uu-winconf-post-news
+(when gnus-uu-winconf-post-news
 (set-window-configuration gnus-uu-winconf-post-news)))
 ;; Asks for a file to encode, encodes it and inserts the result in
-;; the current buffer. Returns the file name the user gave.
+;; the current buffer.  Returns the file name the user gave.
 (defun gnus-uu-post-insert-binary ()
 (let ((uuencode-buffer-name "*uuencode buffer*")
 	file-path uubuf file-name)
 (setq file-path (read-file-name
 		     "What file do you want to encode? "))
-(if (not (file-exists-p file-path))
+(when (not (file-exists-p file-path))
-	(error "%s: No such file" file-path))
+(error "%s: No such file" file-path))
 (goto-char (point-max))
 (insert (format "\n%s\n" gnus-uu-post-binary-separator))
-(if (string-match "^~/" file-path)
+(when (string-match "^~/" file-path)
-	(setq file-path (concat "$HOME" (substring file-path 1))))
+(setq file-path (concat "$HOME" (substring file-path 1))))
 (if (string-match "/[^/]*$" file-path)
 	(setq file-name (substring file-path (1+ (match-beginning 0))))
 (setq file-name file-path))
 (unwind-protect
 	beg-line minlen buf post-buf whole-len beg-binary end-binary)
 (setq post-buf (current-buffer))
 (goto-char (point-min))
-(if (not (re-search-forward
+(when (not (re-search-forward
-	      (if gnus-uu-post-separate-description
+		(if gnus-uu-post-separate-description
-		  (concat "^" (regexp-quote gnus-uu-post-binary-separator)
+		    (concat "^" (regexp-quote gnus-uu-post-binary-separator)
-			  "$")
+			    "$")
-		(concat "^" (regexp-quote mail-header-separator) "$")) nil t))
+		  (concat "^" (regexp-quote mail-header-separator) "$"))
-	(error "Internal error: No binary/header separator"))
+		nil t))
+(error "Internal error: No binary/header separator"))
 (beginning-of-line)
 (forward-line 1)
 (setq beg-binary (point))
 (setq end-binary (point-max))
 (erase-buffer)
 (insert-buffer-substring post-buf beg-binary end-binary)
 (goto-char (point-min))
 (setq length (count-lines 1 (point-max)))
 (setq parts (/ length gnus-uu-post-length))
-(if (not (< (% length gnus-uu-post-length) 4))
+(when (not (< (% length gnus-uu-post-length) 4))
-	  (setq parts (1+ parts))))
+	(setq parts (1+ parts))))
-(if gnus-uu-post-separate-description
+(when gnus-uu-post-separate-description
-	(forward-line -1))
+(forward-line -1))
 (kill-region (point) (point-max))
 (goto-char (point-min))
 (re-search-forward
 (concat "^" (regexp-quote mail-header-separator) "$") nil t)
 (setq header (buffer-substring 1 (point)))
 (goto-char (point-min))
 (if (not gnus-uu-post-separate-description)
 	()
-(if (and (not threaded) (re-search-forward "^Subject: " nil t))
+(when (and (not threaded) (re-search-forward "^Subject: " nil t))
-	  (progn
+	(end-of-line)
-	    (end-of-line)
+	(insert (format " (0/%d)" parts)))
-	    (insert (format " (0/%d)" parts))))
 (message-send))
 (save-excursion
 (setq i 1)
 (setq beg 1)
 (while (not (> i parts))
 	(set-buffer (get-buffer-create send-buffer-name))
 	(erase-buffer)
 	(insert header)
-	(if (and threaded gnus-uu-post-message-id)
+	(when (and threaded gnus-uu-post-message-id)
-	    (insert (format "References: %s\n" gnus-uu-post-message-id)))
+	  (insert (format "References: %s\n" gnus-uu-post-message-id)))
 	(insert separator)
 	(setq whole-len
 	      (- 62 (length (format top-string "" file-name i parts ""))))
-	(if (> 1 (setq minlen (/ whole-len 2)))
+	(when (> 1 (setq minlen (/ whole-len 2)))
-	    (setq minlen 1))
+	  (setq minlen 1))
 	(setq
 	 beg-line
 	 (format top-string
 		 (make-string minlen ?-)
 		 file-name i parts
 		 (make-string
 		  (if (= 0 (% whole-len 2)) (1- minlen) minlen) ?-)))
 	(goto-char (point-min))
 	    ()
 	  (if (not threaded)
 	      (progn
 		(end-of-line)
 		(insert (format " (%d/%d)" i parts)))
-	    (if (or (and (= i 2) gnus-uu-post-separate-description)
+	    (when (or (and (= i 2) gnus-uu-post-separate-description)
-		    (and (= i 1) (not gnus-uu-post-separate-description)))
+		      (and (= i 1) (not gnus-uu-post-separate-description)))
-		(replace-match "Subject: Re: "))))
+	      (replace-match "Subject: Re: "))))
 	(goto-char (point-max))
 	(save-excursion
 	  (set-buffer uubuf)
 	  (goto-char beg)
 	  (if (= i parts)
 	      (goto-char (point-max))
 	    (forward-line gnus-uu-post-length))
-	  (if (and (= (1+ i) parts) (< (count-lines (point) (point-max)) 4))
+	  (when (and (= (1+ i) parts) (< (count-lines (point) (point-max)) 4))
-	      (forward-line -4))
+	    (forward-line -4))
 	  (setq end (point)))
 	(insert-buffer-substring uubuf beg end)
 	(insert beg-line)
 	(insert "\n")
 	(setq beg end)
 	(goto-char (point-min))
 	(re-search-forward
 	 (concat "^" (regexp-quote mail-header-separator) "$") nil t)
 	(beginning-of-line)
 	(forward-line 2)
-	(if (re-search-forward
+	(when (re-search-forward
-	     (concat "^" (regexp-quote gnus-uu-post-binary-separator) "$")
+	       (concat "^" (regexp-quote gnus-uu-post-binary-separator) "$")
-	     nil t)
+	       nil t)
-	    (progn
+	  (replace-match "")
-	      (replace-match "")
+	  (forward-line 1))
-	      (forward-line 1)))
 	(insert beg-line)
 	(insert "\n")
 	(let (message-sent-message-via)
 	  (message-send))))
-(and (setq buf (get-buffer send-buffer-name))
+(when (setq buf (get-buffer send-buffer-name))
-	 (kill-buffer buf))
+(kill-buffer buf))
-(and (setq buf (get-buffer encoded-buffer-name))
+(when (setq buf (get-buffer encoded-buffer-name))
-	 (kill-buffer buf))
+(kill-buffer buf))
-(if (not gnus-uu-post-separate-description)
+(when (not gnus-uu-post-separate-description)
-	(progn
+(set-buffer-modified-p nil)
-	  (set-buffer-modified-p nil)
+(when (fboundp 'bury-buffer)
-	  (and (fboundp 'bury-buffer) (bury-buffer))))))
+	(bury-buffer)))))
 (provide 'gnus-uu)
 ;; gnus-uu.el ends here

Mercurial > hg > xemacs-beta

comparison lisp/gnus/gnus-uu.el @ 16:0293115a14e9 r19-15b91