hardenedbsd/HardenedBSD
1
0
Fork 0
mirror of https://git.hardenedbsd.org/hardenedbsd/HardenedBSD.git synced 2024-11-18 17:00:49 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

When -v not given, display longer state' and no parent'.

Browse Source
This commit is contained in:
Garrett Wollman 1994-10-24 22:21:51 +00:00
parent 3c43212ad8
commit 9332379174
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=3837
1 changed files with 32 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
usr.sbin/lsdev/lsdev.c
View File

@ -168,14 +168,29 @@ badname(const char *name)
static void
hprint_pretty(void)
{
printf("%-10.10s %-2.2s %-10.10s %s\n",
"Device", "St", "Parent", "Description");
printf("%-10.10s %-2.2s %-10.10s %s\n",
"----------", "--", "----------",
"--------------------------------------------------");
printf("%-10.10s ", "Device");
if(vflag) {
printf("%-2.2s %-10.10s ", "St", "Parent");
} else {
printf("%-15.15s ", "State");
}
printf("%s\n", "Description");
printf("%-10.10s ", "----------");
if(vflag) {
printf("%-2.2s %-10.10s ", "--", "----------");
} else {
printf("%-15.15s ", "---------------");
}
printf("%s\n", "--------------------------------------------------");
}
static const char *const states[] = { "??", "NC", "I", "B" };
static const char *const longstates[] = {
"Unknown", "Unconfigured", "Idle", "Busy"
};
static void
print_pretty(struct devconf *dc)
@ -184,15 +199,21 @@ print_pretty(struct devconf *dc)
snprintf(buf, sizeof buf, "%s%d", dc->dc_name, dc->dc_unit);
printf("%-10.10s %2.2s ", buf, states[dc->dc_state]);
if(vflag) {
printf("%-10.10s %2.2s ", buf, states[dc->dc_state]);
if(dc->dc_punit >= 0) {
snprintf(buf, sizeof buf, "%s%d", dc->dc_pname, dc->dc_punit);
if(dc->dc_punit >= 0) {
snprintf(buf, sizeof buf, "%s%d", dc->dc_pname,
dc->dc_punit);
} else {
buf[0] = '-';
buf[1] = '\0';
}
printf("%-10.10s ", buf);
} else {
buf[0] = '-';
buf[1] = '\0';
printf("%-10.10s %-15.15s ", buf, longstates[dc->dc_state]);
}
printf("%-10.10s %s\n", buf, dc->dc_descr);
printf("%s\n", dc->dc_descr);
}