From 321623463c3427bc6bcd0599fbafaf16ff3edc53 Mon Sep 17 00:00:00 2001 From: Nick Briggs Date: Thu, 26 Mar 2026 18:42:51 -0700 Subject: [PATCH] Removes OCTALSTRING from PUP - now in APRINT --- sources/PUP | 63 ++++++++++++++++++++++------------------------- sources/PUP.LCOM | Bin 34941 -> 34565 bytes 2 files changed, 29 insertions(+), 34 deletions(-) diff --git a/sources/PUP b/sources/PUP index 6967ba0b..09aed83b 100644 --- a/sources/PUP +++ b/sources/PUP @@ -1,12 +1,12 @@ (DEFINE-FILE-INFO PACKAGE "INTERLISP" READTABLE "INTERLISP" BASE 8) -(FILECREATED "22-Dec-2025 11:58:55" {DSK}briggs>projects>medley>sources>PUP.;4 334515Q +(FILECREATED " 3-Feb-2026 18:40:52" {DSK}briggs>Projects>medley>sources>PUP.;6 334127Q :EDIT-BY nhb - :CHANGES-TO (FNS \FIND.LOCALPUPHOSTNUMBER) + :CHANGES-TO (VARS PUPCOMS) - :PREVIOUS-DATE "20-Dec-2025 13:51:34" {DSK}briggs>projects>medley>sources>PUP.;3) + :PREVIOUS-DATE "22-Dec-2025 11:58:55" {DSK}briggs>Projects>medley>sources>PUP.;5) (PRETTYCOMPRINT PUPCOMS) @@ -33,7 +33,7 @@ (FNS SETUPPUP SWAPPUPPORTS GETPUP SENDPUP EXCHANGEPUPS DISCARDPUPS GETPUPWORD \PUPINIT) (FNS ETHERHOSTNAME ETHERHOSTNUMBER ETHERPORT BESTPUPADDRESS NETDAYTIME0 \PUP.SETTIME \SETNEWTIME0 \NET.SETTIME NETDATE \LOOKUPPORT \PARSE.PORTCONSTANT \FIXLOCALNET) - (FNS PORTSTRING OCTALSTRING) + (FNS PORTSTRING) (INITVARS (\ETHERPORTS (HASHARRAY 24Q)) (\ETHERTIMEOUT 3720Q) (\MAXETHERTRIES 4) @@ -1080,11 +1080,6 @@ (COND (SOCKET (OCTALSTRING SOCKET)) (T ""]) - -(OCTALSTRING - [LAMBDA (N) (* bvm%: "21-JUL-81 12:16") - (GLOBALRESOURCE (\NUMSTR \NUMSTR1) - (CONCAT (\CONVERTNUMBER N 10Q NIL NIL \NUMSTR \NUMSTR1]) ) (RPAQ? \ETHERPORTS (HASHARRAY 24Q)) @@ -2468,29 +2463,29 @@ (PUTPROPS PUP FILETYPE CL:COMPILE-FILE) (DECLARE%: DONTCOPY - (FILEMAP (NIL (25117Q 61405Q (\STARTPUP 25131Q . 26003Q) (ASSURE.PUP.READY 26005Q . 34100Q) ( -\FIND.LOCALPUPHOSTNUMBER 34102Q . 36611Q) (\PROMPT.FOR.PUP.NUMBER 36613Q . 40633Q) (\HANDLE.RAW.PUP -40635Q . 56735Q) (\FORWARD.PUP 56737Q . 57657Q) (\SETPUPCHECKSUM 57661Q . 61403Q)) (66151Q 73243Q ( -\PUPERROR 66163Q . 73241Q)) (73302Q 112436Q (SETUPPUP 73314Q . 76502Q) (SWAPPUPPORTS 76504Q . 77321Q) -(GETPUP 77323Q . 102235Q) (SENDPUP 102237Q . 106061Q) (EXCHANGEPUPS 106063Q . 110121Q) (DISCARDPUPS -110123Q . 110727Q) (GETPUPWORD 110731Q . 111250Q) (\PUPINIT 111252Q . 112434Q)) (112437Q 154017Q ( -ETHERHOSTNAME 112451Q . 121577Q) (ETHERHOSTNUMBER 121601Q . 122214Q) (ETHERPORT 122216Q . 125735Q) ( -BESTPUPADDRESS 125737Q . 135777Q) (NETDAYTIME0 136001Q . 136332Q) (\PUP.SETTIME 136334Q . 136761Q) ( -\SETNEWTIME0 136763Q . 140043Q) (\NET.SETTIME 140045Q . 141134Q) (NETDATE 141136Q . 141473Q) ( -\LOOKUPPORT 141475Q . 147334Q) (\PARSE.PORTCONSTANT 147336Q . 152446Q) (\FIXLOCALNET 152450Q . 154015Q -)) (154020Q 155355Q (PORTSTRING 154032Q . 155021Q) (OCTALSTRING 155023Q . 155353Q)) (155747Q 165060Q ( -CLEARPUP 155761Q . 160474Q) (PUTPUPWORD 160476Q . 161023Q) (GETPUPBYTE 161025Q . 161350Q) (PUTPUPBYTE -161352Q . 161703Q) (GETPUPSTRING 161705Q . 163336Q) (GETPUPSTREAM 163340Q . 164267Q) (PUTPUPSTRING -164271Q . 165056Q)) (166651Q 174470Q (READPLIST 166663Q . 174466Q)) (174651Q 200051Q ( -\CANONICAL.HOSTNAME 174663Q . 175730Q) (\CANONICALIZE.PUP.HOSTNAME 175732Q . 200047Q)) (202406Q -235613Q (\PUPGATELISTENER 202420Q . 206251Q) (\HANDLE.PUP.ROUTING.INFO 206253Q . 220612Q) (\ROUTE.PUP -220614Q . 224447Q) (\LOCATE.PUPNET 224451Q . 231206Q) (SORT.PUPHOSTS.BY.DISTANCE 231210Q . 233464Q) ( -\PUPNET.CLOSERP 233466Q . 234647Q) (PUPNET.DISTANCE 234651Q . 235611Q)) (247006Q 256760Q ( -OPENPUPSOCKET 247020Q . 253501Q) (CLOSEPUPSOCKET 253503Q . 255162Q) (PUPSOCKETNUMBER 255164Q . 255415Q -) (PUPSOCKETFROMNUMBER 255417Q . 256056Q) (PUPSOCKETEVENT 256060Q . 256337Q) (\FLUSHPUPSOCQUEUE -256341Q . 256756Q)) (256761Q 257526Q (\GETMISCSOCKET 256773Q . 257524Q)) (277224Q 312014Q ( -PUP.ECHOSERVER 277236Q . 302043Q) (PUP.ECHOUSER 302045Q . 312012Q)) (312045Q 321176Q (\PEEKPUP 312057Q - . 317210Q) (\MAYBEPEEKPUP 317212Q . 321174Q)) (321577Q 333034Q (PRINTPUP 321611Q . 325761Q) ( -PRINTPUPROUTE 325763Q . 327730Q) (PRINTPUPDATA 327732Q . 330402Q) (PRINTERRORPUP 330404Q . 331104Q) ( -PUPTRACE 331106Q . 331417Q) (PRINTCONSTANT 331421Q . 333032Q))))) + (FILEMAP (NIL (25063Q 61351Q (\STARTPUP 25075Q . 25747Q) (ASSURE.PUP.READY 25751Q . 34044Q) ( +\FIND.LOCALPUPHOSTNUMBER 34046Q . 36555Q) (\PROMPT.FOR.PUP.NUMBER 36557Q . 40577Q) (\HANDLE.RAW.PUP +40601Q . 56701Q) (\FORWARD.PUP 56703Q . 57623Q) (\SETPUPCHECKSUM 57625Q . 61347Q)) (66115Q 73207Q ( +\PUPERROR 66127Q . 73205Q)) (73246Q 112402Q (SETUPPUP 73260Q . 76446Q) (SWAPPUPPORTS 76450Q . 77265Q) +(GETPUP 77267Q . 102201Q) (SENDPUP 102203Q . 106025Q) (EXCHANGEPUPS 106027Q . 110065Q) (DISCARDPUPS +110067Q . 110673Q) (GETPUPWORD 110675Q . 111214Q) (\PUPINIT 111216Q . 112400Q)) (112403Q 153763Q ( +ETHERHOSTNAME 112415Q . 121543Q) (ETHERHOSTNUMBER 121545Q . 122160Q) (ETHERPORT 122162Q . 125701Q) ( +BESTPUPADDRESS 125703Q . 135743Q) (NETDAYTIME0 135745Q . 136276Q) (\PUP.SETTIME 136300Q . 136725Q) ( +\SETNEWTIME0 136727Q . 140007Q) (\NET.SETTIME 140011Q . 141100Q) (NETDATE 141102Q . 141437Q) ( +\LOOKUPPORT 141441Q . 147300Q) (\PARSE.PORTCONSTANT 147302Q . 152412Q) (\FIXLOCALNET 152414Q . 153761Q +)) (153764Q 154767Q (PORTSTRING 153776Q . 154765Q)) (155361Q 164472Q (CLEARPUP 155373Q . 160106Q) ( +PUTPUPWORD 160110Q . 160435Q) (GETPUPBYTE 160437Q . 160762Q) (PUTPUPBYTE 160764Q . 161315Q) ( +GETPUPSTRING 161317Q . 162750Q) (GETPUPSTREAM 162752Q . 163701Q) (PUTPUPSTRING 163703Q . 164470Q)) ( +166263Q 174102Q (READPLIST 166275Q . 174100Q)) (174263Q 177463Q (\CANONICAL.HOSTNAME 174275Q . 175342Q +) (\CANONICALIZE.PUP.HOSTNAME 175344Q . 177461Q)) (202020Q 235225Q (\PUPGATELISTENER 202032Q . 205663Q +) (\HANDLE.PUP.ROUTING.INFO 205665Q . 220224Q) (\ROUTE.PUP 220226Q . 224061Q) (\LOCATE.PUPNET 224063Q + . 230620Q) (SORT.PUPHOSTS.BY.DISTANCE 230622Q . 233076Q) (\PUPNET.CLOSERP 233100Q . 234261Q) ( +PUPNET.DISTANCE 234263Q . 235223Q)) (246420Q 256372Q (OPENPUPSOCKET 246432Q . 253113Q) (CLOSEPUPSOCKET + 253115Q . 254574Q) (PUPSOCKETNUMBER 254576Q . 255027Q) (PUPSOCKETFROMNUMBER 255031Q . 255470Q) ( +PUPSOCKETEVENT 255472Q . 255751Q) (\FLUSHPUPSOCQUEUE 255753Q . 256370Q)) (256373Q 257140Q ( +\GETMISCSOCKET 256405Q . 257136Q)) (276636Q 311426Q (PUP.ECHOSERVER 276650Q . 301455Q) (PUP.ECHOUSER +301457Q . 311424Q)) (311457Q 320610Q (\PEEKPUP 311471Q . 316622Q) (\MAYBEPEEKPUP 316624Q . 320606Q)) ( +321211Q 332446Q (PRINTPUP 321223Q . 325373Q) (PRINTPUPROUTE 325375Q . 327342Q) (PRINTPUPDATA 327344Q + . 330014Q) (PRINTERRORPUP 330016Q . 330516Q) (PUPTRACE 330520Q . 331031Q) (PRINTCONSTANT 331033Q . +332444Q))))) STOP diff --git a/sources/PUP.LCOM b/sources/PUP.LCOM index 4bb0cc79982d8eca01394bcbe6a85044d59da6ce..87a0bd8ef50c032b1ec299d48c8865bb4e5e08db 100644 GIT binary patch delta 335 zcmZ{fJx_yB7)C=kneAZW@a85e441%#OX-biL_U;=LisX|Qb?_-U`pd+jFYRO=}+Ou zIhknVqDJ@gu{BHerUV@LWc&Ki2VAiR5apJ@{2|&oqD26Z%t>8QsfrXKi zc|jUu`%?*s5Nwx|&2b8f!l=P0MZo`K`ME@ZDv-zw-go C8Cehj delta 679 zcmZ{g&ubGw6vuaSD9vI)v0{ZD9t+jo!-k!m*~AXDcC$N47RO!pSD=tXZ4#Q6q?V>P zDfQx2QgZMl_$LUVXU~HFgGc`g!P%xZG3XrTy_xs@y!Yk3|4{ffDvX+|mSuR|wqco; z4G2+tlbYo6XhS}^9If|=u7GNxzZ9fG5mMo-{bq2|f6{@&V^C`u=P<7;l}ajfUY~V4 z|KhQ&>WWtLIdfy?q|6(ClGj$>ddZ9Pt!&sm9d7TR9v&PFw{sIZ0gQ=_>U&XBHhgo8HqPLiD&iTjGMidhjl>dyA@#Lqx zV_$@B>hL6u{h$uid#Y$0G!p_{2PrB@lDsF0bG6xjSIm>W{JJ8`dAL`Qclyh{PQzbW z%HP+5#=|`Q>QBSn-ZXys_9yu+X?8gRHw;`S1sh#N&=QX(i_;)`S!FR`bX(4M;cy