be more verbose when warning for partition errors,

print partition number in the message.

4 files changed, 22 insertions, 20 deletions

diff --git a/sbin/fdisk/cmd.c b/sbin/fdisk/cmd.c
index ad799fe4677..db341992bdc 100644
--- a/sbin/fdisk/cmd.c
+++ b/sbin/fdisk/cmd.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cmd.c,v 1.25 2000/04/18 22:40:15 kjell Exp $	*/
+/*	$OpenBSD: cmd.c,v 1.26 2000/07/01 21:49:12 mickey Exp $	*/
 
 /*
  * Copyright (c) 1997 Tobias Weingartner
@@ -168,9 +168,9 @@ Xedit(cmd, disk, mbr, tt, offset)
 		EDIT("BIOS Ending head",       ASK_DEC, pp->ehead, 0, maxhead, NULL);
 		EDIT("BIOS Ending sector",     ASK_DEC, pp->esect, 1, maxsect, NULL);
 		/* Fix up off/size values */
-		PRT_fix_BN(disk, pp);
+		PRT_fix_BN(disk, pp, pn);
 		/* Fix up CHS values for LBA */
-		PRT_fix_CHS(disk, pp);
+		PRT_fix_CHS(disk, pp, pn);
 	} else {
 		u_int m;
 
@@ -186,7 +186,7 @@ Xedit(cmd, disk, mbr, tt, offset)
 		    m, NULL);
 
 		/* Fix up CHS values */
-		PRT_fix_CHS(disk, pp);
+		PRT_fix_CHS(disk, pp, pn);
 	}
 #undef EDIT
 	return (ret);
diff --git a/sbin/fdisk/mbr.c b/sbin/fdisk/mbr.c
index c286698f217..e3ebff06960 100644
--- a/sbin/fdisk/mbr.c
+++ b/sbin/fdisk/mbr.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: mbr.c,v 1.9 1999/08/21 22:49:25 niklas Exp $	*/
+/*	$OpenBSD: mbr.c,v 1.10 2000/07/01 21:49:12 mickey Exp $	*/
 
 /*
  * Copyright (c) 1997 Tobias Weingartner
@@ -68,7 +68,7 @@ MBR_init(disk_t *disk, mbr_t *mbr)
 	mbr->part[3].esect = disk->real->sectors;
 
 	/* Fix up start/length fields */
-	PRT_fix_BN(disk, &mbr->part[3]);
+	PRT_fix_BN(disk, &mbr->part[3], 3);
 
 #if defined(__powerpc__) || defined(__mips__)
 	/* Now fix up for the MS-DOS boot partition on PowerPC. */
@@ -108,8 +108,7 @@ MBR_parse(disk, mbr_buf, offset, reloff, mbr)
 
 	for (i = 0; i < NDOSPART; i++)
 		PRT_parse(disk, &mbr_buf[MBR_PART_OFF + MBR_PART_SIZE * i], 
-		    offset, reloff,
-		    &mbr->part[i]);
+		    offset, reloff, &mbr->part[i], i);
 }
 
 void
diff --git a/sbin/fdisk/part.c b/sbin/fdisk/part.c
index 5b5d672924c..4eeff9b5937 100644
--- a/sbin/fdisk/part.c
+++ b/sbin/fdisk/part.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: part.c,v 1.17 2000/06/11 16:11:55 markus Exp $	*/
+/*	$OpenBSD: part.c,v 1.18 2000/07/01 21:49:12 mickey Exp $	*/
 
 /*
  * Copyright (c) 1997 Tobias Weingartner
@@ -144,12 +144,13 @@ PRT_ascii_id(id)
 }
 
 void
-PRT_parse(disk, prt, offset, reloff, partn)
+PRT_parse(disk, prt, offset, reloff, partn, pn)
 	disk_t *disk;
 	void *prt;
 	off_t offset;
 	off_t reloff;
 	prt_t *partn;
+	int pn;
 {
 	unsigned char *p = prt;
 	off_t off;
@@ -175,7 +176,7 @@ PRT_parse(disk, prt, offset, reloff, partn)
 	partn->bs = getlong(p) + off;
 	partn->ns = getlong(p+4);
 
-	PRT_fix_CHS(disk, partn);
+	PRT_fix_CHS(disk, partn, pn);
 }
 
 int
@@ -275,9 +276,10 @@ PRT_print(num, partn)
 }
 
 void
-PRT_fix_BN(disk, part)
+PRT_fix_BN(disk, part, pn)
 	disk_t *disk;
 	prt_t *part;
+	int pn;
 {
 	int spt, tpc, spc;
 	int start = 0;
@@ -298,16 +300,17 @@ PRT_fix_BN(disk, part)
 
 	/* XXX - Should handle this... */
 	if (start > end)
-		warn("Start of partition after end!");
+		warn("Start of partition #%d after end!", pn);
 
 	part->bs = start;
 	part->ns = (end - start) + 1;
 }
 
 void
-PRT_fix_CHS(disk, part)
+PRT_fix_CHS(disk, part, pn)
 	disk_t *disk;
 	prt_t *part;
+	int pn;
 {
 	int spt, tpc, spc;
 	int start, end, size;
@@ -329,7 +332,7 @@ PRT_fix_CHS(disk, part)
 
 	if (cyl > 1023) {
 		cyl = 1023;
-		printf("Only LBA values are valid in starting cylinder.\n");
+		printf("Only LBA values are valid in starting cylinder for partition #%d.\n", pn);
 	}
 	part->scyl = cyl;
 	part->shead = head;
@@ -342,7 +345,7 @@ PRT_fix_CHS(disk, part)
 
 	if (cyl > 1023) {
 		cyl = 1023;
-		printf("Only LBA values are valid in ending cylinder.\n");
+		printf("Only LBA values are valid in ending cylinder for partition #%d.\n", pn);
 	}
 	part->ecyl = cyl;
 	part->ehead = head;
diff --git a/sbin/fdisk/part.h b/sbin/fdisk/part.h
index 073b6ac57f9..4ecd5558a06 100644
--- a/sbin/fdisk/part.h
+++ b/sbin/fdisk/part.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: part.h,v 1.5 1998/09/14 03:54:35 rahnds Exp $	*/
+/*	$OpenBSD: part.h,v 1.6 2000/07/01 21:49:12 mickey Exp $	*/
 
 /*
  * Copyright (c) 1997 Tobias Weingartner
@@ -46,15 +46,15 @@ typedef struct _prt_t {
 /* Prototypes */
 void	PRT_printall __P((void));
 char *PRT_ascii_id __P((int));
-void PRT_parse __P((disk_t *, void *, off_t, off_t, prt_t *));
+void PRT_parse __P((disk_t *, void *, off_t, off_t, prt_t *, int));
 void PRT_make __P((prt_t *, off_t, off_t, void *));
 void PRT_print __P((int, prt_t *));
 
 /* This does CHS -> bs/ns */
-void PRT_fix_BN __P((disk_t *, prt_t *));
+void PRT_fix_BN __P((disk_t *, prt_t *, int));
 
 /* This does bs/ns -> CHS */
-void PRT_fix_CHS __P((disk_t *, prt_t *));
+void PRT_fix_CHS __P((disk_t *, prt_t *, int));
 
 #endif _PART_H