Make sure the correct errno is reported by warn* or err* and not

the errno of an intervening cleanup operation like close/unlink/etc.

Diff from Doug Hogan (doug (at) acyclic.org)

1 files changed, 5 insertions, 3 deletions

diff --git a/sbin/bioctl/bioctl.c b/sbin/bioctl/bioctl.c
index cfd5b243cb2..97de831a6c8 100644
--- a/sbin/bioctl/bioctl.c
+++ b/sbin/bioctl/bioctl.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: bioctl.c,v 1.120 2014/04/22 20:42:01 tedu Exp $       */
+/* $OpenBSD: bioctl.c,v 1.121 2014/07/20 01:38:40 guenther Exp $       */
 
 /*
  * Copyright (c) 2004, 2005 Marco Peereboom
@@ -926,8 +926,9 @@ bio_createraid(u_int16_t level, char *dev_list, char *key_disk)
 		if (fd == -1)
 			err(1, "could not open %s", key_disk);
 		if (fstat(fd, &sb) == -1) {
+			int saved_errno = errno;
 			close(fd);
-			err(1, "could not stat %s", key_disk);
+			errc(1, saved_errno, "could not stat %s", key_disk);
 		}
 		close(fd);
 		create.bc_key_disk = sb.st_rdev;
@@ -1026,8 +1027,9 @@ bio_parse_devlist(char *lst, dev_t *dt)
 			if (fd == -1)
 				err(1, "could not open %s", dev);
 			if (fstat(fd, &sb) == -1) {
+				int saved_errno = errno;
 				close(fd);
-				err(1, "could not stat %s", dev);
+				errc(1, saved_errno, "could not stat %s", dev);
 			}
 			close(fd);
 			dt[no_dev] = sb.st_rdev;