Date: Sat, 16 Nov 2002 00:37:13 -0800 (PST) From: Julian Elischer <julian@elischer.org> To: Nate Lawson <nate@root.org> Cc: Tim Robbins <tjr@FreeBSD.ORG>, FreeBSD current users <current@FreeBSD.ORG> Subject: Re: Sign fixes for disklabel(8) Message-ID: <Pine.BSF.4.21.0211160011590.50399-200000@InterJet.elischer.org> In-Reply-To: <Pine.BSF.4.21.0211152205130.48493-100000@root.org>
next in thread | previous in thread | raw e-mail | index | archive | help
This message is in MIME format. The first part should be readable text,
while the remaining parts are likely unreadable without MIME-aware tools.
Send mail to mime@docserver.cac.washington.edu for more info.
--0-661448415-1037435833=:50399
Content-Type: TEXT/PLAIN; charset=US-ASCII
On Fri, 15 Nov 2002, Nate Lawson wrote:
> On Sat, 16 Nov 2002, Tim Robbins wrote:
> > On Fri, Nov 15, 2002 at 03:59:25PM -0800, Julian Elischer wrote:
> >
> > > Here are the diffs to allow disklabel to correctly create partitions >
> > > 1TB (up to 2TB is useful with UFS2) pending a different partitionning
> > > scheme. It also allows you to correctly make smaller partitions beyond
> > > 1TB which is nice if you don't want to waste 800GB on an array :-)
> > >
> > >
> > > permission to commit please?
> > > (pending comments by others)
> > >
> > > (also the sysinstall changes posted before)
> > > (also the bluetooth code)
> > [...]
> > > - v = atoi(tp);
> > > + v = strtoul(tp, NULL, 0);
> > > if (v <= 0 || (v % DEV_BSIZE) != 0) {
> > > fprintf(stderr,
> > > "line %d: %s: bad sector size\n",
> >
> > Should be == 0, not <= 0 since v is unsigned.
good catch.
I've altered all the checks of v to be unsigned..
> >
> > [...]
> > > - v = atoi(tp);
> > > + v = strtoul(tp, NULL, 0);
> > > if (v < 0) {
> > > fprintf(stderr, "line %d: %s: bad %s\n",
> > > lineno, tp, cp);
> >
> > v < 0 is impossible.
>
> In the overflow case, strtoul returns ULONG_MAX. Or if you're interested
> in catching invalid characters, use endptr.
I'm not that interested in catching those cases.. they were not caught
before and I'm looking for the minimal diff..
I've just removed the clause. See new patch attached..
A sensible thing might be to compare against a "sensible" value
but who knows what that value should be?
I include the new diff for your coments
Any comments from anyone about the sysinstall fixes would also be
apreciated..
>
> -Nate
>
>
> To Unsubscribe: send mail to majordomo@FreeBSD.org
> with "unsubscribe freebsd-current" in the body of the message
>
--0-661448415-1037435833=:50399
Content-Type: TEXT/PLAIN; charset=US-ASCII; name="disklabel.current.diff"
Content-Transfer-Encoding: BASE64
Content-ID: <Pine.BSF.4.21.0211160037130.50399@InterJet.elischer.org>
Content-Description:
Content-Disposition: attachment; filename="disklabel.current.diff"
SW5kZXg6IGRpc2tsYWJlbC5jDQo9PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09DQpS
Q1MgZmlsZTogL2hvbWUvbmN2cy9zcmMvc2Jpbi9kaXNrbGFiZWwvZGlza2xh
YmVsLmMsdg0KcmV0cmlldmluZyByZXZpc2lvbiAxLjYyDQpkaWZmIC11IC1y
MS42MiBkaXNrbGFiZWwuYw0KLS0tIGRpc2tsYWJlbC5jCTggT2N0IDIwMDIg
MTI6MTM6MTkgLTAwMDAJMS42Mg0KKysrIGRpc2tsYWJlbC5jCTE2IE5vdiAy
MDAyIDA4OjIzOjE0IC0wMDAwDQpAQCAtOTQzLDcgKzk0Myw4IEBADQogCWNv
bnN0IGNoYXIgKipjcHA7DQogCXVuc2lnbmVkIGludCBwYXJ0Ow0KIAljaGFy
ICp0cCwgbGluZVtCVUZTSVpdOw0KLQlpbnQgdiwgbGluZW5vID0gMCwgZXJy
b3JzID0gMDsNCisJdW5zaWduZWQgaW50IHY7DQorCWludCBsaW5lbm8gPSAw
LCBlcnJvcnMgPSAwOw0KIAlpbnQgaTsNCiANCiAJbHAtPmRfYmJzaXplID0g
QkJTSVpFOwkJCQkvKiBYWFggKi8NCkBAIC05NzMsNyArOTc0LDcgQEANCiAJ
CQkJfQ0KIAkJCWlmIChjcHAgPCAmZGt0eXBlbmFtZXNbREtNQVhUWVBFU10p
DQogCQkJCWNvbnRpbnVlOw0KLQkJCXYgPSBhdG9pKHRwKTsNCisJCQl2ID0g
c3RydG91bCh0cCwgTlVMTCwgMCk7DQogCQkJaWYgKCh1bnNpZ25lZCl2ID49
IERLTUFYVFlQRVMpDQogCQkJCWZwcmludGYoc3RkZXJyLCAibGluZSAlZDol
cyAlZFxuIiwgbGluZW5vLA0KIAkJCQkgICAgIldhcm5pbmcsIHVua25vd24g
ZGlzayB0eXBlIiwgdik7DQpAQCAtMTAwNiw4ICsxMDA3LDggQEANCiAJCQl9
DQogCQkJY29udGludWU7DQogCQl9DQotCQlpZiAoc3NjYW5mKGNwLCAiJWQg
cGFydGl0aW9ucyIsICZ2KSA9PSAxKSB7DQotCQkJaWYgKHYgPT0gMCB8fCAo
dW5zaWduZWQpdiA+IE1BWFBBUlRJVElPTlMpIHsNCisJCWlmIChzc2NhbmYo
Y3AsICIldSBwYXJ0aXRpb25zIiwgJnYpID09IDEpIHsNCisJCQlpZiAodiA9
PSAwIHx8IHYgPiBNQVhQQVJUSVRJT05TKSB7DQogCQkJCWZwcmludGYoc3Rk
ZXJyLA0KIAkJCQkgICAgImxpbmUgJWQ6IGJhZCAjIG9mIHBhcnRpdGlvbnNc
biIsIGxpbmVubyk7DQogCQkJCWxwLT5kX25wYXJ0aXRpb25zID0gTUFYUEFS
VElUSU9OUzsNCkBAIC0xMDI3LDggKzEwMjgsOCBAQA0KIAkJCWNvbnRpbnVl
Ow0KIAkJfQ0KIAkJaWYgKHN0cmVxKGNwLCAiYnl0ZXMvc2VjdG9yIikpIHsN
Ci0JCQl2ID0gYXRvaSh0cCk7DQotCQkJaWYgKHYgPD0gMCB8fCAodiAlIERF
Vl9CU0laRSkgIT0gMCkgew0KKwkJCXYgPSBzdHJ0b3VsKHRwLCBOVUxMLCAw
KTsNCisJCQlpZiAodiA9PSAwIHx8ICh2ICUgREVWX0JTSVpFKSAhPSAwKSB7
DQogCQkJCWZwcmludGYoc3RkZXJyLA0KIAkJCQkgICAgImxpbmUgJWQ6ICVz
OiBiYWQgc2VjdG9yIHNpemVcbiIsDQogCQkJCSAgICBsaW5lbm8sIHRwKTsN
CkBAIC0xMDM4LDggKzEwMzksOCBAQA0KIAkJCWNvbnRpbnVlOw0KIAkJfQ0K
IAkJaWYgKHN0cmVxKGNwLCAic2VjdG9ycy90cmFjayIpKSB7DQotCQkJdiA9
IGF0b2kodHApOw0KLQkJCWlmICh2IDw9IDApIHsNCisJCQl2ID0gc3RydG91
bCh0cCwgTlVMTCwgMCk7DQorCQkJaWYgKHYgPT0gMCkgew0KIAkJCQlmcHJp
bnRmKHN0ZGVyciwgImxpbmUgJWQ6ICVzOiBiYWQgJXNcbiIsDQogCQkJCSAg
ICBsaW5lbm8sIHRwLCBjcCk7DQogCQkJCWVycm9ycysrOw0KQEAgLTEwNDgs
OCArMTA0OSw4IEBADQogCQkJY29udGludWU7DQogCQl9DQogCQlpZiAoc3Ry
ZXEoY3AsICJzZWN0b3JzL2N5bGluZGVyIikpIHsNCi0JCQl2ID0gYXRvaSh0
cCk7DQotCQkJaWYgKHYgPD0gMCkgew0KKwkJCXYgPSBzdHJ0b3VsKHRwLCBO
VUxMLCAwKTsNCisJCQlpZiAodiA9PSAwKSB7DQogCQkJCWZwcmludGYoc3Rk
ZXJyLCAibGluZSAlZDogJXM6IGJhZCAlc1xuIiwNCiAJCQkJICAgIGxpbmVu
bywgdHAsIGNwKTsNCiAJCQkJZXJyb3JzKys7DQpAQCAtMTA1OCw4ICsxMDU5
LDggQEANCiAJCQljb250aW51ZTsNCiAJCX0NCiAJCWlmIChzdHJlcShjcCwg
InRyYWNrcy9jeWxpbmRlciIpKSB7DQotCQkJdiA9IGF0b2kodHApOw0KLQkJ
CWlmICh2IDw9IDApIHsNCisJCQl2ID0gc3RydG91bCh0cCwgTlVMTCwgMCk7
DQorCQkJaWYgKHYgPT0gMCkgew0KIAkJCQlmcHJpbnRmKHN0ZGVyciwgImxp
bmUgJWQ6ICVzOiBiYWQgJXNcbiIsDQogCQkJCSAgICBsaW5lbm8sIHRwLCBj
cCk7DQogCQkJCWVycm9ycysrOw0KQEAgLTEwNjgsOCArMTA2OSw4IEBADQog
CQkJY29udGludWU7DQogCQl9DQogCQlpZiAoc3RyZXEoY3AsICJjeWxpbmRl
cnMiKSkgew0KLQkJCXYgPSBhdG9pKHRwKTsNCi0JCQlpZiAodiA8PSAwKSB7
DQorCQkJdiA9IHN0cnRvdWwodHAsIE5VTEwsIDApOw0KKwkJCWlmICh2ID09
IDApIHsNCiAJCQkJZnByaW50ZihzdGRlcnIsICJsaW5lICVkOiAlczogYmFk
ICVzXG4iLA0KIAkJCQkgICAgbGluZW5vLCB0cCwgY3ApOw0KIAkJCQllcnJv
cnMrKzsNCkBAIC0xMDc4LDggKzEwNzksOCBAQA0KIAkJCWNvbnRpbnVlOw0K
IAkJfQ0KIAkJaWYgKHN0cmVxKGNwLCAic2VjdG9ycy91bml0IikpIHsNCi0J
CQl2ID0gYXRvaSh0cCk7DQotCQkJaWYgKHYgPD0gMCkgew0KKwkJCXYgPSBz
dHJ0b3VsKHRwLCBOVUxMLCAwKTsNCisJCQlpZiAodiA9PSAwKSB7DQogCQkJ
CWZwcmludGYoc3RkZXJyLCAibGluZSAlZDogJXM6IGJhZCAlc1xuIiwNCiAJ
CQkJICAgIGxpbmVubywgdHAsIGNwKTsNCiAJCQkJZXJyb3JzKys7DQpAQCAt
MTA4OCw4ICsxMDg5LDggQEANCiAJCQljb250aW51ZTsNCiAJCX0NCiAJCWlm
IChzdHJlcShjcCwgInJwbSIpKSB7DQotCQkJdiA9IGF0b2kodHApOw0KLQkJ
CWlmICh2IDw9IDApIHsNCisJCQl2ID0gc3RydG91bCh0cCwgTlVMTCwgMCk7
DQorCQkJaWYgKHYgPT0gMCkgew0KIAkJCQlmcHJpbnRmKHN0ZGVyciwgImxp
bmUgJWQ6ICVzOiBiYWQgJXNcbiIsDQogCQkJCSAgICBsaW5lbm8sIHRwLCBj
cCk7DQogCQkJCWVycm9ycysrOw0KQEAgLTEwOTgsOCArMTA5OSw4IEBADQog
CQkJY29udGludWU7DQogCQl9DQogCQlpZiAoc3RyZXEoY3AsICJpbnRlcmxl
YXZlIikpIHsNCi0JCQl2ID0gYXRvaSh0cCk7DQotCQkJaWYgKHYgPD0gMCkg
ew0KKwkJCXYgPSBzdHJ0b3VsKHRwLCBOVUxMLCAwKTsNCisJCQlpZiAodiA9
PSAwKSB7DQogCQkJCWZwcmludGYoc3RkZXJyLCAibGluZSAlZDogJXM6IGJh
ZCAlc1xuIiwNCiAJCQkJICAgIGxpbmVubywgdHAsIGNwKTsNCiAJCQkJZXJy
b3JzKys7DQpAQCAtMTEwOCw0MyArMTEwOSwyMyBAQA0KIAkJCWNvbnRpbnVl
Ow0KIAkJfQ0KIAkJaWYgKHN0cmVxKGNwLCAidHJhY2tza2V3IikpIHsNCi0J
CQl2ID0gYXRvaSh0cCk7DQotCQkJaWYgKHYgPCAwKSB7DQotCQkJCWZwcmlu
dGYoc3RkZXJyLCAibGluZSAlZDogJXM6IGJhZCAlc1xuIiwNCi0JCQkJICAg
IGxpbmVubywgdHAsIGNwKTsNCi0JCQkJZXJyb3JzKys7DQotCQkJfSBlbHNl
DQotCQkJCWxwLT5kX3RyYWNrc2tldyA9IHY7DQorCQkJdiA9IHN0cnRvdWwo
dHAsIE5VTEwsIDApOw0KKwkJCWxwLT5kX3RyYWNrc2tldyA9IHY7DQogCQkJ
Y29udGludWU7DQogCQl9DQogCQlpZiAoc3RyZXEoY3AsICJjeWxpbmRlcnNr
ZXciKSkgew0KLQkJCXYgPSBhdG9pKHRwKTsNCi0JCQlpZiAodiA8IDApIHsN
Ci0JCQkJZnByaW50ZihzdGRlcnIsICJsaW5lICVkOiAlczogYmFkICVzXG4i
LA0KLQkJCQkgICAgbGluZW5vLCB0cCwgY3ApOw0KLQkJCQllcnJvcnMrKzsN
Ci0JCQl9IGVsc2UNCi0JCQkJbHAtPmRfY3lsc2tldyA9IHY7DQorCQkJdiA9
IHN0cnRvdWwodHAsIE5VTEwsIDApOw0KKwkJCWxwLT5kX2N5bHNrZXcgPSB2
Ow0KIAkJCWNvbnRpbnVlOw0KIAkJfQ0KIAkJaWYgKHN0cmVxKGNwLCAiaGVh
ZHN3aXRjaCIpKSB7DQotCQkJdiA9IGF0b2kodHApOw0KLQkJCWlmICh2IDwg
MCkgew0KLQkJCQlmcHJpbnRmKHN0ZGVyciwgImxpbmUgJWQ6ICVzOiBiYWQg
JXNcbiIsDQotCQkJCSAgICBsaW5lbm8sIHRwLCBjcCk7DQotCQkJCWVycm9y
cysrOw0KLQkJCX0gZWxzZQ0KLQkJCQlscC0+ZF9oZWFkc3dpdGNoID0gdjsN
CisJCQl2ID0gc3RydG91bCh0cCwgTlVMTCwgMCk7DQorCQkJbHAtPmRfaGVh
ZHN3aXRjaCA9IHY7DQogCQkJY29udGludWU7DQogCQl9DQogCQlpZiAoc3Ry
ZXEoY3AsICJ0cmFjay10by10cmFjayBzZWVrIikpIHsNCi0JCQl2ID0gYXRv
aSh0cCk7DQotCQkJaWYgKHYgPCAwKSB7DQotCQkJCWZwcmludGYoc3RkZXJy
LCAibGluZSAlZDogJXM6IGJhZCAlc1xuIiwNCi0JCQkJICAgIGxpbmVubywg
dHAsIGNwKTsNCi0JCQkJZXJyb3JzKys7DQotCQkJfSBlbHNlDQotCQkJCWxw
LT5kX3Rya3NlZWsgPSB2Ow0KKwkJCXYgPSBzdHJ0b3VsKHRwLCBOVUxMLCAw
KTsNCisJCQlscC0+ZF90cmtzZWVrID0gdjsNCiAJCQljb250aW51ZTsNCiAJ
CX0NCiAJCS8qIHRoZSAnOicgd2FzIHJlbW92ZWQgYWJvdmUgKi8NCkBAIC0x
MTgyLDcgKzExNjMsNyBAQA0KIAkJcmV0dXJuICgxKTsgXA0KIAl9IGVsc2Ug
eyBcDQogCQljcCA9IHRwLCB0cCA9IHdvcmQoY3ApOyBcDQotCQkobikgPSBh
dG9pKGNwKTsgXA0KKwkJKG4pID0gc3RydG91bChjcCwgTlVMTCwgMCk7IFwN
CiAJfSBcDQogfSB3aGlsZSAoMCkNCiANCkBAIC0xMTk0LDcgKzExNzUsNyBA
QA0KIAl9IGVsc2UgeyBcDQogCSAgICAgICAgY2hhciAqdG1wOyBcDQogCQlj
cCA9IHRwLCB0cCA9IHdvcmQoY3ApOyBcDQotCSAgICAgICAgKG4pID0gc3Ry
dG9sKGNwLCZ0bXAsMTApOyBcDQorCSAgICAgICAgKG4pID0gc3RydG91bChj
cCwgJnRtcCwgMTApOyBcDQogCQlpZiAodG1wKSAodykgPSAqdG1wOyBcDQog
CX0gXA0KIH0gd2hpbGUgKDApDQpAQCAtMTIwOSwxNCArMTE5MCwxNCBAQA0K
IAlzdHJ1Y3QgcGFydGl0aW9uICpwcDsNCiAJY2hhciAqY3A7DQogCWNvbnN0
IGNoYXIgKipjcHA7DQotCWludCB2Ow0KKwl1bnNpZ25lZCBpbnQgdjsNCiAN
CiAJcHAgPSAmbHAtPmRfcGFydGl0aW9uc1twYXJ0XTsNCiAJY3AgPSBOVUxM
Ow0KIA0KIAl2ID0gMDsNCiAJTlhUV09SRChwYXJ0X3NpemVfdHlwZVtwYXJ0
XSx2KTsNCi0JaWYgKHYgPCAwIHx8ICh2ID09IDAgJiYgcGFydF9zaXplX3R5
cGVbcGFydF0gIT0gJyonKSkgew0KKwlpZiAodiA9PSAwICYmIHBhcnRfc2l6
ZV90eXBlW3BhcnRdICE9ICcqJykgew0KIAkJZnByaW50ZihzdGRlcnIsICJs
aW5lICVkOiAlczogYmFkIHBhcnRpdGlvbiBzaXplXG4iLCBsaW5lbm8sDQog
CQkgICAgY3ApOw0KIAkJcmV0dXJuICgxKTsNCkBAIC0xMjI1LDggKzEyMDYs
OCBAQA0KIA0KIAl2ID0gMDsNCiAJTlhUV09SRChwYXJ0X29mZnNldF90eXBl
W3BhcnRdLHYpOw0KLQlpZiAodiA8IDAgfHwgKHYgPT0gMCAmJiBwYXJ0X29m
ZnNldF90eXBlW3BhcnRdICE9ICcqJyAmJg0KLQkgICAgcGFydF9vZmZzZXRf
dHlwZVtwYXJ0XSAhPSAnXDAnKSkgew0KKwlpZiAodiA9PSAwICYmIHBhcnRf
b2Zmc2V0X3R5cGVbcGFydF0gIT0gJyonICYmDQorCSAgICBwYXJ0X29mZnNl
dF90eXBlW3BhcnRdICE9ICdcMCcpIHsNCiAJCWZwcmludGYoc3RkZXJyLCAi
bGluZSAlZDogJXM6IGJhZCBwYXJ0aXRpb24gb2Zmc2V0XG4iLCBsaW5lbm8s
DQogCQkgICAgY3ApOw0KIAkJcmV0dXJuICgxKTsNCkBAIC0xMjQwLDcgKzEy
MjEsNyBAQA0KIAkJcHAtPnBfZnN0eXBlID0gY3BwIC0gZnN0eXBlbmFtZXM7
DQogCX0gZWxzZSB7DQogCQlpZiAoaXNkaWdpdCgqY3ApKQ0KLQkJCXYgPSBh
dG9pKGNwKTsNCisJCQl2ID0gc3RydG91bChjcCwgTlVMTCwgMCk7DQogCQll
bHNlDQogCQkJdiA9IEZTTUFYVFlQRVM7DQogCQlpZiAoKHVuc2lnbmVkKXYg
Pj0gRlNNQVhUWVBFUykgew0K
--0-661448415-1037435833=:50399--
To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-current" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?Pine.BSF.4.21.0211160011590.50399-200000>