diff options
| author | Theo de Raadt <deraadt@cvs.openbsd.org> | 1997-10-03 20:58:07 +0000 |
|---|---|---|
| committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 1997-10-03 20:58:07 +0000 |
| commit | 98b9a977f2fc904beaf85348bbc87bbaa7569d7c (patch) | |
| tree | c81a7150f3df069bd1c1e9d17fd2e0734c3702a8 | |
| parent | aaffa9428f7ad9e839b95f08cc7d3b64f48eaeb9 (diff) | |
avoid sign extension on bios geometry!
| -rw-r--r-- | sbin/sysctl/sysctl.c | 10 | ||||
| -rw-r--r-- | sys/arch/i386/stand/installboot/installboot.c | 8 | ||||
| -rw-r--r-- | usr.sbin/sysctl/sysctl.c | 10 |
3 files changed, 14 insertions, 14 deletions
diff --git a/sbin/sysctl/sysctl.c b/sbin/sysctl/sysctl.c index afdf2562be7..6ea3bf1c17c 100644 --- a/sbin/sysctl/sysctl.c +++ b/sbin/sysctl/sysctl.c @@ -1,4 +1,4 @@ -/* $OpenBSD: sysctl.c,v 1.26 1997/09/21 23:02:03 mickey Exp $ */ +/* $OpenBSD: sysctl.c,v 1.27 1997/10/03 20:58:04 deraadt Exp $ */ /* $NetBSD: sysctl.c,v 1.9 1995/09/30 07:12:50 thorpej Exp $ */ /* @@ -44,7 +44,7 @@ static char copyright[] = #if 0 static char sccsid[] = "@(#)sysctl.c 8.1 (Berkeley) 6/6/93"; #else -static char *rcsid = "$OpenBSD: sysctl.c,v 1.26 1997/09/21 23:02:03 mickey Exp $"; +static char *rcsid = "$OpenBSD: sysctl.c,v 1.27 1997/10/03 20:58:04 deraadt Exp $"; #endif #endif /* not lint */ @@ -502,12 +502,12 @@ parse(string, flags) } #ifdef CPU_BIOS if (special & BIOSGEO) { - int geo = *(int *)buf; + u_int geo = *(int *)buf; if (!nflag) (void)printf("%s = ", string); - (void) printf("spt = %d, tpc = %d\n", - BIOSNSECTS(geo), BIOSNHEADS(geo)); + printf("Cylinders=%d Tracks=%d Sectors=%d %08x\n", + BIOSNTRACKS(geo), BIOSNHEADS(geo), BIOSNSECTS(geo), geo); return; } if (special & BIOSDEV) { diff --git a/sys/arch/i386/stand/installboot/installboot.c b/sys/arch/i386/stand/installboot/installboot.c index 30ef480a723..7e80a44bd78 100644 --- a/sys/arch/i386/stand/installboot/installboot.c +++ b/sys/arch/i386/stand/installboot/installboot.c @@ -1,4 +1,4 @@ -/* $OpenBSD: installboot.c,v 1.15 1997/09/30 22:10:50 deraadt Exp $ */ +/* $OpenBSD: installboot.c,v 1.16 1997/10/03 20:58:06 deraadt Exp $ */ /* $NetBSD: installboot.c,v 1.5 1995/11/17 23:23:50 gwr Exp $ */ /* @@ -139,16 +139,16 @@ main(argc, argv) mib[0] = CTL_MACHDEP; mib[1] = CPU_BIOS; mib[2] = BIOS_DEV; - size = sizeof(int); + size = sizeof(biosdev); if ((nheads == -1 || nsectors == -1) && sysctl(mib, 3, &biosdev, &size, NULL, 0) != -1) { if (biosdev & 0x80) { - int geo; + u_int geo; mib[2] = BIOS_GEOMETRY; - size = sizeof(int); + size = sizeof(geo); if (sysctl(mib, 3, &geo, &size, NULL, 0) == -1) err(1, "sysctl"); diff --git a/usr.sbin/sysctl/sysctl.c b/usr.sbin/sysctl/sysctl.c index afdf2562be7..6ea3bf1c17c 100644 --- a/usr.sbin/sysctl/sysctl.c +++ b/usr.sbin/sysctl/sysctl.c @@ -1,4 +1,4 @@ -/* $OpenBSD: sysctl.c,v 1.26 1997/09/21 23:02:03 mickey Exp $ */ +/* $OpenBSD: sysctl.c,v 1.27 1997/10/03 20:58:04 deraadt Exp $ */ /* $NetBSD: sysctl.c,v 1.9 1995/09/30 07:12:50 thorpej Exp $ */ /* @@ -44,7 +44,7 @@ static char copyright[] = #if 0 static char sccsid[] = "@(#)sysctl.c 8.1 (Berkeley) 6/6/93"; #else -static char *rcsid = "$OpenBSD: sysctl.c,v 1.26 1997/09/21 23:02:03 mickey Exp $"; +static char *rcsid = "$OpenBSD: sysctl.c,v 1.27 1997/10/03 20:58:04 deraadt Exp $"; #endif #endif /* not lint */ @@ -502,12 +502,12 @@ parse(string, flags) } #ifdef CPU_BIOS if (special & BIOSGEO) { - int geo = *(int *)buf; + u_int geo = *(int *)buf; if (!nflag) (void)printf("%s = ", string); - (void) printf("spt = %d, tpc = %d\n", - BIOSNSECTS(geo), BIOSNHEADS(geo)); + printf("Cylinders=%d Tracks=%d Sectors=%d %08x\n", + BIOSNTRACKS(geo), BIOSNHEADS(geo), BIOSNSECTS(geo), geo); return; } if (special & BIOSDEV) { |