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

Sort the list results by the unit number. The list returned by the

Browse Source 
kernel is in the order the devices were made, which is not useful to
the user. Also, remove the "%d more" test since the kernel does not
return the complete count in md_pad[0] (maybe it should?).

Submitted by:	Wojciech A. Koszek
This commit is contained in:
Dima Dorfman 2005-12-22 10:32:11 +00:00
parent 0014abfcc4
commit 7e06d7bcbc
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=153636
1 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
sbin/mdconfig/mdconfig.c
View File

@ -19,6 +19,7 @@
#include <libutil.h>
#include <string.h>
#include <err.h>
#include <assert.h>
#include <sys/ioctl.h>
#include <sys/param.h>
@ -269,19 +270,28 @@ main(int argc, char **argv)
return (0);
}
static int
mdunitcmp(const void *a, const void *b)
{
return (*(int *)a - *(int *)b);
}
int
list(const int fd)
{
int unit;
int mdcount;
if (ioctl(fd, MDIOCLIST, &mdio) < 0)
err(1, "ioctl(/dev/%s)", MDCTL_NAME);
for (unit = 0; unit < mdio.md_pad[0] && unit < MDNPAD - 1; unit++) {
mdcount = mdio.md_pad[0];
assert(mdcount < MDNPAD - 1);
if (mdcount > 0)
qsort(&mdio.md_pad[1], mdcount, sizeof(mdio.md_pad[0]), mdunitcmp);
for (unit = 0; unit < mdcount; unit++) {
printf("%s%s%d", unit > 0 ? " " : "",
nflag ? "" : MD_NAME, mdio.md_pad[unit + 1]);
}
if (mdio.md_pad[0] - unit > 0)
printf(" ... %d more", mdio.md_pad[0] - unit);
if (unit > 0)
printf("\n");
return (0);