BSD 4_3_Net_2 release

[unix-history] / usr / src / usr.sbin / sendmail / src / macro.c

diff --git a/usr/src/usr.sbin/sendmail/src/macro.c b/usr/src/usr.sbin/sendmail/src/macro.c
index 0fcb20f..da35b46 100644 (file)
--- a/usr/src/usr.sbin/sendmail/src/macro.c
+++ b/usr/src/usr.sbin/sendmail/src/macro.c
@@ -1,21 +1,42 @@
 /*
 /*

-**  Sendmail
-**  Copyright (c) 1983  Eric P. Allman
-**  Berkeley, California
-**
-**  Copyright (c) 1983 Regents of the University of California.
-**  All rights reserved.  The Berkeley software License Agreement
-**  specifies the terms and conditions for redistribution.
-*/
+ * Copyright (c) 1983 Eric P. Allman
+ * Copyright (c) 1988 Regents of the University of California.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *     This product includes software developed by the University of
+ *     California, Berkeley and its contributors.
+ * 4. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */

 
 #ifndef lint
 
 #ifndef lint

-static char    SccsId[] = "@(#)macro.c 5.1 (Berkeley) %G%";
-#endif not lint
+static char sccsid[] = "@(#)macro.c    5.7 (Berkeley) 6/1/90";
+#endif /* not lint */

 
 # include "sendmail.h"
 
 # include "sendmail.h"

-# include "conf.h"
-
-SCCSID(@(#)macro.c     5.1             %G%);

 
 /*
 **  EXPAND -- macro expand a string using $x escapes.
 
 /*
 **  EXPAND -- macro expand a string using $x escapes.


@@ -48,14 +69,12 @@ expand(s, buf, buflim, e)
        char xbuf[BUFSIZ];
        extern char *macvalue();
 
        char xbuf[BUFSIZ];
        extern char *macvalue();
 

-# ifdef DEBUG
-       if (tTd(35, 4))
+       if (tTd(35, 24))

        {
                printf("expand(");
                xputs(s);
                printf(")\n");
        }
        {
                printf("expand(");
                xputs(s);
                printf(")\n");
        }

-# endif DEBUG

 
        skipping = FALSE;
        if (s == NULL)
 
        skipping = FALSE;
        if (s == NULL)


@@ -115,14 +134,12 @@ expand(s, buf, buflim, e)
        }
        *xp = '\0';
 
        }
        *xp = '\0';
 

-# ifdef DEBUG
-       if (tTd(35, 4))
+       if (tTd(35, 24))

        {
                printf("expand ==> ");
                xputs(xbuf);
                printf("\n");
        }
        {
                printf("expand ==> ");
                xputs(xbuf);
                printf("\n");
        }

-# endif DEBUG

 
        /* recurse as appropriate */
        if (recurse)
 
        /* recurse as appropriate */
        if (recurse)


@@ -203,14 +220,12 @@ define(n, v, e)
        char *v;
        register ENVELOPE *e;
 {
        char *v;
        register ENVELOPE *e;
 {

-# ifdef DEBUG
-       if (tTd(35, 3))
+       if (tTd(35, 9))

        {
                printf("define(%c as ", n);
                xputs(v);
                printf(")\n");
        }
        {
                printf("define(%c as ", n);
                xputs(v);
                printf(")\n");
        }

-# endif DEBUG

        e->e_macro[n & 0177] = v;
 }
 \f/*
        e->e_macro[n & 0177] = v;
 }
 \f/*