--===============1221205114==
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
New submission from Ulrich Spoerlein <uqs@spoerlein.net>:
hack(6): fix very old mis-merge by restoring code from OpenBSD
If you look at the CVS history for this file, you will see that
the code in question tried to find the provided name in the path, not
just a fixed location (that could be coded more easily).
Restore the OpenBSD version of this code, which was cleaned up, already
----------
files: hack.diff
messages: 7783
nosy: uqs
priority: cleanup
status: unread
title: hack(6): fix old mis-merge
_____________________________________________________
DragonFly issue tracker <bugs@lists.dragonflybsd.org>
<http://bugs.dragonflybsd.org/issue1606>
_____________________________________________________
--===============1221205114==
Content-Type: application/octet-stream
MIME-Version: 1.0
Content-Transfer-Encoding: base64
Content-Disposition: attachment;
filename="hack.diff"
RnJvbSBjOTE4MzNiNjA4YTQ1ZThiY2E4YmQ5ODU3MjVjZTNiZmE3MTY0NjZhIE1vbiBTZXAgMTcg
MDA6MDA6MDAgMjAwMQpGcm9tOiA9P1VURi04P3E/VWxyaWNoPTIwU3A9QzM9QjZybGVpbj89IDx1
cXNAc3BvZXJsZWluLm5ldD4KRGF0ZTogU3VuLCAxNSBOb3YgMjAwOSAxNzoxNzowMiArMDEwMApT
dWJqZWN0OiBbUEFUQ0hdIGhhY2soNik6IGZpeCB2ZXJ5IG9sZCBtaXMtbWVyZ2UgYnkgcmVzdG9y
aW5nIGNvZGUgZnJvbSBPcGVuQlNECgpJZiB5b3UgbG9vayBhdCB0aGUgQ1ZTIGhpc3RvcnkgZm9y
IHRoaXMgZmlsZSwgeW91IHdpbGwgc2VlIHRoYXQKdGhlIGNvZGUgaW4gcXVlc3Rpb24gdHJpZWQg
dG8gZmluZCB0aGUgcHJvdmlkZWQgbmFtZSBpbiB0aGUgcGF0aCwgbm90Cmp1c3QgYSBmaXhlZCBs
b2NhdGlvbiAodGhhdCBjb3VsZCBiZSBjb2RlZCBtb3JlIGVhc2lseSkuCgpSZXN0b3JlIHRoZSBP
cGVuQlNEIHZlcnNpb24gb2YgdGhpcyBjb2RlLCB3aGljaCB3YXMgY2xlYW5lZCB1cCwgYWxyZWFk
eQotLS0KIGdhbWVzL2hhY2svaGFjay51bml4LmMgfCAgIDM1ICsrKysrKysrKysrKysrKysrKysr
KysrKysrKystLS0tLS0tCiAxIGZpbGVzIGNoYW5nZWQsIDI4IGluc2VydGlvbnMoKyksIDcgZGVs
ZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZ2FtZXMvaGFjay9oYWNrLnVuaXguYyBiL2dhbWVzL2hh
Y2svaGFjay51bml4LmMKaW5kZXggMzE4ZDg4Yi4uNjgxMGNiYSAxMDA2NDQKLS0tIGEvZ2FtZXMv
aGFjay9oYWNrLnVuaXguYworKysgYi9nYW1lcy9oYWNrL2hhY2sudW5peC5jCkBAIC0xOSw3ICsx
OSw5IEBACiAKICNpbmNsdWRlCTxzeXMvdHlwZXMuaD4JCS8qIGZvciB0aW1lX3QgYW5kIHN0YXQg
Ki8KICNpbmNsdWRlCTxzeXMvc3RhdC5oPgorI2luY2x1ZGUJPHN5cy9wYXJhbS5oPgogI2luY2x1
ZGUJPHRpbWUuaD4KKyNpbmNsdWRlCTxlcnIuaD4KIAogc3RhdGljIHN0cnVjdCB0bQkqZ2V0bHQo
dm9pZCk7CiBzdGF0aWMgYm9vbAkJIHZlcnlvbGQoaW50KTsKQEAgLTk1LDEzICs5NywzMiBAQCBz
dHJ1Y3Qgc3RhdCBidWYsIGhidWY7CiB2b2lkCiBnZXRoZGF0ZShjb25zdCBjaGFyICpuYW1lKQog
ewotLyogb2xkIHZlcnNpb24gLSBmb3IgcGVvcGxlIHNob3J0IG9mIHNwYWNlICovCi1jaGFyICpu
cDsKLQotCW5hbWUgPSAiL3Vzci9nYW1lcy9oaWRlL2hhY2siOwotCWlmKHN0YXQobmFtZSwgJmhi
dWYpKQotCQllcnJvcigiQ2Fubm90IGdldCBzdGF0dXMgb2YgJXMuIiwKLQkJCShucCA9IHJpbmRl
eChuYW1lLCAnLycpKSA/IG5wKzEgOiBuYW1lKTsKKwljaGFyICpwLCAqbnAsICpwYXRoOworCWNo
YXIgZmlsZW5hbWVbTUFYUEFUSExFTisxXTsKKworCWlmIChzdHJjaHIobmFtZSwgJy8nKSAhPSBO
VUxMIHx8IChwID0gZ2V0ZW52KCJQQVRIIikpID09IE5VTEwpCisJCXAgPSAiIjsKKwlucCA9IHBh
dGggPSBzdHJkdXAocCk7CS8qIE1ha2UgYSBjb3B5IGZvciBzdHJzZXAuICovCisJaWYgKHBhdGgg
PT0gTlVMTCkKKwkJZXJyKDEsIE5VTEwpOworCisJZm9yICg7OykgeworCQlpZiAoKHAgPSBzdHJz
ZXAoJm5wLCAiOiIpKSA9PSBOVUxMKQorCQkJYnJlYWs7CisJCWlmICgqcCA9PSAnXDAnKQkJCS8q
IDo6ICovCisJCQkodm9pZCkgc3RybGNweShmaWxlbmFtZSwgbmFtZSwgc2l6ZW9mKGZpbGVuYW1l
KSk7CisJCWVsc2UKKwkJCSh2b2lkKSBzbnByaW50ZihmaWxlbmFtZSwgc2l6ZW9mKGZpbGVuYW1l
KSwKKwkJCSAgICAiJXMvJXMiLCBwLCBuYW1lKTsKKworCQlpZiAoc3RhdChmaWxlbmFtZSwgJmhi
dWYpID09IDApIHsKKwkJCWZyZWUocGF0aCk7CisJCQlyZXR1cm47CisJCX0KKwl9CisJZXJyb3Io
IkNhbm5vdCBnZXQgc3RhdHVzIG9mICVzLiIsCisJCShwID0gc3RycmNocihuYW1lLCAnLycpKSA/
IHArMSA6IG5hbWUpOworCWZyZWUocGF0aCk7CiB9CiAKIGJvb2wKLS0gCjEuNi41LjEKCg==
--===============1221205114==--