bin/144644: [patch] Fix *alloc cornercases with config(1)
Garrett Cooper
yanegomi at gmail.com
Sat Mar 13 07:30:07 UTC 2010
The following reply was made to PR bin/144644; it has been noted by GNATS.
From: Garrett Cooper <yanegomi at gmail.com>
To: bug-followup at freebsd.org, gcooper at freebsd.org
Cc:
Subject: Re: bin/144644: [patch] Fix *alloc cornercases with config(1)
Date: Fri, 12 Mar 2010 23:28:22 -0800
--00504501598bbff07b0481a99781
Content-Type: text/plain; charset=ISO-8859-1
The attached patch addresses the non-style(9) conformity with my
previous patch as pointed out by several folks on current at .
Thanks,
-Garrett
--00504501598bbff07b0481a99781
Content-Type: text/plain; charset=US-ASCII; name="config-failure-corner-cases.diff.txt"
Content-Disposition: attachment;
filename="config-failure-corner-cases.diff.txt"
Content-Transfer-Encoding: base64
X-Attachment-Id: f_g6q3h2070
SW5kZXg6IG1rb3B0aW9ucy5jCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIG1rb3B0aW9ucy5jCShyZXZpc2lvbiAy
MDUxMTUpCisrKyBta29wdGlvbnMuYwkod29ya2luZyBjb3B5KQpAQCAtNzAsNiArNzAsOCBAQAog
CS8qIEZha2UgdGhlIGNwdSB0eXBlcyBhcyBvcHRpb25zLiAqLwogCVNMSVNUX0ZPUkVBQ0goY3As
ICZjcHV0eXBlLCBjcHVfbmV4dCkgewogCQlvcCA9IChzdHJ1Y3Qgb3B0ICopY2FsbG9jKDEsIHNp
emVvZigqb3ApKTsKKwkJaWYgKG9wID09IE5VTEwpCisJCQllcnJ4KEVYSVRfRkFJTFVSRSwgImNh
bGxvYyIpOwogCQlvcC0+b3BfbmFtZSA9IG5zKGNwLT5jcHVfbmFtZSk7CiAJCVNMSVNUX0lOU0VS
VF9IRUFEKCZvcHQsIG9wLCBvcF9uZXh0KTsKIAl9CQpAQCAtODQsNiArODYsOCBAQAogCiAJLyog
RmFrZSBNQVhVU0VSUyBhcyBhbiBvcHRpb24uICovCiAJb3AgPSAoc3RydWN0IG9wdCAqKWNhbGxv
YygxLCBzaXplb2YoKm9wKSk7CisJaWYgKG9wID09IE5VTEwpCisJCWVycngoRVhJVF9GQUlMVVJF
LCAiY2FsbG9jIik7CiAJb3AtPm9wX25hbWUgPSBucygiTUFYVVNFUlMiKTsKIAlzbnByaW50Zihi
dWYsIHNpemVvZihidWYpLCAiJWQiLCBtYXh1c2Vycyk7CiAJb3AtPm9wX3ZhbHVlID0gbnMoYnVm
KTsKQEAgLTE5OSw2ICsyMDMsOCBAQAogCQkJdGlkeSsrOwogCQl9IGVsc2UgewogCQkJb3AgPSAo
c3RydWN0IG9wdCAqKSBjYWxsb2MoMSwgc2l6ZW9mICpvcCk7CisJCQlpZiAob3AgPT0gTlVMTCkK
KwkJCQllcnJ4KEVYSVRfRkFJTFVSRSwgImNhbGxvYyIpOwogCQkJb3AtPm9wX25hbWUgPSBpbnc7
CiAJCQlvcC0+b3BfdmFsdWUgPSBpbnZhbHVlOwogCQkJU0xJU1RfSU5TRVJUX0hFQUQoJm9wX2hl
YWQsIG9wLCBvcF9uZXh0KTsKQEAgLTIyNSw2ICsyMzEsOCBAQAogCWlmICh2YWx1ZSAmJiAhc2Vl
bikgewogCQkvKiBOZXcgb3B0aW9uIGFwcGVhcnMgKi8KIAkJb3AgPSAoc3RydWN0IG9wdCAqKSBj
YWxsb2MoMSwgc2l6ZW9mICpvcCk7CisJCWlmIChvcCA9PSBOVUxMKQorCQkJZXJyeChFWElUX0ZB
SUxVUkUsICJjYWxsb2MiKTsKIAkJb3AtPm9wX25hbWUgPSBucyhuYW1lKTsKIAkJb3AtPm9wX3Zh
bHVlID0gdmFsdWUgPyBucyh2YWx1ZSkgOiBOVUxMOwogCQlTTElTVF9JTlNFUlRfSEVBRCgmb3Bf
aGVhZCwgb3AsIG9wX25leHQpOwpAQCAtMzM2LDYgKzM0NCw4IEBACiAJfQogCQogCXBvID0gKHN0
cnVjdCBvcHRfbGlzdCAqKSBjYWxsb2MoMSwgc2l6ZW9mICpwbyk7CisJaWYgKHBvID09IE5VTEwp
CisJCWVycngoRVhJVF9GQUlMVVJFLCAiY2FsbG9jIik7CiAJcG8tPm9fbmFtZSA9IHRoaXM7CiAJ
cG8tPm9fZmlsZSA9IHZhbDsKIAlTTElTVF9JTlNFUlRfSEVBRCgmb3RhYiwgcG8sIG9fbmV4dCk7
CkluZGV4OiBtYWluLmMKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gbWFpbi5jCShyZXZpc2lvbiAyMDUxMTUpCisr
KyBtYWluLmMJKHdvcmtpbmcgY29weSkKQEAgLTEyMCw3ICsxMjAsNyBAQAogCQkJaWYgKCpkZXN0
ZGlyID09ICdcMCcpCiAJCQkJc3RybGNweShkZXN0ZGlyLCBvcHRhcmcsIHNpemVvZihkZXN0ZGly
KSk7CiAJCQllbHNlCi0JCQkJZXJyeCgyLCAiZGlyZWN0b3J5IGFscmVhZHkgc2V0Iik7CisJCQkJ
ZXJyeChFWElUX0ZBSUxVUkUsICJkaXJlY3RvcnkgYWxyZWFkeSBzZXQiKTsKIAkJCWJyZWFrOwog
CQljYXNlICdnJzoKIAkJCWRlYnVnZ2luZysrOwpAQCAtMTc1LDcgKzE3NSw3IEBACiAJCWlmICht
a2RpcihwLCAwNzc3KSkKIAkJCWVycigyLCAiJXMiLCBwKTsKIAl9IGVsc2UgaWYgKCFTX0lTRElS
KGJ1Zi5zdF9tb2RlKSkKLQkJZXJyeCgyLCAiJXMgaXNuJ3QgYSBkaXJlY3RvcnkiLCBwKTsKKwkJ
ZXJyeChFWElUX0ZBSUxVUkUsICIlcyBpc24ndCBhIGRpcmVjdG9yeSIsIHApOwogCiAJU0xJU1Rf
SU5JVCgmY3B1dHlwZSk7CiAJU0xJU1RfSU5JVCgmbWtvcHQpOwpAQCAtMjU2LDcgKzI1Niw3IEBA
CiAJaW50IGk7CiAKIAlpZiAocmVhbHBhdGgoIi4uLy4uIiwgc3JjZGlyKSA9PSBOVUxMKQotCQll
cnJ4KDIsICJVbmFibGUgdG8gZmluZCByb290IG9mIHNvdXJjZSB0cmVlIik7CisJCWVycngoRVhJ
VF9GQUlMVVJFLCAiVW5hYmxlIHRvIGZpbmQgcm9vdCBvZiBzb3VyY2UgdHJlZSIpOwogCWlmICgo
cHdkID0gZ2V0ZW52KCJQV0QiKSkgIT0gTlVMTCAmJiAqcHdkID09ICcvJyAmJgogCSAgICAocHdk
ID0gc3RyZHVwKHB3ZCkpICE9IE5VTEwpIHsKIAkJLyogUmVtb3ZlIHRoZSBsYXN0IHR3byBwYXRo
IGNvbXBvbmVudHMuICovCkBAIC02NTAsNiArNjUwLDggQEAKIAkJfQogCX0KIAlobCA9IGNhbGxv
YygxLCBzaXplb2YoKmhsKSk7CisJaWYgKGhsID09IE5VTEwpCisJCWVycngoRVhJVF9GQUlMVVJF
LCAiY2FsbG9jIik7CiAJaGwtPmhfbmFtZSA9IHM7CiAJaGwtPmhfbmV4dCA9IGh0YWI7CiAJaHRh
YiA9IGhsOwpJbmRleDogbWttYWtlZmlsZS5jCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIG1rbWFrZWZpbGUuYwko
cmV2aXNpb24gMjA1MTE1KQorKysgbWttYWtlZmlsZS5jCSh3b3JraW5nIGNvcHkpCkBAIC05OCw2
ICs5OCw4IEBACiAJc3RydWN0IGZpbGVfbGlzdCAqZnA7CiAKIAlmcCA9IChzdHJ1Y3QgZmlsZV9s
aXN0ICopIGNhbGxvYygxLCBzaXplb2YgKmZwKTsKKwlpZiAoZnAgPT0gTlVMTCkKKwkJZXJyeChF
WElUX0ZBSUxVUkUsICJjYWxsb2MiKTsKIAlTVEFJTFFfSU5TRVJUX1RBSUwoJmZ0YWIsIGZwLCBm
X25leHQpOwogCXJldHVybiAoZnApOwogfQpJbmRleDogbGFuZy5sCj09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIGxh
bmcubAkocmV2aXNpb24gMjA1MTE1KQorKysgbGFuZy5sCSh3b3JraW5nIGNvcHkpCkBAIC0zMSw2
ICszMSw3IEBACiAgKiAkRnJlZUJTRCQKICAqLwogCisjaW5jbHVkZSA8ZXJyLmg+CiAjaW5jbHVk
ZSA8YXNzZXJ0Lmg+CiAjaW5jbHVkZSA8Y3R5cGUuaD4KICNpbmNsdWRlIDxzdHJpbmcuaD4KQEAg
LTIyMCw2ICsyMjEsOSBAQAogCXN0cnVjdCBjZmdmaWxlICpjZjsKIAogCWNmID0gY2FsbG9jKDEs
IHNpemVvZigqY2YpKTsKKwlpZiAoY2YgPT0gTlVMTCkgeworCQllcnJ4KEVYSVRfRkFJTFVSRSwg
ImNhbGxvYyIpOworCX0KIAlhc3NlcnQoY2YgIT0gTlVMTCk7CiAJYXNwcmludGYoJmNmLT5jZmdf
cGF0aCwgIiVzIiwgZm5hbWUpOwogCVNUQUlMUV9JTlNFUlRfVEFJTCgmY2ZnZmlsZXMsIGNmLCBj
ZmdfbmV4dCk7CkluZGV4OiBjb25maWcueQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBjb25maWcueQkocmV2aXNp
b24gMjA1MTE1KQorKysgY29uZmlnLnkJKHdvcmtpbmcgY29weSkKQEAgLTE2Niw2ICsxNjYsOCBA
QAogCUNQVSBTYXZlX2lkIHsKIAkJc3RydWN0IGNwdXR5cGUgKmNwID0KIAkJICAgIChzdHJ1Y3Qg
Y3B1dHlwZSAqKWNhbGxvYygxLCBzaXplb2YgKHN0cnVjdCBjcHV0eXBlKSk7CisJCWlmIChjcCA9
PSBOVUxMKQorCQkJZXJyeChFWElUX0ZBSUxVUkUsICJjYWxsb2MiKTsKIAkJY3AtPmNwdV9uYW1l
ID0gJDI7CiAJCVNMSVNUX0lOU0VSVF9IRUFEKCZjcHV0eXBlLCBjcCwgY3B1X25leHQpOwogCSAg
ICAgIH0gfApAQCAtMTk3LDYgKzE5OSw4IEBACiAJCXN0cnVjdCBoaW50ICpoaW50OwogCiAJCWhp
bnQgPSAoc3RydWN0IGhpbnQgKiljYWxsb2MoMSwgc2l6ZW9mIChzdHJ1Y3QgaGludCkpOworCQlp
ZiAoaGludCA9PSBOVUxMKQorCQkJZXJyeChFWElUX0ZBSUxVUkUsICJjYWxsb2MiKTsJCiAJCWhp
bnQtPmhpbnRfbmFtZSA9ICQyOwogCQlTVEFJTFFfSU5TRVJUX1RBSUwoJmhpbnRzLCBoaW50LCBo
aW50X25leHQpOwogCQloaW50bW9kZSA9IDE7CkBAIC0zMzEsNiArMzM1LDggQEAKIAlzdHJ1Y3Qg
ZmlsZXNfbmFtZSAqbmw7CiAJCiAJbmwgPSAoc3RydWN0IGZpbGVzX25hbWUgKikgY2FsbG9jKDEs
IHNpemVvZiAqbmwpOworCWlmIChubCA9PSBOVUxMKQorCQllcnJ4KEVYSVRfRkFJTFVSRSwgImNh
bGxvYyIpOwogCW5sLT5mX25hbWUgPSBuYW1lOwogCVNUQUlMUV9JTlNFUlRfVEFJTCgmZm50YWIs
IG5sLCBmX25leHQpOwogfQpAQCAtMzY0LDYgKzM3MCw4IEBACiAJfQogCiAJbnAgPSAoc3RydWN0
IGRldmljZSAqKSBjYWxsb2MoMSwgc2l6ZW9mICpucCk7CisJaWYgKG5wID09IE5VTEwpCisJCWVy
cngoRVhJVF9GQUlMVVJFLCAiY2FsbG9jIik7CiAJbnAtPmRfbmFtZSA9IG5hbWU7CiAJU1RBSUxR
X0lOU0VSVF9UQUlMKCZkdGFiLCBucCwgZF9uZXh0KTsKIH0KQEAgLTQyMiw2ICs0MzAsOCBAQAog
CX0KIAogCW9wID0gKHN0cnVjdCBvcHQgKiljYWxsb2MoMSwgc2l6ZW9mIChzdHJ1Y3Qgb3B0KSk7
CisJaWYgKG9wID09IE5VTEwpCisJCWVycngoRVhJVF9GQUlMVVJFLCAiY2FsbG9jIik7CiAJb3At
Pm9wX25hbWUgPSBuYW1lOwogCW9wLT5vcF9vd25maWxlID0gMDsKIAlvcC0+b3BfdmFsdWUgPSB2
YWx1ZTsK
--00504501598bbff07b0481a99781--
More information about the freebsd-bugs
mailing list