From 056ebd06e3f565f50af13f2f122bc3102307e7e9 Mon Sep 17 00:00:00 2001 From: rmkaplan Date: Sun, 26 Apr 2026 21:10:21 -0700 Subject: [PATCH] Trying to update with Matt's FILEIO --- sources/FILEIO | 83 ++++++++++++++++++++++---------------------- sources/FILEIO.LCOM | Bin 45838 -> 45822 bytes 2 files changed, 42 insertions(+), 41 deletions(-) diff --git a/sources/FILEIO b/sources/FILEIO index 115d7836..3c049fec 100644 --- a/sources/FILEIO +++ b/sources/FILEIO @@ -1,12 +1,12 @@ (DEFINE-FILE-INFO :PACKAGE "INTERLISP" :READTABLE "INTERLISP" :BASE 10) -(FILECREATED "21-Apr-2026 20:57:55" {DSK}matt>Interlisp>medley>sources>FILEIO.;17 166496 +(FILECREATED "26-Apr-2026 21:00:55" {WMEDLEY}FILEIO.;145 166582 - :EDIT-BY "mth" + :EDIT-BY rmk - :CHANGES-TO (FNS \DO.PARAMS.AT.OPEN) + :CHANGES-TO (FNS \RENAMEFILE) - :PREVIOUS-DATE "21-Apr-2026 20:24:53" {DSK}matt>Interlisp>medley>sources>FILEIO.;15) + :PREVIOUS-DATE "21-Apr-2026 20:57:55" {WMEDLEY}FILEIO.;144) (PRETTYCOMPRINT FILEIOCOMS) @@ -1517,7 +1517,8 @@ (FOR FN IN STREAM-AFTER-OPEN-FNS DO (APPLY* FN STREAM ACCESS PARAMETERS]) (\RENAMEFILE - [LAMBDA (OLDFILE NEWFILE) (* ; "Edited 25-Dec-2024 10:14 by rmk") + [LAMBDA (OLDFILE NEWFILE) (* ; "Edited 25-Apr-2026 16:03 by rmk") + (* ; "Edited 25-Dec-2024 10:14 by rmk") (* ; "Edited 16-Dec-2024 21:07 by rmk") (* hdj " 7-May-86 12:22") (SETQ OLDFILE (\ADD.CONNECTED.DIR OLDFILE)) @@ -1532,7 +1533,7 @@ NEW-DEVICE (TRUEFILENAME NEWFILE))) (CL:IF (PSEUDOHOSTP NEWFILE) - (PSEUDOFILENAME NEWFULLNAME) + (PSEUDOFILENAME NEWFULLNAME (FILENAMEFIELD NEWFILE 'HOST)) NEWFULLNAME))]) (\REVALIDATEFILE @@ -3172,39 +3173,39 @@ update the map") (ADDTOVAR LAMA \IS.NOT.RANDACCESSP \ILLEGAL.DEVICEOP STREAMPROP) ) (DECLARE%: DONTCOPY - (FILEMAP (NIL (27757 31873 (STREAMPROP 27767 . 28201) (GETSTREAMPROP 28203 . 28952) (PUTSTREAMPROP -28954 . 31721) (STREAMP 31723 . 31871)) (31916 35295 (\DEFPRINT.BY.NAME 31926 . 33078) ( -\STREAM.DEFPRINT 33080 . 34988) (\FDEV.DEFPRINT 34990 . 35293)) (35553 40594 (\GETACCESS 35563 . 36017 -) (\SETACCESS 36019 . 40592)) (60820 66789 (\DEFINEDEVICE 60830 . 63146) (\GETDEVICEFROMNAME 63148 . -63621) (\GETDEVICEFROMHOSTNAME 63623 . 64667) (\REMOVEDEVICE 64669 . 65792) (\REMOVEDEVICE.NAMES 65794 - . 66787)) (66829 94486 (\CLOSEFILE 66839 . 67664) (\DELETEFILE 67666 . 67960) (\DEVICEEVENT 67962 . -69732) (\GENERATEFILES 69734 . 70681) (\GENERATENEXTFILE 70683 . 71334) (\GENERATEFILEINFO 71336 . -71797) (\GETFILENAME 71799 . 72188) (\GENERIC.OUTFILEP 72190 . 72660) (\OPENFILE 72662 . 75240) ( -\DO.PARAMS.AT.OPEN 75242 . 79364) (\RENAMEFILE 79366 . 80322) (\REVALIDATEFILE 80324 . 82926) ( -\PAGED.REVALIDATEFILELST 82928 . 84486) (\PAGED.REVALIDATEFILES 84488 . 86207) (\PAGED.REVALIDATEFILE -86209 . 88492) (\BUFFERED.REVALIDATEFILE 88494 . 90780) (\BUFFERED.REVALIDATEFILELST 90782 . 91966) ( -\PRINT-REVALIDATION-RESULT 91968 . 92810) (\TRUNCATEFILE 92812 . 93203) (\FILE-CONFLICT 93205 . 94484) -) (94522 99185 (\GENERATENOFILES 94532 . 96628) (\NULLFILEGENERATOR 96630 . 96874) (\NOFILESNEXTFILEFN - 96876 . 98867) (\NOFILESINFOFN 98869 . 99183)) (99304 101212 (\FILE.NOT.OPEN 99314 . 99827) ( -\FILE.WONT.OPEN 99829 . 100157) (\ILLEGAL.DEVICEOP 100159 . 100441) (\IS.NOT.RANDACCESSP 100443 . -100889) (\STREAM.NOT.OPEN 100891 . 101210)) (101347 103645 (\FDEVINSTANCE 101357 . 103643)) (104847 -111818 (CNDIR 104857 . 106162) (DIRECTORYNAME 106164 . 109944) (DIRECTORYNAMEP 109946 . 110562) ( -HOSTNAMEP 110564 . 111371) (\ADD.CONNECTED.DIR 111373 . 111816)) (111863 140810 (\BACKFILEPTR 111873 - . 112061) (\BACKPEEKBIN 112063 . 112424) (\BACKBIN 112426 . 112777) (BIN 112779 . 112996) (\BIN -112998 . 113275) (\BINS 113277 . 113563) (BOUT 113565 . 113927) (\BOUT 113929 . 114244) (\BOUTS 114246 - . 114557) (COPYBYTES 114559 . 117891) (COPYCHARS 117893 . 121691) (COPYFILE 121693 . 123053) ( -\COPYOPENFILE 123055 . 126254) (\INFER.FILE.TYPE 126256 . 127210) (EOFP 127212 . 127509) (FORCEOUTPUT -127511 . 127758) (\FLUSH.OPEN.STREAMS 127760 . 128116) (CHARSET 128118 . 129477) (ACCESS-CHARSET -129479 . 130116) (GETEOFPTR 130118 . 130368) (GETFILEINFO 130370 . 133563) (\TYPE.FROM.FILETYPE 133565 - . 134035) (\FILETYPE.FROM.TYPE 134037 . 134216) (GETFILEPTR 134218 . 134470) (SETFILEINFO 134472 . -138709) (SETFILEPTR 138711 . 140430) (BOUT16 140432 . 140617) (BIN16 140619 . 140808)) (140913 148093 -(\GENERIC.BINS 140923 . 141203) (\GENERIC.BOUTS 141205 . 141470) (\GENERIC.RENAMEFILE 141472 . 143720) - (\GENERIC.OPENP 143722 . 145037) (\GENERIC.READP 145039 . 146191) (\GENERIC.CHARSET 146193 . 148091)) - (148094 148433 (\MAP-OPEN-STREAMS 148104 . 148431)) (150288 152368 (\EOF.ACTION 150298 . 150549) ( -\EOSERROR 150551 . 150744) (\GETEOFPTR 150746 . 150928) (\INCFILEPTR 150930 . 151280) (\PEEKBIN 151282 - . 151473) (\SETCLOSEDFILELENGTH 151475 . 151809) (\SETEOFPTR 151811 . 151999) (\SETFILEPTR 152001 . -152366)) (152369 152911 (\FIXPOUT 152379 . 152679) (\FIXPIN 152681 . 152909)) (152912 153478 (\BOUTEOL - 152922 . 153476)) (156374 166238 (\BUFFERED.BIN 156384 . 157236) (\BUFFERED.PEEKBIN 157238 . 158020) -(\BUFFERED.BOUT 158022 . 158882) (\BUFFERED.BINS 158884 . 162569) (\BUFFERED.BOUTS 162571 . 164372) ( -\BUFFERED.COPYBYTES 164374 . 166236))))) + (FILEMAP (NIL (27704 31820 (STREAMPROP 27714 . 28148) (GETSTREAMPROP 28150 . 28899) (PUTSTREAMPROP +28901 . 31668) (STREAMP 31670 . 31818)) (31863 35242 (\DEFPRINT.BY.NAME 31873 . 33025) ( +\STREAM.DEFPRINT 33027 . 34935) (\FDEV.DEFPRINT 34937 . 35240)) (35500 40541 (\GETACCESS 35510 . 35964 +) (\SETACCESS 35966 . 40539)) (60767 66736 (\DEFINEDEVICE 60777 . 63093) (\GETDEVICEFROMNAME 63095 . +63568) (\GETDEVICEFROMHOSTNAME 63570 . 64614) (\REMOVEDEVICE 64616 . 65739) (\REMOVEDEVICE.NAMES 65741 + . 66734)) (66776 94572 (\CLOSEFILE 66786 . 67611) (\DELETEFILE 67613 . 67907) (\DEVICEEVENT 67909 . +69679) (\GENERATEFILES 69681 . 70628) (\GENERATENEXTFILE 70630 . 71281) (\GENERATEFILEINFO 71283 . +71744) (\GETFILENAME 71746 . 72135) (\GENERIC.OUTFILEP 72137 . 72607) (\OPENFILE 72609 . 75187) ( +\DO.PARAMS.AT.OPEN 75189 . 79311) (\RENAMEFILE 79313 . 80408) (\REVALIDATEFILE 80410 . 83012) ( +\PAGED.REVALIDATEFILELST 83014 . 84572) (\PAGED.REVALIDATEFILES 84574 . 86293) (\PAGED.REVALIDATEFILE +86295 . 88578) (\BUFFERED.REVALIDATEFILE 88580 . 90866) (\BUFFERED.REVALIDATEFILELST 90868 . 92052) ( +\PRINT-REVALIDATION-RESULT 92054 . 92896) (\TRUNCATEFILE 92898 . 93289) (\FILE-CONFLICT 93291 . 94570) +) (94608 99271 (\GENERATENOFILES 94618 . 96714) (\NULLFILEGENERATOR 96716 . 96960) (\NOFILESNEXTFILEFN + 96962 . 98953) (\NOFILESINFOFN 98955 . 99269)) (99390 101298 (\FILE.NOT.OPEN 99400 . 99913) ( +\FILE.WONT.OPEN 99915 . 100243) (\ILLEGAL.DEVICEOP 100245 . 100527) (\IS.NOT.RANDACCESSP 100529 . +100975) (\STREAM.NOT.OPEN 100977 . 101296)) (101433 103731 (\FDEVINSTANCE 101443 . 103729)) (104933 +111904 (CNDIR 104943 . 106248) (DIRECTORYNAME 106250 . 110030) (DIRECTORYNAMEP 110032 . 110648) ( +HOSTNAMEP 110650 . 111457) (\ADD.CONNECTED.DIR 111459 . 111902)) (111949 140896 (\BACKFILEPTR 111959 + . 112147) (\BACKPEEKBIN 112149 . 112510) (\BACKBIN 112512 . 112863) (BIN 112865 . 113082) (\BIN +113084 . 113361) (\BINS 113363 . 113649) (BOUT 113651 . 114013) (\BOUT 114015 . 114330) (\BOUTS 114332 + . 114643) (COPYBYTES 114645 . 117977) (COPYCHARS 117979 . 121777) (COPYFILE 121779 . 123139) ( +\COPYOPENFILE 123141 . 126340) (\INFER.FILE.TYPE 126342 . 127296) (EOFP 127298 . 127595) (FORCEOUTPUT +127597 . 127844) (\FLUSH.OPEN.STREAMS 127846 . 128202) (CHARSET 128204 . 129563) (ACCESS-CHARSET +129565 . 130202) (GETEOFPTR 130204 . 130454) (GETFILEINFO 130456 . 133649) (\TYPE.FROM.FILETYPE 133651 + . 134121) (\FILETYPE.FROM.TYPE 134123 . 134302) (GETFILEPTR 134304 . 134556) (SETFILEINFO 134558 . +138795) (SETFILEPTR 138797 . 140516) (BOUT16 140518 . 140703) (BIN16 140705 . 140894)) (140999 148179 +(\GENERIC.BINS 141009 . 141289) (\GENERIC.BOUTS 141291 . 141556) (\GENERIC.RENAMEFILE 141558 . 143806) + (\GENERIC.OPENP 143808 . 145123) (\GENERIC.READP 145125 . 146277) (\GENERIC.CHARSET 146279 . 148177)) + (148180 148519 (\MAP-OPEN-STREAMS 148190 . 148517)) (150374 152454 (\EOF.ACTION 150384 . 150635) ( +\EOSERROR 150637 . 150830) (\GETEOFPTR 150832 . 151014) (\INCFILEPTR 151016 . 151366) (\PEEKBIN 151368 + . 151559) (\SETCLOSEDFILELENGTH 151561 . 151895) (\SETEOFPTR 151897 . 152085) (\SETFILEPTR 152087 . +152452)) (152455 152997 (\FIXPOUT 152465 . 152765) (\FIXPIN 152767 . 152995)) (152998 153564 (\BOUTEOL + 153008 . 153562)) (156460 166324 (\BUFFERED.BIN 156470 . 157322) (\BUFFERED.PEEKBIN 157324 . 158106) +(\BUFFERED.BOUT 158108 . 158968) (\BUFFERED.BINS 158970 . 162655) (\BUFFERED.BOUTS 162657 . 164458) ( +\BUFFERED.COPYBYTES 164460 . 166322))))) STOP diff --git a/sources/FILEIO.LCOM b/sources/FILEIO.LCOM index 102917fc17bb67b05a47ac457c7809cb00778ffa..bdde3d6f3b7f1e194d8486cf324458ea24d2883a 100644 GIT binary patch delta 426 zcmeBs#`Nzg(}ak6GhN4mB3&Z`BQpgfLn{LVD^pV?1r4R-{M>@foYWMB{5%CEh3ar$ zR~H}G$Xc7?{L-T2)M7g~PajuLe?4nM6H`qEE+r!*V+>8KOwFu}&6O0Aic;a`q*fFZ z6{}h)#00teIr_SS^ebfMDR3ych5Gm?7@1AHFItby91~L|O)d?Pa_1md#}HQ+1r*B= zZpQ0I1w%74Qwt*nD_0lK5M8H8g`(VS1uJI{M?ZJhVBHXZ1r0a9U|ud{*G-vSrh^zn5Y!=h}(Fp)w=W$#B delta 420 zcmezOl&S9-(}ak6LtV#$B3&Z`BQpgf11nPtD?>vi1r4R-{M>@foYWMB{5%CE1+HqB zVDDO+jQreGyWGT*5*$ zBUHnU%&m+~loXOcX6LAe ztIOmGjFP#eyGFs#%*@2nOo7YF)x|SJ*C|p#DYqm;Nx{n5!_m*(HCQ*qUqQpoFIXYQ z#a}PLG04$3SkEy;&p*J`Z*l{pqP3BUm8mgV0b#oND5ISkqu*o}4F?rLM@|MHnC1nh i1iS