From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with archive (Exim 4.43) id 1DM51T-0007A3-Fv for mharc-grub-devel@gnu.org; Thu, 14 Apr 2005 10:08:47 -0400 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1DM51K-00075z-H9 for grub-devel@gnu.org; Thu, 14 Apr 2005 10:08:39 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1DM51E-00072D-Gi for grub-devel@gnu.org; Thu, 14 Apr 2005 10:08:34 -0400 Received: from [199.232.76.173] (helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1DM51E-00071H-6L for grub-devel@gnu.org; Thu, 14 Apr 2005 10:08:32 -0400 Received: from [217.12.11.36] (helo=smtp005.mail.ukl.yahoo.com) by monty-python.gnu.org with smtp (Exim 4.34) id 1DM51c-0005IX-QZ for grub-devel@gnu.org; Thu, 14 Apr 2005 10:08:57 -0400 Received: from unknown (HELO ?192.168.0.2?) (subdino2004@83.194.41.32 with plain) by smtp005.mail.ukl.yahoo.com with SMTP; 14 Apr 2005 14:08:17 -0000 Message-ID: <425E7979.101@yahoo.fr> Date: Thu, 14 Apr 2005 16:08:57 +0200 From: Vincent Pelletier User-Agent: Debian Thunderbird 1.0.2 (X11/20050331) X-Accept-Language: en-us, en MIME-Version: 1.0 To: The development of GRUB 2 References: <421A4CEA.5030603@yahoo.fr> <421F118C.5000504@yahoo.fr> <5118c6fb99a015e564cf60860935ce8d@penguinppc.org> <200502251812.04315.okuji@enbug.org> <425E181C.1000908@yahoo.fr> In-Reply-To: <425E181C.1000908@yahoo.fr> X-Enigmail-Version: 0.90.2.0 X-Enigmail-Supports: pgp-inline, pgp-mime Content-Type: multipart/mixed; boundary="------------060308040708070701000607" Subject: Re: [PATCHv2] dprintf implementation X-BeenThere: grub-devel@gnu.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: The development of GRUB 2 List-Id: The development of GRUB 2 List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 14 Apr 2005 14:08:44 -0000 This is a multi-part message in MIME format. --------------060308040708070701000607 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Here is a clean diff with that new grub_strword version. Vincent Pelletier 2005-04-14 Vincent Pelletier * include/grub/misc.h (grub_dprintf): New macro. (grub_real_dprintf): New prototype. (grub_strword): Likewise. (grub_iswordseparator): Likewise. * kern/misc.c (grub_real_dprintf): New function. (grub_strword): Likewise. (grub_iswordseparator): Likewise. --------------060308040708070701000607 Content-Type: audio/x-mp3; name="dprintf_3.diff" Content-Transfer-Encoding: base64 Content-Disposition: inline; filename="dprintf_3.diff" SW5kZXg6IGluY2x1ZGUvZ3J1Yi9taXNjLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQpSQ1MgZmlsZTogL2N2 c3Jvb3QvZ3J1Yi9ncnViMi9pbmNsdWRlL2dydWIvbWlzYy5oLHYKcmV0cmlldmluZyByZXZp c2lvbiAxLjEyCmRpZmYgLXUgLXAgLXIxLjEyIG1pc2MuaAotLS0gaW5jbHVkZS9ncnViL21p c2MuaAkyOSBKYW4gMjAwNSAyMjowMTo1MyAtMDAwMAkxLjEyCisrKyBpbmNsdWRlL2dydWIv bWlzYy5oCTE0IEFwciAyMDA1IDE0OjA0OjQ1IC0wMDAwCkBAIC0yNiw2ICsyNiw3IEBACiAj aW5jbHVkZSA8Z3J1Yi9zeW1ib2wuaD4KICNpbmNsdWRlIDxncnViL2Vyci5oPgogCisjZGVm aW5lIGdydWJfZHByaW50Zihjb25kaXRpb24sIGZtdCwgYXJncy4uLikgZ3J1Yl9yZWFsX2Rw cmludGYoX19GSUxFX18sIF9fTElORV9fLCBjb25kaXRpb24sIGZtdCwgYXJncyk7CiAvKiBY WFg6IElmIGdydWJfbWVtbW92ZSBpcyB0b28gc2xvdywgd2UgbXVzdCBpbXBsZW1lbnQgZ3J1 Yl9tZW1jcHkuICAqLwogI2RlZmluZSBncnViX21lbWNweShkLHMsbikJZ3J1Yl9tZW1tb3Zl ICgoZCksIChzKSwgKG4pKQogCkBAIC00Niw2ICs0Nyw4IEBAIGludCBFWFBPUlRfRlVOQyhn cnViX3N0cm5jbXApIChjb25zdCBjaGEKIGludCBFWFBPUlRfRlVOQyhncnViX3N0cm5jYXNl Y21wKSAoY29uc3QgY2hhciAqczEsIGNvbnN0IGNoYXIgKnMyLCBpbnQgYyk7CiBjaGFyICpF WFBPUlRfRlVOQyhncnViX3N0cmNocikgKGNvbnN0IGNoYXIgKnMsIGludCBjKTsKIGNoYXIg KkVYUE9SVF9GVU5DKGdydWJfc3RycmNocikgKGNvbnN0IGNoYXIgKnMsIGludCBjKTsKK2lu dCBFWFBPUlRfRlVOQyhncnViX3N0cndvcmQpIChjb25zdCBjaGFyICpzLCBjb25zdCBjaGFy ICp3KTsKK2ludCBFWFBPUlRfRlVOQyhncnViX2lzd29yZHNlcGFyYXRvcikgKGludCBjKTsK IGludCBFWFBPUlRfRlVOQyhncnViX2lzc3BhY2UpIChpbnQgYyk7CiBpbnQgRVhQT1JUX0ZV TkMoZ3J1Yl9pc3ByaW50KSAoaW50IGMpOwogaW50IEVYUE9SVF9GVU5DKGdydWJfaXNhbHBo YSkgKGludCBjKTsKQEAgLTU4LDYgKzYxLDEwIEBAIGNoYXIgKkVYUE9SVF9GVU5DKGdydWJf c3RybmR1cCkgKGNvbnN0IGMKIHZvaWQgKkVYUE9SVF9GVU5DKGdydWJfbWVtc2V0KSAodm9p ZCAqcywgaW50IGMsIGdydWJfc2l6ZV90IG4pOwogZ3J1Yl9zaXplX3QgRVhQT1JUX0ZVTkMo Z3J1Yl9zdHJsZW4pIChjb25zdCBjaGFyICpzKTsKIGludCBFWFBPUlRfRlVOQyhncnViX3By aW50ZikgKGNvbnN0IGNoYXIgKmZtdCwgLi4uKSBfX2F0dHJpYnV0ZV9fICgoZm9ybWF0IChw cmludGYsIDEsIDIpKSk7Cit2b2lkIEVYUE9SVF9GVU5DKGdydWJfcmVhbF9kcHJpbnRmKSAo Y29uc3QgY2hhciAqZmlsZSwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICBjb25zdCBpbnQgbGluZSwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICBjb25zdCBjaGFyICpjb25kaXRpb24sCisgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgY29uc3QgY2hhciAqZm10LCAuLi4pIF9fYXR0cmlidXRlX18gKChmb3JtYXQg KHByaW50ZiwgNCwgNSkpKTsKIGludCBFWFBPUlRfRlVOQyhncnViX3ZwcmludGYpIChjb25z dCBjaGFyICpmbXQsIHZhX2xpc3QgYXJncyk7CiBpbnQgRVhQT1JUX0ZVTkMoZ3J1Yl9zcHJp bnRmKSAoY2hhciAqc3RyLCBjb25zdCBjaGFyICpmbXQsIC4uLikgX19hdHRyaWJ1dGVfXyAo KGZvcm1hdCAocHJpbnRmLCAyLCAzKSkpOwogaW50IEVYUE9SVF9GVU5DKGdydWJfdnNwcmlu dGYpIChjaGFyICpzdHIsIGNvbnN0IGNoYXIgKmZtdCwgdmFfbGlzdCBhcmdzKTsKSW5kZXg6 IGtlcm4vbWlzYy5jCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT0KUkNTIGZpbGU6IC9jdnNyb290L2dydWIvZ3J1 YjIva2Vybi9taXNjLmMsdgpyZXRyaWV2aW5nIHJldmlzaW9uIDEuMTgKZGlmZiAtdSAtcCAt cjEuMTggbWlzYy5jCi0tLSBrZXJuL21pc2MuYwkxOSBGZWIgMjAwNSAyMDo1NjowNyAtMDAw MAkxLjE4CisrKyBrZXJuL21pc2MuYwkxNCBBcHIgMjAwNSAxNDowNDo0NiAtMDAwMApAQCAt MTI4LDYgKzEyOCwyMyBAQCBncnViX3ByaW50ZiAoY29uc3QgY2hhciAqZm10LCAuLi4pCiAg IHJldHVybiByZXQ7CiB9ICAKIAordm9pZAorZ3J1Yl9yZWFsX2RwcmludGYoY29uc3QgY2hh ciAqZmlsZSwgY29uc3QgaW50IGxpbmUsIGNvbnN0IGNoYXIgKmNvbmRpdGlvbiwKKyAgICAg ICAgICAgICAgICAgIGNvbnN0IGNoYXIgKmZtdCwgLi4uKQoreworICB2YV9saXN0IGFyZ3M7 CisgIGNvbnN0IGNoYXIgKmRlYnVnID0gZ3J1Yl9lbnZfZ2V0ICgiZGVidWciKTsKKyAgaWYg KCEgZGVidWcpCisgICAgcmV0dXJuOworICBpZiAoZ3J1Yl9zdHJ3b3JkIChkZWJ1ZywgImFs bCIpIHx8IGdydWJfc3Ryd29yZCAoZGVidWcsIGNvbmRpdGlvbikpCisgICAgeworICAgICAg Z3J1Yl9wcmludGYgKCIlcywlZCA6ICIsIGZpbGUsIGxpbmUpOworICAgICAgdmFfc3RhcnQg KGFyZ3MsIGZtdCk7CisgICAgICBncnViX3ZwcmludGYgKGZtdCwgYXJncyk7CisgICAgICB2 YV9lbmQgKGFyZ3MpOworICAgIH0KK30KKwogaW50CiBncnViX3ZwcmludGYgKGNvbnN0IGNo YXIgKmZtdCwgdmFfbGlzdCBhcmdzKQogewpAQCAtMjM4LDYgKzI1NSw0OSBAQCBncnViX3N0 cnJjaHIgKGNvbnN0IGNoYXIgKnMsIGludCBjKQogfQogCiBpbnQKK2dydWJfc3Ryd29yZCAo Y29uc3QgY2hhciAqaGF5c3RhY2ssIGNvbnN0IGNoYXIgKm5lZWRsZSkKK3sKKyAgY29uc3Qg Y2hhciAqbl9wb3MgPSBuZWVkbGU7CisKKyAgd2hpbGUgKGdydWJfaXN3b3Jkc2VwYXJhdG9y ICgqaGF5c3RhY2spKQorICAgIGhheXN0YWNrKys7CisKKyAgd2hpbGUgKCpoYXlzdGFjaykK KyAgICB7CisgICAgICAvKiBDcmF3bCBib3RoIHRoZSBuZWVkbGUgYW5kIHRoZSBoYXlzdGFj ayB3b3JkIHdlJ3JlIG9uLiAgKi8KKyAgICAgIHdoaWxlKCpoYXlzdGFjayAmJiAhZ3J1Yl9p c3dvcmRzZXBhcmF0b3IgKCpoYXlzdGFjaykKKyAgICAgICAgICAgICYmICpoYXlzdGFjayA9 PSAqbl9wb3MpCisgICAgICAgIHsKKyAgICAgICAgICBoYXlzdGFjaysrOworICAgICAgICAg IG5fcG9zKys7CisgICAgICAgIH0KKworICAgICAgLyogSWYgd2UgcmVhY2hlZCB0aGUgZW5k IG9mIGJvdGggd29yZHMgYXQgdGhlIHNhbWUgdGltZSwgdGhlIHdvcmQKKyAgICAgIGlzIGZv dW5kLiBJZiBub3QsIGVhdCBldmVyeXRoaW5nIGluIHRoZSBoYXlzdGFjayB0aGF0IGlzbid0 IHRoZQorICAgICAgbmV4dCB3b3JkIChvciB0aGUgZW5kIG9mIHN0cmluZykgYW5kICJyZXNl dCIgdGhlIG5lZWRsZS4gICovCisgICAgICBpZiAoICghKmhheXN0YWNrIHx8IGdydWJfaXN3 b3Jkc2VwYXJhdG9yICgqaGF5c3RhY2spKQorICAgICAgICAgJiYgKCEqbl9wb3MgfHwgZ3J1 Yl9pc3dvcmRzZXBhcmF0b3IgKCpuX3BvcykpKQorICAgICAgICByZXR1cm4gMTsKKyAgICAg IGVsc2UKKyAgICAgICAgeworICAgICAgICAgIG5fcG9zID0gbmVlZGxlOworICAgICAgICAg IHdoaWxlICgqaGF5c3RhY2sgJiYgIWdydWJfaXN3b3Jkc2VwYXJhdG9yICgqaGF5c3RhY2sp KQorICAgICAgICAgICAgaGF5c3RhY2srKzsKKyAgICAgICAgICB3aGlsZSAoZ3J1Yl9pc3dv cmRzZXBhcmF0b3IgKCpoYXlzdGFjaykpCisgICAgICAgICAgICBoYXlzdGFjaysrOworICAg ICAgICB9CisgICAgfQorCisgIHJldHVybiAwOworfQorCitpbnQKK2dydWJfaXN3b3Jkc2Vw YXJhdG9yIChpbnQgYykKK3sKKyAgcmV0dXJuIChncnViX2lzc3BhY2UgKGMpIHx8IGMgPT0g JywnIHx8IGMgPT0gJzsnIHx8IGMgPT0gJ3wnIHx8IGMgPT0gJyYnKTsKK30KKworaW50CiBn cnViX2lzc3BhY2UgKGludCBjKQogewogICByZXR1cm4gKGMgPT0gJ1xuJyB8fCBjID09ICdc cicgfHwgYyA9PSAnICcgfHwgYyA9PSAnXHQnKTsK --------------060308040708070701000607--