BSD 4_3_Net_2 release

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

diff --git a/usr/src/usr.sbin/sendmail/src/collect.c b/usr/src/usr.sbin/sendmail/src/collect.c
index c037018..a96df15 100644 (file)
--- a/usr/src/usr.sbin/sendmail/src/collect.c
+++ b/usr/src/usr.sbin/sendmail/src/collect.c
@@ -3,11 +3,37 @@
  * Copyright (c) 1988 Regents of the University of California.
  * All rights reserved.
  *
  * Copyright (c) 1988 Regents of the University of California.
  * All rights reserved.
  *

- * %sccs.include.redist.c%
+ * 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[] = "@(#)collect.c  5.9 (Berkeley) %G%";
+static char sccsid[] = "@(#)collect.c  5.9 (Berkeley) 6/1/90";

 #endif /* not lint */
 
 # include <errno.h>
 #endif /* not lint */
 
 # include <errno.h>


@@ -21,22 +47,19 @@ static char sccsid[] = "@(#)collect.c       5.9 (Berkeley) %G%";
 **     stripped off (after important information is extracted).
 **
 **     Parameters:
 **     stripped off (after important information is extracted).
 **
 **     Parameters:

-**             from -- the person we think it may be from.  If
-**                     there is a "From" line, we will replace
-**                     the name of the person by this.  If NULL,
-**                     do no such replacement.
+**             sayok -- if set, give an ARPANET style message
+**                     to say we are ready to collect input.

 **
 **     Returns:
 **
 **     Returns:

-**             Name of the "from" person extracted from the
-**             arpanet header.
+**             none.

 **
 **     Side Effects:
 **             Temp file is created and filled.
 **             The from person may be set.
 */
 
 **
 **     Side Effects:
 **             Temp file is created and filled.
 **             The from person may be set.
 */
 

-maketemp(from)
-       char *from;
+collect(sayok)
+       bool sayok;

 {
        register FILE *tf;
        char buf[MAXFIELD], buf2[MAXFIELD];
 {
        register FILE *tf;
        char buf[MAXFIELD], buf2[MAXFIELD];


@@ -44,7 +67,6 @@ maketemp(from)
        register int workbuflen;
        extern char *hvalue();
        extern bool isheader(), flusheol();
        register int workbuflen;
        extern char *hvalue();
        extern bool isheader(), flusheol();

-       extern char *index();

 
        /*
        **  Create the temp file name and create the file.
 
        /*
        **  Create the temp file name and create the file.