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 61b86f5a019b0673ac53f19ab66fcc6b8be21957..8c9d2789ad2d083f468f62c369a5735b4ad2b26c 100644 (file)
--- 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 6f1aa930e153071ac150827f02614f72f83829cb..00e593fc58eff733661c3b3e077ee6bceff29fcb 100644 (file)
--- 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