[PATCH v2 1/4] grub-core/osdep/linux/ofpath.c: Update strstr() calls

Nicholas Vinson <[email protected]> Tue, 24 Feb 2026 19:48:39 -0500
Newsgroups org.gnu.grub-devel
Message-ID <9b4a2318a57add6b06670bceaf3105c6981d92c0.1771980262.git.nvinson234@gmail.com>
V2l0aCBDMjMsIHN0cnN0cigpIHJldHVybnMgYSAnY29uc3QgY2hhciAqJyBpZiBpdHMgZmlyc3Qg
YWdydW1lbnQgaXMKJ2NvbnN0IGNoYXIgKicsIGFuZCB0aGVzZSBjaGFuZ2VzIGFyZSBpbXBsZW1l
bnRlZCBpbiBnbGliYy0yLjQzLgoKQXMgYSByZXN1bHQsIHRoZSBmaXJzdCBzdHJzdHIoKSBjYWxs
IGluIGNoZWNrX3NhcygpIG5vdyByZXR1cm5zIGEgJ2NvbnN0CmNoYXIgKicgaW5zdGVhZCBvZiAn
Y2hhciAqJyBiZWNhdXNlIHN5c2ZzX3BhdGggaXMgYSAnY29uc3QgY2hhciAqJy4gVGhpcwp0cmln
Z2VycyBhICJkaXNjYXJkcyBxdWFsaWZpZXJzIiB3YXJuaW5nLCB0aGF0IGlzIGxhdGVyIHByb21v
dGVkIHRvIGFuCmVycm9yIGFuZCB1bHRpbWF0ZWx5IGNhdXNlcyB0aGUgYnVpbGQgdG8gZmFpbC4K
ClRvIGZpeCB0aGUgaXNzdWUsIHRoaXMgcGF0Y2ggY29udmVydHMgJ2VkJywgdGhlIHBvaW50ZXIg
dGhhdCBzdG9yZXMKc3Ryc3RyKCkncyByZXR1cm4gdmFsdWUsIHRvIGEgJ2NvbnN0IGNoYXIgKicu
IFJlbW92ZXMgdGhlIHhzdHJkdXAoKQpjYWxsIGFuZCBjbGVhbnMgdXAgdGhlIHJlc3Qgb2YgdGhl
IGZ1bmN0aW9uIGJ5IHVwZGF0aW5nIHRoZSAqcHJpbnRmKCkKY2FsbHMgYW5kIHVzaW5nIHBvaW50
ZXIgYXJ0aGltZXRpYyB0byBjb21wdXRlIGxlbmd0aHMgaW5zdGVhZCBvZgpzdHJsZW4oKS4KClNp
Z25lZC1vZmYtYnk6IE5pY2hvbGFzIFZpbnNvbiA8bnZpbnNvbjIzNEBnbWFpbC5jb20+Ci0tLQog
Z3J1Yi1jb3JlL29zZGVwL2xpbnV4L29mcGF0aC5jIHwgMjUgKysrKysrKysrKysrLS0tLS0tLS0t
LS0tLQogMSBmaWxlIGNoYW5nZWQsIDEyIGluc2VydGlvbnMoKyksIDEzIGRlbGV0aW9ucygtKQoK
ZGlmZiAtLWdpdCBhL2dydWItY29yZS9vc2RlcC9saW51eC9vZnBhdGguYyBiL2dydWItY29yZS9v
c2RlcC9saW51eC9vZnBhdGguYwppbmRleCAyNGE0ZDVjOGQuLjBlYmZlYTQ0YyAxMDA2NDQKLS0t
IGEvZ3J1Yi1jb3JlL29zZGVwL2xpbnV4L29mcGF0aC5jCisrKyBiL2dydWItY29yZS9vc2RlcC9s
aW51eC9vZnBhdGguYwpAQCAtNDg4LDggKzQ4OCwxMSBAQCBjaGVja19oYmFfaWRlbnRpZmllcnMg
KGNvbnN0IGNoYXIgKnN5c2ZzX3BhdGgsIGludCAqdmVuZG9yLCBpbnQgKmRldmljZV9pZCkKIHN0
YXRpYyB2b2lkCiBjaGVja19zYXMgKGNvbnN0IGNoYXIgKnN5c2ZzX3BhdGgsIGludCAqdGd0LCB1
bnNpZ25lZCBsb25nIGludCAqc2FzX2FkZHJlc3MpCiB7Ci0gIGNoYXIgKmVkID0gc3Ryc3RyIChz
eXNmc19wYXRoLCAiZW5kX2RldmljZSIpOwotICBjaGFyICpwLCAqcSwgKnBhdGg7CisgIGNvbnN0
IGNoYXIgKmVkID0gc3Ryc3RyIChzeXNmc19wYXRoLCAiZW5kX2RldmljZSIpOworICBpbnQgcF9s
ZW47CisgIGludCBlZF9sZW47CisgIGNvbnN0IGNoYXIgKnE7CisgIGNoYXIgKnBhdGg7CiAgIGNo
YXIgcGh5WzIxXTsKICAgaW50IGZkOwogICBzaXplX3QgcGF0aF9zaXplOwpAQCAtNDk4LDIwICs1
MDEsMTYgQEAgY2hlY2tfc2FzIChjb25zdCBjaGFyICpzeXNmc19wYXRoLCBpbnQgKnRndCwgdW5z
aWduZWQgbG9uZyBpbnQgKnNhc19hZGRyZXNzKQogICAgIHJldHVybjsKIAogICAvKiBTQVMgZGV2
aWNlcyBhcmUgaWRlbnRpZmllZCB1c2luZyBkaXNrQCRQSFlfSUQgKi8KLSAgcCA9IHhzdHJkdXAg
KHN5c2ZzX3BhdGgpOwotICBlZCA9IHN0cnN0cihwLCAiZW5kX2RldmljZSIpOwotICBpZiAoIWVk
KQotICAgIHJldHVybjsKLQogICBxID0gZWQ7CiAgIHdoaWxlICgqcSAmJiAqcSAhPSAnLycpCiAg
ICAgcSsrOwotICAqcSA9ICdcMCc7CisgIHBfbGVuID0gKGludCkgKHEgLSBzeXNmc19wYXRoKTsK
KyAgZWRfbGVuID0gKGludCkgKHEgLSBlZCk7CiAKLSAgcGF0aF9zaXplID0gKHN0cmxlbiAocCkg
KyBzdHJsZW4gKGVkKQotCSAgICAgICArIHNpemVvZiAoIiVzL3Nhc19kZXZpY2UvJXMvcGh5X2lk
ZW50aWZpZXIiKSk7CisgIHBhdGhfc2l6ZSA9IChwX2xlbiArIGVkX2xlbiArIHNpemVvZiAoIiVz
L3Nhc19kZXZpY2UvJXMvcGh5X2lkZW50aWZpZXIiKSk7CiAgIHBhdGggPSB4bWFsbG9jIChwYXRo
X3NpemUpOwotICBzbnByaW50ZiAocGF0aCwgcGF0aF9zaXplLCAiJXMvc2FzX2RldmljZS8lcy9w
aHlfaWRlbnRpZmllciIsIHAsIGVkKTsKKyAgc25wcmludGYgKHBhdGgsIHBhdGhfc2l6ZSwgIiUu
KnMvc2FzX2RldmljZS8lLipzL3BoeV9pZGVudGlmaWVyIiwgcF9sZW4sCisJICAgIHN5c2ZzX3Bh
dGgsIGVkX2xlbiwgZWQpOwogICBmZCA9IG9wZW4gKHBhdGgsIE9fUkRPTkxZKTsKICAgaWYgKGZk
IDwgMCkKICAgICBncnViX3V0aWxfZXJyb3IgKF8oImNhbm5vdCBvcGVuIGAlcyc6ICVzIiksIHBh
dGgsIHN0cmVycm9yIChlcnJubykpOwpAQCAtNTI0LDcgKzUyMyw4IEBAIGNoZWNrX3NhcyAoY29u
c3QgY2hhciAqc3lzZnNfcGF0aCwgaW50ICp0Z3QsIHVuc2lnbmVkIGxvbmcgaW50ICpzYXNfYWRk
cmVzcykKIAogICBzc2NhbmYgKHBoeSwgIiVkIiwgdGd0KTsKIAotICBzbnByaW50ZiAocGF0aCwg
cGF0aF9zaXplLCAiJXMvc2FzX2RldmljZS8lcy9zYXNfYWRkcmVzcyIsIHAsIGVkKTsKKyAgc25w
cmludGYgKHBhdGgsIHBhdGhfc2l6ZSwgIiUuKnMvc2FzX2RldmljZS8lLipzL3Nhc19hZGRyZXNz
IiwgcF9sZW4sCisJICAgIHN5c2ZzX3BhdGgsIGVkX2xlbiwgZWQpOwogICBmZCA9IG9wZW4gKHBh
dGgsIE9fUkRPTkxZKTsKICAgaWYgKGZkIDwgMCkKICAgICBncnViX3V0aWxfZXJyb3IgKF8oImNh
bm5vdCBvcGVuIGAlcyc6ICVzIiksIHBhdGgsIHN0cmVycm9yIChlcnJubykpOwpAQCAtNTM1LDcg
KzUzNSw2IEBAIGNoZWNrX3NhcyAoY29uc3QgY2hhciAqc3lzZnNfcGF0aCwgaW50ICp0Z3QsIHVu
c2lnbmVkIGxvbmcgaW50ICpzYXNfYWRkcmVzcykKICAgc3NjYW5mIChwaHksICIlbHgiLCBzYXNf
YWRkcmVzcyk7CiAKICAgZnJlZSAocGF0aCk7Ci0gIGZyZWUgKHApOwogICBjbG9zZSAoZmQpOwog
fQogCi0tIAoyLjUzLjAKCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f
X19fX19fXwpHcnViLWRldmVsIG1haWxpbmcgbGlzdApHcnViLWRldmVsQGdudS5vcmcKaHR0cHM6
Ly9saXN0cy5nbnUub3JnL21haWxtYW4vbGlzdGluZm8vZ3J1Yi1kZXZlbAo=