d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
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
This commit is contained in:
luigi 2008-12-12 15:56:38 +00:00
parent 1105294546
commit 3e21de6755
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
sbin/newfs/newfs.c
View File

@ -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];