(resend)patch to beaglefs
guido iodice <[email protected]> Mon, 6 Jul 2009 10:42:59 +0200
| Newsgroups | gmane.comp.gnome.dashboard.devel |
|---|---|
| Message-ID | <[email protected]> |
--00504502bad0d49ebe046e058483 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: quoted-printable Dears, I'm a Beagle fan: http://guiodic.wordpress.com/category/gnulinux/guide-pratiche-gnulinux/beag= le-guide-pratiche-gnulinux-gnulinux/ I discovered that *beaglefs* has a bug because new beagle syntax. Sorry, I'm unable to use 'diff' and 'patch' properly. Changement is simple, in hit.c: beagle_query_add_text (query, "type:File OR type:IMLog"); /* CHANGHE */ /* beagle_query_add_text (query, "type:IMLog"); */ =A0 =A0 =A0 =A0/* DELETE= OR COMMENT THIS LINE*/ Thank you. --00504502bad0d49ebe046e058483 Content-Type: text/x-csrc; charset=US-ASCII; name="hit.c" Content-Disposition: attachment; filename="hit.c" Content-Transfer-Encoding: base64 X-Attachment-Id: f_fwstp0ph0 LyoKICogYmVhZ2xlZnMvaGl0LmMgLSBRdWVyeSBoaXQgcHJvY2Vzc2luZyBlbmdpbmUKICoKICog Um9iZXJ0IExvdmUgPHJtbEBub3ZlbGwuY29tPgogKgogKiBDb3B5cmlnaHQgKEMpIDIwMDYgUm9i ZXJ0IExvdmUKICoKICogTGljZW5zZWQgdW5kZXIgdGhlIHRlcm1zIG9mIHRoZSBHTlUgR1BMIHYy CiAqLwoKI2luY2x1ZGUgPHN0cmluZy5oPgoKI2luY2x1ZGUgPGJlYWdsZS9iZWFnbGUuaD4KI2lu Y2x1ZGUgPGdsaWIuaD4KCiNpbmNsdWRlICJoaXQuaCIKI2luY2x1ZGUgImlub2RlLmgiCiNpbmNs dWRlICJkaXIuaCIKCnN0YXRpYyBjaGFyICpxdWVyeV90ZXh0OwpzdGF0aWMgR01haW5Mb29wICpo aXRfbWFpbl9sb29wOwoKLyoKICogYmVhZ2xlX2hpdF9zZXRfcXVlcnkgLSBTZXQgdGhlIHF1ZXJ5 IHVzZWQgYnkgdGhlIGZpbGVzeXN0ZW0gdG8gJ3F1ZXJ5Jy4KICogQSBjb3B5IG9mICdxdWVyeScg aXMgbWFkZSBhbmQgbXVzdCBiZSBmcmVlZCB2aWEgZ19mcmVlKCkuCiAqLwp2b2lkCmJlYWdsZV9o aXRfc2V0X3F1ZXJ5IChjb25zdCBjaGFyICpxdWVyeSkKewoJZ19yZXR1cm5faWZfZmFpbCAocXVl cnkpOwoJcXVlcnlfdGV4dCA9IGdfc3RyZHVwIChxdWVyeSk7Cn0KCi8qCiAqIGhpdF90b19uZXdf aW5vZGUgLSBjcmVhdGUgYSBuZXcgYmVhZ2xlZnMgaW5vZGUgb2JqZWN0IHZpYSBiZWFnbGVfaW5v ZGVfbmV3KCkKICogYW5kIGluaXRpYWxpemUgaXRzIGRlZmF1bHQgdmFsdWVzIHZpYSBhIEJlYWds ZUhpdCBvYmplY3QuCiAqCiAqIFJldHVybnMgdGhlIG5ld2x5IGFsbG9jYXRlZCBpbm9kZSBvYmpl Y3QsIHdoaWNoIG11c3QgYmUgZnJlZWQgdmlhIGEgY2FsbCB0bwogKiBiZWFnbGVfaW5vZGVfZnJl ZSgpLgogKi8Kc3RhdGljIGJlYWdsZV9pbm9kZV90ICoKaGl0X3RvX25ld19pbm9kZSAoQmVhZ2xl SGl0ICpoaXQpCnsKCUJlYWdsZVRpbWVzdGFtcCAqaGl0X3RpbWU7CgliZWFnbGVfaW5vZGVfdCAq aW5vZGU7Cgl0aW1lX3QgdGltZXN0YW1wOwoKCWdfcmV0dXJuX3ZhbF9pZl9mYWlsIChoaXQsIE5V TEwpOwoKCWhpdF90aW1lID0gYmVhZ2xlX2hpdF9nZXRfdGltZXN0YW1wIChoaXQpOwoJaWYgKCFi ZWFnbGVfdGltZXN0YW1wX3RvX3VuaXhfdGltZSAoaGl0X3RpbWUsICZ0aW1lc3RhbXApKQoJCXRp bWUgKCZ0aW1lc3RhbXApOyAvKiBjdXJyZW50IHRpbWUgaXMgYmV0dGVyIHRoYW4gbm90aGluZyAq LwoKCWlub2RlID0gYmVhZ2xlX2lub2RlX25ldyAoYmVhZ2xlX2hpdF9nZXRfdXJpIChoaXQpLAoJ CQkJICB0aW1lc3RhbXAsCgkJCQkgIGJlYWdsZV9oaXRfZ2V0X21pbWVfdHlwZSAoaGl0KSwKCQkJ CSAgYmVhZ2xlX2hpdF9nZXRfdHlwZSAoaGl0KSwKCQkJCSAgYmVhZ2xlX2hpdF9nZXRfc291cmNl IChoaXQpLAoJCQkJICBiZWFnbGVfaGl0X2dldF9zY29yZSAoaGl0KSk7CgoJcmV0dXJuIGlub2Rl Owp9CgovKgogKiBoaXRzX2FkZGVkX2NiIC0gT3VyIGNhbGxiYWNrIGZvciB0aGUgbGliYmVhZ2xl ICJoaXRzLWFkZGVkIiBzaWduYWwuICBGb3IKICogZWFjaCBoaXQsIGNyZWF0ZSBhIG5ldyBpbm9k ZSBvYmplY3QgYW5kIGFkZCBpdCB0byB0aGUgZmlsZXN5c3RlbS4KICovCnN0YXRpYyB2b2lkCmhp dHNfYWRkZWRfY2IgKEdfR05VQ19VTlVTRUQgQmVhZ2xlUXVlcnkgKnF1ZXJ5LAoJICAgICAgIEJl YWdsZUhpdHNBZGRlZFJlc3BvbnNlICpyZXNwb25zZSkgCnsKCUdTTGlzdCAqaGl0cywgKmVsdDsK CgloaXRzID0gYmVhZ2xlX2hpdHNfYWRkZWRfcmVzcG9uc2VfZ2V0X2hpdHMgKHJlc3BvbnNlKTsK CWZvciAoZWx0ID0gaGl0czsgZWx0OyBlbHQgPSBnX3NsaXN0X25leHQgKGVsdCkpIHsKCQliZWFn bGVfaW5vZGVfdCAqaW5vZGU7CgoJCWlub2RlID0gaGl0X3RvX25ld19pbm9kZSAoQkVBR0xFX0hJ VCAoZWx0LT5kYXRhKSk7CgoJCWJlYWdsZV9kaXJfd3JpdGVfbG9jayAoKTsKCQliZWFnbGVfZGly X2FkZF9pbm9kZSAoaW5vZGUpOwoJCWJlYWdsZV9kaXJfd3JpdGVfdW5sb2NrKCk7Cgl9Cn0KCi8q CiAqIGhpdHNfc3VidHJhY3RlZF9jYiAtIE91ciBjYWxsYmFjayBmb3IgdGhlIGxpYmJlYWdsZSAi aGl0cy1zdWJ0cmFjdGVkIgogKiBzaWduYWwuICBGb3IgZWFjaCBoaXQsIHJlbW92ZSB0aGUgY29y cmVzcG9uZGluZyBpbm9kZSBmcm9tIHRoZSBmaWxlc3lzdGVtLgogKi8Kc3RhdGljIHZvaWQKaGl0 c19zdWJ0cmFjdGVkX2NiIChHX0dOVUNfVU5VU0VEIEJlYWdsZVF1ZXJ5ICpxdWVyeSwKCQkgICAg QmVhZ2xlSGl0c1N1YnRyYWN0ZWRSZXNwb25zZSAqcmVzcG9uc2UpIAp7CglHU0xpc3QgKmhpdHMs ICplbHQ7CgoJaGl0cyA9IGJlYWdsZV9oaXRzX3N1YnRyYWN0ZWRfcmVzcG9uc2VfZ2V0X3VyaXMg KHJlc3BvbnNlKTsKCWZvciAoZWx0ID0gaGl0czsgZWx0OyBlbHQgPSBnX3NsaXN0X25leHQgKGVs dCkpIHsKCQljb25zdCBjaGFyICpuYW1lOwoKCQluYW1lID0gc3RycmNociAoZWx0LT5kYXRhLCBH X0RJUl9TRVBBUkFUT1IpOwoKCQliZWFnbGVfZGlyX3dyaXRlX2xvY2sgKCk7CgkJYmVhZ2xlX2Rp cl9yZW1vdmVfaW5vZGVfYnlfbmFtZSAobmFtZSk7CgkJYmVhZ2xlX2Rpcl93cml0ZV91bmxvY2sg KCk7Cgl9Cn0KCnN0YXRpYyB2b2lkICoKaGl0X3RocmVhZF9zdGFydCAoR19HTlVDX1VOVVNFRCB2 b2lkICppZ25vcmVkKQp7CglCZWFnbGVDbGllbnQgKmNsaWVudDsKCUJlYWdsZVF1ZXJ5ICpxdWVy eTsKCUJlYWdsZVJlcXVlc3QgKnJlcXVlc3Q7CgoJY2xpZW50ID0gYmVhZ2xlX2NsaWVudF9uZXcg KE5VTEwpOwoJaWYgKCFjbGllbnQpCgkJZ19jcml0aWNhbCAoIkZhaWxlZCB0byBpbnN0YW50aWF0 ZSBhIEJlYWdsZUNsaWVudC4iKTsKCgloaXRfbWFpbl9sb29wID0gZ19tYWluX2xvb3BfbmV3IChO VUxMLCBGQUxTRSk7CglxdWVyeSA9IGJlYWdsZV9xdWVyeV9uZXcgKCk7CglyZXF1ZXN0ID0gQkVB R0xFX1JFUVVFU1QgKHF1ZXJ5KTsKCgliZWFnbGVfcXVlcnlfYWRkX3RleHQgKHF1ZXJ5LCBxdWVy eV90ZXh0KTsKCWJlYWdsZV9xdWVyeV9hZGRfdGV4dCAocXVlcnksICJ0eXBlOkZpbGUgT1IgdHlw ZTpJTUxvZyIpOyAvKiBDSEFOR0hFICovCgkvKiBiZWFnbGVfcXVlcnlfYWRkX3RleHQgKHF1ZXJ5 LCAidHlwZTpJTUxvZyIpOyAqLyAgICAgICAgLyogREVMRVRFIFRISVMgKi8gCgoKCWdfc2lnbmFs X2Nvbm5lY3QgKHF1ZXJ5LAoJCQkgICJoaXRzLWFkZGVkIiwKCQkJICBHX0NBTExCQUNLIChoaXRz X2FkZGVkX2NiKSwKCQkJICBjbGllbnQpOwoKCWdfc2lnbmFsX2Nvbm5lY3QgKHF1ZXJ5LAoJCQkg ICJoaXRzLXN1YnRyYWN0ZWQiLAoJCQkgIEdfQ0FMTEJBQ0sgKGhpdHNfc3VidHJhY3RlZF9jYiks CgkJCSAgY2xpZW50KTsKCglpZiAoIWJlYWdsZV9jbGllbnRfc2VuZF9yZXF1ZXN0X2FzeW5jIChj bGllbnQsIHJlcXVlc3QsIE5VTEwpKQoJCWdfY3JpdGljYWwgKCJGYWlsZWQgdG8gc2VuZCBCZWFn bGVRdWVyeSB0byBCZWFnbGUuIik7CgoJZ19tYWluX2xvb3BfcnVuIChoaXRfbWFpbl9sb29wKTsK CglnX29iamVjdF91bnJlZiAocXVlcnkpOwoJZ19vYmplY3RfdW5yZWYgKGNsaWVudCk7CglnX21h aW5fbG9vcF91bnJlZiAoaGl0X21haW5fbG9vcCk7CglnX2ZyZWUgKHF1ZXJ5X3RleHQpOwoKCXJl dHVybiBOVUxMOwp9CgovKgogKiBiZWFnbGVfaGl0X2luaXQgLSBJbml0aWFsaXplIHRoZSBoaXQg ZW5naW5lLgogKi8Kdm9pZApiZWFnbGVfaGl0X2luaXQgKHZvaWQpCnsKCWdfdGhyZWFkX2luaXQg KE5VTEwpOwoJZ190eXBlX2luaXQgKCk7CgoJaWYgKCFnX3RocmVhZF9jcmVhdGUgKGhpdF90aHJl YWRfc3RhcnQsIE5VTEwsIEZBTFNFLCBOVUxMKSkKCQlnX2NyaXRpY2FsICgiRmFpbGVkIHRvIGxh dW5jaCBoaXQgZW5naW5lIHRocmVhZC4iKTsKfQoKLyoKICogYmVhZ2xlX2hpdF9kZXN0cm95IC0g Rm9yY2UgYSByZXR1cm4gZnJvbSB0aGUgbWFpbiBsb29wLCBkZXN0cm95aW5nIHRoZSBoaXQKICog ZW5naW5lIHRocmVhZC4KICovCnZvaWQKYmVhZ2xlX2hpdF9kZXN0cm95ICh2b2lkKQp7CglnX21h aW5fbG9vcF9xdWl0IChoaXRfbWFpbl9sb29wKTsKfQo= --00504502bad0d49ebe046e058483 Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ Dashboard-hackers mailing list [email protected] http://mail.gnome.org/mailman/listinfo/dashboard-hackers --00504502bad0d49ebe046e058483--