BSD 4_3_Net_2 release

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

diff --git a/usr/src/usr.bin/mail/temp.c b/usr/src/usr.bin/mail/temp.c
index 2a53b82..c03684f 100644 (file)
--- a/usr/src/usr.bin/mail/temp.c
+++ b/usr/src/usr.bin/mail/temp.c
@@ -2,11 +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.
  *

- * %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[] = "@(#)temp.c     5.14 (Berkeley) %G%";
+static char sccsid[] = "@(#)temp.c     5.15 (Berkeley) 2/3/91";

 #endif /* not lint */
 
 #include "rcv.h"
 #endif /* not lint */
 
 #include "rcv.h"


@@ -20,7 +46,6 @@ static char sccsid[] = "@(#)temp.c    5.14 (Berkeley) %G%";
 char   tempMail[24];
 char   tempQuit[24];
 char   tempEdit[24];
 char   tempMail[24];
 char   tempQuit[24];
 char   tempEdit[24];

-char   tempSet[24];

 char   tempResid[24];
 char   tempMesg[24];
 
 char   tempResid[24];
 char   tempMesg[24];
 


@@ -36,8 +61,6 @@ tinit()
        mktemp(strcat(tempQuit, "RmXXXXXX"));
        strcpy(tempEdit, _PATH_TMP);
        mktemp(strcat(tempEdit, "ReXXXXXX"));
        mktemp(strcat(tempQuit, "RmXXXXXX"));
        strcpy(tempEdit, _PATH_TMP);
        mktemp(strcat(tempEdit, "ReXXXXXX"));

-       strcpy(tempSet, _PATH_TMP);
-       mktemp(strcat(tempSet, "RxXXXXXX"));

        strcpy(tempMesg, _PATH_TMP);
        mktemp(strcat(tempMesg, "RxXXXXXX"));
 
        strcpy(tempMesg, _PATH_TMP);
        mktemp(strcat(tempMesg, "RxXXXXXX"));