diff options
| author |   niallo <niallo@openbsd.org> | 2006-03-06 15:04:17 +0000 |
|---|---|---|
| committer | niallo <niallo@openbsd.org> | 2006-03-06 15:04:17 +0000 |
| commit | ee1016bf55dc7c4de353ce0a0e11fda377b0c842 (patch) | |
| tree | 68adf5f6003902d2fe9641adf522e9e1c8649d9b | |
| parent | update usage(); (diff) | |
| download | wireguard-openbsd-ee1016bf55dc7c4de353ce0a0e11fda377b0c842.tar.xz wireguard-openbsd-ee1016bf55dc7c4de353ce0a0e11fda377b0c842.zip | |
like gnu ci(1), continue to process valid files in argv even if some are
invalid.
ok xsa@
| -rw-r--r-- | usr.bin/cvs/buf.c | 8 | ||||
| -rw-r--r-- | usr.bin/rcs/ci.c | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/usr.bin/cvs/buf.c b/usr.bin/cvs/buf.c index 1bcf4ba635f..d2c652a120e 100644 --- a/usr.bin/cvs/buf.c +++ b/usr.bin/cvs/buf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: buf.c,v 1.33 2006/02/26 09:45:02 xsa Exp $ */ +/* $OpenBSD: buf.c,v 1.34 2006/03/06 15:04:17 niallo Exp $ */ /* * Copyright (c) 2003 Jean-Francois Brousseau <jfb@openbsd.org> * All rights reserved. @@ -94,8 +94,10 @@ cvs_buf_load(const char *path, u_int flags) struct stat st; BUF *buf; - if ((fd = open(path, O_RDONLY, 0600)) == -1) - fatal("%s: %s", path, strerror(errno)); + if ((fd = open(path, O_RDONLY, 0600)) == -1) { + cvs_log(LP_ERRNO, "%s: %s", path, strerror(errno)); + return (NULL); + } if (fstat(fd, &st) == -1) fatal("cvs_buf_load: fstat: %s", strerror(errno)); diff --git a/usr.bin/rcs/ci.c b/usr.bin/rcs/ci.c index 0753d4afb18..76b0e6f756f 100644 --- a/usr.bin/rcs/ci.c +++ b/usr.bin/rcs/ci.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ci.c,v 1.108 2006/03/06 14:49:54 jmc Exp $ */ +/* $OpenBSD: ci.c,v 1.109 2006/03/06 15:04:17 niallo Exp $ */ /* * Copyright (c) 2005, 2006 Niall O'Higgins <niallo@openbsd.org> * All rights reserved. @@ -488,7 +488,6 @@ checkin_update(struct checkin_params *pb) /* Load file contents */ if ((bp = cvs_buf_load(pb->filename, BUF_AUTOEXT)) == NULL) { - cvs_log(LP_ERR, "failed to load '%s'", pb->filename); rcs_close(pb->file); return (-1); } @@ -598,7 +597,6 @@ checkin_init(struct checkin_params *pb) /* Load file contents */ if ((bp = cvs_buf_load(pb->filename, BUF_AUTOEXT)) == NULL) { - cvs_log(LP_ERR, "failed to load '%s'", pb->filename); rcs_close(pb->file); return (-1); } |