diff options
| author | Todd C. Miller <millert@cvs.openbsd.org> | 1997-07-14 00:24:32 +0000 |
|---|---|---|
| committer | Todd C. Miller <millert@cvs.openbsd.org> | 1997-07-14 00:24:32 +0000 |
| commit | 293e2ed3692571512edc7bff8a33c5e39245390a (patch) | |
| tree | 3f8cf6e621e7cfbcc8fee5d99dad7fb95dd5538d /usr.bin/mail/v7.local.c | |
| parent | 3045f0573e3ce834b83de1532157108acab288bf (diff) | |
NOSTR -> NULL
Use sigsetjmp/siglongjmp instead of sigjmp/longjmp for portability.
Diffstat (limited to 'usr.bin/mail/v7.local.c')
| -rw-r--r-- | usr.bin/mail/v7.local.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/usr.bin/mail/v7.local.c b/usr.bin/mail/v7.local.c index 0521ce6a95f..81d11700006 100644 --- a/usr.bin/mail/v7.local.c +++ b/usr.bin/mail/v7.local.c @@ -1,4 +1,4 @@ -/* $OpenBSD: v7.local.c,v 1.7 1997/07/13 21:21:18 millert Exp $ */ +/* $OpenBSD: v7.local.c,v 1.8 1997/07/14 00:24:31 millert Exp $ */ /* $NetBSD: v7.local.c,v 1.8 1997/05/13 06:15:58 mikel Exp $ */ /* @@ -38,7 +38,7 @@ #if 0 static char sccsid[] = "@(#)v7.local.c 8.1 (Berkeley) 6/6/93"; #else -static char rcsid[] = "$OpenBSD: v7.local.c,v 1.7 1997/07/13 21:21:18 millert Exp $"; +static char rcsid[] = "$OpenBSD: v7.local.c,v 1.8 1997/07/14 00:24:31 millert Exp $"; #endif #endif /* not lint */ @@ -81,7 +81,7 @@ void demail() { - if (value("keep") != NOSTR || rm(mailname) < 0) + if (value("keep") != NULL || rm(mailname) < 0) (void)close(creat(mailname, 0600)); } @@ -94,12 +94,12 @@ username() char *np; uid_t uid; - if ((np = getenv("USER")) != NOSTR) + if ((np = getenv("USER")) != NULL) return(np); - if ((np = getenv("LOGNAME")) != NOSTR) + if ((np = getenv("LOGNAME")) != NULL) return(np); - if ((np = getname(uid = getuid())) != NOSTR) + if ((np = getname(uid = getuid())) != NULL) return(np); printf("Cannot associate a name with uid %u\n", (unsigned)uid); - return(NOSTR); + return(NULL); } |