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

The model string can be 40 bytes long with no terminating null, so

Browse Source 
convert all nulls to spaces and then print it with a %40s.
This commit is contained in:
Rodney W. Grimes 1994-02-22 18:51:27 +00:00
parent c5d47aacfd
commit 1004b0634c
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
sys/i386/isa/wd.c
View File

@ -37,7 +37,7 @@ static int wdtest = 0;
* SUCH DAMAGE. * SUCH DAMAGE.
* *
* from: @(#)wd.c 7.2 (Berkeley) 5/9/91 * from: @(#)wd.c 7.2 (Berkeley) 5/9/91
* $Id: wd.c,v 1.29 1994/02/11 12:02:35 nate Exp $ * $Id: wd.c,v 1.30 1994/02/21 12:32:33 rgrimes Exp $
*/ */
/* TODO: /* TODO:
@ -256,9 +256,11 @@ wdattach(struct isa_device *dvp)
/* /*
* Print out description of drive. * Print out description of drive.
* wdp_model can be [0..40] bytes, thus \0 can be missing so
* use %40s to print it.
*/ */
if (wdgetctlr(du) == 0) { if (wdgetctlr(du) == 0) {
printf("wdc%d: unit %d (wd%d): <%s>\n", printf("wdc%d: unit %d (wd%d): <%40s>\n",
dvp->id_unit, unit, lunit, du->dk_params.wdp_model); dvp->id_unit, unit, lunit, du->dk_params.wdp_model);
if (du->dk_params.wdp_heads == 0) if (du->dk_params.wdp_heads == 0)
printf("wd%d: size unknown\n", lunit); printf("wd%d: size unknown\n", lunit);
@ -1108,6 +1110,13 @@ wdgetctlr(struct disk *du)
p = (u_short *) (wp->wdp_model + i); p = (u_short *) (wp->wdp_model + i);
*p = ntohs(*p); *p = ntohs(*p);
} }
/* Clean up the wdp_model by converting nulls to spaces */
for (i = 0; i < sizeof(wp->wdp_model); i++) {
if (wp->wdp_model[i] == '\0') {
wp->wdp_model[i] = ' ';
}
}
#ifdef WDDEBUG #ifdef WDDEBUG
printf( printf(
"\nwd(%d,%d): wdgetctlr: gc %x cyl %d trk %d sec %d type %d sz %d model %s\n", "\nwd(%d,%d): wdgetctlr: gc %x cyl %d trk %d sec %d type %d sz %d model %s\n",