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

Sort the disknames when we get them from the kernel.

Browse Source 
Submitted by:	<anarcat@anarcat.dyndns.org>
This commit is contained in:
Poul-Henning Kamp 2001-12-23 21:43:48 +00:00
parent 40d4e05fce
commit 257bc17600
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=88448
1 changed files with 23 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
lib/libdisk/disk.c
View File

@ -483,10 +483,18 @@ static char * device_list[] = {"wd", "aacd", "ad", "da", "afd", "fla", "idad", "
static char * device_list[] = {"aacd", "ad", "da", "afd", "fla", "idad", "mlxd", "amrd", "twed", "ar", "fd", 0};
#endif
int qstrcmp(const void* a, const void* b) {
char *str1 = *(char**)a;
char *str2 = *(char**)b;
return strcmp(str1, str2);
}
char **
Disk_Names()
{
int i,j,k;
int i,j,disk_cnt;
char disk[25];
char diskname[25];
struct stat st;
@ -505,13 +513,15 @@ Disk_Names()
error = sysctlbyname("kern.disks", disklist, &listsize, NULL, 0);
if (error)
return NULL;
k = 0;
for (dp = disks; ((*dp = strsep(&disklist, " ")) != NULL) && k < MAX_NO_DISKS; k++, dp++);
return disks;
}
disk_cnt = 0;
for (dp = disks; ((*dp = strsep(&disklist, " ")) != NULL) &&
disk_cnt < MAX_NO_DISKS; disk_cnt++, dp++);
} else {
warn("kern.disks sysctl not available");
k = 0;
disk_cnt = 0;
for (j = 0; device_list[j]; j++) {
if(disk_cnt >= MAX_NO_DISKS)
break;
for (i = 0; i < MAX_NO_DISKS; i++) {
sprintf(diskname, "%s%d", device_list[j], i);
sprintf(disk, _PATH_DEV"%s", diskname);
@ -527,12 +537,15 @@ Disk_Names()
continue;
}
close(fd);
disks[k++] = strdup(diskname);
if(k == MAX_NO_DISKS)
return disks;
disks[disk_cnt++] = strdup(diskname);
if(disk_cnt >= MAX_NO_DISKS)
break;
}
}
return disks;
}
qsort(disks, disk_cnt, sizeof(char*), qstrcmp);
return disks;
}
#ifdef PC98