Attachment 156922 Details for Bug 218783 – patch for this issue

[patch] patch for this issue

scsi.diff (text/plain), 1.21 KB, created by Bill Nottingham on 2007-06-13 21:25:29 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Bill Nottingham

Created: 2007-06-13 21:25:29 UTC

Size: 1.21 KB

patch

obsolete

>Index: scsi.c
>===================================================================
>RCS file: /usr/local/CVS/kudzu/scsi.c,v
>retrieving revision 1.49.4.2
>retrieving revision 1.49.4.4
>diff -u -r1.49.4.2 -r1.49.4.4
>--- scsi.c	21 Nov 2006 23:48:56 -0000	1.49.4.2
>+++ scsi.c	13 Jun 2007 21:14:21 -0000	1.49.4.4
>@@ -531,23 +531,18 @@
> 		newdev->driver = strdup("ignore");
> 		newdev->desc = strdup(linebuf);
> 		
>-		i = 0;
>-		while (1) {
>-			snprintf(path,63, "/proc/scsi/usb-storage-%d", i);
>-			if (stat(path, &sb)) break;
>-			snprintf(path,63, "/proc/scsi/usb-storage-%d/%d", i, newdev->host);
>-			i++;
>-			fd = open(path, O_RDONLY);
>-			if (fd < 0) continue;
>+	        snprintf(path,63, "/proc/scsi/usb-storage/%d", newdev->host);
>+		fd = open(path, O_RDONLY);
>+		if (fd >= 0) {
> 			memset(buf, '\0', sizeof(buf));
> 			rc = read(fd, buf, 16384);
>-			if (rc <= 0) continue;
>-			buf[rc-1] = '\0';
>-			close(fd);
>-			if (strstr(buf, "Protocol: Uniform Floppy Interface (UFI)")) {
>-			  newdev->type = CLASS_FLOPPY;
>+			if (rc > 0) {
>+				buf[rc-1] = '\0';
>+				if (strstr(buf, "Protocol: Uniform Floppy Interface (UFI)")) {
>+					newdev->type = CLASS_FLOPPY;
>+				}
> 			}
>-			break;
>+			close(fd);
> 		}
> 
> 		for (i = 0; i < numMissingHosts; i++) {

Actions: View | Diff

Attachments on bug 218783: 144900 | 153421 | 153454 | 156922