-
Notifications
You must be signed in to change notification settings - Fork 0
/
sndml.mods
2135 lines (1917 loc) · 53 KB
/
sndml.mods
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
464
465
466
467
468
469
470
471
472
473
474
475
476
477
478
479
480
481
482
483
484
485
486
487
488
489
490
491
492
493
494
495
496
497
498
499
500
501
502
503
504
505
506
507
508
509
510
511
512
513
514
515
516
517
518
519
520
521
522
523
524
525
526
527
528
529
530
531
532
533
534
535
536
537
538
539
540
541
542
543
544
545
546
547
548
549
550
551
552
553
554
555
556
557
558
559
560
561
562
563
564
565
566
567
568
569
570
571
572
573
574
575
576
577
578
579
580
581
582
583
584
585
586
587
588
589
590
591
592
593
594
595
596
597
598
599
600
601
602
603
604
605
606
607
608
609
610
611
612
613
614
615
616
617
618
619
620
621
622
623
624
625
626
627
628
629
630
631
632
633
634
635
636
637
638
639
640
641
642
643
644
645
646
647
648
649
650
651
652
653
654
655
656
657
658
659
660
661
662
663
664
665
666
667
668
669
670
671
672
673
674
675
676
677
678
679
680
681
682
683
684
685
686
687
688
689
690
691
692
693
694
695
696
697
698
699
700
701
702
703
704
705
706
707
708
709
710
711
712
713
714
715
716
717
718
719
720
721
722
723
724
725
726
727
728
729
730
731
732
733
734
735
736
737
738
739
740
741
742
743
744
745
746
747
748
749
750
751
752
753
754
755
756
757
758
759
760
761
762
763
764
765
766
767
768
769
770
771
772
773
774
775
776
777
778
779
780
781
782
783
784
785
786
787
788
789
790
791
792
793
794
795
796
797
798
799
800
801
802
803
804
805
806
807
808
809
810
811
812
813
814
815
816
817
818
819
820
821
822
823
824
825
826
827
828
829
830
831
832
833
834
835
836
837
838
839
840
841
842
843
844
845
846
847
848
849
850
851
852
853
854
855
856
857
858
859
860
861
862
863
864
865
866
867
868
869
870
871
872
873
874
875
876
877
878
879
880
881
882
883
884
885
886
887
888
889
890
891
892
893
894
895
896
897
898
899
900
901
902
903
904
905
906
907
908
909
910
911
912
913
914
915
916
917
918
919
920
921
922
923
924
925
926
927
928
929
930
931
932
933
934
935
936
937
938
939
940
941
942
943
944
945
946
947
948
949
950
951
952
953
954
955
956
957
958
959
960
961
962
963
964
965
966
967
968
969
970
971
972
973
974
975
976
977
978
979
980
981
982
983
984
985
986
987
988
989
990
991
992
993
994
995
996
997
998
999
1000
From: Bruce Israel <talcott!mimsy.umd.edu:gymble!israel>
Subject: translation tables in sendmail
Newsgroups: mod.sources
Approved: jpn@panda.UUCP
Mod.sources: Volume 3, Issue 31
Submitted by: Bruce Israel <talcott!mimsy.umd.edu:gymble!israel>
Here are my modifications to sendmail that I announced recently. I
am posting these due to the number of requests. These modifications
allow translations to be used in the sendmail.cf file, such as
pathalias information and other stuff. Run the shar in a clean
directory and then read the README. Enjoy.
Bruce Israel
University of Maryland, Computer Science Dept.
{rlgvax,seismo}!umcp-cs!israel (Usenet) israel@Maryland (Arpanet)
: Run this shell script with "sh" not "csh"
PATH=:/bin:/usr/bin:/usr/ucb
export PATH
all=FALSE
if [ x$1 = x-a ]; then
all=TRUE
fi
/bin/echo 'Extracting 4.2diffs'
sed 's/^X//' <<'//go.sysin dd *' >4.2diffs
diff -c main.c.old main.c
*** /usr/4.2/src/usr.lib/sendmail/src/main.c Sun Sep 25 21:06:10 1983
--- /usr/israel/sendmail/src/main.c Wed Mar 6 15:45:26 1985
***************
*** 695,700 ****
--- 695,707 ----
'*', MATCHZANY, '+', MATCHANY, '-', MATCHONE, '=', MATCHCLASS,
'~', MATCHNCLASS,
+ #ifdef ROUTING /* ******************************** */
+
+ /* for RHS translation table */
+ '&', EQUIVREPL,
+
+ #endif ROUTING /* ******************************** */
+
/* these are RHS metasymbols */
'#', CANONNET, '@', CANONHOST, ':', CANONUSER, '>', CALLSUBR,
***************
*** 808,813 ****
--- 815,822 ----
union frz fhdr;
extern char edata;
extern char Version[];
+ extern char **environ;
+ char **envsave;
if (freezefile == NULL)
return (FALSE);
***************
*** 835,840 ****
--- 844,855 ----
(void) close(f);
return (FALSE);
}
+ /**
+ ** Arrrrg! Since the pointer to the environment is in BSS, and our
+ ** bss get's blasted over when the freeze file is read in, we need to
+ ** save and restore the environ pointer for getenv()
+ **/
+ envsave = environ; /* save pointer to environment */
/* now read in the freeze file */
if (read(f, (char *) &edata, fhdr.frzinfo.frzbrk - &edata) !=
***************
*** 844,849 ****
--- 859,866 ----
write(2, "Cannot read freeze file\n", 24);
_exit(EX_SOFTWARE);
}
+
+ environ = envsave;
(void) close(f);
return (TRUE);
diff -c parseaddr.c.old parseaddr.c
*** /usr/4.2/src/usr.lib/sendmail/src/parseaddr.c Mon Jul 25 23:20:46 1983
--- /usr/israel/sendmail/src/parseaddr.c Thu Oct 31 17:45:31 1985
***************
*** 2,7 ****
--- 2,9 ----
SCCSID(@(#)parseaddr.c 4.1 7/25/83);
+ char **copyplist();
+
/*
** PARSEADDR -- Parse an address
**
***************
*** 204,214 ****
--- 206,241 ----
char *DelimChar; /* set to point to the delimiter */
+ #ifdef ROUTING /* ******************************** */
+
+ char **prescan1();
+
+ #endif ROUTING /* ******************************** */
+
char **
prescan(addr, delim)
char *addr;
char delim;
{
+ static char buf[MAXNAME+MAXATOM];
+ static char *av[MAXATOM+1];
+
+ #ifdef ROUTING /* ******************************** */
+
+ return(prescan1(addr,delim,buf,av,sizeof buf));
+ }
+
+ char **
+ prescan1(addr,delim,buf,av,bufsize)
+ char *addr;
+ char delim;
+ char buf[];
+ char *av[];
+ int bufsize;
+ {
+
+ #endif ROUTING /* ******************************** */
+
register char *p;
register char *q;
register int c;
***************
*** 219,226 ****
char *tok;
int state;
int newstate;
- static char buf[MAXNAME+MAXATOM];
- static char *av[MAXATOM+1];
q = buf;
bslashmode = FALSE;
--- 246,251 ----
***************
*** 249,255 ****
if (c != NOCHAR)
{
/* squirrel it away */
! if (q >= &buf[sizeof buf - 5])
{
usrerr("Address too long");
DelimChar = p;
--- 274,280 ----
if (c != NOCHAR)
{
/* squirrel it away */
! if (q >= &buf[bufsize - 5])
{
usrerr("Address too long");
DelimChar = p;
***************
*** 396,401 ****
--- 421,429 ----
}
if (c == MATCHCLASS || c == MATCHREPL || c == MATCHNCLASS)
return (ONE);
+ #ifdef ROUTING /* ******************************** */
+ if (c == EQUIVREPL) return (ONE);
+ #endif ROUTING /* ******************************** */
if (c == '"')
return (QST);
if (!isascii(c))
***************
*** 442,447 ****
--- 470,478 ----
{
char **first; /* first token matched */
char **last; /* last token matched */
+ #ifdef ROUTING /* ******************************** */
+ char *equiv; /* equivalence name for match */
+ #endif ROUTING /* ******************************** */
};
# define MAXMATCH 9 /* max params per rewrite */
***************
*** 528,533 ****
--- 559,571 ----
else if (*rp == MATCHNCLASS)
goto backup;
+ #ifdef ROUTING /* ******************************** */
+
+ mlp -> equiv = getequiv(rp[1],s);
+
+ #endif ROUTING /* ******************************** */
+
+
/* explicit fall-through */
case MATCHONE:
***************
*** 536,541 ****
--- 574,582 ----
mlp->first = avp;
mlp->last = avp++;
mlp++;
+ #ifdef ROUTING /* ******************************** */
+ mlp -> equiv = NULL;
+ #endif ROUTING /* ******************************** */
break;
case MATCHZANY:
***************
*** 543,548 ****
--- 584,592 ----
mlp->first = avp;
mlp->last = avp - 1;
mlp++;
+ #ifdef ROUTING /* ******************************** */
+ mlp -> equiv = NULL;
+ #endif ROUTING /* ******************************** */
break;
default:
***************
*** 576,581 ****
--- 620,628 ----
{
/* back out binding */
mlp--;
+ #ifdef ROUTING /* ******************************** */
+ mlp -> equiv = NULL;
+ #endif ROUTING /* ******************************** */
}
}
***************
*** 630,636 ****
register char **pp;
rp = *rvp;
! if (*rp != MATCHREPL)
{
if (avp >= &npvp[MAXATOM])
{
--- 677,687 ----
register char **pp;
rp = *rvp;
! if (*rp != MATCHREPL
! #ifdef ROUTING /* ******************************** */
! && *rp != EQUIVREPL
! #endif ROUTING /* ******************************** */
! )
{
if (avp >= &npvp[MAXATOM])
{
***************
*** 641,651 ****
--- 692,722 ----
continue;
}
+ #ifdef ROUTING /* ******************************** */
+
+ /* if the $& is not followed by a digit, put the
+ '&' on the output string. */
+
+ if (*rp == EQUIVREPL && (rp[1] < '1' || rp[1] > '9'))
+ {
+ *avp++ = "&";
+ continue;
+ }
+
+ #endif ROUTING /* ******************************** */
+
/* substitute from LHS */
m = &mlist[rp[1] - '1'];
# ifdef DEBUG
if (tTd(21, 15))
{
+ #ifdef ROUTING /* ******************************** */
+ if (*rp == EQUIVREPL) {
+ printf("$&%c:%x=\"%s\"\n",
+ rp[1], *m->equiv, *m->equiv);
+ }
+ else {
+ #endif ROUTING /* ******************************** */
printf("$%c:", rp[1]);
pp = m->first;
while (pp <= m->last)
***************
*** 655,662 ****
printf("%s\"", *pp++);
}
printf("\n");
! }
# endif DEBUG
pp = m->first;
while (pp <= m->last)
{
--- 726,763 ----
printf("%s\"", *pp++);
}
printf("\n");
! #ifdef ROUTING /* ******************************** */
! }
! #endif ROUTING /* ******************************** */
! };
# endif DEBUG
+
+ #ifdef ROUTING /* ******************************** */
+
+ if (*rp == EQUIVREPL) {
+ char buf[1024];
+ char *av[MAXATOM+1];
+ char *Dchar = DelimChar; /* save! */
+
+ pp = copyplist(prescan1(m -> equiv,
+ '\0',buf,av,sizeof buf),TRUE);
+
+ /* restore saved version, recursive */
+ DelimChar = Dchar;
+
+ while (*pp)
+ {
+ if (avp >= &npvp[MAXATOM])
+ {
+ syserr("rewrite: expansion too long");
+ return;
+ }
+ *avp++ = *pp++;
+ }
+ }
+ else
+ {
+ #endif ROUTING /* ******************************** */
pp = m->first;
while (pp <= m->last)
{
***************
*** 667,672 ****
--- 768,776 ----
}
*avp++ = *pp++;
}
+ #ifdef ROUTING /* ******************************** */
+ }
+ #endif ROUTING /* ******************************** */
}
*avp++ = NULL;
if (**npvp == CALLSUBR)
diff -c readcf.c.old readcf.c
*** /usr/4.2/src/usr.lib/sendmail/src/readcf.c Sun Sep 25 21:06:11 1983
--- /usr/israel/sendmail/src/readcf.c Fri Feb 1 17:59:14 1985
***************
*** 110,119 ****
rwp->r_lhs = copyplist(rwp->r_lhs, TRUE);
/* expand and save the RHS */
! while (*++p == '\t')
continue;
q = p;
! while (*p != '\0' && *p != '\t')
p++;
*p = '\0';
expand(q, exbuf, &exbuf[sizeof exbuf], CurEnv);
--- 110,119 ----
rwp->r_lhs = copyplist(rwp->r_lhs, TRUE);
/* expand and save the RHS */
! while (*++p == '\t' || *p == ' ')
continue;
q = p;
! while (*p != '\0' && *p != '\t' && *p != ' ')
p++;
*p = '\0';
expand(q, exbuf, &exbuf[sizeof exbuf], CurEnv);
***************
*** 140,165 ****
(void) chompheader(&buf[1], TRUE);
break;
- case 'C': /* word class */
case 'F': /* word class from file */
! /* read list of words from argument or file */
! if (buf[0] == 'F')
{
! /* read from file */
! for (p = &buf[2]; *p != '\0' && !isspace(*p); p++)
! continue;
! if (*p == '\0')
! p = "%s";
! else
! {
! *p = '\0';
! while (isspace(*++p))
! continue;
! }
! fileclass(buf[1], &buf[2], p);
! break;
}
/* scan the list of words and set class for all */
for (p = &buf[2]; *p != '\0'; )
{
--- 140,161 ----
(void) chompheader(&buf[1], TRUE);
break;
case 'F': /* word class from file */
!
! /* read from file */
! for (p = &buf[2]; *p != '\0' && !isspace(*p); p++)
! continue;
! if (*p == '\0') p = "%s";
! else
{
! *p = '\0';
! while (isspace(*++p)) continue;
}
+ fileclass(buf[1], &buf[2], p);
+ break;
+ case 'C': /* word class */
+
/* scan the list of words and set class for all */
for (p = &buf[2]; *p != '\0'; )
{
***************
*** 179,184 ****
--- 175,221 ----
}
break;
+
+ #ifdef ROUTING /* ******************************** */
+
+ case 'E': /* word equivalence class */
+
+ /* scan the list of words as a <word, translation>
+ pair, and set class for all */
+
+ for (p = &buf[2]; *p != '\0'; )
+ {
+ register char *wd;
+ register char *wd2;
+ char delim;
+ STAB *s;
+
+ while (*p != '\0' && isspace(*p))
+ p++;
+ wd = p;
+ while (*p != '\0' && !isspace(*p))
+ p++;
+ delim = *p;
+ *p = '\0';
+ if (wd[0] != '\0')
+ s = setclass(buf[1], wd);
+ *p = delim;
+
+ while (*p != '\0' && isspace(*p))
+ p++;
+ wd2 = p;
+ while (*p != '\0' && !isspace(*p))
+ p++;
+ delim = *p;
+ *p = '\0';
+ if (*wd != NULL)
+ makeequiv(buf[1],wd2,s);
+ *p = delim;
+ }
+ break;
+
+ #endif ROUTING /* ******************************** */
+
case 'M': /* define mailer */
makemailer(&buf[1], safe);
break;
***************
*** 269,274 ****
--- 306,322 ----
**
** puts all lines in filename that match a scanf into
** the named class.
+ **
+ ** Comment: equivalence class modification
+ ** fileclass has been modified so that if you use a format
+ ** string returning two strings, i.e.:
+ **
+ ** FN/usr/lib/net-gateways "%s%s"
+ **
+ ** it will store the second name as a name translation of
+ ** the first, accessable through the $&<digit> macro.
+ ** - BNI 9/5/84
+ **
*/
fileclass(class, filename, fmt)
***************
*** 279,284 ****
--- 327,338 ----
register FILE *f;
char buf[MAXLINE];
+ #ifdef DEBUG
+ if (tTd(86,5))
+ printf("fileclass: class = %c, file = %s, fmt = \"%s\".\n"
+ , class, filename, fmt);
+ #endif DEBUG
+
f = fopen(filename, "r");
if (f == NULL)
{
***************
*** 291,300 ****
--- 345,391 ----
register STAB *s;
char wordbuf[MAXNAME+1];
+ #ifdef ROUTING /* ******************************** */
+ char word2[MAXNAME+1];
+ int ssc;
+ #ifdef DEBUG
+ if (tTd(86,11))
+ printf("fileclass: got line '%s'.\n",buf);
+ #endif DEBUG
+ word2[0] = '\0';
+
+ if ((ssc=sscanf(buf, fmt, wordbuf, word2, 0)) < 1) {
+ #ifdef DEBUG
+ if(tTd(86,8))
+ printf("fileclass: found nothing on line.\n");
+ #endif DEBUG
+ continue;
+ }
+ #ifdef DEBUG
+ if (tTd(86,8))
+ if (*word2)
+ printf("fileclass: found word translation '%s' --> '%s'.\n",
+ wordbuf,word2);
+ else printf("fileclass: found word '%s'.\n",wordbuf);
+ #endif DEBUG
+
+ #else ROUTING /* ******************************** */
+
if (sscanf(buf, fmt, wordbuf) != 1)
continue;
+
+ #endif ROUTING /* ******************************** */
+
s = stab(wordbuf, ST_CLASS, ST_ENTER);
setbitn(class, s->s_class);
+
+ #ifdef ROUTING /* ******************************** */
+
+ if (*word2 != NULL)
+ makeequiv(class,word2,s);
+
+ #endif ROUTING /* ******************************** */
+
}
(void) fclose(f);
***************
*** 805,816 ****
** word -- the word to enter
**
** Returns:
! ** none.
**
** Side Effects:
** puts the word into the symbol table.
*/
setclass(class, word)
int class;
char *word;
--- 896,915 ----
** word -- the word to enter
**
** Returns:
! ** a pointer to the symbol table entry created.
! ** - changed from 'no return value' 9/5/84 - BNI
**
** Side Effects:
** puts the word into the symbol table.
*/
+
+ #ifdef ROUTING /* ******************************** */
+
+ STAB *
+
+ #endif ROUTING /* ******************************** */
+
setclass(class, word)
int class;
char *word;
***************
*** 819,822 ****
--- 918,926 ----
s = stab(word, ST_CLASS, ST_ENTER);
setbitn(class, s->s_class);
+
+ #ifdef ROUTING /* ******************************** */
+ return (s);
+ #endif ROUTING /* ******************************** */
+
}
diff -c stab.c.old stab.c
*** /usr/4.2/src/usr.lib/sendmail/src/stab.c Mon Jul 25 23:18:41 1983
--- /usr/israel/sendmail/src/stab.c Fri Feb 1 17:00:59 1985
***************
*** 106,108 ****
--- 106,185 ----
return (s);
}
+
+ #ifdef ROUTING /* ******************************** */
+
+ /*
+ ** MAKEEQUIV -- make a name equivalence entry
+ **
+ ** Parameters:
+ ** class -- the class the equivalence is in.
+ ** name -- The name to be translated into.
+ ** s -- a symbol table entry to the orginal name.
+ **
+ ** Returns:
+ ** none.
+ **
+ ** Side Effects:
+ ** none.
+ **
+ ** Author:
+ ** Bruce Israel -- 9/4/84.
+ **
+ */
+
+ makeequiv(class,name,s)
+ char class;
+ char *name;
+ STAB *s;
+ {
+ EQUIV *eq;
+
+ #ifdef DEBUG
+ if (tTd(87,5))
+ printf("makeequiv: defining '%s' --> '%s' in class '%c'.\n",
+ s -> s_name, name, class);
+ #endif DEBUG
+
+ eq = (EQUIV *) xalloc(sizeof *eq);
+ eq -> class = class;
+ eq -> equivname = newstr(name);
+ eq -> next = s ->s_equiv;
+ s -> s_equiv = eq;
+ }
+
+ /*
+ ** GETQUIV -- get a name equivalence for a class
+ **
+ ** Parameters:
+ ** class -- the class the equivalence is in.
+ ** s -- The symbol table entry of the word.
+ **
+ ** Returns:
+ ** a pointer to a string containing the translation
+ ** name. If the symbol table entry has no translation
+ ** name, the original name will be returned.
+ **
+ ** Side Effects:
+ ** none.
+ **
+ ** Author:
+ ** Bruce Israel -- 9/4/84.
+ **
+ */
+
+ char *getequiv(class,s)
+ char class;
+ STAB *s;
+ {
+ EQUIV *eq;
+
+ eq = s -> s_equiv;
+ while (eq != NULL) {
+ if (eq -> class == class) return (eq -> equivname);
+ eq = eq -> next;
+ }
+ return(s -> s_name);
+ }
+
+ #endif ROUTING /* ******************************** */
diff -c sendmail.h.old sendmail.h
*** /usr/4.2/src/usr.lib/sendmail/src/sendmail.h Sun Sep 25 21:06:12 1983
--- /usr/israel/sendmail/src/sendmail.h Fri Feb 1 17:00:42 1985
***************
*** 2,9 ****
** SENDMAIL.H -- Global definitions for sendmail.
*/
-
# ifdef _DEFINE
# define EXTERN
# ifndef lint
--- 2,9 ----
** SENDMAIL.H -- Global definitions for sendmail.
*/
+ # define ROUTING /* Mods for equivalence name classes - BNI 9/5/84 */
# ifdef _DEFINE
# define EXTERN
# ifndef lint
***************
*** 290,299 ****
--- 290,319 ----
# define CONDIF '\031' /* conditional if-then */
# define CONDELSE '\032' /* conditional else */
# define CONDFI '\033' /* conditional fi */
+
+ #ifdef ROUTING /* ******************************** */
+
+ # define EQUIVREPL '\034' /* equivalence class replacement */
+
+ #endif ROUTING /* ******************************** */
+
/*
** Symbol table definitions
*/
+ #ifdef ROUTING /* ******************************** */
+
+ struct equivstr
+ {
+ char class; /* class the name belongs in */
+ char *equivname; /* translated version of name */
+ struct equivstr *next; /* next item on equivalence list */
+ };
+
+ typedef struct equivstr EQUIV;
+
+ #endif ROUTING /* ******************************** */
+
struct symtab
{
char *s_name; /* name to be entered */
***************
*** 306,311 ****
--- 326,334 ----
MAILER *sv_mailer; /* pointer to mailer */
char *sv_alias; /* alias */
} s_value;
+ #ifdef ROUTING /* ******************************** */
+ EQUIV *s_equiv; /* pointer to equivalence names list */
+ #endif ROUTING /* ******************************** */
};
typedef struct symtab STAB;
***************
*** 323,328 ****
--- 346,358 ----
# define s_alias s_value.sv_alias
extern STAB *stab();
+
+ #ifdef ROUTING /* ******************************** */
+
+ STAB *setclass();
+ char *getequiv();
+
+ #endif ROUTING /* ******************************** */
/* opcodes to stab */
# define ST_FIND 0 /* find entry */
//go.sysin dd *
if [ `wc -c < 4.2diffs` != 17321 ]; then
made=FALSE
/bin/echo 'error transmitting "4.2diffs" --'
/bin/echo 'length should be 17321, not' `wc -c < 4.2diffs`
else
made=TRUE
fi
if [ $made = TRUE ]; then
/bin/chmod 644 4.2diffs
/bin/echo -n ' '; /bin/ls -ld 4.2diffs
fi
/bin/echo 'Extracting 4.3diffs'
sed 's/^X//' <<'//go.sysin dd *' >4.3diffs
RCS file: RCS/main.c,v
retrieving revision 1.1
diff -c -r1.1 main.c
*** /tmp/,RCSt1001795 Thu Oct 31 18:03:04 1985
--- main.c Fri Oct 18 19:39:15 1985
***************
*** 778,783 ****
--- 778,784 ----
/* these are RHS metasymbols */
'#', CANONNET, '@', CANONHOST, ':', CANONUSER, '>', CALLSUBR,
+ '&', EQUIVREPL,
/* the conditional operations */
'?', CONDIF, '|', CONDELSE, '.', CONDFI,
===================================================================
RCS file: RCS/parseaddr.c,v
retrieving revision 1.1
diff -c -r1.1 parseaddr.c
*** /tmp/,RCSt1001795 Thu Oct 31 18:03:12 1985
--- parseaddr.c Fri Oct 18 19:39:19 1985
***************
*** 213,218 ****
--- 213,222 ----
**
** Side Effects:
** none.
+ **
+ ** N.B.: prescan's work is all done by the internal routine
+ ** _prescan, which merely has one additional parameter:
+ ** av -- place to put the pointers.
*/
/* states and character types */
***************
*** 250,255 ****
--- 254,272 ----
char delim;
char pvpbuf[];
{
+ static char *av[MAXATOM+1];
+ char **_prescan();
+
+ return (_prescan(addr, delim, pvpbuf, av));
+ }
+
+ static char **
+ _prescan(addr, delim, pvpbuf, av)
+ char *addr;
+ char delim;
+ char pvpbuf[];
+ char *av[];
+ {
register char *p;
register char *q;
register int c;
***************
*** 260,266 ****
char *tok;
int state;
int newstate;
- static char *av[MAXATOM+1];
extern int errno;
/* make sure error messages don't have garbage on them */
--- 277,282 ----
***************
*** 443,449 ****
expand("\001o", buf, &buf[sizeof buf - 1], CurEnv);
(void) strcat(buf, DELIMCHARS);
}
! if (c == MATCHCLASS || c == MATCHREPL || c == MATCHNCLASS)
return (ONE);
if (c == '"')
return (QST);
--- 459,466 ----
expand("\001o", buf, &buf[sizeof buf - 1], CurEnv);
(void) strcat(buf, DELIMCHARS);
}
! if (c == MATCHCLASS || c == MATCHREPL || c == MATCHNCLASS ||
! c == EQUIVREPL)
return (ONE);
if (c == '"')
return (QST);
***************
*** 491,496 ****
--- 508,514 ----
{
char **first; /* first token matched */
char **last; /* last token matched */
+ char *equiv; /* equivalence name for match */ /* XXX */
};
# define MAXMATCH 9 /* max params per rewrite */
***************
*** 576,582 ****
}
else if (*rp == MATCHNCLASS)
goto backup;
!
/* explicit fall-through */
case MATCHONE:
--- 594,604 ----
}
else if (*rp == MATCHNCLASS)
goto backup;
! /*
! * XXX Should only note equiv parameters
! * here, and do translation later.
! */
! mlp->equiv = getequiv(rp[1], s);
/* explicit fall-through */
case MATCHONE:
***************
*** 585,590 ****
--- 607,613 ----
mlp->first = avp;
mlp->last = avp++;
mlp++;
+ mlp->equiv = NULL;
break;
case MATCHZANY:
***************
*** 592,597 ****
--- 615,621 ----
mlp->first = avp;
mlp->last = avp - 1;
mlp++;
+ mlp->equiv = NULL;
break;
default:
***************
*** 625,630 ****
--- 649,655 ----
{
/* back out binding */
mlp--;
+ mlp->equiv = NULL;
}
}
***************
*** 679,689 ****
register char **pp;
rp = *rvp;
! if (*rp == MATCHREPL)
{
/* substitute from LHS */
m = &mlist[rp[1] - '1'];
! if (m >= mlp)
{
syserr("rewrite: ruleset %d: replacement out of bounds", ruleset);
return;
--- 704,714 ----
register char **pp;
rp = *rvp;
! if (*rp == MATCHREPL || *rp == EQUIVREPL)
{
/* substitute from LHS */
m = &mlist[rp[1] - '1'];
! if (rp[1] < '1' || rp[1] > '9' || m >= mlp)
{
syserr("rewrite: ruleset %d: replacement out of bounds", ruleset);
return;
***************
*** 691,697 ****
# ifdef DEBUG
if (tTd(21, 15))
{
! printf("$%c:", rp[1]);
pp = m->first;
while (pp <= m->last)
{
--- 716,725 ----
# ifdef DEBUG
if (tTd(21, 15))
{
! if (*rp == EQUIVREPL)
! printf("$&%c:", rp[1]);
! else
! printf("$%c:", rp[1]);
pp = m->first;
while (pp <= m->last)
{
***************
*** 699,716 ****
(void) fflush(stdout);
printf("%s\"", *pp++);
}
printf("\n");
}
# endif DEBUG
! pp = m->first;
! while (pp <= m->last)