Fixes for handling 'wfd' (and any other disk with a non-2-character name)

Submitted by:	Some from Satoh Junichi (junichi@astec.co.jp)

1 files changed, 5 insertions, 6 deletions

diff --git a/lib/libdisk/create_chunk.c b/lib/libdisk/create_chunk.c
index 86e18f8..d5c89c6 100644
--- a/lib/libdisk/create_chunk.c
+++ b/lib/libdisk/create_chunk.c
@@ -6,7 +6,7 @@
  * this stuff is worth it, you can buy me a beer in return.   Poul-Henning Kamp
  * ----------------------------------------------------------------------------
  *
- * $Id: create_chunk.c,v 1.30 1998/03/20 23:43:03 jkh Exp $
+ * $Id: create_chunk.c,v 1.31 1998/09/15 10:23:17 gibbs Exp $
  *
  */
 
@@ -254,18 +254,17 @@ MakeDev(struct chunk *c1, const char *path)
 	return 0;
     
     if (!strncmp(p, "wd", 2))
-	bmaj = 0, cmaj = 3;
+	bmaj = 0, cmaj = 3, p += 2;
     else if (!strncmp(p, "sd", 2))
-	bmaj = 4, cmaj = 13;
+	bmaj = 4, cmaj = 13, p += 2;
     else if (!strncmp(p, "wfd", 3))
-	bmaj = 1, cmaj = 87;
+	bmaj = 1, cmaj = 87, p += 3;
     else if (!strncmp(p, "da", 2))	/* CAM support */
-	bmaj = 4, cmaj = 13;
+	bmaj = 4, cmaj = 13, p += 2;
     else {
 	msgDebug("MakeDev: Unknown major/minor for devtype %s\n", p);
 	return 0;
     }
-    p += 2;
     if (!isdigit(*p)) {
 	msgDebug("MakeDev: Invalid disk unit passed: %s\n", p);
 	return 0;