From 6e00dcf458c27347a79cc8dc6a6522454738b11f Mon Sep 17 00:00:00 2001
From: Nick Briggs <nicholas.h.briggs@gmail.com>
Date: Thu, 1 Jan 2026 18:05:52 -0800
Subject: [PATCH] When no ethernet \FIND.LOCALPUPHOSTNUMBER should immediately
 return NIL

If there is NO ethernet it is better to avoid a delay waiting for a
PUP lookup response that will never come, and there is no value in
asking for the user to enter a PUP host number that will not be used.
---
 sources/PUP      | 380 +++++++++++++++++++++++------------------------
 sources/PUP.LCOM | Bin 34876 -> 34941 bytes
 2 files changed, 188 insertions(+), 192 deletions(-)

diff --git a/sources/PUP b/sources/PUP
index c64000e1..6967ba0b 100644
--- a/sources/PUP
+++ b/sources/PUP
@@ -1,15 +1,13 @@
-(DEFINE-FILE-INFO READTABLE "INTERLISP" PACKAGE "INTERLISP" BASE 8)
-
(FILECREATED " 1-May-2021 19:49:18" {DSK}<home>larry>ilisp>medley>sources>PUP.;2
 336270Q
+(DEFINE-FILE-INFO PACKAGE "INTERLISP" READTABLE "INTERLISP" BASE 8)
 
-      changes to%:  (FNS \PUP.SETTIME CANONICAL.HOSTNAME)
-                    (VARS PUPCOMS)
+
(FILECREATED "22-Dec-2025 11:58:55" {DSK}<Users>briggs>projects>medley>sources>PUP.;4
 334515Q
 
-      previous date%: "19-Jan-93 11:14:09" {DSK}<home>larry>ilisp>medley>sources>PUP.;1)
+      :EDIT-BY nhb
 
+      :CHANGES-TO (FNS \FIND.LOCALPUPHOSTNUMBER)
+
+      :PREVIOUS-DATE "20-Dec-2025 13:51:34" {DSK}<Users>briggs>projects>medley>sources>PUP.;3)
 
-(* ; "
-Copyright (c) 3676-3711, 3745 by Venue & Xerox Corporation.
-")
 
 (PRETTYCOMPRINT PUPCOMS)
 
@@ -45,13 +43,13 @@ Copyright (c) 3676-3711, 3745 by Venue & Xerox Corporation.
               (FNS CLEARPUP PUTPUPWORD GETPUPBYTE PUTPUPBYTE GETPUPSTRING GETPUPSTREAM PUTPUPSTRING)
               (OPTIMIZERS GETPUPWORD PUTPUPWORD GETPUPBYTE PUTPUPBYTE))
         (COMS                                                (* ; 
-
                                                           "Reading property lists from streams")

+
                                                             "Reading property lists from streams")

               (FNS READPLIST)
               (INITVARS \READPLIST.READTABLES)
               (GLOBALVARS \READPLIST.READTABLES))
         (COMS (FNS \CANONICAL.HOSTNAME \CANONICALIZE.PUP.HOSTNAME)
               (P                                             (* ; 
-
                                                           "Default this for when IP not loaded")

+
                                                             "Default this for when IP not loaded")

                  (MOVD? 'NILL '\CANONICALIZE.IP.HOSTNAME NIL T))
               (ADDVARS (\HOSTNAMES)
                      (\SYSTEMCACHEVARS \HOSTNAMES))
@@ -138,53 +136,52 @@ Copyright (c) 3676-3711, 3745 by Venue & Xerox Corporation.
 (* "FOLLOWING DEFINITIONS EXPORTED")(DECLARE%: EVAL@COMPILE
 
 (ACCESSFNS PUP
 [(PUPBASE (LOCF (fetch
 (ETHERPACKET EPBODY) of
 DATUM]
-                   [BLOCKRECORD PUPBASE ((PUPLENGTH WORD)
-                                         (PUPTCONTROL BYTE)
-                                         (PUPTYPE BYTE)
-                                         (PUPID FIXP)
-                                         (PUPDEST WORD)
-                                         (PUPDESTSOCKET FIXP)
-                                         (PUPSOURCE WORD)
-                                         (PUPSOURCESOCKET FIXP)
-                                         (PUPDATASTART 412Q WORD))
-                          (BLOCKRECORD PUPBASE ((NIL WORD)
-                                                (TYPEWORD WORD)
-                                                (PUPIDHI WORD)
-                                                (PUPIDLO WORD)
-                                                (PUPDESTNET BYTE)
-                                                (PUPDESTHOST BYTE)
-                                                (PUPDESTSOCKETHI WORD)
-                                                (PUPDESTSOCKETLO WORD)
-                                                (PUPSOURCENET BYTE)
-                                                (PUPSOURCEHOST BYTE)
-                                                (PUPSOURCESOCKETHI WORD)
-                                                (PUPSOURCESOCKETLO WORD))
+               [BLOCKRECORD PUPBASE ((PUPLENGTH WORD)
+                                     (PUPTCONTROL BYTE)
+                                     (PUPTYPE BYTE)
+                                     (PUPID FIXP)
+                                     (PUPDEST WORD)
+                                     (PUPDESTSOCKET FIXP)
+                                     (PUPSOURCE WORD)
+                                     (PUPSOURCESOCKET FIXP)
+                                     (PUPDATASTART 412Q WORD))
+                      (BLOCKRECORD PUPBASE ((NIL WORD)
+                                            (TYPEWORD WORD)
+                                            (PUPIDHI WORD)
+                                            (PUPIDLO WORD)
+                                            (PUPDESTNET BYTE)
+                                            (PUPDESTHOST BYTE)
+                                            (PUPDESTSOCKETHI WORD)
+                                            (PUPDESTSOCKETLO WORD)
+                                            (PUPSOURCENET BYTE)
+                                            (PUPSOURCEHOST BYTE)
+                                            (PUPSOURCESOCKETHI WORD)
+                                            (PUPSOURCESOCKETLO WORD))
                                                              (* ; "Temporary extra synonyms")

-                                 (SYNONYM PUPDESTNET (DESTNET))
-                                 (SYNONYM PUPDESTHOST (DESTHOST))
-                                 (SYNONYM PUPDESTSOCKETHI (DESTSKTHI))
-                                 (SYNONYM PUPDESTSOCKETLO (DESTSKTLO))
-                                 (SYNONYM PUPSOURCENET (SOURCENET))
-                                 (SYNONYM PUPSOURCEHOST (SOURCEHOST))
-                                 (SYNONYM PUPSOURCESOCKETHI (SOURCESKTHI))
-                                 (SYNONYM PUPSOURCESOCKETLO (SOURCESKTLO)))
-                          (SYNONYM PUPDEST (DEST))
-                          (SYNONYM PUPDESTSOCKET (DESTSKT))
-                          (SYNONYM PUPSOURCE (SOURCE))
-                          (SYNONYM PUPSOURCESOCKET (SOURCESKT))
-                          (ACCESSFNS PUPDATASTART ((PUPCONTENTS (LOCF DATUM]
-                   [ACCESSFNS PUP [(PUPCHECKSUMBASE (fetch
 PUPBASE of
 DATUM))
-                                   (PUPCHECKSUMLOC (\ADDBASE (fetch
 PUPBASE of
 DATUM)
-                                                          (FOLDLO (SUB1 (fetch
 PUPLENGTH
-                                                                           of
 DATUM))
-                                                                 BYTESPERWORD]
-                          (BLOCKRECORD PUPCHECKSUMLOC ((PUPCHECKSUM WORD]
-                   (TYPE?
 (type?
 ETHERPACKET DATUM)))
+                             (SYNONYM PUPDESTNET (DESTNET))
+                             (SYNONYM PUPDESTHOST (DESTHOST))
+                             (SYNONYM PUPDESTSOCKETHI (DESTSKTHI))
+                             (SYNONYM PUPDESTSOCKETLO (DESTSKTLO))
+                             (SYNONYM PUPSOURCENET (SOURCENET))
+                             (SYNONYM PUPSOURCEHOST (SOURCEHOST))
+                             (SYNONYM PUPSOURCESOCKETHI (SOURCESKTHI))
+                             (SYNONYM PUPSOURCESOCKETLO (SOURCESKTLO)))
+                      (SYNONYM PUPDEST (DEST))
+                      (SYNONYM PUPDESTSOCKET (DESTSKT))
+                      (SYNONYM PUPSOURCE (SOURCE))
+                      (SYNONYM PUPSOURCESOCKET (SOURCESKT))
+                      (ACCESSFNS PUPDATASTART ((PUPCONTENTS (LOCF DATUM]
+               [ACCESSFNS PUP [(PUPCHECKSUMBASE (fetch
 PUPBASE of
 DATUM))
+                               (PUPCHECKSUMLOC (\ADDBASE (fetch
 PUPBASE of
 DATUM)
+                                                      (FOLDLO (SUB1 (fetch
 PUPLENGTH of
 DATUM))
+                                                             BYTESPERWORD]
+                      (BLOCKRECORD PUPCHECKSUMLOC ((PUPCHECKSUM WORD]
+               (TYPE?
 (type?
 ETHERPACKET DATUM)))
 
 (ACCESSFNS PUPADDRESS
 ((PUPNET# (LRSH DATUM 10Q))
-                           (PUPHOST# (LOGAND DATUM 377Q)))
-                          (CREATE
 (IPLUS (LLSH PUPNET# 10Q)
-                                             PUPHOST#)))
+                       (PUPHOST# (LOGAND DATUM 377Q)))
+                      (CREATE
 (IPLUS (LLSH PUPNET# 10Q)
+                                     PUPHOST#)))
 )
 (DECLARE%: EVAL@COMPILE 
 
@@ -274,23 +271,26 @@ Copyright (c) 3676-3711, 3745 by Venue & Xerox Corporation.
                   (RETURN T])])
 
 (\FIND.LOCALPUPHOSTNUMBER

-  [LAMBDA (NDB EVENT QUIET)
                              (* bvm%: "26-Jul-84 16:27")

+  [LAMBDA (NDB EVENT QUIET)
                                  (* ; "Edited 22-Dec-2025 11:58 by nhb")


+                                                             (* ; "Edited 20-Dec-2025 13:51 by nhb")

+                                                             (* bvm%: "26-Jul-84 16:27")

 
     (* ;; "Finds out our pup address on this 10mb NDB")

 
     (PROG (NEWNUMBER)
           [COND
+             ((NOT (\ETHER-AVAILABLE))
+              (RETURN NIL))
              [(SETQ NEWNUMBER (\LOOKUPPUPNUMBER \MY.NSHOSTNUMBER NDB))
               (COND
-                 (PUPTRACEFLG (printout PUPTRACEFILE "My pup address = " (fetch
 PUPNET#
-                                                                            of
 NEWNUMBER)
+                 (PUPTRACEFLG (printout PUPTRACEFILE "My pup address = " (fetch
 PUPNET# of
 NEWNUMBER)
                                      "#"
                                      (fetch
 PUPHOST# of
 NEWNUMBER)
                                      "#" T]
              (QUIET (RETURN NIL))
              (T (SETQ NEWNUMBER (\PROMPT.FOR.PUP.NUMBER
 (AND (EQ EVENT 'AFTERLOGOUT)
-                                                                 (NEQ \OLDPUPHOST# 0)
-                                                                 (OCTALSTRING
 \OLDPUPHOST#]
+                                                             (NEQ \OLDPUPHOST# 0)
+                                                             (OCTALSTRING
 \OLDPUPHOST#]
 
      (* ;; "Only rely on the host number part of reply.  There is confusion for machines that exist on more than one net")

 
@@ -470,14 +470,14 @@ Copyright (c) 3676-3711, 3745 by Venue & Xerox Corporation.
 (* "FOLLOWING DEFINITIONS EXPORTED")(DECLARE%: EVAL@COMPILE
 
 (ACCESSFNS ERRORPUP
 ((ERRORPUPBASE (fetch
 PUPCONTENTS of
 DATUM)))
-                        (BLOCKRECORD ERRORPUPBASE ((ERRORPUPCOPY 12Q WORD)
+                    (BLOCKRECORD ERRORPUPBASE ((ERRORPUPCOPY 12Q WORD)
                                                              (* ; "Copy of pup header")

-                                                   (ERRORPUPCODE WORD)
-                                                   (ERRORPUPARG WORD)
+                                               (ERRORPUPCODE WORD)
+                                               (ERRORPUPARG WORD)
                                                              (* ; "Usually zero")

-                                                   (ERRORPUPSTRINGBASE WORD)
+                                               (ERRORPUPSTRINGBASE WORD)
                                                              (* ; "Human readable message")

-                                                   )))
+                                               )))
 )
 
 (RPAQQ PUPERRORCODES

@@ -1174,24 +1174,22 @@ Copyright (c) 3676-3711, 3745 by Venue & Xerox Corporation.
 )
 
 (DEFOPTIMIZER GETPUPWORD
 (PUPARG WORD#)
-                             `(\GETBASE (fetch
 PUPCONTENTS of
 (\DTEST ,PUPARG 'ETHERPACKET))
-                                     ,WORD#))
+                         `(\GETBASE (fetch
 PUPCONTENTS of
 (\DTEST ,PUPARG 'ETHERPACKET))
+                                 ,WORD#))
 
 (DEFOPTIMIZER PUTPUPWORD
 (PUPARG WORD# VALUE)
-                             `(\PUTBASE (fetch
 PUPCONTENTS of
 (\DTEST ,PUPARG 'ETHERPACKET))
-                                     ,WORD#
-                                     ,VALUE))
+                         `(\PUTBASE (fetch
 PUPCONTENTS of
 (\DTEST ,PUPARG 'ETHERPACKET))
+                                 ,WORD#
+                                 ,VALUE))
 
 (DEFOPTIMIZER GETPUPBYTE
 (PUPARG BYTE#)
-                             `(\GETBASEBYTE (fetch
 PUPCONTENTS of
 (\DTEST ,PUPARG
-                                                                                 'ETHERPACKET))
-                                     ,BYTE#))
+                         `(\GETBASEBYTE (fetch
 PUPCONTENTS of
 (\DTEST ,PUPARG 'ETHERPACKET))
+                                 ,BYTE#))
 
 (DEFOPTIMIZER PUTPUPBYTE
 (PUPARG BYTE# VALUE)
-                             `(\PUTBASEBYTE (fetch
 PUPCONTENTS of
 (\DTEST ,PUPARG
-                                                                                 'ETHERPACKET))
-                                     ,BYTE#
-                                     ,VALUE))
+                         `(\PUTBASEBYTE (fetch
 PUPCONTENTS of
 (\DTEST ,PUPARG 'ETHERPACKET))
+                                 ,BYTE#
+                                 ,VALUE))
 
 
 
@@ -1282,7 +1280,7 @@ Copyright (c) 3676-3711, 3745 by Venue & Xerox Corporation.
 )
 
                                                              (* ; 
-
                                                           "Default this for when IP not loaded")

+
                                                             "Default this for when IP not loaded")

 
 (MOVD? 'NILL '\CANONICALIZE.IP.HOSTNAME NIL T)
 
@@ -1301,8 +1299,8 @@ Copyright (c) 3676-3711, 3745 by Venue & Xerox Corporation.
 (* "FOLLOWING DEFINITIONS EXPORTED")(DECLARE%: EVAL@COMPILE 
 
 (PUTPROPS BINDPUPS
 MACRO
 [X (CONS (LIST 'LAMBDA (CAR X)
-                                                (CONS 'PROGN (CDR X)))
-                                          (in
 (CAR X) collect
 (LIST 'ALLOCATE.PUP])
+                                        (CONS 'PROGN (CDR X)))
+                                  (in
 (CAR X) collect
 (LIST 'ALLOCATE.PUP])
 )
 
 (PUTPROPS BINDPUPS
 INFO
 BINDS)
@@ -1597,12 +1595,12 @@ Copyright (c) 3676-3711, 3745 by Venue & Xerox Corporation.
 (DECLARE%: DONTCOPY 
 (DECLARE%: EVAL@COMPILE
 
-(BLOCKRECORD PUPROUTINGINFO
 (                            (* ; 
-
          "Format of each entry in a pup routing info packet.  We only actually use NET# and #HOPS")

-                                 (NET# BYTE)
-                                 (GATENET# BYTE)
-                                 (GATEHOST# BYTE)
-                                 (%#HOPS BYTE)))
+(BLOCKRECORD PUPROUTINGINFO
 (                                (* ; 
+
            "Format of each entry in a pup routing info packet.  We only actually use NET# and #HOPS")

+                             (NET# BYTE)
+                             (GATENET# BYTE)
+                             (GATEHOST# BYTE)
+                             (%#HOPS BYTE)))
 )
 
 (DECLARE%: EVAL@COMPILE 
@@ -1628,24 +1626,24 @@ Copyright (c) 3676-3711, 3745 by Venue & Xerox Corporation.
 (DECLARE%: EVAL@COMPILE
 
 (DATATYPE PUPSOCKET
 ((NIL BITS 4)
-                         (PUPSOCLINK POINTER)                (* ; "So that we can Queue them")

-                         (PSOCKET# FIXP)
-                         (INQUEUE POINTER)
-                         (INQUEUELENGTH WORD)
-                         (PUPSOC#ALLOCATION WORD)
-                         (PUPSOCHANDLE WORD)                 (* ; "Back-fitting for Bcpl")

-                         (PUPSOCPUPADDRESS WORD)             (* ; "Local net/host")

-                         (NIL BITS 4)
-                         (PUPSOCEVENT POINTER)               (* ; 
-
                                         "Event that is notified when a pup arrives on this socket")

-                         (NIL BITS 4)
-                         (NIL POINTER))
-                        (BLOCKRECORD PUPSOCKET ((NIL BITS 4)
-                                                (NIL POINTER)
-                                                (PSOCKETHI WORD)
-                                                (PSOCKETLO WORD)))
-                        INQUEUE _ (create
 SYSQUEUE)
-                        PUPSOC#ALLOCATION _ \MAX.EPKTS.ON.PUPSOCKET)
+                     (PUPSOCLINK POINTER)                    (* ; "So that we can Queue them")

+                     (PSOCKET# FIXP)
+                     (INQUEUE POINTER)
+                     (INQUEUELENGTH WORD)
+                     (PUPSOC#ALLOCATION WORD)
+                     (PUPSOCHANDLE WORD)                     (* ; "Back-fitting for Bcpl")

+                     (PUPSOCPUPADDRESS WORD)                 (* ; "Local net/host")

+                     (NIL BITS 4)
+                     (PUPSOCEVENT POINTER)                   (* ; 
+
                                           "Event that is notified when a pup arrives on this socket")

+                     (NIL BITS 4)
+                     (NIL POINTER))
+                    (BLOCKRECORD PUPSOCKET ((NIL BITS 4)
+                                            (NIL POINTER)
+                                            (PSOCKETHI WORD)
+                                            (PSOCKETLO WORD)))
+                    INQUEUE _ (create
 SYSQUEUE)
+                    PUPSOC#ALLOCATION _ \MAX.EPKTS.ON.PUPSOCKET)
 )
 
 (/DECLAREDATATYPE 'PUPSOCKET '((BITS 4)
@@ -1670,11 +1668,11 @@ Copyright (c) 3676-3711, 3745 by Venue & Xerox Corporation.
 (DECLARE%: EVAL@COMPILE 
 
 (PUTPROPS \PUPSOCKET.FROM#
 MACRO
 (OPENLAMBDA (SOCHI SOCLO)
-                                           (for
 SOC in
 \PUPSOCKETS
-                                              when
 (AND (EQ (fetch
 PSOCKETLO of
 SOC)
-                                                                SOCLO)
-                                                            (EQ (fetch
 PSOCKETHI of
 SOC)
-                                                                SOCHI)) do
 (RETURN SOC))))
+                                   (for
 SOC in
 \PUPSOCKETS
+                                      when
 (AND (EQ (fetch
 PSOCKETLO of
 SOC)
+                                                    SOCLO)
+                                                (EQ (fetch
 PSOCKETHI of
 SOC)
+                                                    SOCHI)) do
 (RETURN SOC))))
 )
 
 (DECLARE%: DOEVAL@COMPILE DONTCOPY
@@ -1704,17 +1702,17 @@ Copyright (c) 3676-3711, 3745 by Venue & Xerox Corporation.
 (ADDTOVAR SYSTEMRECLST
 
 (DATATYPE PUPSOCKET
 ((NIL BITS 4)
-                         (PUPSOCLINK POINTER)
-                         (PSOCKET# FIXP)
-                         (INQUEUE POINTER)
-                         (INQUEUELENGTH WORD)
-                         (PUPSOC#ALLOCATION WORD)
-                         (PUPSOCHANDLE WORD)
-                         (PUPSOCPUPADDRESS WORD)
-                         (NIL BITS 4)
-                         (PUPSOCEVENT POINTER)
-                         (NIL BITS 4)
-                         (NIL POINTER)))
+                     (PUPSOCLINK POINTER)
+                     (PSOCKET# FIXP)
+                     (INQUEUE POINTER)
+                     (INQUEUELENGTH WORD)
+                     (PUPSOC#ALLOCATION WORD)
+                     (PUPSOCHANDLE WORD)
+                     (PUPSOCPUPADDRESS WORD)
+                     (NIL BITS 4)
+                     (PUPSOCEVENT POINTER)
+                     (NIL BITS 4)
+                     (NIL POINTER)))
 )
 (DEFINEQ
 
@@ -1826,21 +1824,21 @@ Copyright (c) 3676-3711, 3745 by Venue & Xerox Corporation.
 (* "FOLLOWING DEFINITIONS EXPORTED")(DECLARE%: EVAL@COMPILE
 
 (BLOCKRECORD PORT
 ((NETHOST WORD)
-                       (SOCKET FIXP))
-                      (BLOCKRECORD PORT ((NET BYTE)
-                                         (HOST BYTE)
-                                         (SOCKETHI WORD)
-                                         (SOCKETLO WORD))))
+                   (SOCKET FIXP))
+                  (BLOCKRECORD PORT ((NET BYTE)
+                                     (HOST BYTE)
+                                     (SOCKETHI WORD)
+                                     (SOCKETLO WORD))))
 
 (ACCESSFNS ERRORPUP
 ((ERRORPUPBASE (fetch
 PUPCONTENTS of
 DATUM)))
-                        (BLOCKRECORD ERRORPUPBASE ((ERRORPUPCOPY 12Q WORD)
+                    (BLOCKRECORD ERRORPUPBASE ((ERRORPUPCOPY 12Q WORD)
                                                              (* ; "Copy of pup header")

-                                                   (ERRORPUPCODE WORD)
-                                                   (ERRORPUPARG WORD)
+                                               (ERRORPUPCODE WORD)
+                                               (ERRORPUPARG WORD)
                                                              (* ; "Usually zero")

-                                                   (ERRORPUPSTRINGBASE WORD)
+                                               (ERRORPUPSTRINGBASE WORD)
                                                              (* ; "Human readable message")

-                                                   )))
+                                               )))
 )
 (DECLARE%: DOEVAL@COMPILE DONTCOPY
 
@@ -1868,20 +1866,20 @@ Copyright (c) 3676-3711, 3745 by Venue & Xerox Corporation.
 (DECLARE%: EVAL@COMPILE 
 
 (PUTPROPS \GETPUPWORD
 DMACRO
 ((PUP WORD#)
-                                      (\GETBASE (fetch
 PUPCONTENTS of
 PUP)
-                                             WORD#)))
+                              (\GETBASE (fetch
 PUPCONTENTS of
 PUP)
+                                     WORD#)))
 
 (PUTPROPS \PUTPUPWORD
 DMACRO
 ((PUP WORD# VALUE)
-                                      (\PUTBASE (fetch
 PUPCONTENTS of
 PUP)
-                                             WORD# VALUE)))
+                              (\PUTBASE (fetch
 PUPCONTENTS of
 PUP)
+                                     WORD# VALUE)))
 
 (PUTPROPS \GETPUPBYTE
 DMACRO
 ((PUP BYTE#)
-                                      (\GETBASEBYTE (fetch
 PUPCONTENTS of
 PUP)
-                                             BYTE#)))
+                              (\GETBASEBYTE (fetch
 PUPCONTENTS of
 PUP)
+                                     BYTE#)))
 
 (PUTPROPS \PUTPUPBYTE
 DMACRO
 ((PUP BYTE# VALUE)
-                                      (\PUTBASEBYTE (fetch
 PUPCONTENTS of
 PUP)
-                                             BYTE# VALUE)))
+                              (\PUTBASEBYTE (fetch
 PUPCONTENTS of
 PUP)
+                                     BYTE# VALUE)))
 )
 
 (RPAQQ RAWPUPTYPES

@@ -2033,13 +2031,13 @@ Copyright (c) 3676-3711, 3745 by Venue & Xerox Corporation.
 (RPAQ? PUPTYPES
 RAWPUPTYPES)
 
 (RPAQQ WELLKNOWNPUPSOCKETS
 ((\PUPSOCKET.TELNET 1)
-                                (\PUPSOCKET.ROUTING 2)
-                                (\PUPSOCKET.FTP 3)
-                                (\PUPSOCKET.MISCSERVICES 4)
-                                (\PUPSOCKET.ECHO 5)
-                                (\PUPSOCKET.EFTP 20Q)
-                                (\PUPSOCKET.PRINTERSTATUS 21Q)
-                                (\PUPSOCKET.LEAF 43Q)))
+                            (\PUPSOCKET.ROUTING 2)
+                            (\PUPSOCKET.FTP 3)
+                            (\PUPSOCKET.MISCSERVICES 4)
+                            (\PUPSOCKET.ECHO 5)
+                            (\PUPSOCKET.EFTP 20Q)
+                            (\PUPSOCKET.PRINTERSTATUS 21Q)
+                            (\PUPSOCKET.LEAF 43Q)))
 (DECLARE%: EVAL@COMPILE 
 
 (RPAQQ \PUPSOCKET.TELNET
 1)
@@ -2074,9 +2072,9 @@ Copyright (c) 3676-3711, 3745 by Venue & Xerox Corporation.
 
 
 (RPAQQ PUPCONSTANTS
 ((\PUPHEADERLEN 24Q)
-                         (\NetMask 177400Q)
-                         (\HILOCALSOCKET 1)
-                         (\PORTIDLEN 3)))
+                     (\NetMask 177400Q)
+                     (\HILOCALSOCKET 1)
+                     (\PORTIDLEN 3)))
 (DECLARE%: EVAL@COMPILE 
 
 (RPAQQ \PUPHEADERLEN
 24Q)
@@ -2097,28 +2095,28 @@ Copyright (c) 3676-3711, 3745 by Venue & Xerox Corporation.
 (DECLARE%: EVAL@COMPILE 
 
 (PUTPROPS PUPDEBUGGING
 MACRO
 [(X . Y)
-                                      (COND
-                                         (PUPTRACEFLG (printout PUPTRACEFILE X . Y])
+                              (COND
+                                 (PUPTRACEFLG (printout PUPTRACEFILE X . Y])
 )
 
 
 (ADDTOVAR PUPPRINTMACROS
 (210Q CHARS)
-                             (214Q CHARS)
-                             (211Q CHARS)
-                             (213Q CHARS)
-                             (201Q WORDS 2 CHARS 24Q |...|)
-                             (30Q CHARS))
+                         (214Q CHARS)
+                         (211Q CHARS)
+                         (213Q CHARS)
+                         (201Q WORDS 2 CHARS 24Q |...|)
+                         (30Q CHARS))
 
 (DECLARE%: EVAL@COMPILE
 
 (BLOCKRECORD TIMEPUPCONTENTS
 ((TIMEPUPVALUEHI WORD)
-                                  (TIMEPUPVALUELO WORD)
-                                  (TIMEPUPEASTP FLAG)
-                                  (TIMEPUPHOURS BITS 7)
-                                  (TIMEPUPMINUTES BITS 10Q)
-                                  (TIMEPUPBEGINDST WORD)
-                                  (TIMEPUPENDDST WORD))      (* ; "format of alto time response")

-                                 )
+                              (TIMEPUPVALUELO WORD)
+                              (TIMEPUPEASTP FLAG)
+                              (TIMEPUPHOURS BITS 7)
+                              (TIMEPUPMINUTES BITS 10Q)
+                              (TIMEPUPBEGINDST WORD)
+                              (TIMEPUPENDDST WORD))          (* ; "format of alto time response")

+                             )
 )
 )
 
@@ -2447,10 +2445,10 @@ Copyright (c) 3676-3711, 3745 by Venue & Xerox Corporation.
 (ADDTOVAR PUPIGNORETYPES
 )
 
 (ADDTOVAR PUPPRINTMACROS
 (4 . PRINTERRORPUP)
-                             (220Q CHARS)
-                             (221Q REPEAT BYTES -2 WORDS -4)
-                             (223Q BYTES -2 WORDS)
-                             (224Q CHARS))
+                         (220Q CHARS)
+                         (221Q REPEAT BYTES -2 WORDS -4)
+                         (223Q BYTES -2 WORDS)
+                         (224Q CHARS))
 (DECLARE%: DONTEVAL@LOAD 
 
 (\PUPINIT
)
@@ -2469,32 +2467,30 @@ Copyright (c) 3676-3711, 3745 by Venue & Xerox Corporation.
 (PUTPROPS PUP
 MAKEFILE-ENVIRONMENT
 (:READTABLE "INTERLISP" :PACKAGE "INTERLISP" :BASE 10Q))
 
 (PUTPROPS PUP
 FILETYPE
 CL:COMPILE-FILE)
-(PUTPROPS PUP COPYRIGHT ("Venue & Xerox Corporation" 3676Q 3677Q 3700Q 3701Q 3702Q 3703Q 3704Q 3705Q 
-3706Q 3707Q 3710Q 3711Q 3745Q))
 (DECLARE%: DONTCOPY
-  (FILEMAP (NIL (25631Q 61606Q (\STARTPUP 25643Q . 26515Q) (ASSURE.PUP.READY 26517Q . 34612Q) (
-\FIND.LOCALPUPHOSTNUMBER 34614Q . 37012Q) (\PROMPT.FOR.PUP.NUMBER 37014Q . 41034Q) (\HANDLE.RAW.PUP 
-41036Q . 57136Q) (\FORWARD.PUP 57140Q . 60060Q) (\SETPUPCHECKSUM 60062Q . 61604Q)) (66376Q 73470Q (
-\PUPERROR 66410Q . 73466Q)) (73527Q 112663Q (SETUPPUP 73541Q . 76727Q) (SWAPPUPPORTS 76731Q . 77546Q) 
-(GETPUP 77550Q . 102462Q) (SENDPUP 102464Q . 106306Q) (EXCHANGEPUPS 106310Q . 110346Q) (DISCARDPUPS 
-110350Q . 111154Q) (GETPUPWORD 111156Q . 111475Q) (\PUPINIT 111477Q . 112661Q)) (112664Q 154244Q (
-ETHERHOSTNAME 112676Q . 122024Q) (ETHERHOSTNUMBER 122026Q . 122441Q) (ETHERPORT 122443Q . 126162Q) (
-BESTPUPADDRESS 126164Q . 136224Q) (NETDAYTIME0 136226Q . 136557Q) (\PUP.SETTIME 136561Q . 137206Q) (
-\SETNEWTIME0 137210Q . 140270Q) (\NET.SETTIME 140272Q . 141361Q) (NETDATE 141363Q . 141720Q) (
-\LOOKUPPORT 141722Q . 147561Q) (\PARSE.PORTCONSTANT 147563Q . 152673Q) (\FIXLOCALNET 152675Q . 154242Q
-)) (154245Q 155602Q (PORTSTRING 154257Q . 155246Q) (OCTALSTRING 155250Q . 155600Q)) (156174Q 165305Q (
-CLEARPUP 156206Q . 160721Q) (PUTPUPWORD 160723Q . 161250Q) (GETPUPBYTE 161252Q . 161575Q) (PUTPUPBYTE 
-161577Q . 162130Q) (GETPUPSTRING 162132Q . 163563Q) (GETPUPSTREAM 163565Q . 164514Q) (PUTPUPSTRING 
-164516Q . 165303Q)) (167410Q 175227Q (READPLIST 167422Q . 175225Q)) (175410Q 200610Q (
-\CANONICAL.HOSTNAME 175422Q . 176467Q) (\CANONICALIZE.PUP.HOSTNAME 176471Q . 200606Q)) (203163Q 
-236370Q (\PUPGATELISTENER 203175Q . 207026Q) (\HANDLE.PUP.ROUTING.INFO 207030Q . 221367Q) (\ROUTE.PUP 
-221371Q . 225224Q) (\LOCATE.PUPNET 225226Q . 231763Q) (SORT.PUPHOSTS.BY.DISTANCE 231765Q . 234241Q) (
-\PUPNET.CLOSERP 234243Q . 235424Q) (PUPNET.DISTANCE 235426Q . 236366Q)) (250017Q 257771Q (
-OPENPUPSOCKET 250031Q . 254512Q) (CLOSEPUPSOCKET 254514Q . 256173Q) (PUPSOCKETNUMBER 256175Q . 256426Q
-) (PUPSOCKETFROMNUMBER 256430Q . 257067Q) (PUPSOCKETEVENT 257071Q . 257350Q) (\FLUSHPUPSOCQUEUE 
-257352Q . 257767Q)) (257772Q 260537Q (\GETMISCSOCKET 260004Q . 260535Q)) (300551Q 313341Q (
-PUP.ECHOSERVER 300563Q . 303370Q) (PUP.ECHOUSER 303372Q . 313337Q)) (313372Q 322523Q (\PEEKPUP 313404Q
- . 320535Q) (\MAYBEPEEKPUP 320537Q . 322521Q)) (323124Q 334361Q (PRINTPUP 323136Q . 327306Q) (
-PRINTPUPROUTE 327310Q . 331255Q) (PRINTPUPDATA 331257Q . 331727Q) (PRINTERRORPUP 331731Q . 332431Q) (
-PUPTRACE 332433Q . 332744Q) (PRINTCONSTANT 332746Q . 334357Q)))))
+  (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)))))
 STOP
diff --git a/sources/PUP.LCOM b/sources/PUP.LCOM
index 82a817906eef3c9178405992ae777fb480e89b97..4bb0cc79982d8eca01394bcbe6a85044d59da6ce 100644
GIT binary patch
delta 7829
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
SfAQH?tL@LeDO5wAU;BSD_8W2l

delta 7772
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
D+>kJY