Revert "FILEIO: EOL for input defaults to ANY, EXT-FORMAT can specify EOL"
This reverts commit 6a7e8c3665.
This commit is contained in:
rmkaplan
@@ -1,6 +1,6 @@
|
||||
(DEFINE-FILE-INFO PACKAGE "INTERLISP" READTABLE "INTERLISP" BASE 10)
|
||||
|
||||
(FILECREATED "15-Jul-2024 21:25:14" {WMEDLEY}<sources>FILEIO.;129 164231
|
||||
(FILECREATED "15-Jul-2024 21:39:13" {WMEDLEY}<sources>FILEIO.;130 164736
|
||||
|
||||
:EDIT-BY rmk
|
||||
|
||||
@@ -1446,7 +1446,7 @@
|
||||
(GO RETRY])
|
||||
|
||||
(\DO.PARAMS.AT.OPEN
|
||||
[LAMBDA (STREAM ACCESS PARAMETERS) (* ; "Edited 15-Jul-2024 21:25 by rmk")
|
||||
[LAMBDA (STREAM ACCESS PARAMETERS) (* ; "Edited 15-Jul-2024 21:39 by rmk")
|
||||
(* ; "Edited 25-Aug-2023 08:43 by rmk")
|
||||
(* ; "Edited 6-Jul-2022 00:00 by rmk")
|
||||
(* ; "Edited 19-Dec-2021 09:30 by rmk")
|
||||
@@ -1480,12 +1480,19 @@
|
||||
(ENDOFSTREAMOP (SETFILEINFO STREAM 'ENDOFSTREAMOP VAL))
|
||||
(CHARSET (CHARSET STREAM VAL))
|
||||
((FORMAT EXTERNALFORMAT :EXTERNAL-FORMAT)
|
||||
(* ;;
|
||||
"VAL can be :UTF-8, CR, (UTF:8 CR), i.e. specify either one or both")
|
||||
|
||||
(SETQ EOLFLAG T)
|
||||
(if (LISTP VAL)
|
||||
then (\EXTERNALFORMAT STREAM (CAR VAL))
|
||||
(* ; "VAL could be (:UTF-8 CR)")
|
||||
(CL:IF (CADR VAL)
|
||||
(SETFILEINFO STREAM 'EOL (CADR VAL)))
|
||||
then (* ;
|
||||
"VAL could be (:UTF-8 CR), either can be NIL")
|
||||
(\EXTERNALFORMAT STREAM (CAR VAL))
|
||||
(* ;
|
||||
"Can override the EOL of the format")
|
||||
(SETFILEINFO STREAM 'EOL (CADR VAL))
|
||||
elseif (MEMB VAL '(LF CR CRLF ANY))
|
||||
then (SETFILEINFO STREAM 'EOL VAL)
|
||||
else (\EXTERNALFORMAT STREAM VAL)))
|
||||
(CONVHANKAKU (CONVHANKAKU STREAM VAL))
|
||||
((EOL EOLCONVENTION EOLC)
|
||||
@@ -3135,34 +3142,34 @@ update the map")
|
||||
\STREAM.DEFPRINT 33034 . 34942) (\FDEV.DEFPRINT 34944 . 35247)) (35507 40548 (\GETACCESS 35517 . 35971
|
||||
) (\SETACCESS 35973 . 40546)) (60774 66743 (\DEFINEDEVICE 60784 . 63100) (\GETDEVICEFROMNAME 63102 .
|
||||
63575) (\GETDEVICEFROMHOSTNAME 63577 . 64621) (\REMOVEDEVICE 64623 . 65746) (\REMOVEDEVICE.NAMES 65748
|
||||
. 66741)) (66783 93012 (\CLOSEFILE 66793 . 67618) (\DELETEFILE 67620 . 67914) (\DEVICEEVENT 67916 .
|
||||
. 66741)) (66783 93517 (\CLOSEFILE 66793 . 67618) (\DELETEFILE 67620 . 67914) (\DEVICEEVENT 67916 .
|
||||
69686) (\GENERATEFILES 69688 . 70635) (\GENERATENEXTFILE 70637 . 71288) (\GENERATEFILEINFO 71290 .
|
||||
71751) (\GETFILENAME 71753 . 72142) (\GENERIC.OUTFILEP 72144 . 72614) (\OPENFILE 72616 . 75194) (
|
||||
\DO.PARAMS.AT.OPEN 75196 . 78422) (\RENAMEFILE 78424 . 78848) (\REVALIDATEFILE 78850 . 81452) (
|
||||
\PAGED.REVALIDATEFILELST 81454 . 83012) (\PAGED.REVALIDATEFILES 83014 . 84733) (\PAGED.REVALIDATEFILE
|
||||
84735 . 87018) (\BUFFERED.REVALIDATEFILE 87020 . 89306) (\BUFFERED.REVALIDATEFILELST 89308 . 90492) (
|
||||
\PRINT-REVALIDATION-RESULT 90494 . 91336) (\TRUNCATEFILE 91338 . 91729) (\FILE-CONFLICT 91731 . 93010)
|
||||
) (93048 97711 (\GENERATENOFILES 93058 . 95154) (\NULLFILEGENERATOR 95156 . 95400) (\NOFILESNEXTFILEFN
|
||||
95402 . 97393) (\NOFILESINFOFN 97395 . 97709)) (97830 99738 (\FILE.NOT.OPEN 97840 . 98353) (
|
||||
\FILE.WONT.OPEN 98355 . 98683) (\ILLEGAL.DEVICEOP 98685 . 98967) (\IS.NOT.RANDACCESSP 98969 . 99415) (
|
||||
\STREAM.NOT.OPEN 99417 . 99736)) (99873 102171 (\FDEVINSTANCE 99883 . 102169)) (103373 110747 (CNDIR
|
||||
103383 . 104688) (DIRECTORYNAME 104690 . 108873) (DIRECTORYNAMEP 108875 . 109491) (HOSTNAMEP 109493 .
|
||||
110300) (\ADD.CONNECTED.DIR 110302 . 110745)) (110792 139071 (\BACKFILEPTR 110802 . 110990) (
|
||||
\BACKPEEKBIN 110992 . 111353) (\BACKBIN 111355 . 111706) (BIN 111708 . 111925) (\BIN 111927 . 112204)
|
||||
(\BINS 112206 . 112492) (BOUT 112494 . 112856) (\BOUT 112858 . 113173) (\BOUTS 113175 . 113486) (
|
||||
COPYBYTES 113488 . 116820) (COPYCHARS 116822 . 120488) (COPYFILE 120490 . 121554) (\COPYOPENFILE
|
||||
121556 . 124755) (\INFER.FILE.TYPE 124757 . 125711) (EOFP 125713 . 126010) (FORCEOUTPUT 126012 .
|
||||
126259) (\FLUSH.OPEN.STREAMS 126261 . 126617) (CHARSET 126619 . 127978) (ACCESS-CHARSET 127980 .
|
||||
128508) (GETEOFPTR 128510 . 128760) (GETFILEINFO 128762 . 131955) (\TYPE.FROM.FILETYPE 131957 . 132427
|
||||
) (\FILETYPE.FROM.TYPE 132429 . 132608) (GETFILEPTR 132610 . 132862) (SETFILEINFO 132864 . 136970) (
|
||||
SETFILEPTR 136972 . 138691) (BOUT16 138693 . 138878) (BIN16 138880 . 139069)) (139174 145828 (
|
||||
\GENERIC.BINS 139184 . 139464) (\GENERIC.BOUTS 139466 . 139731) (\GENERIC.RENAMEFILE 139733 . 141564)
|
||||
(\GENERIC.OPENP 141566 . 142881) (\GENERIC.READP 142883 . 144035) (\GENERIC.CHARSET 144037 . 145826))
|
||||
(145829 146168 (\MAP-OPEN-STREAMS 145839 . 146166)) (148023 150103 (\EOF.ACTION 148033 . 148284) (
|
||||
\EOSERROR 148286 . 148479) (\GETEOFPTR 148481 . 148663) (\INCFILEPTR 148665 . 149015) (\PEEKBIN 149017
|
||||
. 149208) (\SETCLOSEDFILELENGTH 149210 . 149544) (\SETEOFPTR 149546 . 149734) (\SETFILEPTR 149736 .
|
||||
150101)) (150104 150646 (\FIXPOUT 150114 . 150414) (\FIXPIN 150416 . 150644)) (150647 151213 (\BOUTEOL
|
||||
150657 . 151211)) (154109 163973 (\BUFFERED.BIN 154119 . 154971) (\BUFFERED.PEEKBIN 154973 . 155755)
|
||||
(\BUFFERED.BOUT 155757 . 156617) (\BUFFERED.BINS 156619 . 160304) (\BUFFERED.BOUTS 160306 . 162107) (
|
||||
\BUFFERED.COPYBYTES 162109 . 163971)))))
|
||||
\DO.PARAMS.AT.OPEN 75196 . 78927) (\RENAMEFILE 78929 . 79353) (\REVALIDATEFILE 79355 . 81957) (
|
||||
\PAGED.REVALIDATEFILELST 81959 . 83517) (\PAGED.REVALIDATEFILES 83519 . 85238) (\PAGED.REVALIDATEFILE
|
||||
85240 . 87523) (\BUFFERED.REVALIDATEFILE 87525 . 89811) (\BUFFERED.REVALIDATEFILELST 89813 . 90997) (
|
||||
\PRINT-REVALIDATION-RESULT 90999 . 91841) (\TRUNCATEFILE 91843 . 92234) (\FILE-CONFLICT 92236 . 93515)
|
||||
) (93553 98216 (\GENERATENOFILES 93563 . 95659) (\NULLFILEGENERATOR 95661 . 95905) (\NOFILESNEXTFILEFN
|
||||
95907 . 97898) (\NOFILESINFOFN 97900 . 98214)) (98335 100243 (\FILE.NOT.OPEN 98345 . 98858) (
|
||||
\FILE.WONT.OPEN 98860 . 99188) (\ILLEGAL.DEVICEOP 99190 . 99472) (\IS.NOT.RANDACCESSP 99474 . 99920) (
|
||||
\STREAM.NOT.OPEN 99922 . 100241)) (100378 102676 (\FDEVINSTANCE 100388 . 102674)) (103878 111252 (
|
||||
CNDIR 103888 . 105193) (DIRECTORYNAME 105195 . 109378) (DIRECTORYNAMEP 109380 . 109996) (HOSTNAMEP
|
||||
109998 . 110805) (\ADD.CONNECTED.DIR 110807 . 111250)) (111297 139576 (\BACKFILEPTR 111307 . 111495) (
|
||||
\BACKPEEKBIN 111497 . 111858) (\BACKBIN 111860 . 112211) (BIN 112213 . 112430) (\BIN 112432 . 112709)
|
||||
(\BINS 112711 . 112997) (BOUT 112999 . 113361) (\BOUT 113363 . 113678) (\BOUTS 113680 . 113991) (
|
||||
COPYBYTES 113993 . 117325) (COPYCHARS 117327 . 120993) (COPYFILE 120995 . 122059) (\COPYOPENFILE
|
||||
122061 . 125260) (\INFER.FILE.TYPE 125262 . 126216) (EOFP 126218 . 126515) (FORCEOUTPUT 126517 .
|
||||
126764) (\FLUSH.OPEN.STREAMS 126766 . 127122) (CHARSET 127124 . 128483) (ACCESS-CHARSET 128485 .
|
||||
129013) (GETEOFPTR 129015 . 129265) (GETFILEINFO 129267 . 132460) (\TYPE.FROM.FILETYPE 132462 . 132932
|
||||
) (\FILETYPE.FROM.TYPE 132934 . 133113) (GETFILEPTR 133115 . 133367) (SETFILEINFO 133369 . 137475) (
|
||||
SETFILEPTR 137477 . 139196) (BOUT16 139198 . 139383) (BIN16 139385 . 139574)) (139679 146333 (
|
||||
\GENERIC.BINS 139689 . 139969) (\GENERIC.BOUTS 139971 . 140236) (\GENERIC.RENAMEFILE 140238 . 142069)
|
||||
(\GENERIC.OPENP 142071 . 143386) (\GENERIC.READP 143388 . 144540) (\GENERIC.CHARSET 144542 . 146331))
|
||||
(146334 146673 (\MAP-OPEN-STREAMS 146344 . 146671)) (148528 150608 (\EOF.ACTION 148538 . 148789) (
|
||||
\EOSERROR 148791 . 148984) (\GETEOFPTR 148986 . 149168) (\INCFILEPTR 149170 . 149520) (\PEEKBIN 149522
|
||||
. 149713) (\SETCLOSEDFILELENGTH 149715 . 150049) (\SETEOFPTR 150051 . 150239) (\SETFILEPTR 150241 .
|
||||
150606)) (150609 151151 (\FIXPOUT 150619 . 150919) (\FIXPIN 150921 . 151149)) (151152 151718 (\BOUTEOL
|
||||
151162 . 151716)) (154614 164478 (\BUFFERED.BIN 154624 . 155476) (\BUFFERED.PEEKBIN 155478 . 156260)
|
||||
(\BUFFERED.BOUT 156262 . 157122) (\BUFFERED.BINS 157124 . 160809) (\BUFFERED.BOUTS 160811 . 162612) (
|
||||
\BUFFERED.COPYBYTES 162614 . 164476)))))
|
||||
STOP
|
||||
|
||||
Binary file not shown.
Reference in New Issue
Block a user