BSD 4_3_Tahoe release

[unix-history] / usr / src / ucb / Mail / v7.local.c

diff --git a/usr/src/ucb/Mail/v7.local.c b/usr/src/ucb/Mail/v7.local.c
index cb57f5f..2af8192 100644 (file)
--- a/usr/src/ucb/Mail/v7.local.c
+++ b/usr/src/ucb/Mail/v7.local.c
@@ -1,12 +1,18 @@
 /*
  * Copyright (c) 1980 Regents of the University of California.
 /*
  * Copyright (c) 1980 Regents of the University of California.

- * All rights reserved.  The Berkeley software License Agreement
- * specifies the terms and conditions for redistribution.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms are permitted
+ * provided that this notice is preserved and that due credit is given
+ * to the University of California at 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'' without express or implied warranty.

  */
 
  */
 

-#ifndef lint
-static char *sccsid = "@(#)v7.local.c  5.2 (Berkeley) 6/21/85";
-#endif not lint
+#ifdef notdef
+static char sccsid[] = "@(#)v7.local.c 5.4 (Berkeley) 2/18/88";
+#endif /* notdef */

 
 /*
  * Mail -- a mail program
 
 /*
  * Mail -- a mail program


@@ -25,10 +31,8 @@ static char *sccsid = "@(#)v7.local.c        5.2 (Berkeley) 6/21/85";
 
 findmail()
 {
 
 findmail()
 {

-       register char *cp;

 
 

-       cp = copy("/usr/spool/mail/", mailname);
-       copy(myname, cp);
+       strcpy(copy("/usr/spool/mail/", mailname), myname);

        if (isdir(mailname)) {
                stradd(mailname, '/');
                strcat(mailname, myname);
        if (isdir(mailname)) {
                stradd(mailname, '/');
                strcat(mailname, myname);