diff options
| author | Todd C. Miller <millert@cvs.openbsd.org> | 1998-01-22 05:13:19 +0000 |
|---|---|---|
| committer | Todd C. Miller <millert@cvs.openbsd.org> | 1998-01-22 05:13:19 +0000 |
| commit | 470f38724656a2cc86f07d838426fb19429e60b9 (patch) | |
| tree | 7132dedf5ba2e1f2326a0d30879bd0c5c11b82b7 /sbin | |
| parent | d288150d2da98ce8d6e46fc313b31a2c888c58bd (diff) | |
Fix sanity check of backup sblocks as well as error message.
Diffstat (limited to 'sbin')
| -rw-r--r-- | sbin/fsirand/fsirand.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/sbin/fsirand/fsirand.c b/sbin/fsirand/fsirand.c index 97bd3553acc..1e645322ae6 100644 --- a/sbin/fsirand/fsirand.c +++ b/sbin/fsirand/fsirand.c @@ -1,4 +1,4 @@ -/* $OpenBSD: fsirand.c,v 1.10 1997/08/11 02:52:31 millert Exp $ */ +/* $OpenBSD: fsirand.c,v 1.11 1998/01/22 05:13:18 millert Exp $ */ /* * Copyright (c) 1997 Todd C. Miller <Todd.Miller@courtesan.com> @@ -31,7 +31,7 @@ */ #ifndef lint -static char rcsid[] = "$OpenBSD: fsirand.c,v 1.10 1997/08/11 02:52:31 millert Exp $"; +static char rcsid[] = "$OpenBSD: fsirand.c,v 1.11 1998/01/22 05:13:18 millert Exp $"; #endif /* not lint */ #include <sys/types.h> @@ -175,9 +175,9 @@ fsirand(device) if (lseek(devfd, (off_t)dblk * (off_t)bsize, SEEK_SET) < 0) { warn("Can't seek to %qd", (off_t)dblk * bsize); return (1); - } else if ((n = write(devfd, (void *)sblock, SBSIZE)) != SBSIZE) { + } else if ((n = read(devfd, (void *)sblock, SBSIZE)) != SBSIZE) { warn("Can't read backup superblock %d on %s: %s", - cg + 1, devpath, (n < SBSIZE) ? "short write" + cg + 1, devpath, (n < SBSIZE) ? "short read" : strerror(errno)); return (1); } @@ -222,7 +222,7 @@ fsirand(device) return (1); } if ((n = write(devfd, (void *)sblock, SBSIZE)) != SBSIZE) { - warn("Can't read superblock on %s: %s", devpath, + warn("Can't write superblock on %s: %s", devpath, (n < SBSIZE) ? "short write" : strerror(errno)); return (1); } |