From 17792da409d0f63ce2666ebb6c76e2c9f5e58b33 Mon Sep 17 00:00:00 2001
From: rmkaplan <ron.kaplan@post.harvard.edu>
Date: Thu, 14 Jul 2022 18:48:54 -0700
Subject: [PATCH] PSEUDOHOSTS:  Error if file won't open

---
 lispusers/PSEUDOHOSTS      |  41 ++++++++++++++++++++-----------------
 lispusers/PSEUDOHOSTS.LCOM | Bin 8676 -> 8720 bytes
 2 files changed, 22 insertions(+), 19 deletions(-)

diff --git a/lispusers/PSEUDOHOSTS b/lispusers/PSEUDOHOSTS
index 05dc0f81..17392f02 100644
--- a/lispusers/PSEUDOHOSTS
+++ b/lispusers/PSEUDOHOSTS
@@ -1,12 +1,12 @@
 (DEFINE-FILE-INFO PACKAGE "INTERLISP" READTABLE "INTERLISP" BASE 10)
 
-
(FILECREATED "25-Jun-2022 17:24:45" 
-{DSK}<Users>kaplan>Local>medley3.5>working-medley>lispusers>PSEUDOHOSTS.;149
 27524  
+
(FILECREATED "14-Jul-2022 17:54:43" 
+{DSK}<Users>kaplan>Local>medley3.5>working-medley>lispusers>PSEUDOHOSTS.;150
 27644  
 
-      :CHANGES-TO (VARS PSEUDOHOSTSCOMS)
+      :CHANGES-TO (FNS OPENFILE.PH)
 
-      :PREVIOUS-DATE "25-Jun-2022 17:07:38" 
-{DSK}<Users>kaplan>Local>medley3.5>working-medley>lispusers>PSEUDOHOSTS.;148)
+      :PREVIOUS-DATE "25-Jun-2022 17:24:45" 
+{DSK}<Users>kaplan>Local>medley3.5>working-medley>lispusers>PSEUDOHOSTS.;149)
 
 
 (PRETTYCOMPRINT PSEUDOHOSTSCOMS)
@@ -314,6 +314,8 @@
 (OPENFILE.PH

   [LAMBDA (FILE ACCESS RECOG OTHERINFO FDEV OLDSTRING)
 
+    (* ;; "Edited 14-Jul-2022 17:53 by rmk")

+
     (* ;; "Edited 25-Jun-2022 17:06 by rmk:  If the stream was opened through the pseudohost, then it should only be registered on the pseudohost.  We assume that it is safe to remove it from the target hosts list.  The goal is that OPENP should only see it once, as being open on the pseudohost.")

 
     (* ;; "Edited 25-Jan-2022 08:45 by rmk")

@@ -323,11 +325,12 @@
     (LET ((TARGETDEV (FETCH
 (PHDEVICE TARGETDEV) OF
 FDEV))
           (STREAM (PSEUDOHOST.TARGETVAL OPENFILE (FILE ACCESS RECOG OTHERINFO FDEV OLDSTRING)
                          FDEV)))
-         (CL:WHEN STREAM
-             (FDEVOP 'UNREGISTERFILE TARGETDEV TARGETDEV STREAM)
-             (CHANGE
 (FETCH
 (STREAM FULLFILENAME) OF
 STREAM)
-                    (CONTRACT.PH
 DATUM FDEV))
-             (REPLACE
 (STREAM DEVICE) OF
 STREAM WITH
 FDEV))
+         (IF
 STREAM
+             THEN
 (FDEVOP 'UNREGISTERFILE TARGETDEV TARGETDEV STREAM)
+                  (CHANGE
 (FETCH
 (STREAM FULLFILENAME) OF
 STREAM)
+                         (CONTRACT.PH
 DATUM FDEV))
+                  (REPLACE
 (STREAM DEVICE) OF
 STREAM WITH
 FDEV)
+           ELSE
 (ERROR "File not found: " FILE))
          STREAM])
 
 (GETFILENAME.PH

@@ -521,13 +524,13 @@
     (LOAD 'EXPORTS.ALL))
 )
 (DECLARE%: DONTCOPY
-  (FILEMAP (NIL (1355 9387 (PSEUDOHOST 1365 . 6924) (PSEUDOHOSTP 6926 . 7439) (PSEUDOHOSTS 7441 . 7798) 
-(TARGETHOST 7800 . 8074) (TRUEFILENAME 8076 . 8763) (PSEUDOFILENAME 8765 . 9385)) (9415 16954 (
-EXPAND.PH 9425 . 10678) (CONTRACT.PH 10680 . 13345) (SLASHIT 13347 . 14915) (UNSLASHIT 14917 . 16663) 
-(GETHOSTINFO.PH 16665 . 16952)) (16955 24859 (OPENFILE.PH 16965 . 17938) (GETFILENAME.PH 17940 . 18229
-) (DIRECTORYNAMEP.PH 18231 . 18855) (CLOSEFILE.PH 18857 . 19324) (REOPENFILE.PH 19326 . 19891) (
-DELETEFILE.PH 19893 . 20177) (OPENP.PH 20179 . 20474) (UNREGISTERFILE.PH 20476 . 21018) (
-REGISTERFILE.PH 21020 . 21554) (GENERATEFILES.PH 21556 . 22596) (GETFILEINFO.PH 22598 . 22900) (
-SETFILEINFO.PH 22902 . 23101) (NEXTFILEFN.PH 23103 . 23645) (FILEINFOFN.PH 23647 . 23918) (
-RENAMEFILE.PH 23920 . 24857)))))
+  (FILEMAP (NIL (1350 9382 (PSEUDOHOST 1360 . 6919) (PSEUDOHOSTP 6921 . 7434) (PSEUDOHOSTS 7436 . 7793) 
+(TARGETHOST 7795 . 8069) (TRUEFILENAME 8071 . 8758) (PSEUDOFILENAME 8760 . 9380)) (9410 16949 (
+EXPAND.PH 9420 . 10673) (CONTRACT.PH 10675 . 13340) (SLASHIT 13342 . 14910) (UNSLASHIT 14912 . 16658) 
+(GETHOSTINFO.PH 16660 . 16947)) (16950 24979 (OPENFILE.PH 16960 . 18058) (GETFILENAME.PH 18060 . 18349
+) (DIRECTORYNAMEP.PH 18351 . 18975) (CLOSEFILE.PH 18977 . 19444) (REOPENFILE.PH 19446 . 20011) (
+DELETEFILE.PH 20013 . 20297) (OPENP.PH 20299 . 20594) (UNREGISTERFILE.PH 20596 . 21138) (
+REGISTERFILE.PH 21140 . 21674) (GENERATEFILES.PH 21676 . 22716) (GETFILEINFO.PH 22718 . 23020) (
+SETFILEINFO.PH 23022 . 23221) (NEXTFILEFN.PH 23223 . 23765) (FILEINFOFN.PH 23767 . 24038) (
+RENAMEFILE.PH 24040 . 24977)))))
 STOP
diff --git a/lispusers/PSEUDOHOSTS.LCOM b/lispusers/PSEUDOHOSTS.LCOM
index 84c36a9f2107bd03c0b2d87c6704fed2b77d39c8..d2d8d933dff60bfc487e4cae355e11c251f222ba 100644
GIT binary patch
delta 309
zcmaFjJi%o`xQL;Nu2*S}u91O}k%FPQm8pr9iOIz5SV>a@O$8-1NkaoG6N`xt#nb!)
zT>acUeO&bdJQOnX6qMXTeS8#<73=BgDJi5RmZYX&GsM(HNs~(hWPo#!t7C|(3x*<)
zGmIxz`<j^=C>WWWnV2Y8IeR$zxw{7IhWIOJxcLPua3MKDQ^6`A$TiH<KQvg^1!&-8
z7sk}h?o6SA%!WoLljjS^GgeLhFKo@YX|lD5u~b(+0}wcHfk-a_1`R_)3kBDpApanR
l$weY*;tGa_MnErR=A<g*<(DX=<(KBASScuNz9GWH3jn6WPL%)v

delta 221
zcmbQ>^2B*U_~gfoViR+tB~2_f6_kujbiGRRbd3y*j1&ybtW1rqOid>~6!*!?FUiQv
zOIOIuQ&4gX_3=?aR;Z_^r=*aQSdyB8X@H59fq{}Hmxi0CkE?T#t7C|(%jAcQshSE#
z=B7p_3Rcb@j(+a0!MY*-3L0UKLBR@K0l}`JF8&_=!6CuU{=UJJFET2!8kk!dTTG5)
w^kp)!*zCp>D##3U;pBP3@r-$s{|Q?&ZkcQ)V$9+tz@Ra?T_kNYizp8-0LxlD0RR91