diff options
author | iedowse <iedowse@FreeBSD.org> | 2002-06-05 08:11:28 +0000 |
---|---|---|
committer | iedowse <iedowse@FreeBSD.org> | 2002-06-05 08:11:28 +0000 |
commit | 306d84207e66a03a612bdc2511115dfd7c673ef3 (patch) | |
tree | 574dee57f22721020bd14e5e3c74602c44c7f1e8 /sbin | |
parent | a30fd029236041af70b9a21c141f1b964d28efb7 (diff) | |
download | FreeBSD-src-306d84207e66a03a612bdc2511115dfd7c673ef3.zip FreeBSD-src-306d84207e66a03a612bdc2511115dfd7c673ef3.tar.gz |
Oops, unbreak parsing of the `type' field in getasciilabel(). I had
changed a `goto' to a `continue' in revision 1.52, but it continued
the wrong loop.
Noticed by: bde
Diffstat (limited to 'sbin')
-rw-r--r-- | sbin/bsdlabel/bsdlabel.c | 4 | ||||
-rw-r--r-- | sbin/disklabel/disklabel.c | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/sbin/bsdlabel/bsdlabel.c b/sbin/bsdlabel/bsdlabel.c index d29763c..dad7cc6 100644 --- a/sbin/bsdlabel/bsdlabel.c +++ b/sbin/bsdlabel/bsdlabel.c @@ -958,8 +958,10 @@ getasciilabel(FILE *f, struct disklabel *lp) for (; cpp < &dktypenames[DKMAXTYPES]; cpp++) if (*cpp && streq(*cpp, tp)) { lp->d_type = cpp - dktypenames; - continue; + break; } + if (cpp < &dktypenames[DKMAXTYPES]) + continue; v = atoi(tp); if ((unsigned)v >= DKMAXTYPES) fprintf(stderr, "line %d:%s %d\n", lineno, diff --git a/sbin/disklabel/disklabel.c b/sbin/disklabel/disklabel.c index d29763c..dad7cc6 100644 --- a/sbin/disklabel/disklabel.c +++ b/sbin/disklabel/disklabel.c @@ -958,8 +958,10 @@ getasciilabel(FILE *f, struct disklabel *lp) for (; cpp < &dktypenames[DKMAXTYPES]; cpp++) if (*cpp && streq(*cpp, tp)) { lp->d_type = cpp - dktypenames; - continue; + break; } + if (cpp < &dktypenames[DKMAXTYPES]) + continue; v = atoi(tp); if ((unsigned)v >= DKMAXTYPES) fprintf(stderr, "line %d:%s %d\n", lineno, |