ADIR: rename when making, close when restarting

Author: rmkaplan

sources/ADIR

@@ -1,12 +1,12 @@
 (DEFINE-FILE-INFO PACKAGE "INTERLISP" READTABLE "INTERLISP" BASE 10)
 
-
(FILECREATED "29-Jun-2023 11:42:04" {WMEDLEY}<sources>ADIR.;22
 66615  
+
(FILECREATED " 1-Jul-2023 12:34:50" {WMEDLEY}<sources>ADIR.;25
 66630  
 
       :EDIT-BY rmk
 
       :CHANGES-TO (FNS \COPYSYS)
 
-      :PREVIOUS-DATE "11-May-2023 21:39:25" {WMEDLEY}<sources>ADIR.;20)
+      :PREVIOUS-DATE "29-Jun-2023 11:42:04" {WMEDLEY}<sources>ADIR.;22)
 
 
 (PRETTYCOMPRINT ADIRCOMS)
@@ -194,7 +194,8 @@
     (fetch
 (IFPAGE NActivePages) of
 \InterfacePage])
 
 (\COPYSYS

-  [LAMBDA (FILE SYSNAME DONTSAVE)
                            (* ; "Edited 29-Jun-2023 11:41 by rmk")


+  [LAMBDA (FILE SYSNAME DONTSAVE)
                            (* ; "Edited  1-Jul-2023 12:34 by rmk")


+                                                             (* ; "Edited 29-Jun-2023 11:41 by rmk")


                                                              (* ; "Edited 31-Oct-2022 23:49 by rmk")


                                                            (* ; "Edited 16-Mar-2021 19:46 by larry")

     (PROG (TEMPNAME VAL TARGETFILE TARGETHOST)
@@ -219,27 +220,24 @@
                                          'BODY
                                          (\UFS.RECOGNIZE.FILE TARGETFILE 'NON (\GETDEVICEFROMNAME
                                                                                TARGETHOST]
-                   (SETQ VAL (\FLUSHVM
 TEMPNAME))
-                   (CLOSEF? TEMPNAME)                        (* ; "Without this, restarting thinks that the TEMPNAME is still open.  Which is odd, because that information is not in the saved image.")

-                   (RENAMEFILE
 TEMPNAME TARGETFILE))
+                   (SETQ VAL (\FLUSHVM
 TEMPNAME)))
               (UNIX [SETQ TEMPNAME (CONCAT "{" TARGETHOST "}" (\UFS.RECOGNIZE.FILE TARGETFILE
                                                                      'NON
                                                                      (\GETDEVICEFROMNAME TARGETHOST]
                                                              (* ; "\DOFLUSHVM ")

-                    (SETQ VAL (\FLUSHVM
 TEMPNAME))
-                    (CLOSEF? TEMPNAME)
-                    (RENAMEFILE
 TEMPNAME TARGETFILE))
+                    (SETQ VAL (\FLUSHVM
 TEMPNAME)))
               (PROGN (SETQ VAL (\FLUSHVM
))
-                     (LET ((UNIXVAR (UNIX-GETENV "LDEDESTSYSOUT")))
+                     (LET ((LDEDEST (UNIX-GETENV "LDEDESTSYSOUT")))
                                                              (* ; 
-
                                    "\FLSUVM saves image to  Unix enviroment var  or lisp.virtualmem")

+
  "\FLUSHVM saves image to  Unix enviroment var  or lisp.virtualmem.  LDEDEST is assumed to be DSK??")

                           (SETQ TEMPNAME (COPYFILE (COND
-                                                      (UNIXVAR (CONCAT "{DSK}" UNIXVAR))
+                                                      (LDEDEST (CONCAT "{DSK}" LDEDEST))
                                                       (T "{DSK}~/lisp.virtualmem"))
                                                 TARGETFILE
                                                 '((TYPE BINARY]
           (COND
              ((NULL VAL)                                     (* ; "Continuing in the current image")

+              (CL:WHEN TARGETFILE (RENAMEFILE
 TEMPNAME TARGETFILE))
               (\DAYTIME0 \LASTUSERACTION)
               (RETURN TARGETFILE))
              ((AND (SMALLP VAL)
@@ -249,9 +247,11 @@
                      TEMPNAME)
               (GO RETRY))
              (T                                              (* ; "Restarting sysout")

+                (CLOSEF? TEMPNAME)                           (* ; 
+
                                             "The temp file may be seen as still open in the VM file")

                 (\CLEARSYSBUF T)                             (* ; "Get rid of any spurious typeahead")

                 (\RESETKEYBOARD)                             (* ; "Enable keyhandler")

-                (RETURN (LIST TARGETFILE])
+                (RETURN (LIST (OR TARGETFILE TEMPNAME])
 
 (\FLUSHVM

   [LAMBDA (MAIKO.SYSOUTFILE)
                           (* ; "Edited 16-Mar-2021 10:59 by larry")


@@ -1242,14 +1242,14 @@
 (ADDTOVAR LAMA
 PACKFILENAME.STRING PACKFILENAME)
 )
 (DECLARE%: DONTCOPY
-  (FILEMAP (NIL (3106 15081 (DELFILE 3116 . 3277) (FULLNAME 3279 . 3646) (INFILE 3648 . 3796) (INFILEP 
+  (FILEMAP (NIL (3106 15096 (DELFILE 3116 . 3277) (FULLNAME 3279 . 3646) (INFILE 3648 . 3796) (INFILEP 
 3798 . 3933) (IOFILE 3935 . 4075) (OPENFILE 4077 . 4380) (OPENSTREAM 4382 . 8722) (OUTFILE 8724 . 8875
 ) (OUTFILEP 8877 . 9013) (RENAMEFILE 9015 . 9321) (SIMPLE.FINDFILE 9323 . 9733) (VMEMSIZE 9735 . 9902)
- (\COPYSYS 9904 . 13800) (\FLUSHVM 13802 . 14874) (\LOGOUT0 14876 . 15079)) (15539 37444 (
-UNPACKFILENAME.STRING 15549 . 34823) (\UPF.DIRECTORY 34825 . 37442)) (38972 41644 (UNPACKFILENAME 
-38982 . 39168) (LASTCHPOS 39170 . 39864) (FILENAMEFIELD 39866 . 40351) (FILENAMEFIELD.STRING 40353 . 
-40932) (PACKFILENAME 40934 . 41277) (PACKFILENAME.STRING 41279 . 41642)) (56114 57027 (
-FILEDIRCASEARRAY 56124 . 57025)) (57194 64374 (LOGOUT 57204 . 58121) (MAKESYS 58123 . 59752) (SYSOUT 
-59754 . 61306) (SAVEVM 61308 . 62108) (HERALD 62110 . 62270) (INTERPRET.REM.CM 62272 . 63997) (
-\USEREVENT 63999 . 64372)) (64556 66283 (USERNAME 64566 . 65522) (SETUSERNAME 65524 . 66281)))))
+ (\COPYSYS 9904 . 13815) (\FLUSHVM 13817 . 14889) (\LOGOUT0 14891 . 15094)) (15554 37459 (
+UNPACKFILENAME.STRING 15564 . 34838) (\UPF.DIRECTORY 34840 . 37457)) (38987 41659 (UNPACKFILENAME 
+38997 . 39183) (LASTCHPOS 39185 . 39879) (FILENAMEFIELD 39881 . 40366) (FILENAMEFIELD.STRING 40368 . 
+40947) (PACKFILENAME 40949 . 41292) (PACKFILENAME.STRING 41294 . 41657)) (56129 57042 (
+FILEDIRCASEARRAY 56139 . 57040)) (57209 64389 (LOGOUT 57219 . 58136) (MAKESYS 58138 . 59767) (SYSOUT 
+59769 . 61321) (SAVEVM 61323 . 62123) (HERALD 62125 . 62285) (INTERPRET.REM.CM 62287 . 64012) (
+\USEREVENT 64014 . 64387)) (64571 66298 (USERNAME 64581 . 65537) (SETUSERNAME 65539 . 66296)))))
 STOP