X-Git-Url: https://git.subgeniuskitty.com/unix-history/.git/blobdiff_plain/2ae9f53f75d78089d784d0be9fccf0396252244a..a12ff48697cac43c0bd58aadc3f665316752562b:/usr/src/usr.bin/mail/v7.local.c

diff --git a/usr/src/usr.bin/mail/v7.local.c b/usr/src/usr.bin/mail/v7.local.c
index c94d5b502b..c6249505c2 100644
--- a/usr/src/usr.bin/mail/v7.local.c
+++ b/usr/src/usr.bin/mail/v7.local.c
@@ -1,6 +1,13 @@
+/*
+ * Copyright (c) 1980, 1993
+ *	The Regents of the University of California.  All rights reserved.
+ *
+ * %sccs.include.redist.c%
+ */
+
 #ifndef lint
-static char sccsid[] = "@(#)v7.local.c	2.3 (Berkeley) %G%";
-#endif
+static char sccsid[] = "@(#)v7.local.c	8.1 (Berkeley) %G%";
+#endif /* not lint */
 
 /*
  * Mail -- a mail program
@@ -11,51 +18,40 @@ static char sccsid[] = "@(#)v7.local.c	2.3 (Berkeley) %G%";
  */
 
 #include "rcv.h"
+#include <fcntl.h>
+#include "extern.h"
 
 /*
  * Locate the user's mailbox file (ie, the place where new, unread
- * mail is queued).  In Version 7, it is in /usr/spool/mail/name.
+ * mail is queued).
  */
-
-findmail()
+void
+findmail(user, buf)
+	char *user, *buf;
 {
-	register char *cp;
-
-	cp = copy("/usr/spool/mail/", mailname);
-	copy(myname, cp);
-	if (isdir(mailname)) {
-		stradd(mailname, '/');
-		strcat(mailname, myname);
-	}
+	(void)sprintf(buf, "%s/%s", _PATH_MAILDIR, user);
 }
 
 /*
  * Get rid of the queued mail.
  */
-
+void
 demail()
 {
 
-	if (value("keep") != NOSTR)
-		close(creat(mailname, 0666));
-	else {
-		if (remove(mailname) < 0)
-			close(creat(mailname, 0666));
-	}
+	if (value("keep") != NOSTR || rm(mailname) < 0)
+		close(creat(mailname, 0600));
 }
 
 /*
  * Discover user login name.
  */
-
-username(uid, namebuf)
-	char namebuf[];
+char *
+username()
 {
-	register char *np;
+	char *np;
 
-	if (uid == getuid() && (np = getenv("USER")) != NOSTR) {
-		strncpy(namebuf, np, PATHSIZE);
-		return(0);
-	}
-	return(getname(uid, namebuf));
+	if ((np = getenv("USER")) != NOSTR)
+		return np;
+	return getname(getuid());
 }