diff options
| -rw-r--r-- | sbin/fdisk/disk.c | 4 | ||||
| -rw-r--r-- | sbin/fdisk/mbr.c | 4 | ||||
| -rw-r--r-- | sbin/fdisk/misc.c | 6 |
3 files changed, 7 insertions, 7 deletions
diff --git a/sbin/fdisk/disk.c b/sbin/fdisk/disk.c index c2a8045d21a..cf0aef6aab4 100644 --- a/sbin/fdisk/disk.c +++ b/sbin/fdisk/disk.c @@ -1,4 +1,4 @@ -/* $OpenBSD: disk.c,v 1.47 2015/03/30 17:11:49 krw Exp $ */ +/* $OpenBSD: disk.c,v 1.48 2015/08/27 20:58:27 krw Exp $ */ /* * Copyright (c) 1997 Tobias Weingartner @@ -111,7 +111,7 @@ DISK_printgeometry(char *units) } /* - * Read the sector at 'where' from the file descriptor 'fd' into newly + * Read the sector at 'where' from the file descriptor 'fd' into newly * calloc'd memory. Return a pointer to the memory if it contains the * requested data, or NULL if it does not. * diff --git a/sbin/fdisk/mbr.c b/sbin/fdisk/mbr.c index 87afd151af5..ba7066f8cad 100644 --- a/sbin/fdisk/mbr.c +++ b/sbin/fdisk/mbr.c @@ -1,4 +1,4 @@ -/* $OpenBSD: mbr.c,v 1.52 2015/04/02 18:00:55 krw Exp $ */ +/* $OpenBSD: mbr.c,v 1.53 2015/08/27 20:58:27 krw Exp $ */ /* * Copyright (c) 1997 Tobias Weingartner @@ -116,7 +116,7 @@ MBR_init(struct mbr *mbr) i *= 2; adj = DL_BLKTOSEC(&dl, i) - mbr->part[3].bs; mbr->part[3].bs += adj; - mbr->part[3].ns -= adj; + mbr->part[3].ns -= adj; PRT_fix_CHS(&mbr->part[3]); } diff --git a/sbin/fdisk/misc.c b/sbin/fdisk/misc.c index 4b32da58391..808cd52a0c0 100644 --- a/sbin/fdisk/misc.c +++ b/sbin/fdisk/misc.c @@ -1,4 +1,4 @@ -/* $OpenBSD: misc.c,v 1.51 2015/03/30 17:11:49 krw Exp $ */ +/* $OpenBSD: misc.c,v 1.52 2015/08/27 20:58:27 krw Exp $ */ /* * Copyright (c) 1997 Tobias Weingartner @@ -303,10 +303,10 @@ getuint64(char *prompt, u_int64_t oval, u_int64_t maxval) if (saveerr == ERANGE || d > maxval || d < 0 || d < d2) { printf("%s is out of range: %c%s%c\n", prompt, operator, - p, unit); + p, unit); } else if (*endptr != '\0') { printf("%s is invalid: %c%s%c\n", prompt, operator, - p, unit); + p, unit); } else { break; } |