From: Chris Hanson <org/chris-hanson/cph>
Date: Thu, 14 Jan 1999 18:37:50 +0000 (+0000)
Subject: Use new BLOWFISH-FILE? predicate to test .bf files to see if they are
X-Git-Tag: 20090517-FFI~4690
X-Git-Url: https://birchwood-abbey.net/git?a=commitdiff_plain;h=eba1565c8d73d16fd66a730f1386a4741c7e3380;p=mit-scheme.git

Use new BLOWFISH-FILE? predicate to test .bf files to see if they are
encoded.
---

diff --git a/v7/src/edwin/dosfile.scm b/v7/src/edwin/dosfile.scm
index 61b86f5a0..8c9d2789a 100644
--- a/v7/src/edwin/dosfile.scm
+++ b/v7/src/edwin/dosfile.scm
@@ -1,6 +1,6 @@
 ;;; -*-Scheme-*-
 ;;;
-;;; $Id: dosfile.scm,v 1.23 1999/01/14 18:25:09 cph Exp $
+;;; $Id: dosfile.scm,v 1.24 1999/01/14 18:37:44 cph Exp $
 ;;;
 ;;; Copyright (c) 1994-1999 Massachusetts Institute of Technology
 ;;;
@@ -674,7 +674,8 @@ filename suffixes \".bf\" and \".ky\"."
 (define (read/write-encrypted-file? group pathname)
   (and (ref-variable enable-encrypted-files group)
        (or (and (equal? "bf" (pathname-type pathname))
-		(blowfish-available?))
+		(blowfish-available?)
+		(blowfish-file? pathname))
 	   (equal? "ky" (pathname-type pathname)))))
 
 (define (read-encrypted-file pathname mark)
diff --git a/v7/src/edwin/unix.scm b/v7/src/edwin/unix.scm
index 6f1aa930e..00e593fc5 100644
--- a/v7/src/edwin/unix.scm
+++ b/v7/src/edwin/unix.scm
@@ -1,6 +1,6 @@
 ;;; -*-Scheme-*-
 ;;;
-;;; $Id: unix.scm,v 1.89 1999/01/14 18:25:03 cph Exp $
+;;; $Id: unix.scm,v 1.90 1999/01/14 18:37:50 cph Exp $
 ;;;
 ;;; Copyright (c) 1989-1999 Massachusetts Institute of Technology
 ;;;
@@ -452,7 +452,8 @@ filename suffixes \".bf\" and \".ky\"."
        (let ((type (pathname-type pathname)))
 	 (and (member type unix/encrypted-file-suffixes)
 	      (if (equal? "bf" type)
-		  (blowfish-available?)
+		  (and (blowfish-available?)
+		       (blowfish-file? pathname))
 		  #t)))))
 
 (define unix/encrypted-file-suffixes