From 6d404356ea8e21e3b6cefaa4a8b3bf9518e342b9 Mon Sep 17 00:00:00 2001 From: adrian Date: Thu, 9 Nov 2000 09:03:19 +0000 Subject: Remove the block/char device distinction. badsect only worked on bdevs, and then mapped /dev/foo into /dev/rfoo to get to the character device. This isn't needed anymore. Reviewed by: ps --- sbin/badsect/badsect.c | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) (limited to 'sbin/badsect') diff --git a/sbin/badsect/badsect.c b/sbin/badsect/badsect.c index 7ecf186..c6972b8 100644 --- a/sbin/badsect/badsect.c +++ b/sbin/badsect/badsect.c @@ -122,7 +122,7 @@ main(argc, argv) if (lstat(name, &devstat) < 0) err(4, "%s", name); if (stbuf.st_dev == devstat.st_rdev && - (devstat.st_mode & IFMT) == IFBLK) + (devstat.st_mode & IFMT) == IFCHR) break; } closedir(dirp); @@ -131,12 +131,6 @@ main(argc, argv) (u_long)stbuf.st_rdev, argv[1]); exit(5); } - /* - * Opening of a mounted on device is not allowed. - * Attempt to open the raw device instead. - */ - memcpy(name_dir_end + 1, name_dir_end, strlen(name_dir_end) + 1); - *name_dir_end = 'r'; if ((fsi = open(name, O_RDONLY)) < 0) err(6, "%s", name); fs = &sblock; -- cgit v1.1