tm 7.80.

[elisp/tm.git] / tm-file.el

diff --git a/tm-file.el b/tm-file.el
index 6eae652..105f62b 100644 (file)
--- a/tm-file.el
+++ b/tm-file.el
@@ -2,42 +2,75 @@
 ;;; tm-file.el --- tm-view internal method for file extraction
 ;;;
 ;;; Copyright (C) 1995 Free Software Foundation, Inc.
-;;; Copyright (C) 1995 MORIOKA Tomohiko
+;;; Copyright (C) 1995,1996 MORIOKA Tomohiko
 ;;;
 ;;; Author: MORIOKA Tomohiko <morioka@jaist.ac.jp>
+;;; modified by KOBAYASHI Shuhei <shuhei-k@jaist.ac.jp>
+;;; Maintainer: KOBAYASHI Shuhei <shuhei-k@jaist.ac.jp>
 ;;; Version:
-;;;    $Id: tm-file.el,v 2.0 1995/11/06 16:05:29 morioka Exp $
+;;;    $Id: tm-file.el,v 7.6 1996/05/27 07:58:21 morioka Exp $
 ;;; Keywords: mail, news, MIME, multimedia
 ;;;
 ;;; This file is part of tm (Tools for MIME).
 ;;;
+;;; This program is free software; you can redistribute it and/or
+;;; modify it under the terms of the GNU General Public License as
+;;; published by the Free Software Foundation; either version 2, or
+;;; (at your option) any later version.
+;;;
+;;; This program is distributed in the hope that it will be useful,
+;;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+;;; General Public License for more details.
+;;;
+;;; You should have received a copy of the GNU General Public License
+;;; along with This program.  If not, write to the Free Software
+;;; Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+;;;
+;;; Code:
 
 (require 'tm-view)
 
 (defun mime-article/extract-file (beg end cal)
-  (let* ((name (or (cdr (assoc "name" cal))
-                  (cdr (assoc "x-name" cal))
-                  (make-temp-name "tm")))
+  (goto-char beg)
+  (let* ((name
+         (save-restriction
+           (narrow-to-region beg end)
+           (mime-article/get-filename cal)
+           ))
         (encoding (cdr (assq 'encoding cal)))
-        (dir (call-interactively
-              (function
-               (lambda (dir)
-                 (interactive "Ddirictory: ")
-                 dir))))
-        (file-coding-system *noconv*)
-        (filename (expand-file-name name dir))
+        (filename
+          (if (and name (not (string-equal name "")))
+             (expand-file-name name
+                               (call-interactively
+                                (function
+                                 (lambda (dir)
+                                   (interactive "DDirectory: ")
+                                   dir))))
+           (call-interactively
+            (function
+             (lambda (file)
+               (interactive "FFilename: ")
+               (expand-file-name file))))))
         (the-buf (current-buffer))
-        (tmp-buf (generate-new-buffer name))
+        (tmp-buf (generate-new-buffer (file-name-nondirectory filename)))
         )
-    (goto-char beg)
+    (if (file-exists-p filename)
+        (or (yes-or-no-p (format "File %s exists. Save anyway? " filename))
+            (error "")))
     (re-search-forward "\n\n")
     (append-to-buffer tmp-buf (match-end 0) end)
     (save-excursion
       (set-buffer tmp-buf)
-      (mime/decode-region encoding (point-min)(point-max))
-      (let ((file-coding-system *noconv*)
-           jka-compr-compression-info-list
-           jam-zcat-filename-list)
+      (mime-decode-region (point-min)(point-max) encoding)
+      (let ((mc-flag nil)                   ; for Mule
+           (file-coding-system
+            (if (featurep 'mule) *noconv*))
+           kanji-flag                      ; for NEmacs
+           (emx-binary-mode t)             ; for OS/2
+           jka-compr-compression-info-list ; for jka-compr
+           jam-zcat-filename-list          ; for jam-zcat
+           require-final-newline)
        (write-file filename)
        )
       (kill-buffer tmp-buf)
@@ -62,3 +95,5 @@
 ;;;
 
 (provide 'tm-file)
+
+;;; end of tm-file.el