diff options
| author | Xavier Santolaria <xsa@cvs.openbsd.org> | 2005-12-19 17:43:02 +0000 |
|---|---|---|
| committer | Xavier Santolaria <xsa@cvs.openbsd.org> | 2005-12-19 17:43:02 +0000 |
| commit | 03f76ed10563fc55c1f4f5da5e6fb37de80ef249 (patch) | |
| tree | aef2d6ba8c8255335adf3ada5b56b3fa41ab833f | |
| parent | d4d0ab9cb01a98494afc8e6f8ffa66b6dc7914a9 (diff) | |
use fatal() if getpwuid() fails; OK joris@.
| -rw-r--r-- | usr.bin/cvs/cvs.c | 10 | ||||
| -rw-r--r-- | usr.bin/cvs/rcs.c | 9 |
2 files changed, 6 insertions, 13 deletions
diff --git a/usr.bin/cvs/cvs.c b/usr.bin/cvs/cvs.c index 7f612698f61..293c2c35507 100644 --- a/usr.bin/cvs/cvs.c +++ b/usr.bin/cvs/cvs.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cvs.c,v 1.88 2005/12/10 20:27:45 joris Exp $ */ +/* $OpenBSD: cvs.c,v 1.89 2005/12/19 17:43:01 xsa Exp $ */ /* * Copyright (c) 2004 Jean-Francois Brousseau <jfb@openbsd.org> * All rights reserved. @@ -129,12 +129,8 @@ main(int argc, char **argv) cvs_readonly = 1; if ((cvs_homedir = getenv("HOME")) == NULL) { - pw = getpwuid(getuid()); - if (pw == NULL) { - cvs_log(LP_NOTICE, - "failed to get user's password entry"); - exit(CVS_EX_DATA); - } + if ((pw = getpwuid(getuid())) == NULL) + fatal("getpwuid failed"); cvs_homedir = pw->pw_dir; } diff --git a/usr.bin/cvs/rcs.c b/usr.bin/cvs/rcs.c index cd56920ae7d..05bd3e45b3e 100644 --- a/usr.bin/cvs/rcs.c +++ b/usr.bin/cvs/rcs.c @@ -1,4 +1,4 @@ -/* $OpenBSD: rcs.c,v 1.111 2005/12/12 17:47:03 joris Exp $ */ +/* $OpenBSD: rcs.c,v 1.112 2005/12/19 17:43:01 xsa Exp $ */ /* * Copyright (c) 2004 Jean-Francois Brousseau <jfb@openbsd.org> * All rights reserved. @@ -1361,11 +1361,8 @@ rcs_rev_add(RCSFILE *rf, RCSNUM *rev, const char *msg, time_t date, } } - if ((pw = getpwuid(getuid())) == NULL) { - rcs_errno = RCS_ERR_ERRNO; - rcsnum_free(old); - return (-1); - } + if ((pw = getpwuid(getuid())) == NULL) + fatal("getpwuid failed"); rdp = (struct rcs_delta *)xmalloc(sizeof(*rdp)); memset(rdp, 0, sizeof(*rdp)); |