Move the check for the ending char in the partition name where

it was before -- the check is only made when getdisklabel()
returns valid info.
On passing, use MAXPARTITIONS to identify the max partition number,
instead of the hardwired 'h'

MFC after:	4 weeks

1 files changed, 6 insertions, 5 deletions

diff --git a/sbin/newfs/newfs.c b/sbin/newfs/newfs.c
index 269707b..d27071f 100644
--- a/sbin/newfs/newfs.c
+++ b/sbin/newfs/newfs.c
@@ -354,11 +354,6 @@ main(int argc, char *argv[])
 		mediasize = st.st_size;
 		/* set fssize from the partition */
 	} else {
-	    part_name = special[strlen(special) - 1];
-	    if ((part_name < 'a' || part_name > 'h') && !isdigit(part_name))
-		errx(1, "%s: can't figure out file system partition",
-				special);
-
 	    if (sectorsize == 0)
 		if (ioctl(disk.d_fd, DIOCGSECTORSIZE, &sectorsize) == -1)
 		    sectorsize = 0;	/* back out on error for safety */
@@ -368,6 +363,12 @@ main(int argc, char *argv[])
 	pp = NULL;
 	lp = getdisklabel(special);
 	if (lp != NULL) {
+		if (!is_file) /* already set for files */
+			part_name = special[strlen(special) - 1];
+		if ((part_name < 'a' || part_name - 'a' >= MAXPARTITIONS) &&
+				!isdigit(part_name))
+			errx(1, "%s: can't figure out file system partition",
+					special);
 		cp = &part_name;
 		if (isdigit(*cp))
 			pp = &lp->d_partitions[RAW_PART];