From c7272e78f28812d109a01ed02dff4cf2a67c0cf5 Mon Sep 17 00:00:00 2001 From: rmkaplan Date: Tue, 25 Jan 2022 17:24:19 -0800 Subject: [PATCH] ADIR: Only first colon before marks a device #651 --- sources/ADIR | 33 ++++++++++++++++----------------- sources/ADIR.LCOM | Bin 24318 -> 24297 bytes 2 files changed, 16 insertions(+), 17 deletions(-) diff --git a/sources/ADIR b/sources/ADIR index c2f27f11..638c2267 100644 --- a/sources/ADIR +++ b/sources/ADIR @@ -1,11 +1,11 @@ (DEFINE-FILE-INFO PACKAGE "INTERLISP" READTABLE "INTERLISP" BASE 10) -(FILECREATED " 5-Jan-2022 11:06:37" {DSK}kaplan>Local>medley3.5>my-medley>sources>ADIR.;10 65596 +(FILECREATED "25-Jan-2022 17:19:00" {DSK}kaplan>Local>medley3.5>my-medley>sources>ADIR.;11 65609 :CHANGES-TO (FNS UNPACKFILENAME.STRING) - :PREVIOUS-DATE "13-Jun-2021 11:25:58" -{DSK}kaplan>Local>medley3.5>my-medley>sources>ADIR.;9) + :PREVIOUS-DATE " 5-Jan-2022 11:06:37" +{DSK}kaplan>Local>medley3.5>my-medley>sources>ADIR.;10) (* ; " @@ -286,7 +286,8 @@ Copyright (c) 1981-1988, 1990-1992, 1920, 2017, 2020-2021 by Venue & Xerox Corpo (UNPACKFILENAME.STRING FILE ONEFIELDFLG NIL OSTYPE T]) (UNPACKFILENAME.STRING - [LAMBDA (FILE ONEFIELDFLG DIRFLG OSTYPE PACKFLG CLFLG) (* ; "Edited 5-Jan-2022 11:03 by rmk") + [LAMBDA (FILE ONEFIELDFLG DIRFLG OSTYPE PACKFLG CLFLG) (* ; "Edited 25-Jan-2022 17:16 by rmk") + (* ; "Edited 5-Jan-2022 11:03 by rmk") (* ; "Edited 30-Mar-90 22:37 by nm") (* ;;; "Given a string or atom representation of a file name, unpack it into its component parts") @@ -350,9 +351,7 @@ Copyright (c) 1981-1988, 1990-1992, 1920, 2017, 2020-2021 by Venue & Xerox Corpo ((AND (SETQ TEM (\UPF.NEXTPOS (CHARCODE (%: < /)) FILE POS)) (EQ (CHARCODE %:) - (NTHCHARCODE FILE TEM)) - (SETQ TEM (LASTCHPOS (CHARCODE %:) - FILE TEM))) (* ; + (NTHCHARCODE FILE TEM))) (* ;  "all device returned have DEVICE.END on it so that NIL: will work") (UNPACKFILE1 'DEVICE POS (if CLFLG then (SUB1 TEM) @@ -1157,14 +1156,14 @@ Copyright (c) 1981-1988, 1990-1992, 1920, 2017, 2020-2021 by Venue & Xerox Corpo (PUTPROPS ADIR COPYRIGHT ("Venue & Xerox Corporation" 1981 1982 1983 1984 1985 1986 1987 1988 1990 1991 1992 1920 2017 2020 2021)) (DECLARE%: DONTCOPY - (FILEMAP (NIL (2686 13811 (DELFILE 2696 . 2857) (FULLNAME 2859 . 3226) (INFILE 3228 . 3376) (INFILEP -3378 . 3513) (IOFILE 3515 . 3655) (OPENFILE 3657 . 4057) (OPENSTREAM 4059 . 8399) (OUTFILE 8401 . 8552 -) (OUTFILEP 8554 . 8690) (RENAMEFILE 8692 . 8998) (SIMPLE.FINDFILE 9000 . 9410) (VMEMSIZE 9412 . 9579) - (\COPYSYS 9581 . 12530) (\FLUSHVM 12532 . 13604) (\LOGOUT0 13606 . 13809)) (14183 34403 ( -UNPACKFILENAME 14193 . 14379) (UNPACKFILENAME.STRING 14381 . 31282) (LASTCHPOS 31284 . 31978) ( -\UPF.NEXTPOS 31980 . 32625) (\UPF.TEMPFILEP 32627 . 33204) (FILENAMEFIELD 33206 . 33691) (PACKFILENAME - 33693 . 34036) (PACKFILENAME.STRING 34038 . 34401)) (56043 63223 (LOGOUT 56053 . 56970) (MAKESYS -56972 . 58601) (SYSOUT 58603 . 60155) (SAVEVM 60157 . 60957) (HERALD 60959 . 61119) (INTERPRET.REM.CM -61121 . 62846) (\USEREVENT 62848 . 63221)) (63405 65132 (USERNAME 63415 . 64371) (SETUSERNAME 64373 . -65130))))) + (FILEMAP (NIL (2687 13812 (DELFILE 2697 . 2858) (FULLNAME 2860 . 3227) (INFILE 3229 . 3377) (INFILEP +3379 . 3514) (IOFILE 3516 . 3656) (OPENFILE 3658 . 4058) (OPENSTREAM 4060 . 8400) (OUTFILE 8402 . 8553 +) (OUTFILEP 8555 . 8691) (RENAMEFILE 8693 . 8999) (SIMPLE.FINDFILE 9001 . 9411) (VMEMSIZE 9413 . 9580) + (\COPYSYS 9582 . 12531) (\FLUSHVM 12533 . 13605) (\LOGOUT0 13607 . 13810)) (14184 34416 ( +UNPACKFILENAME 14194 . 14380) (UNPACKFILENAME.STRING 14382 . 31295) (LASTCHPOS 31297 . 31991) ( +\UPF.NEXTPOS 31993 . 32638) (\UPF.TEMPFILEP 32640 . 33217) (FILENAMEFIELD 33219 . 33704) (PACKFILENAME + 33706 . 34049) (PACKFILENAME.STRING 34051 . 34414)) (56056 63236 (LOGOUT 56066 . 56983) (MAKESYS +56985 . 58614) (SYSOUT 58616 . 60168) (SAVEVM 60170 . 60970) (HERALD 60972 . 61132) (INTERPRET.REM.CM +61134 . 62859) (\USEREVENT 62861 . 63234)) (63418 65145 (USERNAME 63428 . 64384) (SETUSERNAME 64386 . +65143))))) STOP diff --git a/sources/ADIR.LCOM b/sources/ADIR.LCOM index 370a9cb699b04f4b8227d8af234c12688a2e3515..da993a541c98b349093af4cf87206cc5d59de729 100644 GIT binary patch delta 3440 zcmZuzJ#U;v5a!YVhlCPhLc2O8!d7HwXZHJuNG|8s*unOhyK^8C5{i-tSr`Z?1ypZG zML~2wfG#y65~4{%OU)0UL_$i$4~Tg7z4v4H;F|YlcV>6ynP+D9#nawjPkTRnxW;Dl z=AAD#SuzW9LkdI1k3O3)ZHNKuZja^A@Q~aE@XtOgtX^_{)_VmvKI^I{uH|8Ymkfml52z4I!O z=v!lDSp3)vYa&&op|nHg7Jv8NJwx)zo@x^;deTG{^Z;nkI$FJio^Ntcy}}%PqqtT6l*a%zA>9m_YU8KNGgh>`Q$(t z_C{<^i(AEX22Hk{YO;}uCX@L1_-JQqUK||75RZf*>r#Ef&9mdOKAL29nDo_QjTh2} z?rf<{E9l@W|7t}Y93^{DTya8s@3VMI?b-iF%fbDF_p6|_4b%m#t>?^MTOB%8Ro&h= zW5SBAF_aq{S?2C&O?f`FvMV-9r$}ifReoknOPW#5(&P&SG#ibpG3h$u+pH`XloFRN zji%Gl?adn_WLrxLVzj?M8Q0ON5X|D)+i#WD3oI2M9FO*e3P9s9l4*wjD$Td@-Znrf zkF6SC<#BLFIOUM})D`7a?whh9g{UlqvQpUQ}8Wpl(iWqozsFz=CnX5 zbs?6qQYhHGx+qX?Lmp)7d?9c0`XrCmp29}X z&Ur^Dnp{J!lrKrOVj^RRZ9N2Vs=eY6TrRkH@e5X*8JDehp^@w|it5&te|1+$lHyT$X(KTFKHIJx&G zhnU?6p!jHB94i_v4>P<5<{u_r!f}le;)44Cr2}|MthR4 zh`pUS6?pOB+FGdsj@sUv7UTJ3dK=5=9Xor){0|i9X#Vw zQHDfh#w4kCFXB#SwAxM^-8((Yc(eHG+W9r(D)c)&qkY^Mo8=ttHZ+FLc5!QOj07s* z{sj{g9fUb8=Eu`Rp?p|;FON#R83u#+nhMpIz||-de2?GAb$o%VtiBG9nkZYewD>is z!gY*%?KU77-w6s0VBG?ICoFID;S@Sks~Yc%LRlFSk~FxA<0Pop86hvx9c-vzl^9%! zf6xD4_LE13;hyWBwAS~?){ z##?WKLNlrGP!ewdxPu`O?U#6Pz~iVD9P*oZ!`2wcWvyz#$5u6#T=a%DMtWz{7pxdC z#GT4v;KA&$62CD5e9=U^g9!OYR_2qmF%0WCqBJ@>$9)Fx_A4|tre{-=f zR@0JB?VP@SSM&~7lZg6r%cAk`foV#@4 zgR9rO&*68c|Mb_{o&MG9r^D*~N8Ohno-b@Brpu$@(O^EDjdEd>vSP8iwph-`)3>l> z6PAPJ>{uA~PK@UHjeNdXzGKsg)nU?>Na&Z6n?J8*Pq-ulK*6T!H zTT6|o)s^+y87sGBja8|#;UaZMYfkf_mD|!$CPqptGU=TmEpbLQlS?-UXx0*!L(+A? zx87NAXd^CO9L(o~n+Mkh$hMY>#9%U+4eRKnbmjN2?-t5uQeZQGXEm4z<$=dE&}o7H zI?lMtd{#rHG8}CXRvE5tDW@EAA3LL*Nxf4}wjdS3UuDUrIwrUg@fxVbj8XM4b(a8*; zN|2~VPD)$IUqk0Y&HSarBB?mxi44O&5Mx7Jf==uIZezYhK` zF!sVAAJ3*3UpQHY$Vay@MMPqaR=PDAC#md%TL8g~ODHZpPGdSQl&P@NA9rLa7CBSYwj6I$eRu z4j95oO95*;eC