From 540aff091cc1f01ec127ea07b2a9cfde0dc20cb0 Mon Sep 17 00:00:00 2001 From: Larry Masinter Date: Wed, 12 Oct 2022 12:00:43 -0700 Subject: [PATCH] When restarting after logout, don't print warning on closed stream (#990) --- sources/FILEIO | 99 ++++++++++++++++++++++++-------------------- sources/FILEIO.LCOM | Bin 44374 -> 44718 bytes 2 files changed, 55 insertions(+), 44 deletions(-) diff --git a/sources/FILEIO b/sources/FILEIO index 2618b8ed..1c2a8b4d 100644 --- a/sources/FILEIO +++ b/sources/FILEIO @@ -1,10 +1,10 @@ (DEFINE-FILE-INFO PACKAGE "INTERLISP" READTABLE "INTERLISP" BASE 10) -(FILECREATED "10-Oct-2022 15:58:01" {DSK}larry>medley>sources>FILEIO.;6 161404 +(FILECREATED "11-Oct-2022 11:34:00" {DSK}larry>medley>sources>FILEIO.;2 161841 - :CHANGES-TO (FNS \STREAM.DEFPRINT) + :CHANGES-TO (FNS \PRINT-REVALIDATION-RESULT) - :PREVIOUS-DATE " 9-Oct-2022 17:31:40" {DSK}larry>medley>sources>FILEIO.;5) + :PREVIOUS-DATE "10-Oct-2022 15:58:01" {DSK}larry>medley>sources>FILEIO.;1) (* ; " @@ -1670,12 +1670,23 @@ update the map") (FDEVOP 'OPENP DEVICE NIL NIL DEVICE]) (\PRINT-REVALIDATION-RESULT - [LAMBDA (RESULT STREAM) (* hdj "26-May-86 15:46") - (printout T T T "**** WARNING: The file " (fetch (STREAM FULLNAME) of STREAM)) - (SELECTQ RESULT - (CHANGED (printout T " has been modified since you last accessed it!" T)) - (DELETED (printout T " was previously opened but has disappeared!" T)) - (SHOULDNT]) + [LAMBDA (RESULT STREAM) (* ; "Edited 29-Sep-2022 20:11 by lmm") + (* hdj "26-May-86 15:46") + + (* ;; "stack overflow if DRIBBLEFILE; use PROMPTWINDOW") + + (FRESHLINE PROMPTWINDOW) + (if [AND (DRIBBLEFILE) + (NOT (OPENP (DRIBBLEFILE) + 'APPEND] + THEN (PRINTOUT PROMPTWINDOW "Dribble file " (DRIBBLE) + " ended" T)) + (printout PROMPTWINDOW "**** WARNING: The file " (fetch (STREAM FULLNAME) of STREAM) + (SELECTQ RESULT + (CHANGED " has been modified since you last accessed it!") + (DELETED " was previously opened but has disappeared!") + (SHOULDNT)) + T]) (\TRUNCATEFILE [LAMBDA (STREAM LASTPAGE LASTOFFSET) (* bvm%: " 8-MAY-82 16:11") @@ -3084,39 +3095,39 @@ update the map") (PUTPROPS FILEIO COPYRIGHT ("Venue & Xerox Corporation" 1981 1982 1983 1984 1985 1986 1987 1988 1989 1990 1991 1992 1993 1999 2020 2021 2022)) (DECLARE%: DONTCOPY - (FILEMAP (NIL (27795 31601 (STREAMPROP 27805 . 28239) (GETSTREAMPROP 28241 . 28836) (PUTSTREAMPROP -28838 . 31449) (STREAMP 31451 . 31599)) (31644 35023 (\DEFPRINT.BY.NAME 31654 . 32806) ( -\STREAM.DEFPRINT 32808 . 34716) (\FDEV.DEFPRINT 34718 . 35021)) (35281 40322 (\GETACCESS 35291 . 35745 -) (\SETACCESS 35747 . 40320)) (60548 66517 (\DEFINEDEVICE 60558 . 62874) (\GETDEVICEFROMNAME 62876 . -63349) (\GETDEVICEFROMHOSTNAME 63351 . 64395) (\REMOVEDEVICE 64397 . 65520) (\REMOVEDEVICE.NAMES 65522 - . 66515)) (66557 91448 (\CLOSEFILE 66567 . 67392) (\DELETEFILE 67394 . 67688) (\DEVICEEVENT 67690 . -69460) (\GENERATEFILES 69462 . 70409) (\GENERATENEXTFILE 70411 . 71062) (\GENERATEFILEINFO 71064 . -71525) (\GETFILENAME 71527 . 71916) (\GENERIC.OUTFILEP 71918 . 72388) (\OPENFILE 72390 . 74968) ( -\DO.PARAMS.AT.OPEN 74970 . 77285) (\RENAMEFILE 77287 . 77711) (\REVALIDATEFILE 77713 . 80315) ( -\PAGED.REVALIDATEFILELST 80317 . 81875) (\PAGED.REVALIDATEFILES 81877 . 83596) (\PAGED.REVALIDATEFILE -83598 . 85881) (\BUFFERED.REVALIDATEFILE 85883 . 88169) (\BUFFERED.REVALIDATEFILELST 88171 . 89355) ( -\PRINT-REVALIDATION-RESULT 89357 . 89772) (\TRUNCATEFILE 89774 . 90165) (\FILE-CONFLICT 90167 . 91446) -) (91484 96147 (\GENERATENOFILES 91494 . 93590) (\NULLFILEGENERATOR 93592 . 93836) (\NOFILESNEXTFILEFN - 93838 . 95829) (\NOFILESINFOFN 95831 . 96145)) (96266 98174 (\FILE.NOT.OPEN 96276 . 96789) ( -\FILE.WONT.OPEN 96791 . 97119) (\ILLEGAL.DEVICEOP 97121 . 97403) (\IS.NOT.RANDACCESSP 97405 . 97851) ( -\STREAM.NOT.OPEN 97853 . 98172)) (98309 100607 (\FDEVINSTANCE 98319 . 100605)) (101809 109183 (CNDIR -101819 . 103124) (DIRECTORYNAME 103126 . 107309) (DIRECTORYNAMEP 107311 . 107927) (HOSTNAMEP 107929 . -108736) (\ADD.CONNECTED.DIR 108738 . 109181)) (109228 137501 (\BACKFILEPTR 109238 . 109426) ( -\BACKPEEKBIN 109428 . 109789) (\BACKBIN 109791 . 110142) (BIN 110144 . 110361) (\BIN 110363 . 110640) -(\BINS 110642 . 110928) (BOUT 110930 . 111292) (\BOUT 111294 . 111609) (\BOUTS 111611 . 111922) ( -COPYBYTES 111924 . 115256) (COPYCHARS 115258 . 118924) (COPYFILE 118926 . 119990) (\COPYOPENFILE -119992 . 123191) (\INFER.FILE.TYPE 123193 . 124147) (EOFP 124149 . 124446) (FORCEOUTPUT 124448 . -124695) (\FLUSH.OPEN.STREAMS 124697 . 125053) (CHARSET 125055 . 126719) (ACCESS-CHARSET 126721 . -126938) (GETEOFPTR 126940 . 127190) (GETFILEINFO 127192 . 130385) (\TYPE.FROM.FILETYPE 130387 . 130857 -) (\FILETYPE.FROM.TYPE 130859 . 131038) (GETFILEPTR 131040 . 131292) (SETFILEINFO 131294 . 135400) ( -SETFILEPTR 135402 . 137121) (BOUT16 137123 . 137308) (BIN16 137310 . 137499)) (137604 142920 ( -\GENERIC.BINS 137614 . 137894) (\GENERIC.BOUTS 137896 . 138161) (\GENERIC.RENAMEFILE 138163 . 139994) -(\GENERIC.OPENP 139996 . 141311) (\GENERIC.READP 141313 . 142465) (\GENERIC.CHARSET 142467 . 142918)) -(142921 143260 (\MAP-OPEN-STREAMS 142931 . 143258)) (145052 147132 (\EOF.ACTION 145062 . 145313) ( -\EOSERROR 145315 . 145508) (\GETEOFPTR 145510 . 145692) (\INCFILEPTR 145694 . 146044) (\PEEKBIN 146046 - . 146237) (\SETCLOSEDFILELENGTH 146239 . 146573) (\SETEOFPTR 146575 . 146763) (\SETFILEPTR 146765 . -147130)) (147133 147675 (\FIXPOUT 147143 . 147443) (\FIXPIN 147445 . 147673)) (147676 148242 (\BOUTEOL - 147686 . 148240)) (151138 161002 (\BUFFERED.BIN 151148 . 152000) (\BUFFERED.PEEKBIN 152002 . 152784) -(\BUFFERED.BOUT 152786 . 153646) (\BUFFERED.BINS 153648 . 157333) (\BUFFERED.BOUTS 157335 . 159136) ( -\BUFFERED.COPYBYTES 159138 . 161000))))) + (FILEMAP (NIL (27805 31611 (STREAMPROP 27815 . 28249) (GETSTREAMPROP 28251 . 28846) (PUTSTREAMPROP +28848 . 31459) (STREAMP 31461 . 31609)) (31654 35033 (\DEFPRINT.BY.NAME 31664 . 32816) ( +\STREAM.DEFPRINT 32818 . 34726) (\FDEV.DEFPRINT 34728 . 35031)) (35291 40332 (\GETACCESS 35301 . 35755 +) (\SETACCESS 35757 . 40330)) (60558 66527 (\DEFINEDEVICE 60568 . 62884) (\GETDEVICEFROMNAME 62886 . +63359) (\GETDEVICEFROMHOSTNAME 63361 . 64405) (\REMOVEDEVICE 64407 . 65530) (\REMOVEDEVICE.NAMES 65532 + . 66525)) (66567 91885 (\CLOSEFILE 66577 . 67402) (\DELETEFILE 67404 . 67698) (\DEVICEEVENT 67700 . +69470) (\GENERATEFILES 69472 . 70419) (\GENERATENEXTFILE 70421 . 71072) (\GENERATEFILEINFO 71074 . +71535) (\GETFILENAME 71537 . 71926) (\GENERIC.OUTFILEP 71928 . 72398) (\OPENFILE 72400 . 74978) ( +\DO.PARAMS.AT.OPEN 74980 . 77295) (\RENAMEFILE 77297 . 77721) (\REVALIDATEFILE 77723 . 80325) ( +\PAGED.REVALIDATEFILELST 80327 . 81885) (\PAGED.REVALIDATEFILES 81887 . 83606) (\PAGED.REVALIDATEFILE +83608 . 85891) (\BUFFERED.REVALIDATEFILE 85893 . 88179) (\BUFFERED.REVALIDATEFILELST 88181 . 89365) ( +\PRINT-REVALIDATION-RESULT 89367 . 90209) (\TRUNCATEFILE 90211 . 90602) (\FILE-CONFLICT 90604 . 91883) +) (91921 96584 (\GENERATENOFILES 91931 . 94027) (\NULLFILEGENERATOR 94029 . 94273) (\NOFILESNEXTFILEFN + 94275 . 96266) (\NOFILESINFOFN 96268 . 96582)) (96703 98611 (\FILE.NOT.OPEN 96713 . 97226) ( +\FILE.WONT.OPEN 97228 . 97556) (\ILLEGAL.DEVICEOP 97558 . 97840) (\IS.NOT.RANDACCESSP 97842 . 98288) ( +\STREAM.NOT.OPEN 98290 . 98609)) (98746 101044 (\FDEVINSTANCE 98756 . 101042)) (102246 109620 (CNDIR +102256 . 103561) (DIRECTORYNAME 103563 . 107746) (DIRECTORYNAMEP 107748 . 108364) (HOSTNAMEP 108366 . +109173) (\ADD.CONNECTED.DIR 109175 . 109618)) (109665 137938 (\BACKFILEPTR 109675 . 109863) ( +\BACKPEEKBIN 109865 . 110226) (\BACKBIN 110228 . 110579) (BIN 110581 . 110798) (\BIN 110800 . 111077) +(\BINS 111079 . 111365) (BOUT 111367 . 111729) (\BOUT 111731 . 112046) (\BOUTS 112048 . 112359) ( +COPYBYTES 112361 . 115693) (COPYCHARS 115695 . 119361) (COPYFILE 119363 . 120427) (\COPYOPENFILE +120429 . 123628) (\INFER.FILE.TYPE 123630 . 124584) (EOFP 124586 . 124883) (FORCEOUTPUT 124885 . +125132) (\FLUSH.OPEN.STREAMS 125134 . 125490) (CHARSET 125492 . 127156) (ACCESS-CHARSET 127158 . +127375) (GETEOFPTR 127377 . 127627) (GETFILEINFO 127629 . 130822) (\TYPE.FROM.FILETYPE 130824 . 131294 +) (\FILETYPE.FROM.TYPE 131296 . 131475) (GETFILEPTR 131477 . 131729) (SETFILEINFO 131731 . 135837) ( +SETFILEPTR 135839 . 137558) (BOUT16 137560 . 137745) (BIN16 137747 . 137936)) (138041 143357 ( +\GENERIC.BINS 138051 . 138331) (\GENERIC.BOUTS 138333 . 138598) (\GENERIC.RENAMEFILE 138600 . 140431) +(\GENERIC.OPENP 140433 . 141748) (\GENERIC.READP 141750 . 142902) (\GENERIC.CHARSET 142904 . 143355)) +(143358 143697 (\MAP-OPEN-STREAMS 143368 . 143695)) (145489 147569 (\EOF.ACTION 145499 . 145750) ( +\EOSERROR 145752 . 145945) (\GETEOFPTR 145947 . 146129) (\INCFILEPTR 146131 . 146481) (\PEEKBIN 146483 + . 146674) (\SETCLOSEDFILELENGTH 146676 . 147010) (\SETEOFPTR 147012 . 147200) (\SETFILEPTR 147202 . +147567)) (147570 148112 (\FIXPOUT 147580 . 147880) (\FIXPIN 147882 . 148110)) (148113 148679 (\BOUTEOL + 148123 . 148677)) (151575 161439 (\BUFFERED.BIN 151585 . 152437) (\BUFFERED.PEEKBIN 152439 . 153221) +(\BUFFERED.BOUT 153223 . 154083) (\BUFFERED.BINS 154085 . 157770) (\BUFFERED.BOUTS 157772 . 159573) ( +\BUFFERED.COPYBYTES 159575 . 161437))))) STOP diff --git a/sources/FILEIO.LCOM b/sources/FILEIO.LCOM index f764e31b4cad136548770b88603891bfef73bb57..b3f960997e54a0a773f315f56ddc5ae79e5aca26 100644 GIT binary patch delta 802 zcmZWm&ui2`6wby=T@VT?wOx=$PP>&|=Or_nY(Qw*%({V?ge0{dYnw%+ML~M-B75XPrH;B0OY8AYA^W;JB?A5a;XR?jmq?h;Wd*A!s%=__Eeg8{+b?-8E!~LVKPIMg* zZG+l`Ob_f;y#q}Rs~{mZW7AKo`Iq&z>F?{&BHZisG|28BjWak$V>Z*ZPP0Aqe7+TP zC*|(BCMleMZ`^2!HTq~#1bb`b1h;w8O+#o8g9MuS=k>Ma4%ku5?|R{O(sjkCe4}x# z(VRYOH!y$kt~FaxU*hCgQ51Do80DfgOVWG{3im+9O=)Jg9!s|?O;I>08W!?8UO>gf zlN#iFTROhrl+=l$Y-EMdpSSbQ4_D^tn}YYeCUiD;S!ttbLCWJO_QX$EAbfy;%z|VT zZu@SK0_sLtCgy20z>;JUn9NCidI~ZMZtQJt`W$FE(Le|z9z>vH3CjBb{_ic)0SsfF zjC?QP;(};OP^UZfJeTCn=n++@|94XQb< zN$Y)ZBJm^_uF8j>Nr}b92kQB2dQ(Ls|4OMkF!R5(wE`vq4aSeMai)P`f#yDWxVLvW JyTrVw{{Yibv_}8{ delta 498 zcmZXQ%SyvQ6o!)sQnQd2tk{)@xJi{tCY_{7R)%KU25M50R9y(-rD#B@SZ}+&f+cU^ z!iB}HUAq!oxDb5?eF4FVNx{o3=A8M@|IZBH%^Uap!d-1dPi%g0q!rX6@B(NhclWd; zOR@~8Vqk1wG`KHJ`+-Ny)n$v+TAu9;-hl%x%CWNxe*?NvR)iui*6b#!(o8_C=#ia^ zc382c0#Xr{Fc{T_>C}l|3S1Ctjt~6i?+1b+7%h*i*>2k}S@aSRK>zi#GBR+q#V)bR zFvne^e#kHk7f#Wg8KtEgA42|HGAHBmkhz;M6J=#@KUO|&^P?ZWB$-V|Gyf-