BSD 4_3_Net_2 release

[unix-history] / usr / src / usr.bin / mail / collect.c

diff --git a/usr/src/usr.bin/mail/collect.c b/usr/src/usr.bin/mail/collect.c
index 0903d4f..4c4038a 100644 (file)
--- a/usr/src/usr.bin/mail/collect.c
+++ b/usr/src/usr.bin/mail/collect.c
@@ -2,23 +2,37 @@
  * Copyright (c) 1980 Regents of the University of California.
  * All rights reserved.
  *
  * Copyright (c) 1980 Regents of the University of California.
  * All rights reserved.
  *

- * Redistribution and use in source and binary forms are permitted provided
- * that: (1) source distributions retain this entire copyright notice and
- * comment, and (2) distributions including binaries display the following
- * acknowledgement:  ``This product includes software developed by the
- * University of California, Berkeley and its contributors'' in the
- * documentation or other materials provided with the distribution and in
- * all advertising materials mentioning features or use of this software.
- * 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 ``AS IS'' AND WITHOUT ANY EXPRESS OR IMPLIED
- * WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+ * 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.22 (Berkeley) 6/25/90";
+static char sccsid[] = "@(#)collect.c  5.24 (Berkeley) 4/1/91";

 #endif /* not lint */
 
 /*
 #endif /* not lint */
 
 /*


@@ -60,12 +74,12 @@ collect(hp, printheaders)
 {
        FILE *fbuf;
        int lc, cc, escape, eofcount;
 {
        FILE *fbuf;
        int lc, cc, escape, eofcount;

-       int collint(), collhup(), collstop();

        register int c, t;
        char linebuf[LINESIZE], *cp;
        extern char tempMail[];
        char getsub;
        int omask;
        register int c, t;
        char linebuf[LINESIZE], *cp;
        extern char tempMail[];
        char getsub;
        int omask;

+       void collint(), collhup(), collstop();

 
        collf = NULL;
        /*
 
        collf = NULL;
        /*


@@ -81,7 +95,7 @@ collect(hp, printheaders)
        savettou = signal(SIGTTOU, collstop);
        savettin = signal(SIGTTIN, collstop);
        if (setjmp(collabort) || setjmp(colljmp)) {
        savettou = signal(SIGTTOU, collstop);
        savettin = signal(SIGTTIN, collstop);
        if (setjmp(collabort) || setjmp(colljmp)) {

-               remove(tempMail);
+               rm(tempMail);

                goto err;
        }
        sigsetmask(omask & ~(sigmask(SIGINT) | sigmask(SIGHUP)));
                goto err;
        }
        sigsetmask(omask & ~(sigmask(SIGINT) | sigmask(SIGHUP)));


@@ -528,6 +542,7 @@ forward(ms, fp, f)
  * Print (continue) when continued after ^Z.
  */
 /*ARGSUSED*/
  * Print (continue) when continued after ^Z.
  */
 /*ARGSUSED*/

+void

 collstop(s)
 {
        sig_t old_action = signal(s, SIG_DFL);
 collstop(s)
 {
        sig_t old_action = signal(s, SIG_DFL);


@@ -548,6 +563,7 @@ collstop(s)
  * Then jump out of the collection loop.
  */
 /*ARGSUSED*/
  * Then jump out of the collection loop.
  */
 /*ARGSUSED*/

+void

 collint(s)
 {
        /*
 collint(s)
 {
        /*


@@ -570,6 +586,7 @@ collint(s)
 }
 
 /*ARGSUSED*/
 }
 
 /*ARGSUSED*/

+void

 collhup(s)
 {
        rewind(collf);
 collhup(s)
 {
        rewind(collf);