Attachment 9574 Details for Bug 19574 – file.diff

[patch] file.diff

file.diff (text/plain), 1.12 KB, created by clive on 2000-06-29 10:00:01 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: clive

Created: 2000-06-29 10:00:01 UTC

Size: 1.12 KB

patch

obsolete

>Index: badsect.c
>===================================================================
>RCS file: /home/ncvs/src/sbin/badsect/badsect.c,v
>retrieving revision 1.7
>diff -u -r1.7 badsect.c
>--- badsect.c	1999/08/28 00:12:28	1.7
>+++ badsect.c	2000/06/29 08:39:56
>@@ -118,11 +118,17 @@
> 		err(3, "%s", name);
> 	name_dir_end = name + strlen(name);
> 	while ((dp = readdir(dirp)) != NULL) {
>+		/*
>+		 * Opening of a mounted on device is not allowed.
>+		 * Attempt to open the raw device instead.
>+		 */
>+		if (dp->d_name[0] != 'r')
>+			continue ; 
> 		strcpy(name_dir_end, dp->d_name);
> 		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 +137,6 @@
> 		    (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;

Actions: View | Diff

Attachments on bug 19574: 9574