diff options
| author |   krw <krw@openbsd.org> | 2014-02-14 15:03:43 +0000 |
|---|---|---|
| committer | krw <krw@openbsd.org> | 2014-02-14 15:03:43 +0000 |
| commit | 33b323a9a44cbad08716217f34bbc52970a2f2c5 (patch) | |
| tree | eed5b717b5b67c4dc73030569c92c2580519462b | |
| parent | convert tables from tbl(7) to mdoc(7) .Bl -column format; (diff) | |
| download | wireguard-openbsd-33b323a9a44cbad08716217f34bbc52970a2f2c5.tar.xz wireguard-openbsd-33b323a9a44cbad08716217f34bbc52970a2f2c5.zip | |
Ooops. r1.169 was supposed to add 'total sectors' to the list of
fields that are ignored when reading an ascii disklabel. Actually
remove the parsing of 'total sectors', which was just above the line
trying to skip said parsing.
Spotted when halex@ forced me to read this code again.
| -rw-r--r-- | sbin/disklabel/disklabel.c | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/sbin/disklabel/disklabel.c b/sbin/disklabel/disklabel.c index 6cf69ab310c..27f7e31554d 100644 --- a/sbin/disklabel/disklabel.c +++ b/sbin/disklabel/disklabel.c @@ -1,4 +1,4 @@ -/* $OpenBSD: disklabel.c,v 1.191 2013/11/22 04:12:47 deraadt Exp $ */ +/* $OpenBSD: disklabel.c,v 1.192 2014/02/14 15:03:43 krw Exp $ */ /* * Copyright (c) 1987, 1993 @@ -1149,16 +1149,6 @@ getasciilabel(FILE *f, struct disklabel *lp) lp->d_ncylinders = v; continue; } - if (!strcmp(cp, "total sectors")) { - lv = GETNUM(lv, tp, 1, &errstr); - if (errstr) { - warnx("line %d: bad %s: %s", lineno, cp, tp); - errors++; - } else { - DL_SETDSIZE(lp, lv); - } - continue; - } /* Ignore fields that are no longer in the disklabel. */ if (!strcmp(cp, "rpm") || |