From 690c22f8ce022abe6423e16fa1af6df10601582a Mon Sep 17 00:00:00 2001
From: Chris Hanson <org/chris-hanson/cph>
Date: Thu, 27 Jan 2000 15:38:52 +0000
Subject: [PATCH] Fix two bugs: (1) Change M-x rmail-get-new-mail to prompt for
 a file argument rather than a string argument.  (2) M-x rmail-output was
 writing malformed unix messages -- the date in the header line is supposed to
 be in unix `ctime' format, not RFC-822 format.

---
 v7/src/edwin/rmail.scm | 25 ++++++++++++++++++++++---
 1 file changed, 22 insertions(+), 3 deletions(-)

diff --git a/v7/src/edwin/rmail.scm b/v7/src/edwin/rmail.scm
index 676e1e1ef..a428b2953 100644
--- a/v7/src/edwin/rmail.scm
+++ b/v7/src/edwin/rmail.scm
@@ -1,6 +1,6 @@
 ;;; -*-Scheme-*-
 ;;;
-;;; $Id: rmail.scm,v 1.65 2000/01/01 17:05:37 cph Exp $
+;;; $Id: rmail.scm,v 1.66 2000/01/27 15:38:52 cph Exp $
 ;;;
 ;;; Copyright (c) 1991-2000 Massachusetts Institute of Technology
 ;;;
@@ -380,7 +380,7 @@ Interactively, a prefix argument causes us to read a file name
 and use that file as the inbox."
   (lambda ()
     (list (and (command-argument)
-	       (prompt-for-string "Get new mail from file" #f))))
+	       (prompt-for-existing-file "Get new mail from file" #f))))
   (lambda (filename)
     (let ((buffer (current-buffer)))
       (rmail-find-file-revert buffer)
@@ -1576,7 +1576,7 @@ buffer visiting that file."
 	       (fetch-first-field "from" start (header-end start end)))
 	      "unknown")
 	  " "
-	  (universal-time->string (get-universal-time))
+	  (universal-time->unix-ctime (get-universal-time))
 	  "\n")
 	 start)))
     (define-variable-local-value! buffer
@@ -1601,6 +1601,25 @@ buffer visiting that file."
        (let ((addresses (rfc822-strip-quoted-names field)))
 	 (and (not (null? addresses))
 	      (car addresses)))))
+
+(define (universal-time->unix-ctime time)
+  (decoded-time->unix-ctime (universal-time->local-decoded-time time)))
+
+(define (decoded-time->unix-ctime dt)
+  (string-append
+   (day-of-week/short-string (decoded-time/day-of-week dt))
+   " "
+   (month/short-string (decoded-time/month dt))
+   " "
+   (string-pad-left (number->string (decoded-time/day dt)) 2)
+   " "
+   (string-pad-left (number->string (decoded-time/hour dt)) 2 #\0)
+   ":"
+   (string-pad-left (number->string (decoded-time/minute dt)) 2 #\0)
+   ":"
+   (string-pad-left (number->string (decoded-time/second dt)) 2 #\0)
+   " "
+   (number->string (decoded-time/year dt))))
 
 ;;;; Editing
 
-- 
2.25.1