63063 2011-06-21 06:01:33 -0700 [EFL] Use accept attribute when executing the file picker for input element 2011-06-27 03:46:13 -0700 1 1 1 Unclassified WebKit WebKit EFL 528+ (Nightly build) Other Linux RESOLVED FIXED P2 Normal --- 0 js45.yang webkit-unassigned gyuyoung.kim lucas.de.marchi rakuco ryuan.choi webkit.review.bot oldest_to_newest 424413 0 js45.yang 2011-06-21 06:01:33 -0700 The accept attribute is only used with <input type="file"> and it specifies the types of files that can be submitted through a file upload. EFL port should use the attribute within the function "ChromeClientEfl::runOpenPanel()" 424419 1 97977 js45.yang 2011-06-21 06:29:22 -0700 Created attachment 97977 Use accept attribute for the file picker for INPUT element 424436 2 ryuan.choi 2011-06-21 07:05:24 -0700 Good point. I didn't know that file type should control 'accept'. Anyway. Could you explain little bit about why we can remove suggestedFilenames. View in context: https://bugs.webkit.org/attachment.cgi?id=97977&action=review > Source/WebKit/efl/WebCoreSupport/ChromeClientEfl.cpp:429 > + CString accept = chooser->acceptTypes().utf8(); > + confirm = ewk_view_run_open_panel(m_view, kit(frame), chooser->allowsMultipleFiles(), accept.data(), &selectedFilenames); And as small thing, I think that it's no need to store it into accept. 424775 3 97977 leandro 2011-06-21 14:56:24 -0700 Comment on attachment 97977 Use accept attribute for the file picker for INPUT element Looks good; but please fix the naming scheme on the ewk_* files. 424952 4 97977 gyuyoung.kim 2011-06-21 19:06:11 -0700 Comment on attachment 97977 Use accept attribute for the file picker for INPUT element View in context: https://bugs.webkit.org/attachment.cgi?id=97977&action=review > Source/WebKit/efl/ewk/ewk_private.h:99 > +Eina_Bool ewk_view_run_open_panel(Evas_Object* o, Evas_Object* frame, Eina_Bool allows_multiple_files, const char* acceptTypes, Eina_List** selected_filenames); For efl style, it is better to change acceptTypes with accept_types. 424973 5 98105 js45.yang 2011-06-21 19:51:05 -0700 Created attachment 98105 fix the naming scheme 424974 6 js45.yang 2011-06-21 20:00:04 -0700 (In reply to comment #2) > Good point. > I didn't know that file type should control 'accept'. > > Anyway. > Could you explain little bit about why we can remove suggestedFilenames. > > View in context: https://bugs.webkit.org/attachment.cgi?id=97977&action=review > > > Source/WebKit/efl/WebCoreSupport/ChromeClientEfl.cpp:429 > > + CString accept = chooser->acceptTypes().utf8(); > > + confirm = ewk_view_run_open_panel(m_view, kit(frame), chooser->allowsMultipleFiles(), accept.data(), &selectedFilenames); > > And as small thing, I think that it's no need to store it into accept. I had thought that suggestedFilenames was not required. I found out the below statement from HTML4 specification and I could not find out any comment about that from HTML5 "Creates a file select control. User agents may use the value of the value attribute as the initial file name." I think that it's just implementation choice. If you want to use the value, I will fix that. 424977 7 ryuan.choi 2011-06-21 20:06:01 -0700 (In reply to comment #6) > (In reply to comment #2) > > Good point. > > I didn't know that file type should control 'accept'. > > > > Anyway. > > Could you explain little bit about why we can remove suggestedFilenames. > > > > View in context: https://bugs.webkit.org/attachment.cgi?id=97977&action=review > > > > > Source/WebKit/efl/WebCoreSupport/ChromeClientEfl.cpp:429 > > > + CString accept = chooser->acceptTypes().utf8(); > > > + confirm = ewk_view_run_open_panel(m_view, kit(frame), chooser->allowsMultipleFiles(), accept.data(), &selectedFilenames); > > > > And as small thing, I think that it's no need to store it into accept. > > I had thought that suggestedFilenames was not required. > I found out the below statement from HTML4 specification and I could not find out any comment about that from HTML5 > "Creates a file select control. User agents may use the value of the value attribute as the initial file name." > > I think that it's just implementation choice. > If you want to use the value, I will fix that. Thanks, I agree with you. I couldn't find any way to give suggestedFilenames also. 426780 8 98471 js45.yang 2011-06-24 01:03:48 -0700 Created attachment 98471 fix the naming scheme fix the naming scheme from ewk_view.cpp 426805 9 98471 tkent 2011-06-24 03:37:58 -0700 Comment on attachment 98471 fix the naming scheme r- because of EWS failures. 427687 10 98666 js45.yang 2011-06-26 23:39:55 -0700 Created attachment 98666 fix build error The cause for build error was that The FileChooser interface was changed by other-side. I applied the new interface for FileChooser to my patch. 427704 11 98666 gyuyoung.kim 2011-06-27 00:04:57 -0700 Comment on attachment 98666 fix build error LGTM. 427825 12 98666 tkent 2011-06-27 03:02:31 -0700 Comment on attachment 98666 fix build error Rubber-stamped by me 427832 13 98666 webkit.review.bot 2011-06-27 03:46:08 -0700 Comment on attachment 98666 fix build error Clearing flags on attachment: 98666 Committed r89812: <http://trac.webkit.org/changeset/89812> 427833 14 webkit.review.bot 2011-06-27 03:46:13 -0700 All reviewed patches have been landed. Closing bug. 97977 2011-06-21 06:29:22 -0700 2011-06-21 19:56:06 -0700 Use accept attribute for the file picker for INPUT element patch_file.patch text/plain 6056 js45.yang SW5kZXg6IFNvdXJjZS9XZWJLaXQvZWZsL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2Uv V2ViS2l0L2VmbC9DaGFuZ2VMb2cJKHJldmlzaW9uIDg5MzQ5KQorKysgU291cmNlL1dlYktpdC9l ZmwvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMjEgQEAKKzIwMTEtMDYtMjEg IEpvbmdzZW9rIFlhbmcgIDxqczQ1LnlhbmdAc2Ftc3VuZy5jb20+CisKKyAgICAgICAgUmV2aWV3 ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgW0VGTF0gVXNlIGFjY2VwdCBhdHRyaWJ1 dGUgd2hlbiBleGVjdXRpbmcgdGhlIGZpbGUgcGlja2VyIGZvciBpbnB1dCBlbGVtZW50CisgICAg ICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD02MzA2MworCisgICAg ICAgIFRoaXMgcGF0Y2g6CisgICAgICAgICAtIHJlbW92ZSB0aGUgYXJndW1lbnQgInN1Z2dlc3Rl ZF9maWxlbmFtZXMiIGZyb20gZXdrX3ZpZXdfcnVuX29wZW5fcGFuZWwKKyAgICAgICAgIC0gYWRk IHRoZSBhcmd1bWVudCAiYWNjZXB0IiB0byBld2tfdmlld19ydW5fb3Blbl9wYW5lbAorICAgICAg ICAgLSBnZXQgdGhlIGFjY2VwdCBhdHRyaWJ1dGUgYW5kIHBhc3MgdG8gZXdrX3ZpZXdfcnVuX29w ZW5fcGFuZWwgd2l0aGluIHJ1bk9wZW5QYW5lbAorCisgICAgICAgICogV2ViQ29yZVN1cHBvcnQv Q2hyb21lQ2xpZW50RWZsLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkNocm9tZUNsaWVudEVmbDo6 cnVuT3BlblBhbmVsKToKKyAgICAgICAgKiBld2svZXdrX3ZpZXcuY3BwCisgICAgICAgIChld2tf dmlld19ydW5fb3Blbl9wYW5lbCk6CisgICAgICAgICogZXdrL2V3a192aWV3LmgKKwogMjAxMS0w Ni0yMCAgR3l1eW91bmcgS2ltICA8Z3l1eW91bmcua2ltQHNhbXN1bmcuY29tPgogCiAgICAgICAg IFVucmV2aWV3ZWQuIEZpeCBzdHlsZSBlcnJvci4KSW5kZXg6IFNvdXJjZS9XZWJLaXQvZWZsL1dl YkNvcmVTdXBwb3J0L0Nocm9tZUNsaWVudEVmbC5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dl YktpdC9lZmwvV2ViQ29yZVN1cHBvcnQvQ2hyb21lQ2xpZW50RWZsLmNwcAkocmV2aXNpb24gODkz MzkpCisrKyBTb3VyY2UvV2ViS2l0L2VmbC9XZWJDb3JlU3VwcG9ydC9DaHJvbWVDbGllbnRFZmwu Y3BwCSh3b3JraW5nIGNvcHkpCkBAIC00MjIsMTkgKzQyMiwxMSBAQCB2b2lkIENocm9tZUNsaWVu dEVmbDo6cnVuT3BlblBhbmVsKEZyYW1lCiAgICAgUmVmUHRyPEZpbGVDaG9vc2VyPiBjaG9vc2Vy ID0gcHJwRmlsZUNob29zZXI7CiAgICAgYm9vbCBjb25maXJtOwogICAgIEVpbmFfTGlzdCogc2Vs ZWN0ZWRGaWxlbmFtZXMgPSAwOwotICAgIEVpbmFfTGlzdCogc3VnZ2VzdGVkRmlsZW5hbWVzID0g MDsKICAgICB2b2lkKiBmaWxlbmFtZTsKICAgICBWZWN0b3I8U3RyaW5nPiBmaWxlbmFtZXM7CiAK LSAgICBmb3IgKHVuc2lnbmVkIGkgPSAwOyBpIDwgY2hvb3Nlci0+ZmlsZW5hbWVzKCkuc2l6ZSgp OyBpKyspIHsKLSAgICAgICAgQ1N0cmluZyBzdHIgPSBjaG9vc2VyLT5maWxlbmFtZXMoKVtpXS51 dGY4KCk7Ci0gICAgICAgIGZpbGVuYW1lID0gc3RyZHVwKHN0ci5kYXRhKCkpOwotICAgICAgICBz dWdnZXN0ZWRGaWxlbmFtZXMgPSBlaW5hX2xpc3RfYXBwZW5kKHN1Z2dlc3RlZEZpbGVuYW1lcywg ZmlsZW5hbWUpOwotICAgIH0KLQotICAgIGNvbmZpcm0gPSBld2tfdmlld19ydW5fb3Blbl9wYW5l bChtX3ZpZXcsIGtpdChmcmFtZSksIGNob29zZXItPmFsbG93c011bHRpcGxlRmlsZXMoKSwgc3Vn Z2VzdGVkRmlsZW5hbWVzLCAmc2VsZWN0ZWRGaWxlbmFtZXMpOwotICAgIEVJTkFfTElTVF9GUkVF KHN1Z2dlc3RlZEZpbGVuYW1lcywgZmlsZW5hbWUpCi0gICAgICAgIGZyZWUoZmlsZW5hbWUpOwor ICAgIENTdHJpbmcgYWNjZXB0ID0gY2hvb3Nlci0+YWNjZXB0VHlwZXMoKS51dGY4KCk7CisgICAg Y29uZmlybSA9IGV3a192aWV3X3J1bl9vcGVuX3BhbmVsKG1fdmlldywga2l0KGZyYW1lKSwgY2hv b3Nlci0+YWxsb3dzTXVsdGlwbGVGaWxlcygpLCBhY2NlcHQuZGF0YSgpLCAmc2VsZWN0ZWRGaWxl bmFtZXMpOwogCiAgICAgaWYgKCFjb25maXJtKQogICAgICAgICByZXR1cm47CkluZGV4OiBTb3Vy Y2UvV2ViS2l0L2VmbC9ld2svZXdrX3ByaXZhdGUuaAo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi S2l0L2VmbC9ld2svZXdrX3ByaXZhdGUuaAkocmV2aXNpb24gODkzMzkpCisrKyBTb3VyY2UvV2Vi S2l0L2VmbC9ld2svZXdrX3ByaXZhdGUuaAkod29ya2luZyBjb3B5KQpAQCAtOTYsNyArOTYsNyBA QCBFaW5hX0Jvb2wgZXdrX3ZpZXdfcnVuX2phdmFzY3JpcHRfcHJvbXB0CiBFaW5hX0Jvb2wgZXdr X3ZpZXdfc2hvdWxkX2ludGVycnVwdF9qYXZhc2NyaXB0KEV2YXNfT2JqZWN0ICpvKTsKIHVpbnQ2 NF90IGV3a192aWV3X2V4Y2VlZGVkX2RhdGFiYXNlX3F1b3RhKEV2YXNfT2JqZWN0ICpvLCBFdmFz X09iamVjdCAqZnJhbWUsIGNvbnN0IGNoYXIgKmRhdGFiYXNlTmFtZSwgdWludDY0X3QgY3VycmVu dF9zaXplLCB1aW50NjRfdCBleHBlY3RlZF9zaXplKTsKIAotRWluYV9Cb29sIGV3a192aWV3X3J1 bl9vcGVuX3BhbmVsKEV2YXNfT2JqZWN0ICpvLCBFdmFzX09iamVjdCAqZnJhbWUsIEVpbmFfQm9v bCBhbGxvd3NfbXVsdGlwbGVfZmlsZXMsIGNvbnN0IEVpbmFfTGlzdCAqc3VnZ2VzdGVkX2ZpbGVu YW1lcywgRWluYV9MaXN0ICoqc2VsZWN0ZWRfZmlsZW5hbWVzKTsKK0VpbmFfQm9vbCBld2tfdmll d19ydW5fb3Blbl9wYW5lbChFdmFzX09iamVjdCogbywgRXZhc19PYmplY3QqIGZyYW1lLCBFaW5h X0Jvb2wgYWxsb3dzX211bHRpcGxlX2ZpbGVzLCBjb25zdCBjaGFyKiBhY2NlcHRUeXBlcywgRWlu YV9MaXN0Kiogc2VsZWN0ZWRfZmlsZW5hbWVzKTsKIAogdm9pZCBld2tfdmlld19yZXBhaW50KEV2 YXNfT2JqZWN0ICpvLCBFdmFzX0Nvb3JkIHgsIEV2YXNfQ29vcmQgeSwgRXZhc19Db29yZCB3LCBF dmFzX0Nvb3JkIGgpOwogdm9pZCBld2tfdmlld19zY3JvbGwoRXZhc19PYmplY3QgKm8sIEV2YXNf Q29vcmQgZHgsIEV2YXNfQ29vcmQgZHksIEV2YXNfQ29vcmQgc3gsIEV2YXNfQ29vcmQgc3ksIEV2 YXNfQ29vcmQgc3csIEV2YXNfQ29vcmQgc2gsIEV2YXNfQ29vcmQgY3gsIEV2YXNfQ29vcmQgY3ks IEV2YXNfQ29vcmQgY3csIEV2YXNfQ29vcmQgY2gsIEVpbmFfQm9vbCBtYWluX2ZyYW1lKTsKSW5k ZXg6IFNvdXJjZS9XZWJLaXQvZWZsL2V3ay9ld2tfdmlldy5jcHAKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL1dlYktpdC9lZmwvZXdrL2V3a192aWV3LmNwcAkocmV2aXNpb24gODkzMzkpCisrKyBTb3Vy Y2UvV2ViS2l0L2VmbC9ld2svZXdrX3ZpZXcuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0zOTkwLDEz ICszOTkwLDEyIEBAIHVpbnQ2NF90IGV3a192aWV3X2V4Y2VlZGVkX2RhdGFiYXNlX3F1b3QKICAq IEBwYXJhbSBmcmFtZSBGcmFtZSBpbiB3aGljaCBvcGVyYXRpb24gaXMgcmVxdWlyZWQuCiAgKiBA cGFyYW0gYWxsb3dzX211bHRpcGxlX2ZpbGVzIEBjIEVJTkFfVFJVRSB3aGVuIG1vcmUgdGhhbiBv bmUgZmlsZSBtYXkgYmUKICAqIHNlbGVjdGVkLCBAYyBFSU5BX0ZBTFNFIG90aGVyd2lzZQotICog QHN1Z2dlc3RlZF9maWxlbmFtZXMgTGlzdCBvZiBzdWdnZXN0ZWQgZmlsZXMgdG8gc2VsZWN0LiBJ dCdzIGFkdmlzYWJsZSB0bwotICoganVzdCBpZ25vcmUgdGhpcyB2YWx1ZSwgc2luY2UgaXQncyBh IHNvdXJjZSBvZiBzZWN1cml0eSBmbGF3LgorICogQHBhcmFtIGFjY2VwdFR5cGVzIGFjY2VwdCBt aW1lIHR5cGVzCiAgKiBAc2VsZWN0ZWRfZmlsZW5hbWVzIExpc3Qgb2YgZmlsZXMgc2VsZWN0ZWQu CiAgKgogICogQHJldHVybiBARUlOQV9GQUxTRSBpZiB1c2VyIGNhbmNlbGVkIGZpbGUgc2VsZWN0 aW9uOyBARUlOQV9UUlVFIGlmIGNvbmZpcm1lZC4KICAqLwotRWluYV9Cb29sIGV3a192aWV3X3J1 bl9vcGVuX3BhbmVsKEV2YXNfT2JqZWN0KiBvLCBFdmFzX09iamVjdCogZnJhbWUsIEVpbmFfQm9v bCBhbGxvd3NfbXVsdGlwbGVfZmlsZXMsIGNvbnN0IEVpbmFfTGlzdCogc3VnZ2VzdGVkX2ZpbGVu YW1lcywgRWluYV9MaXN0Kiogc2VsZWN0ZWRfZmlsZW5hbWVzKQorRWluYV9Cb29sIGV3a192aWV3 X3J1bl9vcGVuX3BhbmVsKEV2YXNfT2JqZWN0KiBvLCBFdmFzX09iamVjdCogZnJhbWUsIEVpbmFf Qm9vbCBhbGxvd3NfbXVsdGlwbGVfZmlsZXMsIGNvbnN0IGNoYXIqIGFjY2VwdFR5cGVzLCBFaW5h X0xpc3QqKiBzZWxlY3RlZF9maWxlbmFtZXMpCiB7CiAgICAgREJHKCJvPSVwIGZyYW1lPSVwIGFs bG93c19tdWx0aXBsZV9maWxlcz0lZCIsIG8sIGZyYW1lLCBhbGxvd3NfbXVsdGlwbGVfZmlsZXMp OwogICAgIEVXS19WSUVXX1NEX0dFVF9PUl9SRVRVUk4obywgc2QsIEVJTkFfRkFMU0UpOwpAQCAt NDAwOCw3ICs0MDA3LDcgQEAgRWluYV9Cb29sIGV3a192aWV3X3J1bl9vcGVuX3BhbmVsKEV2YXNf TwogCiAgICAgKnNlbGVjdGVkX2ZpbGVuYW1lcyA9IDA7CiAKLSAgICBjb25maXJtID0gc2QtPmFw aS0+cnVuX29wZW5fcGFuZWwoc2QsIGZyYW1lLCBhbGxvd3NfbXVsdGlwbGVfZmlsZXMsIHN1Z2dl c3RlZF9maWxlbmFtZXMsIHNlbGVjdGVkX2ZpbGVuYW1lcyk7CisgICAgY29uZmlybSA9IHNkLT5h cGktPnJ1bl9vcGVuX3BhbmVsKHNkLCBmcmFtZSwgYWxsb3dzX211bHRpcGxlX2ZpbGVzLCBhY2Nl cHRUeXBlcywgc2VsZWN0ZWRfZmlsZW5hbWVzKTsKICAgICBpZiAoIWNvbmZpcm0gJiYgKnNlbGVj dGVkX2ZpbGVuYW1lcykKICAgICAgICAgRVJSKCJDYW5jZWxlZCBmaWxlIHNlbGVjdGlvbiwgYnV0 IHNlbGVjdGVkIGZpbGVuYW1lcyAhPSAwLiBGcmVlIG5hbWVzIGJlZm9yZSByZXR1cm4uIik7CiAg ICAgcmV0dXJuIGNvbmZpcm07CkluZGV4OiBTb3VyY2UvV2ViS2l0L2VmbC9ld2svZXdrX3ZpZXcu aAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0L2VmbC9ld2svZXdrX3ZpZXcuaAkocmV2aXNp b24gODkzMzkpCisrKyBTb3VyY2UvV2ViS2l0L2VmbC9ld2svZXdrX3ZpZXcuaAkod29ya2luZyBj b3B5KQpAQCAtMTM4LDcgKzEzOCw3IEBAIHN0cnVjdCBfRXdrX1ZpZXdfU21hcnRfQ2xhc3Mgewog ICAgIEVpbmFfQm9vbCAoKnNob3VsZF9pbnRlcnJ1cHRfamF2YXNjcmlwdCkoRXdrX1ZpZXdfU21h cnRfRGF0YSAqc2QpOwogICAgIHVpbnQ2NF90ICgqZXhjZWVkZWRfZGF0YWJhc2VfcXVvdGEpKEV3 a19WaWV3X1NtYXJ0X0RhdGEgKnNkLCBFdmFzX09iamVjdCAqZnJhbWUsIGNvbnN0IGNoYXIgKmRh dGFiYXNlTmFtZSwgdWludDY0X3QgY3VycmVudF9zaXplLCB1aW50NjRfdCBleHBlY3RlZF9zaXpl KTsKIAotICAgIEVpbmFfQm9vbCAoKnJ1bl9vcGVuX3BhbmVsKShFd2tfVmlld19TbWFydF9EYXRh ICpzZCwgRXZhc19PYmplY3QgKmZyYW1lLCBFaW5hX0Jvb2wgYWxsb3dzX211bHRpcGxlX2ZpbGVz LCBjb25zdCBFaW5hX0xpc3QgKnN1Z2dlc3RlZF9maWxlbmFtZXMsIEVpbmFfTGlzdCAqKnNlbGVj dGVkX2ZpbGVuYW1lcyk7CisgICAgRWluYV9Cb29sICgqcnVuX29wZW5fcGFuZWwpKEV3a19WaWV3 X1NtYXJ0X0RhdGEgKnNkLCBFdmFzX09iamVjdCAqZnJhbWUsIEVpbmFfQm9vbCBhbGxvd3NfbXVs dGlwbGVfZmlsZXMsIGNvbnN0IGNoYXIqIGFjY2VwdFR5cGVzLCBFaW5hX0xpc3QqKiBzZWxlY3Rl ZF9maWxlbmFtZXMpOwogCiAgICAgRWluYV9Cb29sICgqbmF2aWdhdGlvbl9wb2xpY3lfZGVjaXNp b24pKEV3a19WaWV3X1NtYXJ0X0RhdGEgKnNkLCBFd2tfRnJhbWVfUmVzb3VyY2VfUmVxdWVzdCAq cmVxdWVzdCk7CiB9Owo= 98105 2011-06-21 19:51:05 -0700 2011-06-24 01:03:48 -0700 fix the naming scheme patch_file2.patch text/plain 6060 js45.yang SW5kZXg6IFNvdXJjZS9XZWJLaXQvZWZsL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2Uv V2ViS2l0L2VmbC9DaGFuZ2VMb2cJKHJldmlzaW9uIDg5MzQ5KQorKysgU291cmNlL1dlYktpdC9l ZmwvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMjEgQEAKKzIwMTEtMDYtMjEg IEpvbmdzZW9rIFlhbmcgIDxqczQ1LnlhbmdAc2Ftc3VuZy5jb20+CisKKyAgICAgICAgUmV2aWV3 ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgW0VGTF0gVXNlIGFjY2VwdCBhdHRyaWJ1 dGUgd2hlbiBleGVjdXRpbmcgdGhlIGZpbGUgcGlja2VyIGZvciBpbnB1dCBlbGVtZW50CisgICAg ICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD02MzA2MworCisgICAg ICAgIFRoaXMgcGF0Y2g6CisgICAgICAgICAtIHJlbW92ZSB0aGUgYXJndW1lbnQgInN1Z2dlc3Rl ZF9maWxlbmFtZXMiIGZyb20gZXdrX3ZpZXdfcnVuX29wZW5fcGFuZWwKKyAgICAgICAgIC0gYWRk IHRoZSBhcmd1bWVudCAiYWNjZXB0IiB0byBld2tfdmlld19ydW5fb3Blbl9wYW5lbAorICAgICAg ICAgLSBnZXQgdGhlIGFjY2VwdCBhdHRyaWJ1dGUgYW5kIHBhc3MgdG8gZXdrX3ZpZXdfcnVuX29w ZW5fcGFuZWwgd2l0aGluIHJ1bk9wZW5QYW5lbAorCisgICAgICAgICogV2ViQ29yZVN1cHBvcnQv Q2hyb21lQ2xpZW50RWZsLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkNocm9tZUNsaWVudEVmbDo6 cnVuT3BlblBhbmVsKToKKyAgICAgICAgKiBld2svZXdrX3ZpZXcuY3BwCisgICAgICAgIChld2tf dmlld19ydW5fb3Blbl9wYW5lbCk6CisgICAgICAgICogZXdrL2V3a192aWV3LmgKKwogMjAxMS0w Ni0yMCAgR3l1eW91bmcgS2ltICA8Z3l1eW91bmcua2ltQHNhbXN1bmcuY29tPgogCiAgICAgICAg IFVucmV2aWV3ZWQuIEZpeCBzdHlsZSBlcnJvci4KSW5kZXg6IFNvdXJjZS9XZWJLaXQvZWZsL1dl YkNvcmVTdXBwb3J0L0Nocm9tZUNsaWVudEVmbC5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dl YktpdC9lZmwvV2ViQ29yZVN1cHBvcnQvQ2hyb21lQ2xpZW50RWZsLmNwcAkocmV2aXNpb24gODkz MzkpCisrKyBTb3VyY2UvV2ViS2l0L2VmbC9XZWJDb3JlU3VwcG9ydC9DaHJvbWVDbGllbnRFZmwu Y3BwCSh3b3JraW5nIGNvcHkpCkBAIC00MjIsMTkgKzQyMiwxMSBAQCB2b2lkIENocm9tZUNsaWVu dEVmbDo6cnVuT3BlblBhbmVsKEZyYW1lCiAgICAgUmVmUHRyPEZpbGVDaG9vc2VyPiBjaG9vc2Vy ID0gcHJwRmlsZUNob29zZXI7CiAgICAgYm9vbCBjb25maXJtOwogICAgIEVpbmFfTGlzdCogc2Vs ZWN0ZWRGaWxlbmFtZXMgPSAwOwotICAgIEVpbmFfTGlzdCogc3VnZ2VzdGVkRmlsZW5hbWVzID0g MDsKICAgICB2b2lkKiBmaWxlbmFtZTsKICAgICBWZWN0b3I8U3RyaW5nPiBmaWxlbmFtZXM7CiAK LSAgICBmb3IgKHVuc2lnbmVkIGkgPSAwOyBpIDwgY2hvb3Nlci0+ZmlsZW5hbWVzKCkuc2l6ZSgp OyBpKyspIHsKLSAgICAgICAgQ1N0cmluZyBzdHIgPSBjaG9vc2VyLT5maWxlbmFtZXMoKVtpXS51 dGY4KCk7Ci0gICAgICAgIGZpbGVuYW1lID0gc3RyZHVwKHN0ci5kYXRhKCkpOwotICAgICAgICBz dWdnZXN0ZWRGaWxlbmFtZXMgPSBlaW5hX2xpc3RfYXBwZW5kKHN1Z2dlc3RlZEZpbGVuYW1lcywg ZmlsZW5hbWUpOwotICAgIH0KLQotICAgIGNvbmZpcm0gPSBld2tfdmlld19ydW5fb3Blbl9wYW5l bChtX3ZpZXcsIGtpdChmcmFtZSksIGNob29zZXItPmFsbG93c011bHRpcGxlRmlsZXMoKSwgc3Vn Z2VzdGVkRmlsZW5hbWVzLCAmc2VsZWN0ZWRGaWxlbmFtZXMpOwotICAgIEVJTkFfTElTVF9GUkVF KHN1Z2dlc3RlZEZpbGVuYW1lcywgZmlsZW5hbWUpCi0gICAgICAgIGZyZWUoZmlsZW5hbWUpOwor ICAgIENTdHJpbmcgYWNjZXB0ID0gY2hvb3Nlci0+YWNjZXB0VHlwZXMoKS51dGY4KCk7CisgICAg Y29uZmlybSA9IGV3a192aWV3X3J1bl9vcGVuX3BhbmVsKG1fdmlldywga2l0KGZyYW1lKSwgY2hv b3Nlci0+YWxsb3dzTXVsdGlwbGVGaWxlcygpLCBhY2NlcHQuZGF0YSgpLCAmc2VsZWN0ZWRGaWxl bmFtZXMpOwogCiAgICAgaWYgKCFjb25maXJtKQogICAgICAgICByZXR1cm47CkluZGV4OiBTb3Vy Y2UvV2ViS2l0L2VmbC9ld2svZXdrX3ByaXZhdGUuaAo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi S2l0L2VmbC9ld2svZXdrX3ByaXZhdGUuaAkocmV2aXNpb24gODkzMzkpCisrKyBTb3VyY2UvV2Vi S2l0L2VmbC9ld2svZXdrX3ByaXZhdGUuaAkod29ya2luZyBjb3B5KQpAQCAtOTYsNyArOTYsNyBA QCBFaW5hX0Jvb2wgZXdrX3ZpZXdfcnVuX2phdmFzY3JpcHRfcHJvbXB0CiBFaW5hX0Jvb2wgZXdr X3ZpZXdfc2hvdWxkX2ludGVycnVwdF9qYXZhc2NyaXB0KEV2YXNfT2JqZWN0ICpvKTsKIHVpbnQ2 NF90IGV3a192aWV3X2V4Y2VlZGVkX2RhdGFiYXNlX3F1b3RhKEV2YXNfT2JqZWN0ICpvLCBFdmFz X09iamVjdCAqZnJhbWUsIGNvbnN0IGNoYXIgKmRhdGFiYXNlTmFtZSwgdWludDY0X3QgY3VycmVu dF9zaXplLCB1aW50NjRfdCBleHBlY3RlZF9zaXplKTsKIAotRWluYV9Cb29sIGV3a192aWV3X3J1 bl9vcGVuX3BhbmVsKEV2YXNfT2JqZWN0ICpvLCBFdmFzX09iamVjdCAqZnJhbWUsIEVpbmFfQm9v bCBhbGxvd3NfbXVsdGlwbGVfZmlsZXMsIGNvbnN0IEVpbmFfTGlzdCAqc3VnZ2VzdGVkX2ZpbGVu YW1lcywgRWluYV9MaXN0ICoqc2VsZWN0ZWRfZmlsZW5hbWVzKTsKK0VpbmFfQm9vbCBld2tfdmll d19ydW5fb3Blbl9wYW5lbChFdmFzX09iamVjdCogbywgRXZhc19PYmplY3QqIGZyYW1lLCBFaW5h X0Jvb2wgYWxsb3dzX211bHRpcGxlX2ZpbGVzLCBjb25zdCBjaGFyKiBhY2NlcHRfdHlwZXMsIEVp bmFfTGlzdCoqIHNlbGVjdGVkX2ZpbGVuYW1lcyk7CiAKIHZvaWQgZXdrX3ZpZXdfcmVwYWludChF dmFzX09iamVjdCAqbywgRXZhc19Db29yZCB4LCBFdmFzX0Nvb3JkIHksIEV2YXNfQ29vcmQgdywg RXZhc19Db29yZCBoKTsKIHZvaWQgZXdrX3ZpZXdfc2Nyb2xsKEV2YXNfT2JqZWN0ICpvLCBFdmFz X0Nvb3JkIGR4LCBFdmFzX0Nvb3JkIGR5LCBFdmFzX0Nvb3JkIHN4LCBFdmFzX0Nvb3JkIHN5LCBF dmFzX0Nvb3JkIHN3LCBFdmFzX0Nvb3JkIHNoLCBFdmFzX0Nvb3JkIGN4LCBFdmFzX0Nvb3JkIGN5 LCBFdmFzX0Nvb3JkIGN3LCBFdmFzX0Nvb3JkIGNoLCBFaW5hX0Jvb2wgbWFpbl9mcmFtZSk7Cklu ZGV4OiBTb3VyY2UvV2ViS2l0L2VmbC9ld2svZXdrX3ZpZXcuY3BwCj09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNv dXJjZS9XZWJLaXQvZWZsL2V3ay9ld2tfdmlldy5jcHAJKHJldmlzaW9uIDg5MzM5KQorKysgU291 cmNlL1dlYktpdC9lZmwvZXdrL2V3a192aWV3LmNwcAkod29ya2luZyBjb3B5KQpAQCAtMzk5MCwx MyArMzk5MCwxMiBAQCB1aW50NjRfdCBld2tfdmlld19leGNlZWRlZF9kYXRhYmFzZV9xdW90CiAg KiBAcGFyYW0gZnJhbWUgRnJhbWUgaW4gd2hpY2ggb3BlcmF0aW9uIGlzIHJlcXVpcmVkLgogICog QHBhcmFtIGFsbG93c19tdWx0aXBsZV9maWxlcyBAYyBFSU5BX1RSVUUgd2hlbiBtb3JlIHRoYW4g b25lIGZpbGUgbWF5IGJlCiAgKiBzZWxlY3RlZCwgQGMgRUlOQV9GQUxTRSBvdGhlcndpc2UKLSAq IEBzdWdnZXN0ZWRfZmlsZW5hbWVzIExpc3Qgb2Ygc3VnZ2VzdGVkIGZpbGVzIHRvIHNlbGVjdC4g SXQncyBhZHZpc2FibGUgdG8KLSAqIGp1c3QgaWdub3JlIHRoaXMgdmFsdWUsIHNpbmNlIGl0J3Mg YSBzb3VyY2Ugb2Ygc2VjdXJpdHkgZmxhdy4KKyAqIEBwYXJhbSBhY2NlcHRUeXBlcyBhY2NlcHQg bWltZSB0eXBlcwogICogQHNlbGVjdGVkX2ZpbGVuYW1lcyBMaXN0IG9mIGZpbGVzIHNlbGVjdGVk LgogICoKICAqIEByZXR1cm4gQEVJTkFfRkFMU0UgaWYgdXNlciBjYW5jZWxlZCBmaWxlIHNlbGVj dGlvbjsgQEVJTkFfVFJVRSBpZiBjb25maXJtZWQuCiAgKi8KLUVpbmFfQm9vbCBld2tfdmlld19y dW5fb3Blbl9wYW5lbChFdmFzX09iamVjdCogbywgRXZhc19PYmplY3QqIGZyYW1lLCBFaW5hX0Jv b2wgYWxsb3dzX211bHRpcGxlX2ZpbGVzLCBjb25zdCBFaW5hX0xpc3QqIHN1Z2dlc3RlZF9maWxl bmFtZXMsIEVpbmFfTGlzdCoqIHNlbGVjdGVkX2ZpbGVuYW1lcykKK0VpbmFfQm9vbCBld2tfdmll d19ydW5fb3Blbl9wYW5lbChFdmFzX09iamVjdCogbywgRXZhc19PYmplY3QqIGZyYW1lLCBFaW5h X0Jvb2wgYWxsb3dzX211bHRpcGxlX2ZpbGVzLCBjb25zdCBjaGFyKiBhY2NlcHRfdHlwZXMsIEVp bmFfTGlzdCoqIHNlbGVjdGVkX2ZpbGVuYW1lcykKIHsKICAgICBEQkcoIm89JXAgZnJhbWU9JXAg YWxsb3dzX211bHRpcGxlX2ZpbGVzPSVkIiwgbywgZnJhbWUsIGFsbG93c19tdWx0aXBsZV9maWxl cyk7CiAgICAgRVdLX1ZJRVdfU0RfR0VUX09SX1JFVFVSTihvLCBzZCwgRUlOQV9GQUxTRSk7CkBA IC00MDA4LDcgKzQwMDcsNyBAQCBFaW5hX0Jvb2wgZXdrX3ZpZXdfcnVuX29wZW5fcGFuZWwoRXZh c19PCiAKICAgICAqc2VsZWN0ZWRfZmlsZW5hbWVzID0gMDsKIAotICAgIGNvbmZpcm0gPSBzZC0+ YXBpLT5ydW5fb3Blbl9wYW5lbChzZCwgZnJhbWUsIGFsbG93c19tdWx0aXBsZV9maWxlcywgc3Vn Z2VzdGVkX2ZpbGVuYW1lcywgc2VsZWN0ZWRfZmlsZW5hbWVzKTsKKyAgICBjb25maXJtID0gc2Qt PmFwaS0+cnVuX29wZW5fcGFuZWwoc2QsIGZyYW1lLCBhbGxvd3NfbXVsdGlwbGVfZmlsZXMsIGFj Y2VwdF90eXBlcywgc2VsZWN0ZWRfZmlsZW5hbWVzKTsKICAgICBpZiAoIWNvbmZpcm0gJiYgKnNl bGVjdGVkX2ZpbGVuYW1lcykKICAgICAgICAgRVJSKCJDYW5jZWxlZCBmaWxlIHNlbGVjdGlvbiwg YnV0IHNlbGVjdGVkIGZpbGVuYW1lcyAhPSAwLiBGcmVlIG5hbWVzIGJlZm9yZSByZXR1cm4uIik7 CiAgICAgcmV0dXJuIGNvbmZpcm07CkluZGV4OiBTb3VyY2UvV2ViS2l0L2VmbC9ld2svZXdrX3Zp ZXcuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0L2VmbC9ld2svZXdrX3ZpZXcuaAkocmV2 aXNpb24gODkzMzkpCisrKyBTb3VyY2UvV2ViS2l0L2VmbC9ld2svZXdrX3ZpZXcuaAkod29ya2lu ZyBjb3B5KQpAQCAtMTM4LDcgKzEzOCw3IEBAIHN0cnVjdCBfRXdrX1ZpZXdfU21hcnRfQ2xhc3Mg ewogICAgIEVpbmFfQm9vbCAoKnNob3VsZF9pbnRlcnJ1cHRfamF2YXNjcmlwdCkoRXdrX1ZpZXdf U21hcnRfRGF0YSAqc2QpOwogICAgIHVpbnQ2NF90ICgqZXhjZWVkZWRfZGF0YWJhc2VfcXVvdGEp KEV3a19WaWV3X1NtYXJ0X0RhdGEgKnNkLCBFdmFzX09iamVjdCAqZnJhbWUsIGNvbnN0IGNoYXIg KmRhdGFiYXNlTmFtZSwgdWludDY0X3QgY3VycmVudF9zaXplLCB1aW50NjRfdCBleHBlY3RlZF9z aXplKTsKIAotICAgIEVpbmFfQm9vbCAoKnJ1bl9vcGVuX3BhbmVsKShFd2tfVmlld19TbWFydF9E YXRhICpzZCwgRXZhc19PYmplY3QgKmZyYW1lLCBFaW5hX0Jvb2wgYWxsb3dzX211bHRpcGxlX2Zp bGVzLCBjb25zdCBFaW5hX0xpc3QgKnN1Z2dlc3RlZF9maWxlbmFtZXMsIEVpbmFfTGlzdCAqKnNl bGVjdGVkX2ZpbGVuYW1lcyk7CisgICAgRWluYV9Cb29sICgqcnVuX29wZW5fcGFuZWwpKEV3a19W aWV3X1NtYXJ0X0RhdGEgKnNkLCBFdmFzX09iamVjdCAqZnJhbWUsIEVpbmFfQm9vbCBhbGxvd3Nf bXVsdGlwbGVfZmlsZXMsIGNvbnN0IGNoYXIqIGFjY2VwdF90eXBlcywgRWluYV9MaXN0Kiogc2Vs ZWN0ZWRfZmlsZW5hbWVzKTsKIAogICAgIEVpbmFfQm9vbCAoKm5hdmlnYXRpb25fcG9saWN5X2Rl Y2lzaW9uKShFd2tfVmlld19TbWFydF9EYXRhICpzZCwgRXdrX0ZyYW1lX1Jlc291cmNlX1JlcXVl c3QgKnJlcXVlc3QpOwogfTsK 98471 2011-06-24 01:03:48 -0700 2011-06-26 23:40:55 -0700 fix the naming scheme patch_files.path text/plain 6061 js45.yang SW5kZXg6IFNvdXJjZS9XZWJLaXQvZWZsL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2Uv V2ViS2l0L2VmbC9DaGFuZ2VMb2cJKHJldmlzaW9uIDg5MzQ5KQorKysgU291cmNlL1dlYktpdC9l ZmwvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMjEgQEAKKzIwMTEtMDYtMjEg IEpvbmdzZW9rIFlhbmcgIDxqczQ1LnlhbmdAc2Ftc3VuZy5jb20+CisKKyAgICAgICAgUmV2aWV3 ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgW0VGTF0gVXNlIGFjY2VwdCBhdHRyaWJ1 dGUgd2hlbiBleGVjdXRpbmcgdGhlIGZpbGUgcGlja2VyIGZvciBpbnB1dCBlbGVtZW50CisgICAg ICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD02MzA2MworCisgICAg ICAgIFRoaXMgcGF0Y2g6CisgICAgICAgICAtIHJlbW92ZSB0aGUgYXJndW1lbnQgInN1Z2dlc3Rl ZF9maWxlbmFtZXMiIGZyb20gZXdrX3ZpZXdfcnVuX29wZW5fcGFuZWwKKyAgICAgICAgIC0gYWRk IHRoZSBhcmd1bWVudCAiYWNjZXB0IiB0byBld2tfdmlld19ydW5fb3Blbl9wYW5lbAorICAgICAg ICAgLSBnZXQgdGhlIGFjY2VwdCBhdHRyaWJ1dGUgYW5kIHBhc3MgdG8gZXdrX3ZpZXdfcnVuX29w ZW5fcGFuZWwgd2l0aGluIHJ1bk9wZW5QYW5lbAorCisgICAgICAgICogV2ViQ29yZVN1cHBvcnQv Q2hyb21lQ2xpZW50RWZsLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkNocm9tZUNsaWVudEVmbDo6 cnVuT3BlblBhbmVsKToKKyAgICAgICAgKiBld2svZXdrX3ZpZXcuY3BwCisgICAgICAgIChld2tf dmlld19ydW5fb3Blbl9wYW5lbCk6CisgICAgICAgICogZXdrL2V3a192aWV3LmgKKwogMjAxMS0w Ni0yMCAgR3l1eW91bmcgS2ltICA8Z3l1eW91bmcua2ltQHNhbXN1bmcuY29tPgogCiAgICAgICAg IFVucmV2aWV3ZWQuIEZpeCBzdHlsZSBlcnJvci4KSW5kZXg6IFNvdXJjZS9XZWJLaXQvZWZsL1dl YkNvcmVTdXBwb3J0L0Nocm9tZUNsaWVudEVmbC5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dl YktpdC9lZmwvV2ViQ29yZVN1cHBvcnQvQ2hyb21lQ2xpZW50RWZsLmNwcAkocmV2aXNpb24gODkz MzkpCisrKyBTb3VyY2UvV2ViS2l0L2VmbC9XZWJDb3JlU3VwcG9ydC9DaHJvbWVDbGllbnRFZmwu Y3BwCSh3b3JraW5nIGNvcHkpCkBAIC00MjIsMTkgKzQyMiwxMSBAQCB2b2lkIENocm9tZUNsaWVu dEVmbDo6cnVuT3BlblBhbmVsKEZyYW1lCiAgICAgUmVmUHRyPEZpbGVDaG9vc2VyPiBjaG9vc2Vy ID0gcHJwRmlsZUNob29zZXI7CiAgICAgYm9vbCBjb25maXJtOwogICAgIEVpbmFfTGlzdCogc2Vs ZWN0ZWRGaWxlbmFtZXMgPSAwOwotICAgIEVpbmFfTGlzdCogc3VnZ2VzdGVkRmlsZW5hbWVzID0g MDsKICAgICB2b2lkKiBmaWxlbmFtZTsKICAgICBWZWN0b3I8U3RyaW5nPiBmaWxlbmFtZXM7CiAK LSAgICBmb3IgKHVuc2lnbmVkIGkgPSAwOyBpIDwgY2hvb3Nlci0+ZmlsZW5hbWVzKCkuc2l6ZSgp OyBpKyspIHsKLSAgICAgICAgQ1N0cmluZyBzdHIgPSBjaG9vc2VyLT5maWxlbmFtZXMoKVtpXS51 dGY4KCk7Ci0gICAgICAgIGZpbGVuYW1lID0gc3RyZHVwKHN0ci5kYXRhKCkpOwotICAgICAgICBz dWdnZXN0ZWRGaWxlbmFtZXMgPSBlaW5hX2xpc3RfYXBwZW5kKHN1Z2dlc3RlZEZpbGVuYW1lcywg ZmlsZW5hbWUpOwotICAgIH0KLQotICAgIGNvbmZpcm0gPSBld2tfdmlld19ydW5fb3Blbl9wYW5l bChtX3ZpZXcsIGtpdChmcmFtZSksIGNob29zZXItPmFsbG93c011bHRpcGxlRmlsZXMoKSwgc3Vn Z2VzdGVkRmlsZW5hbWVzLCAmc2VsZWN0ZWRGaWxlbmFtZXMpOwotICAgIEVJTkFfTElTVF9GUkVF KHN1Z2dlc3RlZEZpbGVuYW1lcywgZmlsZW5hbWUpCi0gICAgICAgIGZyZWUoZmlsZW5hbWUpOwor ICAgIENTdHJpbmcgYWNjZXB0ID0gY2hvb3Nlci0+YWNjZXB0VHlwZXMoKS51dGY4KCk7CisgICAg Y29uZmlybSA9IGV3a192aWV3X3J1bl9vcGVuX3BhbmVsKG1fdmlldywga2l0KGZyYW1lKSwgY2hv b3Nlci0+YWxsb3dzTXVsdGlwbGVGaWxlcygpLCBhY2NlcHQuZGF0YSgpLCAmc2VsZWN0ZWRGaWxl bmFtZXMpOwogCiAgICAgaWYgKCFjb25maXJtKQogICAgICAgICByZXR1cm47CkluZGV4OiBTb3Vy Y2UvV2ViS2l0L2VmbC9ld2svZXdrX3ByaXZhdGUuaAo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi S2l0L2VmbC9ld2svZXdrX3ByaXZhdGUuaAkocmV2aXNpb24gODkzMzkpCisrKyBTb3VyY2UvV2Vi S2l0L2VmbC9ld2svZXdrX3ByaXZhdGUuaAkod29ya2luZyBjb3B5KQpAQCAtOTYsNyArOTYsNyBA QCBFaW5hX0Jvb2wgZXdrX3ZpZXdfcnVuX2phdmFzY3JpcHRfcHJvbXB0CiBFaW5hX0Jvb2wgZXdr X3ZpZXdfc2hvdWxkX2ludGVycnVwdF9qYXZhc2NyaXB0KEV2YXNfT2JqZWN0ICpvKTsKIHVpbnQ2 NF90IGV3a192aWV3X2V4Y2VlZGVkX2RhdGFiYXNlX3F1b3RhKEV2YXNfT2JqZWN0ICpvLCBFdmFz X09iamVjdCAqZnJhbWUsIGNvbnN0IGNoYXIgKmRhdGFiYXNlTmFtZSwgdWludDY0X3QgY3VycmVu dF9zaXplLCB1aW50NjRfdCBleHBlY3RlZF9zaXplKTsKIAotRWluYV9Cb29sIGV3a192aWV3X3J1 bl9vcGVuX3BhbmVsKEV2YXNfT2JqZWN0ICpvLCBFdmFzX09iamVjdCAqZnJhbWUsIEVpbmFfQm9v bCBhbGxvd3NfbXVsdGlwbGVfZmlsZXMsIGNvbnN0IEVpbmFfTGlzdCAqc3VnZ2VzdGVkX2ZpbGVu YW1lcywgRWluYV9MaXN0ICoqc2VsZWN0ZWRfZmlsZW5hbWVzKTsKK0VpbmFfQm9vbCBld2tfdmll d19ydW5fb3Blbl9wYW5lbChFdmFzX09iamVjdCogbywgRXZhc19PYmplY3QqIGZyYW1lLCBFaW5h X0Jvb2wgYWxsb3dzX211bHRpcGxlX2ZpbGVzLCBjb25zdCBjaGFyKiBhY2NlcHRfdHlwZXMsIEVp bmFfTGlzdCoqIHNlbGVjdGVkX2ZpbGVuYW1lcyk7CiAKIHZvaWQgZXdrX3ZpZXdfcmVwYWludChF dmFzX09iamVjdCAqbywgRXZhc19Db29yZCB4LCBFdmFzX0Nvb3JkIHksIEV2YXNfQ29vcmQgdywg RXZhc19Db29yZCBoKTsKIHZvaWQgZXdrX3ZpZXdfc2Nyb2xsKEV2YXNfT2JqZWN0ICpvLCBFdmFz X0Nvb3JkIGR4LCBFdmFzX0Nvb3JkIGR5LCBFdmFzX0Nvb3JkIHN4LCBFdmFzX0Nvb3JkIHN5LCBF dmFzX0Nvb3JkIHN3LCBFdmFzX0Nvb3JkIHNoLCBFdmFzX0Nvb3JkIGN4LCBFdmFzX0Nvb3JkIGN5 LCBFdmFzX0Nvb3JkIGN3LCBFdmFzX0Nvb3JkIGNoLCBFaW5hX0Jvb2wgbWFpbl9mcmFtZSk7Cklu ZGV4OiBTb3VyY2UvV2ViS2l0L2VmbC9ld2svZXdrX3ZpZXcuY3BwCj09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNv dXJjZS9XZWJLaXQvZWZsL2V3ay9ld2tfdmlldy5jcHAJKHJldmlzaW9uIDg5MzM5KQorKysgU291 cmNlL1dlYktpdC9lZmwvZXdrL2V3a192aWV3LmNwcAkod29ya2luZyBjb3B5KQpAQCAtMzk5MCwx MyArMzk5MCwxMiBAQCB1aW50NjRfdCBld2tfdmlld19leGNlZWRlZF9kYXRhYmFzZV9xdW90CiAg KiBAcGFyYW0gZnJhbWUgRnJhbWUgaW4gd2hpY2ggb3BlcmF0aW9uIGlzIHJlcXVpcmVkLgogICog QHBhcmFtIGFsbG93c19tdWx0aXBsZV9maWxlcyBAYyBFSU5BX1RSVUUgd2hlbiBtb3JlIHRoYW4g b25lIGZpbGUgbWF5IGJlCiAgKiBzZWxlY3RlZCwgQGMgRUlOQV9GQUxTRSBvdGhlcndpc2UKLSAq IEBzdWdnZXN0ZWRfZmlsZW5hbWVzIExpc3Qgb2Ygc3VnZ2VzdGVkIGZpbGVzIHRvIHNlbGVjdC4g SXQncyBhZHZpc2FibGUgdG8KLSAqIGp1c3QgaWdub3JlIHRoaXMgdmFsdWUsIHNpbmNlIGl0J3Mg YSBzb3VyY2Ugb2Ygc2VjdXJpdHkgZmxhdy4KKyAqIEBwYXJhbSBhY2NlcHRfdHlwZXMgYWNjZXB0 IG1pbWUgdHlwZXMKICAqIEBzZWxlY3RlZF9maWxlbmFtZXMgTGlzdCBvZiBmaWxlcyBzZWxlY3Rl ZC4KICAqCiAgKiBAcmV0dXJuIEBFSU5BX0ZBTFNFIGlmIHVzZXIgY2FuY2VsZWQgZmlsZSBzZWxl Y3Rpb247IEBFSU5BX1RSVUUgaWYgY29uZmlybWVkLgogICovCi1FaW5hX0Jvb2wgZXdrX3ZpZXdf cnVuX29wZW5fcGFuZWwoRXZhc19PYmplY3QqIG8sIEV2YXNfT2JqZWN0KiBmcmFtZSwgRWluYV9C b29sIGFsbG93c19tdWx0aXBsZV9maWxlcywgY29uc3QgRWluYV9MaXN0KiBzdWdnZXN0ZWRfZmls ZW5hbWVzLCBFaW5hX0xpc3QqKiBzZWxlY3RlZF9maWxlbmFtZXMpCitFaW5hX0Jvb2wgZXdrX3Zp ZXdfcnVuX29wZW5fcGFuZWwoRXZhc19PYmplY3QqIG8sIEV2YXNfT2JqZWN0KiBmcmFtZSwgRWlu YV9Cb29sIGFsbG93c19tdWx0aXBsZV9maWxlcywgY29uc3QgY2hhciogYWNjZXB0X3R5cGVzLCBF aW5hX0xpc3QqKiBzZWxlY3RlZF9maWxlbmFtZXMpCiB7CiAgICAgREJHKCJvPSVwIGZyYW1lPSVw IGFsbG93c19tdWx0aXBsZV9maWxlcz0lZCIsIG8sIGZyYW1lLCBhbGxvd3NfbXVsdGlwbGVfZmls ZXMpOwogICAgIEVXS19WSUVXX1NEX0dFVF9PUl9SRVRVUk4obywgc2QsIEVJTkFfRkFMU0UpOwpA QCAtNDAwOCw3ICs0MDA3LDcgQEAgRWluYV9Cb29sIGV3a192aWV3X3J1bl9vcGVuX3BhbmVsKEV2 YXNfTwogCiAgICAgKnNlbGVjdGVkX2ZpbGVuYW1lcyA9IDA7CiAKLSAgICBjb25maXJtID0gc2Qt PmFwaS0+cnVuX29wZW5fcGFuZWwoc2QsIGZyYW1lLCBhbGxvd3NfbXVsdGlwbGVfZmlsZXMsIHN1 Z2dlc3RlZF9maWxlbmFtZXMsIHNlbGVjdGVkX2ZpbGVuYW1lcyk7CisgICAgY29uZmlybSA9IHNk LT5hcGktPnJ1bl9vcGVuX3BhbmVsKHNkLCBmcmFtZSwgYWxsb3dzX211bHRpcGxlX2ZpbGVzLCBh Y2NlcHRfdHlwZXMsIHNlbGVjdGVkX2ZpbGVuYW1lcyk7CiAgICAgaWYgKCFjb25maXJtICYmICpz ZWxlY3RlZF9maWxlbmFtZXMpCiAgICAgICAgIEVSUigiQ2FuY2VsZWQgZmlsZSBzZWxlY3Rpb24s IGJ1dCBzZWxlY3RlZCBmaWxlbmFtZXMgIT0gMC4gRnJlZSBuYW1lcyBiZWZvcmUgcmV0dXJuLiIp OwogICAgIHJldHVybiBjb25maXJtOwpJbmRleDogU291cmNlL1dlYktpdC9lZmwvZXdrL2V3a192 aWV3LmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdC9lZmwvZXdrL2V3a192aWV3LmgJKHJl dmlzaW9uIDg5MzM5KQorKysgU291cmNlL1dlYktpdC9lZmwvZXdrL2V3a192aWV3LmgJKHdvcmtp bmcgY29weSkKQEAgLTEzOCw3ICsxMzgsNyBAQCBzdHJ1Y3QgX0V3a19WaWV3X1NtYXJ0X0NsYXNz IHsKICAgICBFaW5hX0Jvb2wgKCpzaG91bGRfaW50ZXJydXB0X2phdmFzY3JpcHQpKEV3a19WaWV3 X1NtYXJ0X0RhdGEgKnNkKTsKICAgICB1aW50NjRfdCAoKmV4Y2VlZGVkX2RhdGFiYXNlX3F1b3Rh KShFd2tfVmlld19TbWFydF9EYXRhICpzZCwgRXZhc19PYmplY3QgKmZyYW1lLCBjb25zdCBjaGFy ICpkYXRhYmFzZU5hbWUsIHVpbnQ2NF90IGN1cnJlbnRfc2l6ZSwgdWludDY0X3QgZXhwZWN0ZWRf c2l6ZSk7CiAKLSAgICBFaW5hX0Jvb2wgKCpydW5fb3Blbl9wYW5lbCkoRXdrX1ZpZXdfU21hcnRf RGF0YSAqc2QsIEV2YXNfT2JqZWN0ICpmcmFtZSwgRWluYV9Cb29sIGFsbG93c19tdWx0aXBsZV9m aWxlcywgY29uc3QgRWluYV9MaXN0ICpzdWdnZXN0ZWRfZmlsZW5hbWVzLCBFaW5hX0xpc3QgKipz ZWxlY3RlZF9maWxlbmFtZXMpOworICAgIEVpbmFfQm9vbCAoKnJ1bl9vcGVuX3BhbmVsKShFd2tf Vmlld19TbWFydF9EYXRhICpzZCwgRXZhc19PYmplY3QgKmZyYW1lLCBFaW5hX0Jvb2wgYWxsb3dz X211bHRpcGxlX2ZpbGVzLCBjb25zdCBjaGFyKiBhY2NlcHRfdHlwZXMsIEVpbmFfTGlzdCoqIHNl bGVjdGVkX2ZpbGVuYW1lcyk7CiAKICAgICBFaW5hX0Jvb2wgKCpuYXZpZ2F0aW9uX3BvbGljeV9k ZWNpc2lvbikoRXdrX1ZpZXdfU21hcnRfRGF0YSAqc2QsIEV3a19GcmFtZV9SZXNvdXJjZV9SZXF1 ZXN0ICpyZXF1ZXN0KTsKIH07Cg== 98666 2011-06-26 23:39:55 -0700 2011-06-27 03:46:08 -0700 fix build error patch_files.patch text/plain 6106 js45.yang SW5kZXg6IFNvdXJjZS9XZWJLaXQvZWZsL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2Uv V2ViS2l0L2VmbC9DaGFuZ2VMb2cJKHJldmlzaW9uIDg5Nzg0KQorKysgU291cmNlL1dlYktpdC9l ZmwvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMjEgQEAKKzIwMTEtMDYtMjYg IEpvbmdzZW9rIFlhbmcgIDxqczQ1LnlhbmdAc2Ftc3VuZy5jb20+CisKKyAgICAgICAgUmV2aWV3 ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgW0VGTF0gVXNlIGFjY2VwdCBhdHRyaWJ1 dGUgd2hlbiBleGVjdXRpbmcgdGhlIGZpbGUgcGlja2VyIGZvciBpbnB1dCBlbGVtZW50CisgICAg ICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD02MzA2MworCisgICAg ICAgIFRoaXMgcGF0Y2g6CisgICAgICAgIC0gcmVtb3ZlIHRoZSBhcmd1bWVudCAic3VnZ2VzdGVk X2ZpbGVuYW1lcyIgZnJvbSBld2tfdmlld19ydW5fb3Blbl9wYW5lbAorICAgICAgICAtIGFkZCB0 aGUgYXJndW1lbnQgImFjY2VwdCIgdG8gZXdrX3ZpZXdfcnVuX29wZW5fcGFuZWwKKyAgICAgICAg LSBnZXQgdGhlIGFjY2VwdCBhdHRyaWJ1dGUgYW5kIHBhc3MgdG8gZXdrX3ZpZXdfcnVuX29wZW5f cGFuZWwgd2l0aGluIHJ1bk9wZW5QYW5lbAorCisgICAgICAgICogV2ViQ29yZVN1cHBvcnQvQ2hy b21lQ2xpZW50RWZsLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkNocm9tZUNsaWVudEVmbDo6cnVu T3BlblBhbmVsKToKKyAgICAgICAgKiBld2svZXdrX3ZpZXcuY3BwOgorICAgICAgICAoZXdrX3Zp ZXdfcnVuX29wZW5fcGFuZWwpOgorICAgICAgICAqIGV3ay9ld2tfdmlldy5oCisKIDIwMTEtMDYt MjYgIFJ5dWFuIENob2kgIDxyeXVhbi5jaG9pQHNhbXN1bmcuY29tPgogCiAgICAgICAgIFJldmll d2VkIGJ5IEFudG9uaW8gR29tZXMuCkluZGV4OiBTb3VyY2UvV2ViS2l0L2VmbC9XZWJDb3JlU3Vw cG9ydC9DaHJvbWVDbGllbnRFZmwuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQvZWZs L1dlYkNvcmVTdXBwb3J0L0Nocm9tZUNsaWVudEVmbC5jcHAJKHJldmlzaW9uIDg5Nzc3KQorKysg U291cmNlL1dlYktpdC9lZmwvV2ViQ29yZVN1cHBvcnQvQ2hyb21lQ2xpZW50RWZsLmNwcAkod29y a2luZyBjb3B5KQpAQCAtNDIyLDE5ICs0MjIsMTEgQEAgdm9pZCBDaHJvbWVDbGllbnRFZmw6OnJ1 bk9wZW5QYW5lbChGcmFtZQogICAgIFJlZlB0cjxGaWxlQ2hvb3Nlcj4gY2hvb3NlciA9IHBycEZp bGVDaG9vc2VyOwogICAgIGJvb2wgY29uZmlybTsKICAgICBFaW5hX0xpc3QqIHNlbGVjdGVkRmls ZW5hbWVzID0gMDsKLSAgICBFaW5hX0xpc3QqIHN1Z2dlc3RlZEZpbGVuYW1lcyA9IDA7CiAgICAg dm9pZCogZmlsZW5hbWU7CiAgICAgVmVjdG9yPFN0cmluZz4gZmlsZW5hbWVzOwogCi0gICAgZm9y ICh1bnNpZ25lZCBpID0gMDsgaSA8IGNob29zZXItPnNldHRpbmdzKCkuc2VsZWN0ZWRGaWxlcy5z aXplKCk7IGkrKykgewotICAgICAgICBDU3RyaW5nIHN0ciA9IGNob29zZXItPnNldHRpbmdzKCku c2VsZWN0ZWRGaWxlc1tpXS51dGY4KCk7Ci0gICAgICAgIGZpbGVuYW1lID0gc3RyZHVwKHN0ci5k YXRhKCkpOwotICAgICAgICBzdWdnZXN0ZWRGaWxlbmFtZXMgPSBlaW5hX2xpc3RfYXBwZW5kKHN1 Z2dlc3RlZEZpbGVuYW1lcywgZmlsZW5hbWUpOwotICAgIH0KLQotICAgIGNvbmZpcm0gPSBld2tf dmlld19ydW5fb3Blbl9wYW5lbChtX3ZpZXcsIGtpdChmcmFtZSksIGNob29zZXItPnNldHRpbmdz KCkuYWxsb3dzTXVsdGlwbGVGaWxlcywgc3VnZ2VzdGVkRmlsZW5hbWVzLCAmc2VsZWN0ZWRGaWxl bmFtZXMpOwotICAgIEVJTkFfTElTVF9GUkVFKHN1Z2dlc3RlZEZpbGVuYW1lcywgZmlsZW5hbWUp Ci0gICAgICAgIGZyZWUoZmlsZW5hbWUpOworICAgIENTdHJpbmcgYWNjZXB0ID0gY2hvb3Nlci0+ c2V0dGluZ3MoKS5hY2NlcHRUeXBlcy51dGY4KCk7CisgICAgY29uZmlybSA9IGV3a192aWV3X3J1 bl9vcGVuX3BhbmVsKG1fdmlldywga2l0KGZyYW1lKSwgY2hvb3Nlci0+c2V0dGluZ3MoKS5hbGxv d3NNdWx0aXBsZUZpbGVzLCBhY2NlcHQuZGF0YSgpLCAmc2VsZWN0ZWRGaWxlbmFtZXMpOwogCiAg ICAgaWYgKCFjb25maXJtKQogICAgICAgICByZXR1cm47CkluZGV4OiBTb3VyY2UvV2ViS2l0L2Vm bC9ld2svZXdrX3ByaXZhdGUuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0L2VmbC9ld2sv ZXdrX3ByaXZhdGUuaAkocmV2aXNpb24gODk3NzcpCisrKyBTb3VyY2UvV2ViS2l0L2VmbC9ld2sv ZXdrX3ByaXZhdGUuaAkod29ya2luZyBjb3B5KQpAQCAtOTYsNyArOTYsNyBAQCBFaW5hX0Jvb2wg ZXdrX3ZpZXdfcnVuX2phdmFzY3JpcHRfcHJvbXB0CiBFaW5hX0Jvb2wgZXdrX3ZpZXdfc2hvdWxk X2ludGVycnVwdF9qYXZhc2NyaXB0KEV2YXNfT2JqZWN0ICpvKTsKIHVpbnQ2NF90IGV3a192aWV3 X2V4Y2VlZGVkX2RhdGFiYXNlX3F1b3RhKEV2YXNfT2JqZWN0ICpvLCBFdmFzX09iamVjdCAqZnJh bWUsIGNvbnN0IGNoYXIgKmRhdGFiYXNlTmFtZSwgdWludDY0X3QgY3VycmVudF9zaXplLCB1aW50 NjRfdCBleHBlY3RlZF9zaXplKTsKIAotRWluYV9Cb29sIGV3a192aWV3X3J1bl9vcGVuX3BhbmVs KEV2YXNfT2JqZWN0ICpvLCBFdmFzX09iamVjdCAqZnJhbWUsIEVpbmFfQm9vbCBhbGxvd3NfbXVs dGlwbGVfZmlsZXMsIGNvbnN0IEVpbmFfTGlzdCAqc3VnZ2VzdGVkX2ZpbGVuYW1lcywgRWluYV9M aXN0ICoqc2VsZWN0ZWRfZmlsZW5hbWVzKTsKK0VpbmFfQm9vbCBld2tfdmlld19ydW5fb3Blbl9w YW5lbChFdmFzX09iamVjdCogbywgRXZhc19PYmplY3QqIGZyYW1lLCBFaW5hX0Jvb2wgYWxsb3dz X211bHRpcGxlX2ZpbGVzLCBjb25zdCBjaGFyKiBhY2NlcHRfdHlwZXMsIEVpbmFfTGlzdCoqIHNl bGVjdGVkX2ZpbGVuYW1lcyk7CiAKIHZvaWQgZXdrX3ZpZXdfcmVwYWludChFdmFzX09iamVjdCAq bywgRXZhc19Db29yZCB4LCBFdmFzX0Nvb3JkIHksIEV2YXNfQ29vcmQgdywgRXZhc19Db29yZCBo KTsKIHZvaWQgZXdrX3ZpZXdfc2Nyb2xsKEV2YXNfT2JqZWN0ICpvLCBFdmFzX0Nvb3JkIGR4LCBF dmFzX0Nvb3JkIGR5LCBFdmFzX0Nvb3JkIHN4LCBFdmFzX0Nvb3JkIHN5LCBFdmFzX0Nvb3JkIHN3 LCBFdmFzX0Nvb3JkIHNoLCBFdmFzX0Nvb3JkIGN4LCBFdmFzX0Nvb3JkIGN5LCBFdmFzX0Nvb3Jk IGN3LCBFdmFzX0Nvb3JkIGNoLCBFaW5hX0Jvb2wgbWFpbl9mcmFtZSk7CkluZGV4OiBTb3VyY2Uv V2ViS2l0L2VmbC9ld2svZXdrX3ZpZXcuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQv ZWZsL2V3ay9ld2tfdmlldy5jcHAJKHJldmlzaW9uIDg5Nzc3KQorKysgU291cmNlL1dlYktpdC9l ZmwvZXdrL2V3a192aWV3LmNwcAkod29ya2luZyBjb3B5KQpAQCAtNDAwNiwxMyArNDAwNiwxMiBA QCB1aW50NjRfdCBld2tfdmlld19leGNlZWRlZF9kYXRhYmFzZV9xdW90CiAgKiBAcGFyYW0gZnJh bWUgRnJhbWUgaW4gd2hpY2ggb3BlcmF0aW9uIGlzIHJlcXVpcmVkLgogICogQHBhcmFtIGFsbG93 c19tdWx0aXBsZV9maWxlcyBAYyBFSU5BX1RSVUUgd2hlbiBtb3JlIHRoYW4gb25lIGZpbGUgbWF5 IGJlCiAgKiBzZWxlY3RlZCwgQGMgRUlOQV9GQUxTRSBvdGhlcndpc2UKLSAqIEBzdWdnZXN0ZWRf ZmlsZW5hbWVzIExpc3Qgb2Ygc3VnZ2VzdGVkIGZpbGVzIHRvIHNlbGVjdC4gSXQncyBhZHZpc2Fi bGUgdG8KLSAqIGp1c3QgaWdub3JlIHRoaXMgdmFsdWUsIHNpbmNlIGl0J3MgYSBzb3VyY2Ugb2Yg c2VjdXJpdHkgZmxhdy4KKyAqIEBwYXJhbSBhY2NlcHRfdHlwZXMgYWNjZXB0IG1pbWUgdHlwZXMK ICAqIEBzZWxlY3RlZF9maWxlbmFtZXMgTGlzdCBvZiBmaWxlcyBzZWxlY3RlZC4KICAqCiAgKiBA cmV0dXJuIEBFSU5BX0ZBTFNFIGlmIHVzZXIgY2FuY2VsZWQgZmlsZSBzZWxlY3Rpb247IEBFSU5B X1RSVUUgaWYgY29uZmlybWVkLgogICovCi1FaW5hX0Jvb2wgZXdrX3ZpZXdfcnVuX29wZW5fcGFu ZWwoRXZhc19PYmplY3QqIG8sIEV2YXNfT2JqZWN0KiBmcmFtZSwgRWluYV9Cb29sIGFsbG93c19t dWx0aXBsZV9maWxlcywgY29uc3QgRWluYV9MaXN0KiBzdWdnZXN0ZWRfZmlsZW5hbWVzLCBFaW5h X0xpc3QqKiBzZWxlY3RlZF9maWxlbmFtZXMpCitFaW5hX0Jvb2wgZXdrX3ZpZXdfcnVuX29wZW5f cGFuZWwoRXZhc19PYmplY3QqIG8sIEV2YXNfT2JqZWN0KiBmcmFtZSwgRWluYV9Cb29sIGFsbG93 c19tdWx0aXBsZV9maWxlcywgY29uc3QgY2hhciogYWNjZXB0X3R5cGVzLCBFaW5hX0xpc3QqKiBz ZWxlY3RlZF9maWxlbmFtZXMpCiB7CiAgICAgREJHKCJvPSVwIGZyYW1lPSVwIGFsbG93c19tdWx0 aXBsZV9maWxlcz0lZCIsIG8sIGZyYW1lLCBhbGxvd3NfbXVsdGlwbGVfZmlsZXMpOwogICAgIEVX S19WSUVXX1NEX0dFVF9PUl9SRVRVUk4obywgc2QsIEVJTkFfRkFMU0UpOwpAQCAtNDAyNCw3ICs0 MDIzLDcgQEAgRWluYV9Cb29sIGV3a192aWV3X3J1bl9vcGVuX3BhbmVsKEV2YXNfTwogCiAgICAg KnNlbGVjdGVkX2ZpbGVuYW1lcyA9IDA7CiAKLSAgICBjb25maXJtID0gc2QtPmFwaS0+cnVuX29w ZW5fcGFuZWwoc2QsIGZyYW1lLCBhbGxvd3NfbXVsdGlwbGVfZmlsZXMsIHN1Z2dlc3RlZF9maWxl bmFtZXMsIHNlbGVjdGVkX2ZpbGVuYW1lcyk7CisgICAgY29uZmlybSA9IHNkLT5hcGktPnJ1bl9v cGVuX3BhbmVsKHNkLCBmcmFtZSwgYWxsb3dzX211bHRpcGxlX2ZpbGVzLCBhY2NlcHRfdHlwZXMs IHNlbGVjdGVkX2ZpbGVuYW1lcyk7CiAgICAgaWYgKCFjb25maXJtICYmICpzZWxlY3RlZF9maWxl bmFtZXMpCiAgICAgICAgIEVSUigiQ2FuY2VsZWQgZmlsZSBzZWxlY3Rpb24sIGJ1dCBzZWxlY3Rl ZCBmaWxlbmFtZXMgIT0gMC4gRnJlZSBuYW1lcyBiZWZvcmUgcmV0dXJuLiIpOwogICAgIHJldHVy biBjb25maXJtOwpJbmRleDogU291cmNlL1dlYktpdC9lZmwvZXdrL2V3a192aWV3LmgKPT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PQotLS0gU291cmNlL1dlYktpdC9lZmwvZXdrL2V3a192aWV3LmgJKHJldmlzaW9uIDg5Nzc3 KQorKysgU291cmNlL1dlYktpdC9lZmwvZXdrL2V3a192aWV3LmgJKHdvcmtpbmcgY29weSkKQEAg LTEzOCw3ICsxMzgsNyBAQCBzdHJ1Y3QgX0V3a19WaWV3X1NtYXJ0X0NsYXNzIHsKICAgICBFaW5h X0Jvb2wgKCpzaG91bGRfaW50ZXJydXB0X2phdmFzY3JpcHQpKEV3a19WaWV3X1NtYXJ0X0RhdGEg KnNkKTsKICAgICB1aW50NjRfdCAoKmV4Y2VlZGVkX2RhdGFiYXNlX3F1b3RhKShFd2tfVmlld19T bWFydF9EYXRhICpzZCwgRXZhc19PYmplY3QgKmZyYW1lLCBjb25zdCBjaGFyICpkYXRhYmFzZU5h bWUsIHVpbnQ2NF90IGN1cnJlbnRfc2l6ZSwgdWludDY0X3QgZXhwZWN0ZWRfc2l6ZSk7CiAKLSAg ICBFaW5hX0Jvb2wgKCpydW5fb3Blbl9wYW5lbCkoRXdrX1ZpZXdfU21hcnRfRGF0YSAqc2QsIEV2 YXNfT2JqZWN0ICpmcmFtZSwgRWluYV9Cb29sIGFsbG93c19tdWx0aXBsZV9maWxlcywgY29uc3Qg RWluYV9MaXN0ICpzdWdnZXN0ZWRfZmlsZW5hbWVzLCBFaW5hX0xpc3QgKipzZWxlY3RlZF9maWxl bmFtZXMpOworICAgIEVpbmFfQm9vbCAoKnJ1bl9vcGVuX3BhbmVsKShFd2tfVmlld19TbWFydF9E YXRhICpzZCwgRXZhc19PYmplY3QgKmZyYW1lLCBFaW5hX0Jvb2wgYWxsb3dzX211bHRpcGxlX2Zp bGVzLCBjb25zdCBjaGFyICphY2NlcHRfdHlwZXMsIEVpbmFfTGlzdCAqKnNlbGVjdGVkX2ZpbGVu YW1lcyk7CiAKICAgICBFaW5hX0Jvb2wgKCpuYXZpZ2F0aW9uX3BvbGljeV9kZWNpc2lvbikoRXdr X1ZpZXdfU21hcnRfRGF0YSAqc2QsIEV3a19GcmFtZV9SZXNvdXJjZV9SZXF1ZXN0ICpyZXF1ZXN0 KTsKIH07Cg==