From 103b4614de6994b6fd6e4720acaa6c74ed393a62 Mon Sep 17 00:00:00 2001
From: Chris Hanson <org/chris-hanson/cph>
Date: Thu, 12 Oct 1995 22:54:47 +0000
Subject: [PATCH] Change so that RMAIL converts the POP password FILE pathname
 to an absolute namestring, so that the OS-specific code doesn't have to do
 this.

---
 v7/src/edwin/rmail.scm | 11 ++++++++---
 v7/src/edwin/unix.scm  |  5 ++---
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/v7/src/edwin/rmail.scm b/v7/src/edwin/rmail.scm
index b568aef82..8c4d71702 100644
--- a/v7/src/edwin/rmail.scm
+++ b/v7/src/edwin/rmail.scm
@@ -1,6 +1,6 @@
 ;;; -*-Scheme-*-
 ;;;
-;;;	$Id: rmail.scm,v 1.44 1995/10/12 22:44:27 cph Exp $
+;;;	$Id: rmail.scm,v 1.45 1995/10/12 22:54:32 cph Exp $
 ;;;
 ;;;	Copyright (c) 1991-95 Massachusetts Institute of Technology
 ;;;
@@ -643,8 +643,7 @@ This variable is ignored if rmail-pop-procedure is #F."
     (if entry
 	(let ((user-name (cadr entry))
 	      (password (caddr entry)))
-	  (cond ((or (string? password)
-		     (and (pair? password) (eq? 'FILE (car password))))
+	  (cond ((string? password)
 		 (values user-name password #f))
 		((eq? 'PROMPT-ONCE password)
 		 (let ((password
@@ -656,6 +655,12 @@ This variable is ignored if rmail-pop-procedure is #F."
 			       #t))))
 		((eq? 'PROMPT-ALWAYS password)
 		 (values user-name (prompt-for-pop-server-password server) #f))
+		((and (pair? password) (eq? 'FILE (car password)))
+		 (values user-name
+			 (list 'FILE
+			       (->namestring
+				(merge-pathnames (cadr password)
+						 (user-homedir-pathname))))))
 		(else
 		 (error "Illegal password value in rmail-pop-accounts entry:"
 			password))))
diff --git a/v7/src/edwin/unix.scm b/v7/src/edwin/unix.scm
index f484db30f..f4f1a7dc3 100644
--- a/v7/src/edwin/unix.scm
+++ b/v7/src/edwin/unix.scm
@@ -1,6 +1,6 @@
 ;;; -*-Scheme-*-
 ;;;
-;;;	$Id: unix.scm,v 1.58 1995/10/12 22:45:41 cph Exp $
+;;;	$Id: unix.scm,v 1.59 1995/10/12 22:54:47 cph Exp $
 ;;;
 ;;;	Copyright (c) 1989-95 Massachusetts Institute of Technology
 ;;;
@@ -730,8 +730,7 @@ option, instead taking -P <filename>."
 		    (newline port)))
 		(receiver (list "-P" filename)))))
 	    ((and (pair? password) (eq? 'FILE (car password)))
-	     (receiver
-	      (list "-P" (->namestring (merge-pathnames (cadr password))))))
+	     (receiver (list "-P" (cadr password))))
 	    (else
 	     (error "Illegal password:" password)))
       (cond ((string? password)
-- 
2.25.1