file reorg, pathnames.h, paths.h

[unix-history] / 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 7a72a3f..a69c067 100644 (file)
--- a/usr/src/usr.bin/mail/v7.local.c
+++ b/usr/src/usr.bin/mail/v7.local.c
@@ -1,4 +1,23 @@
-#
+/*
+ * 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.
+ */
+
+#ifndef lint
+static char sccsid[] = "@(#)v7.local.c 5.8 (Berkeley) %G%";
+#endif /* not lint */

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


@@ -10,50 +29,37 @@
 
 #include "rcv.h"
 
 
 #include "rcv.h"
 

-static char *SccsId = "@(#)v7.local.c  2.1 %G%";
-

 /*
  * Locate the user's mailbox file (ie, the place where new, unread
 /*
  * 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()
+findmail(user, buf)
+       char *user;
+       char *buf;

 {
 {

-       register char *cp;
-
-       cp = copy("/usr/spool/mail/", mailname);
-       copy(myname, cp);
-       if (isdir(mailname)) {
-               stradd(mailname, '/');
-               strcat(mailname, myname);
-       }
+
+       strcpy(copy(_PATH_MBOX, buf), user);

 }
 
 /*
  * Get rid of the queued mail.
  */
 }
 
 /*
  * Get rid of the queued mail.
  */

-

 demail()
 {
 
 demail()
 {
 

-       if (value("keep") != NOSTR)
-               close(creat(mailname, 0666));
-       else
-               remove(mailname);
+       if (value("keep") != NOSTR || remove(mailname) < 0)
+               close(creat(mailname, 0600));

 }
 
 /*
  * Discover user login name.
  */
 }
 
 /*
  * 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());

 }
 }