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.

diff --git a/v7/src/edwin/rmail.scm b/v7/src/edwin/rmail.scm
index b568aef82e1435b3cbb6997b671c4ed226882ff4..8c4d7170296633ae863169e7a1a7fb927ac1c61b 100644 (file)
--- 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 f484db30f0542666a1568190aa400b0b62cdf970..f4f1a7dc3e47e10186b0e7801cf3a14ebfdde49d 100644 (file)
--- 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)