Skip to content

Commit de7a1e1

Browse files
masintermasinter
authored
Add (FILES LAFITE) to UNIXMAIL -- must load lafite before loading UNIXMAIL (#1553)
1 parent 49cb172 commit de7a1e1

File tree

2 files changed

+56
-57
lines changed

2 files changed

+56
-57
lines changed

‎library/lafite/UNIXMAIL‎

Lines changed: 56 additions & 57 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,25 @@
11
(DEFINE-FILE-INFO PACKAGE "INTERLISP" READTABLE "XCL" BASE 10)
2-
(FILECREATED "30-Sep-2021 16:06:26" 
3-
|{DSK}<Users>kaplan>Local>medley3.5>git-medley>library>UNIXMAIL.;2| 82866
42

5-
|changes| |to:| (VARS UNIXMAILCOMS)
6-
(FNS UNIX.POLLNEWMAIL UNIX.NEXTMESSAGE UNIXMAILER.OPENMAILBOX
7-
UNIXMAILER.RETRIEVEMESSAGE UNIXMAILER.CLOSEMAILBOX UNIXSPOOL.OPENMAILBOX
8-
UNIXSPOOL.RETRIEVEMESSAGE UNIXSPOOL.CLOSEMAILBOX UNIX.FLUSH.STREAM
9-
UNIX.RETRIEVE.LINE \\UNIXMAIL.SEND \\UNIXMAIL.SEND.WRAPLINES \\SMTP-DUMP
10-
\\UNIXMAIL.SEND.PARSE \\UNIXMAIL.CHECK.ABORT \\UNIXMAIL.MUNG.RECIPIENTS
11-
\\UNIXMAIL.SMTP \\UNIXMAIL.SMTP.FLUSH \\UNIXMAIL.CHANGE.MODE
12-
\\UNIXMAIL.AUTHENTICATE \\UNIXMAIL.LOGIN \\UNIXMAIL.PARSENAMES
13-
\\UNIXMAIL.MAKEANSWERFORM \\UNIXMAIL.MESSAGE.FROM.SELF.P
14-
\\UNIXMAIL.MESSAGE.P \\UNIXMAIL.REALADDRESS \\UNIXMAIL.FQNAME
15-
\\UNIXMAIL.FIXMICROSOFT)
3+
(FILECREATED "24-Feb-2024 10:26:07" |{DSK}<home>larry>il>medley>library>lafite>UNIXMAIL.;3| 81776
164

17-
|previous| |date:| "10-Feb-2000 12:03:28" |{DSK}<project>medley3.5>library>unixmail.;42|)
5+
:EDIT-BY "lmm"
6+
7+
:CHANGES-TO (VARS UNIXMAILCOMS)
8+
9+
:PREVIOUS-DATE "30-Sep-2021 16:06:26" |{DSK}<home>larry>il>medley>library>lafite>UNIXMAIL.;1|
10+
)
1811

1912

2013
; Copyright (c) 1989-1992, 1997, 1999, 1920, 2021 by ENVOS Corporation.
2114

2215
(PRETTYCOMPRINT UNIXMAILCOMS)
2316

2417
(RPAQQ UNIXMAILCOMS
25-
((DECLARE\: DOEVAL@COMPILE DONTCOPY (FILES (SOURCE)
18+
(
19+
(* |;;| " LMM 2/24/24 need LAFITE to load")
20+
21+
(FILES LAFITE)
22+
(DECLARE\: DOEVAL@COMPILE DONTCOPY (FILES (SOURCE)
2623
LAFITEDECLS NSMAIL)
2724
(RECORDS UNIXMAILBOX UNIXMAILFILEINFO UNIXMAILPARSE))
2825
(ALISTS (LAFITEMODELST UNIX))
@@ -90,6 +87,13 @@
9087
'(CHANGE \\SENDMSG.CHANGE.MODE TO
9188
\\UNIXMAIL.CHANGE.MODE)))))
9289
(PROP FILETYPE UNIXMAIL)))
90+
91+
92+
93+
(* |;;| " LMM 2/24/24 need LAFITE to load")
94+
95+
96+
(FILESLOAD LAFITE)
9397
(DECLARE\: DOEVAL@COMPILE DONTCOPY
9498

9599
(FILESLOAD (SOURCE)
@@ -106,8 +110,8 @@
106110
)
107111

108112
(ADDTOVAR LAFITEMODELST (UNIX 3 \\UNIXMAIL.SEND.PARSE \\UNIXMAIL.SEND \\UNIXMAIL.MAKEANSWERFORM
109-
\\UNIXMAIL.AUTHENTICATE \\UNIXMAIL.MESSAGE.P
110-
\\UNIXMAIL.MESSAGE.FROM.SELF.P \\UNIXMAIL.LOGIN))
113+
\\UNIXMAIL.AUTHENTICATE \\UNIXMAIL.MESSAGE.P
114+
\\UNIXMAIL.MESSAGE.FROM.SELF.P \\UNIXMAIL.LOGIN))
111115

112116

113117

@@ -133,9 +137,9 @@
133137

134138

135139
(RPAQQ UNIXMAIL.MSOPS.LIST ((MAILER UNIX.POLLNEWMAIL UNIXMAILER.OPENMAILBOX UNIX.NEXTMESSAGE
136-
UNIXMAILER.RETRIEVEMESSAGE UNIXMAILER.CLOSEMAILBOX)
137-
(SPOOL UNIX.POLLNEWMAIL UNIXSPOOL.OPENMAILBOX UNIX.NEXTMESSAGE
138-
UNIXSPOOL.RETRIEVEMESSAGE UNIXSPOOL.CLOSEMAILBOX)))
140+
UNIXMAILER.RETRIEVEMESSAGE UNIXMAILER.CLOSEMAILBOX)
141+
(SPOOL UNIX.POLLNEWMAIL UNIXSPOOL.OPENMAILBOX UNIX.NEXTMESSAGE
142+
UNIXSPOOL.RETRIEVEMESSAGE UNIXSPOOL.CLOSEMAILBOX)))
139143

140144

141145

@@ -979,50 +983,46 @@
979983
(* |;;| "This returns multiple-values, so it's a CL:LAMBDA (what the heck).")
980984

981985

982-
(CL:DEFUN \\UNIXMAIL.SMTP.TCP.STREAMS () (* \; "Edited 27-Feb-99 13:55 by rmk:")
986+
(CL:DEFUN \\UNIXMAIL.SMTP.TCP.STREAMS () (* \; "Edited 27-Feb-99 13:55 by rmk:")
983987

984988
(* |;;| "Opens two streams representing the input and output streams of an SMTP TCP connection. On failure return NIL and a string describing the failure.")
985989

986990
(SELECTQ UNIXMAIL.SEND.MODE
987991
(PROCESS (|if| (EQ (MACHINETYPE)
988-
'MAIKO)
992+
'MAIKO)
989993
|then|
990994

991995
(* |;;| "UNIXMAIL.SEND.PROCESS can be a list of possibilities because the process may be in different places in different operating systems (e.g. solaris vs. sunos). If the first one doesn't exist at this time, we search the remaining ones and move the first one we find to the beginning of the list for next time. This could be done as an AFTERSYSOUTFORMS, but easy enough just to do it here.")
992996

993997
(LET ((S (CREATE-PROCESS-STREAM
994998
(CONCAT (IF (NLISTP UNIXMAIL.SEND.PROCESS)
995999
THEN UNIXMAIL.SEND.PROCESS
996-
ELSEIF (INFILEP (PACKFILENAME 'HOST 'DSK 'BODY
997-
(CAR UNIXMAIL.SEND.PROCESS)))
1000+
ELSEIF (INFILEP (PACKFILENAME 'HOST 'DSK 'BODY (CAR
1001+
UNIXMAIL.SEND.PROCESS
1002+
)))
9981003
THEN (CAR UNIXMAIL.SEND.PROCESS)
9991004
ELSE (FOR P IN (CDR UNIXMAIL.SEND.PROCESS)
1000-
WHEN (INFILEP (PACKFILENAME 'HOST
1001-
'DSK
1002-
'BODY P))
1003-
DO (SETQ UNIXMAIL.SEND.PROCESS
1004-
(CONS P (DREMOVE P UNIXMAIL.SEND.PROCESS)
1005-
))
1006-
(RETURN P)))
1005+
WHEN (INFILEP (PACKFILENAME 'HOST 'DSK 'BODY P))
1006+
DO (SETQ UNIXMAIL.SEND.PROCESS
1007+
(CONS P (DREMOVE P UNIXMAIL.SEND.PROCESS)))
1008+
(RETURN P)))
10071009
(IF UNIXMAIL.SEND.HOST
10081010
THEN (CONCAT " " UNIXMAIL.SEND.HOST)
10091011
ELSE "")))))
10101012
(CL:VALUES S S))
10111013
|else| (CL:VALUES NIL
10121014
"this MACHINETYPE can't do Unix process-streams; change UNIXMAIL.SEND.MODE"
1013-
)))
1015+
)))
10141016
(SOCKET (|if| (EQ (MACHINETYPE)
1015-
'MAIKO)
1016-
|then| (LET ((S (OPENTCPSTREAM (OR UNIXMAIL.SEND.HOST (UNIX-GETPARM "HOSTNAME"
1017-
))
1018-
25)))
1019-
(CL:VALUES S S))
1017+
'MAIKO)
1018+
|then| (LET ((S (OPENTCPSTREAM (OR UNIXMAIL.SEND.HOST (UNIX-GETPARM "HOSTNAME"))
1019+
25)))
1020+
(CL:VALUES S S))
10201021
|else| (LET ((S (TCP.OPEN UNIXMAIL.SEND.HOST 25 NIL 'ACTIVE 'INPUT T)))
1021-
(|if| S
1022-
|then| (CL:VALUES S (TCP.OTHER.STREAM S))
1023-
|else| (CL:VALUES NIL
1024-
"TCP.OPEN failed; check your Lisp TCP configuration"
1025-
)))))
1022+
(|if| S
1023+
|then| (CL:VALUES S (TCP.OTHER.STREAM S))
1024+
|else| (CL:VALUES NIL
1025+
"TCP.OPEN failed; check your Lisp TCP configuration")))))
10261026
(ERROR "Unrecognized UNIXMAIL.SEND.MODE:" UNIXMAIL.SEND.MODE)))
10271027

10281028

@@ -1368,23 +1368,22 @@
13681368

13691369
(SETQ LAFITESENDINGMENUITEMS (EDITE (CONS (CAR LAFITESENDINGMENUITEMS)
13701370
(CDR LAFITESENDINGMENUITEMS))
1371-
'(CHANGE \\SENDMSG.CHANGE.MODE TO \\UNIXMAIL.CHANGE.MODE)
1372-
)))
1371+
'(CHANGE \\SENDMSG.CHANGE.MODE TO \\UNIXMAIL.CHANGE.MODE))))
13731372

13741373
(PUTPROPS UNIXMAIL FILETYPE :COMPILE-FILE)
13751374
(PUTPROPS UNIXMAIL COPYRIGHT ("ENVOS Corporation" 1989 1990 1991 1992 1997 1999 1920 2021))
13761375
(DECLARE\: DONTCOPY
1377-
(FILEMAP (NIL (7835 26260 (UNIX.POLLNEWMAIL 7845 . 9795) (UNIX.NEXTMESSAGE 9797 . 9973) (
1378-
UNIXMAILER.OPENMAILBOX 9975 . 14371) (UNIXMAILER.RETRIEVEMESSAGE 14373 . 15580) (
1379-
UNIXMAILER.CLOSEMAILBOX 15582 . 16607) (UNIXSPOOL.OPENMAILBOX 16609 . 22826) (
1380-
UNIXSPOOL.RETRIEVEMESSAGE 22828 . 24909) (UNIXSPOOL.CLOSEMAILBOX 24911 . 26258)) (26308 56798 (
1381-
UNIX.FLUSH.STREAM 26318 . 26899) (UNIX.RETRIEVE.LINE 26901 . 28090) (\\UNIXMAIL.SEND 28092 . 38386) (
1382-
\\UNIXMAIL.SEND.WRAPLINES 38388 . 42018) (\\SMTP-DUMP 42020 . 43290) (\\UNIXMAIL.SEND.PARSE 43292 .
1383-
46536) (\\UNIXMAIL.CHECK.ABORT 46538 . 47366) (\\UNIXMAIL.MUNG.RECIPIENTS 47368 . 52236) (
1384-
\\UNIXMAIL.SMTP 52238 . 52843) (\\UNIXMAIL.SMTP.FLUSH 52845 . 55322) (\\UNIXMAIL.CHANGE.MODE 55324 .
1385-
56796)) (56886 60196 (\\UNIXMAIL.SMTP.TCP.STREAMS 56886 . 60196)) (60275 81847 (
1386-
\\UNIXMAIL.AUTHENTICATE 60285 . 61976) (\\UNIXMAIL.LOGIN 61978 . 62323) (\\UNIXMAIL.PARSENAMES 62325
1387-
. 64643) (\\UNIXMAIL.MAKEANSWERFORM 64645 . 69527) (\\UNIXMAIL.MESSAGE.FROM.SELF.P 69529 . 70658) (
1388-
\\UNIXMAIL.MESSAGE.P 70660 . 70979) (\\UNIXMAIL.REALADDRESS 70981 . 75025) (\\UNIXMAIL.FQNAME 75027 .
1389-
75632) (\\UNIXMAIL.FIXMICROSOFT 75634 . 81845)))))
1376+
(FILEMAP (NIL (7090 25515 (UNIX.POLLNEWMAIL 7100 . 9050) (UNIX.NEXTMESSAGE 9052 . 9228) (
1377+
UNIXMAILER.OPENMAILBOX 9230 . 13626) (UNIXMAILER.RETRIEVEMESSAGE 13628 . 14835) (
1378+
UNIXMAILER.CLOSEMAILBOX 14837 . 15862) (UNIXSPOOL.OPENMAILBOX 15864 . 22081) (
1379+
UNIXSPOOL.RETRIEVEMESSAGE 22083 . 24164) (UNIXSPOOL.CLOSEMAILBOX 24166 . 25513)) (25563 56053 (
1380+
UNIX.FLUSH.STREAM 25573 . 26154) (UNIX.RETRIEVE.LINE 26156 . 27345) (\\UNIXMAIL.SEND 27347 . 37641) (
1381+
\\UNIXMAIL.SEND.WRAPLINES 37643 . 41273) (\\SMTP-DUMP 41275 . 42545) (\\UNIXMAIL.SEND.PARSE 42547 .
1382+
45791) (\\UNIXMAIL.CHECK.ABORT 45793 . 46621) (\\UNIXMAIL.MUNG.RECIPIENTS 46623 . 51491) (
1383+
\\UNIXMAIL.SMTP 51493 . 52098) (\\UNIXMAIL.SMTP.FLUSH 52100 . 54577) (\\UNIXMAIL.CHANGE.MODE 54579 .
1384+
56051)) (56141 59147 (\\UNIXMAIL.SMTP.TCP.STREAMS 56141 . 59147)) (59226 80798 (
1385+
\\UNIXMAIL.AUTHENTICATE 59236 . 60927) (\\UNIXMAIL.LOGIN 60929 . 61274) (\\UNIXMAIL.PARSENAMES 61276
1386+
. 63594) (\\UNIXMAIL.MAKEANSWERFORM 63596 . 68478) (\\UNIXMAIL.MESSAGE.FROM.SELF.P 68480 . 69609) (
1387+
\\UNIXMAIL.MESSAGE.P 69611 . 69930) (\\UNIXMAIL.REALADDRESS 69932 . 73976) (\\UNIXMAIL.FQNAME 73978 .
1388+
74583) (\\UNIXMAIL.FIXMICROSOFT 74585 . 80796)))))
13901389
STOP

‎library/lafite/UNIXMAIL.DFASL‎

153 Bytes
Binary file not shown.

0 commit comments

Comments
 (0)