removed global uid variable

SCCS-vsn: usr.bin/mail/glob.h 5.12
SCCS-vsn: usr.bin/mail/temp.c 5.8

diff --git a/usr/src/usr.bin/mail/glob.h b/usr/src/usr.bin/mail/glob.h
index b61e7bf..da65e63 100644 (file)
--- a/usr/src/usr.bin/mail/glob.h
+++ b/usr/src/usr.bin/mail/glob.h
@@ -14,7 +14,7 @@
  * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *
  * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *

- *     @(#)glob.h      5.11 (Berkeley) %G%
+ *     @(#)glob.h      5.12 (Berkeley) %G%

  */
 
 /*
  */
 
 /*


@@ -42,7 +42,6 @@ int   image;                          /* File descriptor for image of msg */
 FILE   *input;                         /* Current command input file */
 char   mailname[PATHSIZE];             /* Name of current file */
 char   prevfile[PATHSIZE];             /* Name of previous file */
 FILE   *input;                         /* Current command input file */
 char   mailname[PATHSIZE];             /* Name of current file */
 char   prevfile[PATHSIZE];             /* Name of previous file */

-int    uid;                            /* The invoker's user id */

 char   mailrc[PATHSIZE];               /* Name of startup file */
 char   deadletter[PATHSIZE];           /* Name of #/dead.letter */
 char   homedir[PATHSIZE];              /* Path name of home directory */
 char   mailrc[PATHSIZE];               /* Name of startup file */
 char   deadletter[PATHSIZE];           /* Name of #/dead.letter */
 char   homedir[PATHSIZE];              /* Path name of home directory */

diff --git a/usr/src/usr.bin/mail/temp.c b/usr/src/usr.bin/mail/temp.c
index f39ef5b..1a72542 100644 (file)
--- a/usr/src/usr.bin/mail/temp.c
+++ b/usr/src/usr.bin/mail/temp.c
@@ -16,7 +16,7 @@
  */
 
 #ifndef lint
  */
 
 #ifndef lint

-static char sccsid[] = "@(#)temp.c     5.7 (Berkeley) %G%";
+static char sccsid[] = "@(#)temp.c     5.8 (Berkeley) %G%";

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


@@ -38,7 +38,7 @@ tinit()
 {
        register char *cp;
        char uname[PATHSIZE];
 {
        register char *cp;
        char uname[PATHSIZE];

-       uid_t getuid();
+       int uid;

 
        mktemp(strcpy(tempMail, "/tmp/RsXXXXXX"));
        mktemp(strcpy(tempResid, "/tmp/RqXXXXXX"));
 
        mktemp(strcpy(tempMail, "/tmp/RsXXXXXX"));
        mktemp(strcpy(tempResid, "/tmp/RqXXXXXX"));


@@ -54,8 +54,7 @@ tinit()
                            myname);
                        exit(1);
                }
                            myname);
                        exit(1);
                }

-       }
-       else {
+       } else {

                uid = getuid();
                if (username(uid, uname) < 0) {
                        strcpy(myname, "ubluit");
                uid = getuid();
                if (username(uid, uname) < 0) {
                        strcpy(myname, "ubluit");