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 a5c7e90..c03684f 100644 (file)
--- a/usr/src/usr.bin/mail/temp.c
+++ b/usr/src/usr.bin/mail/temp.c
@@ -2,21 +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 the above copyright notice and this paragraph are
- * duplicated in all such forms and that any documentation,
- * advertising materials, and other materials related to such
- * distribution and use acknowledge that the software was developed
- * by the University of California, Berkeley.  The name of the
- * University may not 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 MERCHANTIBILITY 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[] = "@(#)temp.c     5.12 (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"


@@ -30,7 +46,6 @@ static char sccsid[] = "@(#)temp.c    5.12 (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];
 


@@ -39,17 +54,15 @@ tinit()
        register char *cp;
 
        strcpy(tempMail, _PATH_TMP);
        register char *cp;
 
        strcpy(tempMail, _PATH_TMP);

-       mktemp(strcat(tempMail, "/RsXXXXXX"));
+       mktemp(strcat(tempMail, "RsXXXXXX"));

        strcpy(tempResid, _PATH_TMP);
        strcpy(tempResid, _PATH_TMP);

-       mktemp(strcat(tempResid, "/RqXXXXXX"));
+       mktemp(strcat(tempResid, "RqXXXXXX"));

        strcpy(tempQuit, _PATH_TMP);
        strcpy(tempQuit, _PATH_TMP);

-       mktemp(strcat(tempQuit, "/RmXXXXXX"));
+       mktemp(strcat(tempQuit, "RmXXXXXX"));

        strcpy(tempEdit, _PATH_TMP);
        strcpy(tempEdit, _PATH_TMP);

-       mktemp(strcat(tempEdit, "/ReXXXXXX"));
-       strcpy(tempSet, _PATH_TMP);
-       mktemp(strcat(tempSet, "/RxXXXXXX"));
+       mktemp(strcat(tempEdit, "ReXXXXXX"));

        strcpy(tempMesg, _PATH_TMP);
        strcpy(tempMesg, _PATH_TMP);

-       mktemp(strcat(tempMesg, "/RxXXXXXX"));
+       mktemp(strcat(tempMesg, "RxXXXXXX"));

 
        /*
         * It's okay to call savestr in here because main will
 
        /*
         * It's okay to call savestr in here because main will