128939 2006-06-10 12:30:18 +0000 missing file kbabel.defaultproject inhibits the user from updating the identity 2006-11-20 18:29:50 +0000 1 1 10 Unmaintained kbabel general 1.11.2 unspecified Linux RESOLVED FIXED NOR normal --- 1 tr visnovsky nicolasg 0 oldest_to_newest 445555 0 tr 2006-06-10 12:30:19 +0000 Version: 1.11.2 (using KDE 3.5.2, compiled sources) Compiler: gcc version 3.4.1 OS: Linux (i686) release 2.6.15.4 I wanted to remove my KBabel configuration and restart with a fresh one. For this reason i removed all files related to kbabel under ~/.kde/share/config and ~/.kde/share/apps. On next start of kbabel it asks me to input my identity on first startup, but all fields are gray and disabled. I found the reason is, that the file kbabel.defaultproject was missing and kbabel did not recreate a standard-version of the file on startup. This prevents me from updating my user details. 449457 1 nicolasg 2006-06-24 19:59:04 +0000 I can confirm. It is enough to rename the kbabel.defaultproject file to get that bug (even if in that case, you do not get the dialog at startup, but you cannot change the project setting). Have a nice day! 449464 2 nicolasg 2006-06-24 20:29:25 +0000 SVN commit 554679 by goutte: Allow to open empty files as KBabel project files CCBUG:128939 (That is not exactly the same bug, but it has the same symptom.) M +12 -1 kbproject.cpp --- branches/KDE/3.5/kdesdk/kbabel/common/kbproject.cpp #554678:554679 @@ -66,8 +66,19 @@ // first, for existing file check the MIME type // it has to be text file KMimeType::Ptr mime = KMimeType::findByURL( KURL::fromPathOrURL( file ) ); - if( mime->name() != "text/plain" ) + + if ( mime->name() == "text/plain" ) + { + // Plain text, no problem! + } + else if ( mime->name() == "application/x-zerosize" ) + { + // Empty files are allowed too + kdWarning() << "Empty KBabel project file!" << endl; + } + else { + // Unknown mime type, abort! // ### TODO: should the user not be asked instead? kdWarning () << "File type is " << mime->name() << endl; return; 449472 3 16779 nicolasg 2006-06-24 22:26:02 +0000 Created attachment 16779 Try to fix the dialog for a missing default project The patch does not work, as the project configuration dialog show gray entries. 487814 4 18605 lucardus 2006-11-18 17:33:52 +0000 Created attachment 18605 Fix project handling when default project is missing Please try the appended patch. It should fix all problems related to a missing default project file. 488083 5 tr 2006-11-19 19:53:36 +0000 I can confirm that the bug is fixed by the patch provided by Stephan Johach. I'd like to see the fix in SVN :) Thanks :) 488327 6 lucardus 2006-11-20 18:29:49 +0000 SVN commit 606520 by johach: Fix problems when no default project is found. KBabel used a KDE function which returns a null string if the requested file does not exist. That lead to some strange problems with disabled project configuration settings. BUG:128939 M +12 -8 catalogmanager/catalogmanager.cpp M +2 -1 catalogmanager/catalogmanager.h M +3 -1 catalogmanager/main.cpp M +3 -0 common/catalog.cpp M +1 -3 common/catalog.h M +1 -0 common/catalogitem.cpp M +4 -1 common/kbproject.cpp M +9 -0 common/kbprojectmanager.cpp M +2 -0 common/kbprojectmanager.h M +0 -1 common/resources.h M +1 -0 kbabel/hidingmsgedit.cpp M +18 -13 kbabel/kbabel.cpp M +2 -2 kbabel/kbabel.h M +12 -9 kbabel/main.cpp M +1 -1 kbabel/mymultilineedit.cpp 16779 2006-06-24 22:26:02 +0000 2006-06-24 22:26:02 +0000 Try to fix the dialog for a missing default project not_finished.diff text/plain 2691 nicolasg SW5kZXg6IGtiYWJlbC9rYmFiZWwuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIGtiYWJlbC9rYmFiZWwuY3Bw CShSZXZpc2lvbiA1NTIzNjIpCisrKyBrYmFiZWwva2JhYmVsLmNwcAkoQXJiZWl0c2tvcGllKQpA QCAtMzAwLDQyICszMDAsNDEgQEAKICAgICBjb25uZWN0KG1fdmlldywgU0lHTkFMKHNpZ25hbE5l d0ZpbGVPcGVuZWQoS1VSTCkpLAogICAgICAgICAgICAgYm1IYW5kbGVyLCBTTE9UKHNsb3RDbGVh ckJvb2ttYXJrcygpKSk7CiAKKyAgICAvLyBXZSBuZWVkIHRvIHVwZGF0ZSBrYmFiZWxyYyB0byB1 cGRhdGUgdGhlIHZlcnNpb24gbnVtYmVyLgorICAgIC8vIFRPRE86IHVzZSB0aGUgY29ycmVjdCB3 YXkgdG8gZ2V0IHRoZSByYyBmaWxlIG9mIHRoZSBhcHBsaWNhdGlvbgogICAgIF9jb25maWcgPSBL U2hhcmVkQ29uZmlnOjpvcGVuQ29uZmlnKCAia2JhYmVscmMiICk7CiAgICAgcmVzdG9yZVNldHRp bmdzKCk7CiAKICAgICBfY29uZmlnLT5zZXRHcm91cCgiS0JhYmVsIik7CisgICAgX2NvbmZpZy0+ d3JpdGVFbnRyeSgiVmVyc2lvbiIsVkVSU0lPTik7CisgICAgX2NvbmZpZy0+c3luYygpOwogCi0g ICAgaWYoIV9jb25maWctPmhhc0tleSgiVmVyc2lvbiIpKQorICAgIC8vIENoZWNrIGlmIHRoZSBk ZWZhdWx0IHByb2plY3QgZXhpc3RzLgorICAgIEtTaGFyZWRDb25maWc6OlB0ciBwcm9qZWN0Q29u ZmlnID0gS1NoYXJlZENvbmZpZzo6b3BlbkNvbmZpZyggS0JBQkVMX0RFRkFVTFRQUk9KRUNUICk7 CisgICAgcHJvamVjdENvbmZpZy0+c2V0R3JvdXAoICJLQmFiZWwiICk7CisgICAgaWYgKCAhcHJv amVjdENvbmZpZy0+aGFzS2V5KCAiVmVyc2lvbiIgKSApCiAgICAgewotICAgICAgUVN0cmluZyBl bmNvZGluZ1N0cjsKLSAgICAgIHN3aXRjaChjYXRhbG9nLT5zYXZlU2V0dGluZ3MoKS5lbmNvZGlu ZykKLSAgICAgIHsKLSAgICAgICAgIGNhc2UgS0JhYmVsOjpQcm9qZWN0U2V0dGluZ3NCYXNlOjpV VEY4OgotICAgICAgICAgICAgZW5jb2RpbmdTdHI9UVRleHRDb2RlYzo6Y29kZWNGb3JOYW1lKCJV VEYtOCIpLT5uYW1lKCk7Ci0gICAgICAgICAgICBicmVhazsKLSAgICAgICAgIGNhc2UgS0JhYmVs OjpQcm9qZWN0U2V0dGluZ3NCYXNlOjpVVEYxNjoKLSAgICAgICAgICAgIGVuY29kaW5nU3RyPVFU ZXh0Q29kZWM6OmNvZGVjRm9yTmFtZSgiVVRGLTE2IiktPm5hbWUoKTsKLSAgICAgICAgICAgIGJy ZWFrOwotICAgICAgICAgZGVmYXVsdDoKLSAgICAgICAgICAgIGVuY29kaW5nU3RyPVFUZXh0Q29k ZWM6OmNvZGVjRm9yTG9jYWxlKCktPm5hbWUoKTsKLSAgICAgIH0KLQogICAgICAgaWYoIEtCYWJl bFNwbGFzaDo6aW5zdGFuY2UgKSBLQmFiZWxTcGxhc2g6Omluc3RhbmNlLT5jbG9zZSgpOyAvL2Ns b3NlIHNwbGFzaCBzY3JlZW4gd2luZG93LCBpZiB0aGVyZSBpcyBvbmUKIAotICAgICAgS01lc3Nh Z2VCb3g6OmluZm9ybWF0aW9uKDAsaTE4bigiWW91IGhhdmUgbm90IHJ1biBLQmFiZWwgYmVmb3Jl LiAiCisgICAgIC8vIE5vdyB3ZSBtdXN0IHNldCBhIGtleSB0byBjcmVhdGUgdGhlIGZpbGUgKHNl ZSBidWcgIzEyODkzOSkKKyAgICAgcHJvamVjdENvbmZpZy0+d3JpdGVFbnRyeSggIlZlcnNpb24i LCBWRVJTSU9OICk7CisgICAgIHByb2plY3RDb25maWctPnN5bmMoKTsKKworICAgICAgLy8gIyMj IFRPRE86IHRoZSBtZXNzYWdlIHNob3VsZCBiZSBhZGFwdGVkIHRvIHJlZmxlY3QgdGhlIHJlYWwg cHVycG9zZS4KKyAgICAgIEtNZXNzYWdlQm94OjppbmZvcm1hdGlvbiggMCwKKyAgICAgICAgICAg ICAgICAgICBpMThuKCJZb3UgaGF2ZSBub3QgcnVuIEtCYWJlbCBiZWZvcmUuICIKICAgICAgICAg ICAgICAgICAgICAiVG8gYWxsb3cgS0JhYmVsIHRvIHdvcmsgY29ycmVjdGx5IHlvdSBtdXN0IGVu dGVyIHNvbWUgIgogICAgICAgICAgICAgICAgICAgICJpbmZvcm1hdGlvbiBpbiB0aGUgcHJlZmVy ZW5jZXMgZGlhbG9nIGZpcnN0LlxuIgogICAgICAgICAgICAgICAgICAgICJUaGUgbWluaW11bSBy ZXF1aXJlbWVudCBpcyB0byBmaWxsIG91dCB0aGUgSWRlbnRpdHkgcGFnZS5cbiIKICAgICAgICAg ICAgICAgICAgICAiQWxzbyBjaGVjayB0aGUgZW5jb2Rpbmcgb24gdGhlIFNhdmUgcGFnZSwgd2hp Y2ggaXMgY3VycmVudGx5ICIKICAgICAgICAgICAgICAgICAgICAic2V0IHRvICUxLiBZb3UgbWF5 IHdhbnQgdG8gY2hhbmdlIHRoaXMgc2V0dGluZyAiCi0gICAgICAgICAgICAgICAgICAgImFjY29y ZGluZyB0byB0aGUgc2V0dGluZ3Mgb2YgeW91ciBsYW5ndWFnZSB0ZWFtLiIpLmFyZyhlbmNvZGlu Z1N0cikpOwotCisgICAgICAgICAgICAgICAgICAgImFjY29yZGluZyB0byB0aGUgc2V0dGluZ3Mg b2YgeW91ciBsYW5ndWFnZSB0ZWFtLiIpCisgICAgICAgICAgICAgICAgICAgLy8gQnkgZGVmYXVs dCB0aGUgZW5jb2RpbmcgaXMgaW4gVVRGLTgKKyAgICAgICAgICAgICAgICAgICAuYXJnKCJVVEYt OCIpICk7CisgICAgICAgIAogICAgICAgUVRpbWVyOjpzaW5nbGVTaG90KDEsdGhpcyxTTE9UKHBy b2plY3RDb25maWd1cmUoKSkpOwogICAgIH0KIAotICAgIF9jb25maWctPndyaXRlRW50cnkoIlZl cnNpb24iLFZFUlNJT04pOwotICAgIF9jb25maWctPnN5bmMoKTsKLQogfQogCiBLQmFiZWxNVzo6 fktCYWJlbE1XKCkK 18605 2006-11-18 17:33:52 +0000 2006-11-18 17:33:52 +0000 Fix project handling when default project is missing kbabel-defaultproject-fix.diff text/plain 16714 lucardus SW5kZXg6IGtiYWJlbC9rYmFiZWwuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIGtiYWJlbC9rYmFiZWwuY3Bw CShyZXZpc2lvbiA2MDU4NzkpCisrKyBrYmFiZWwva2JhYmVsLmNwcAkod29ya2luZyBjb3B5KQpA QCAtMTIzLDEzICsxMjMsMTUgQEAKIEtCYWJlbE1XOjpLQmFiZWxNVyhRU3RyaW5nIHByb2plY3RG aWxlKQogICAgICAgICA6IEtEb2NrTWFpbldpbmRvdyAoKSwgbV9jaGFyc2VsZWN0b3J2aWV3KDAp CiB7CisgICAgaWYgKCBwcm9qZWN0RmlsZS5pc0VtcHR5KCkgKQorICAgIAlwcm9qZWN0RmlsZSA9 IEtCYWJlbDo6UHJvamVjdE1hbmFnZXI6OmRlZmF1bHRQcm9qZWN0TmFtZSgpOwogICAgIF9wcm9q ZWN0ID0gUHJvamVjdE1hbmFnZXI6Om9wZW4ocHJvamVjdEZpbGUpOwogICAgIAotICAgIGlmICgg X3Byb2plY3QgPT0gTlVMTCApCisgICAgaWYgKCBfcHJvamVjdCA9PSBOVUxMICkgLy8gRklYTUUg c2hvdWxkIG5vdCBoYXBwZW4gYW55bW9yZQogICAgIHsKIAlLTWVzc2FnZUJveDo6ZXJyb3IoIHRo aXMsIGkxOG4oIkNhbm5vdCBvcGVuIHByb2plY3QgZmlsZVxuJTEiKS5hcmcocHJvamVjdEZpbGUp CiAgICAgICAgICAgICAsIGkxOG4oIlByb2plY3QgRmlsZSBFcnJvciIpKTsKLQlfcHJvamVjdCA9 IFByb2plY3RNYW5hZ2VyOjpvcGVuKEtCQUJFTF9ERUZBVUxUUFJPSkVDVCk7CisJX3Byb2plY3Qg PSBQcm9qZWN0TWFuYWdlcjo6b3BlbihLQmFiZWw6OlByb2plY3RNYW5hZ2VyOjpkZWZhdWx0UHJv amVjdE5hbWUoKSk7CiAgICAgfQogICAgIAogICAgIEtCQ2F0YWxvZyogY2F0YWxvZz1uZXcgS0JD YXRhbG9nKHByb2plY3RGaWxlKTsKQEAgLTEzOSwxMyArMTQxLDE1IEBACiBLQmFiZWxNVzo6S0Jh YmVsTVcoS0JDYXRhbG9nKiBjYXRhbG9nLCBRU3RyaW5nIHByb2plY3RGaWxlKQogICAgICAgICA6 IEtEb2NrTWFpbldpbmRvdyAoKSwgbV9jaGFyc2VsZWN0b3J2aWV3KDApCiB7CisgICAgaWYgKCBw cm9qZWN0RmlsZS5pc0VtcHR5KCkgKQorICAgIAlwcm9qZWN0RmlsZSA9IEtCYWJlbDo6UHJvamVj dE1hbmFnZXI6OmRlZmF1bHRQcm9qZWN0TmFtZSgpOwogICAgIF9wcm9qZWN0ID0gUHJvamVjdE1h bmFnZXI6Om9wZW4ocHJvamVjdEZpbGUpOwogCiAgICAgaWYgKCBfcHJvamVjdCA9PSBOVUxMICkK ICAgICB7CiAJS01lc3NhZ2VCb3g6OmVycm9yKCB0aGlzLCBpMThuKCJDYW5ub3Qgb3BlbiBwcm9q ZWN0IGZpbGVcbiUxIikuYXJnKHByb2plY3RGaWxlKQogICAgICAgICAgICAgLCBpMThuKCJQcm9q ZWN0IEZpbGUgRXJyb3IiKSk7Ci0JX3Byb2plY3QgPSBQcm9qZWN0TWFuYWdlcjo6b3BlbihLQkFC RUxfREVGQVVMVFBST0pFQ1QpOworCV9wcm9qZWN0ID0gUHJvamVjdE1hbmFnZXI6Om9wZW4oS0Jh YmVsOjpQcm9qZWN0TWFuYWdlcjo6ZGVmYXVsdFByb2plY3ROYW1lKCkpOwogICAgIH0KICAgICAK ICAgICBpbml0KGNhdGFsb2cpOwpAQCAtNTk4LDcgKzYwMiw3IEBACiAgICBhY3Rpb24gPSBuZXcg S0FjdGlvbihpMThuKCJDJmxvc2UiKSwgImZpbGVjbG9zZSIKICAgICAgICAgICAgLCB0aGlzLCBT TE9UKHByb2plY3RDbG9zZSgpKSxhY3Rpb25Db2xsZWN0aW9uKCkKICAgICAgICAgICAgLCJwcm9q ZWN0X2Nsb3NlIik7Ci0gICBhY3Rpb24tPnNldEVuYWJsZWQgKF9wcm9qZWN0LT5maWxlbmFtZSgp ICE9IEtCQUJFTF9ERUZBVUxUUFJPSkVDVCk7CisgICBhY3Rpb24tPnNldEVuYWJsZWQgKF9wcm9q ZWN0LT5maWxlbmFtZSgpICE9IEtCYWJlbDo6UHJvamVjdE1hbmFnZXI6OmRlZmF1bHRQcm9qZWN0 TmFtZSgpICk7CiAKICAgIGFjdGlvbiA9IG5ldyBLQWN0aW9uKGkxOG4oIiZDb25maWd1cmUuLi4i KSwgImNvbmZpZ3VyZSIKICAgICAgICAgICAgLCB0aGlzLCBTTE9UKHByb2plY3RDb25maWd1cmUo KSksYWN0aW9uQ29sbGVjdGlvbigpCkBAIC0xNTA0LDcgKzE1MDgsNyBAQAogdm9pZCBLQmFiZWxN Vzo6Y2hhbmdlQ2FwdGlvbihjb25zdCBRU3RyaW5nJiB0ZXh0KQogewogICAgIC8vIGRpc3BsYXkg dGhlIHRleHQgb24gdGhlIGNhcHRpb24KLSAgICBzZXRDYXB0aW9uKHRleHQgKyAoIF9wcm9qZWN0 LT5maWxlbmFtZSAoKSAhPSBLQkFCRUxfREVGQVVMVFBST0pFQ1QgPworICAgIHNldENhcHRpb24o dGV4dCArICggX3Byb2plY3QtPmZpbGVuYW1lICgpICE9IEtCYWJlbDo6UHJvamVjdE1hbmFnZXI6 OmRlZmF1bHRQcm9qZWN0TmFtZSgpID8KICAgICAgICAgICAgICIgKCIgKyBfcHJvamVjdC0+bmFt ZSgpICsgIikiIDogIiIgLyogS0RFIDMuNDogaTE4bigiKE5vIHByb2plY3QpIikqLyApCiAgICAg ICAgICxtX3ZpZXctPmlzTW9kaWZpZWQoKSk7CiB9CkBAIC0xNzAyLDcgKzE3MDYsNyBAQAogdm9p ZCBLQmFiZWxNVzo6cHJvamVjdE9wZW4oKQogewogICAgIFFTdHJpbmcgb2xkcHJvamVjdCA9IG1f dmlldy0+cHJvamVjdCgpOwotICAgIGlmKCBvbGRwcm9qZWN0ID09IEtCQUJFTF9ERUZBVUxUUFJP SkVDVCApCisgICAgaWYoIG9sZHByb2plY3QgPT0gS0JhYmVsOjpQcm9qZWN0TWFuYWdlcjo6ZGVm YXVsdFByb2plY3ROYW1lKCkgKQogICAgIHsKICAgICAgICAgb2xkcHJvamVjdCA9IFFTdHJpbmco KTsKICAgICB9CkBAIC0xNzMwLDcgKzE3MzQsNyBAQAogdm9pZCBLQmFiZWxNVzo6cHJvamVjdE9w ZW4oY29uc3QgUVN0cmluZyYgZmlsZSkKIHsKICAgICBRU3RyaW5nIG9sZHByb2plY3QgPSBtX3Zp ZXctPnByb2plY3QoKTsKLSAgICBpZiggb2xkcHJvamVjdCA9PSBLQkFCRUxfREVGQVVMVFBST0pF Q1QgKQorICAgIGlmKCBvbGRwcm9qZWN0ID09IEtCYWJlbDo6UHJvamVjdE1hbmFnZXI6OmRlZmF1 bHRQcm9qZWN0TmFtZSgpICkKICAgICB7CiAgICAgICAgIG9sZHByb2plY3QgPSAiIjsKICAgICB9 CkBAIC0xNzQ5LDIyICsxNzUzLDIzIEBACiAgICAgewogCUtNZXNzYWdlQm94OjplcnJvciggdGhp cywgaTE4bigiQ2Fubm90IG9wZW4gcHJvamVjdCBmaWxlXG4lMSIpLmFyZyhmaWxlKQogICAgICAg ICAgICAgLCBpMThuKCJQcm9qZWN0IEZpbGUgRXJyb3IiKSk7Ci0JX3Byb2plY3QgPSBQcm9qZWN0 TWFuYWdlcjo6b3BlbihLQkFCRUxfREVGQVVMVFBST0pFQ1QpOworCV9wcm9qZWN0ID0gUHJvamVj dE1hbmFnZXI6Om9wZW4oS0JhYmVsOjpQcm9qZWN0TWFuYWdlcjo6ZGVmYXVsdFByb2plY3ROYW1l KCkpOwogCW1fdmlldy0+dXNlUHJvamVjdChfcHJvamVjdCk7Ci0JY2hhbmdlUHJvamVjdEFjdGlv bnMoS0JBQkVMX0RFRkFVTFRQUk9KRUNUKTsKKwljaGFuZ2VQcm9qZWN0QWN0aW9ucyhLQmFiZWw6 OlByb2plY3RNYW5hZ2VyOjpkZWZhdWx0UHJvamVjdE5hbWUoKSk7CiAgICAgfQogfQogCiB2b2lk IEtCYWJlbE1XOjpwcm9qZWN0Q2xvc2UoKQogewotICAgIG1fdmlldy0+dXNlUHJvamVjdCggS0Jh YmVsOjpQcm9qZWN0TWFuYWdlcjo6b3BlbihLQkFCRUxfREVGQVVMVFBST0pFQ1QpICk7Ci0gICAg X3Byb2plY3QgPSBQcm9qZWN0TWFuYWdlcjo6b3BlbihLQkFCRUxfREVGQVVMVFBST0pFQ1QpOwot ICAgIGNoYW5nZVByb2plY3RBY3Rpb25zKEtCQUJFTF9ERUZBVUxUUFJPSkVDVCk7CisgICAgUVN0 cmluZyBkZWZhdWx0UHJvamVjdCA9IEtCYWJlbDo6UHJvamVjdE1hbmFnZXI6OmRlZmF1bHRQcm9q ZWN0TmFtZSgpOworICAgIG1fdmlldy0+dXNlUHJvamVjdCggS0JhYmVsOjpQcm9qZWN0TWFuYWdl cjo6b3BlbihkZWZhdWx0UHJvamVjdCkgKTsKKyAgICBfcHJvamVjdCA9IFByb2plY3RNYW5hZ2Vy OjpvcGVuKGRlZmF1bHRQcm9qZWN0KTsKKyAgICBjaGFuZ2VQcm9qZWN0QWN0aW9ucyhkZWZhdWx0 UHJvamVjdCk7CiB9CiAKIHZvaWQgS0JhYmVsTVc6OmNoYW5nZVByb2plY3RBY3Rpb25zKGNvbnN0 IFFTdHJpbmcmIHByb2plY3QpCiB7Ci0gICAgYm9vbCBkZWYgPSBwcm9qZWN0ID09IEtCQUJFTF9E RUZBVUxUUFJPSkVDVDsKKyAgICBib29sIGRlZiA9IChwcm9qZWN0ID09IEtCYWJlbDo6UHJvamVj dE1hbmFnZXI6OmRlZmF1bHRQcm9qZWN0TmFtZSgpKTsKIAogICAgIEtBY3Rpb24qIHNhdmVBY3Rp b249KEtBY3Rpb24qKWFjdGlvbkNvbGxlY3Rpb24oKS0+YWN0aW9uKCAicHJvamVjdF9jbG9zZSIg KTsKICAgICBzYXZlQWN0aW9uLT5zZXRFbmFibGVkKCAhIGRlZiApOwpJbmRleDoga2JhYmVsL21h aW4uY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT0KLS0tIGtiYWJlbC9tYWluLmNwcAkocmV2aXNpb24gNjA1ODc5KQor Kysga2JhYmVsL21haW4uY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0zMyw2ICszMyw3IEBACiAqKioq KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq KioqKioqKioqKioqKioqICovCiAjaW5jbHVkZSAia2JhYmVsLmgiCiAjaW5jbHVkZSAia2JhYmVs aWZhY2UuaCIKKyNpbmNsdWRlICJrYnByb2plY3RtYW5hZ2VyLmgiCiAjaW5jbHVkZSAiY2F0YWxv Zy5oIgogI2luY2x1ZGUgImtiYWJlbHNwbGFzaC5oIgogI2luY2x1ZGUgImZpbmRvcHRpb25zLmgi CkBAIC0xMzgsOSArMTM5LDExIEBACiAJewogCSAgICBRRmlsZUluZm8gZmkocHJvamVjdEZpbGUp OwogCSAgICBwcm9qZWN0RmlsZSA9IGZpLmFic0ZpbGVQYXRoKCk7Ci0JfSBlbHNlCisJfSAKKwll bHNlCiAJewotCSAgICBwcm9qZWN0RmlsZSA9IEtCQUJFTF9ERUZBVUxUUFJPSkVDVDsKKwkgICAg cHJvamVjdEZpbGUgPSBLQmFiZWw6OlByb2plY3RNYW5hZ2VyOjpkZWZhdWx0UHJvamVjdE5hbWUo KTsKKwkgICAga2REZWJ1ZyhLQkFCRUwpIDw8ICJVc2luZyB0aGUgZGVmYXVsdCBwcm9qZWN0IFBy b2plY3Q6ICIgPDwgcHJvamVjdEZpbGUgPDwgZW5kbDsKIAl9CiAKIAlrZERlYnVnKCkgPDwgIlBy b2plY3Q6ICIgPDwgcHJvamVjdEZpbGUgPDwgZW5kbDsKQEAgLTIxNCw3ICsyMTcsNyBAQAogCiB2 b2lkIEtCYWJlbEludGVyZmFjZTo6b3BlblVSTChRQ1N0cmluZyB1cmwsIFFDU3RyaW5nIHBhY2th Z2UsIFdJZCB3aW5kb3csIGludCBuZXdXaW5kb3cpCiB7Ci0gICAgb3BlblVSTCh1cmwscGFja2Fn ZSx3aW5kb3csbmV3V2luZG93LCBLQkFCRUxfREVGQVVMVFBST0pFQ1QubG9jYWw4Qml0KCkpOwor ICAgIG9wZW5VUkwodXJsLHBhY2thZ2Usd2luZG93LG5ld1dpbmRvdywgIEtCYWJlbDo6UHJvamVj dE1hbmFnZXI6OmRlZmF1bHRQcm9qZWN0TmFtZSgpLmxvY2FsOEJpdCgpKTsKIH0KIAogdm9pZCBL QmFiZWxJbnRlcmZhY2U6Om9wZW5VUkwoUUNTdHJpbmcgdXJsLCBRQ1N0cmluZyBwYWNrYWdlLCBX SWQgd2luZG93LCBpbnQgbmV3V2luZG93LCBRQ1N0cmluZyBwcm9qZWN0RmlsZSkKQEAgLTMwNCw3 ICszMDcsNyBAQAogCiB2b2lkIEtCYWJlbEludGVyZmFjZTo6b3BlblRlbXBsYXRlKFFDU3RyaW5n IG9wZW5GaWxlbmFtZSwgUUNTdHJpbmcgc2F2ZUZpbGVuYW1lLCBRQ1N0cmluZyBwYWNrYWdlLCBp bnQgbmV3V2luZG93KQogewotICAgIG9wZW5UZW1wbGF0ZShvcGVuRmlsZW5hbWUsIHNhdmVGaWxl bmFtZSwgcGFja2FnZSwgbmV3V2luZG93LCBLQkFCRUxfREVGQVVMVFBST0pFQ1QubG9jYWw4Qml0 KCkpOworICAgIG9wZW5UZW1wbGF0ZShvcGVuRmlsZW5hbWUsIHNhdmVGaWxlbmFtZSwgcGFja2Fn ZSwgbmV3V2luZG93LCBLQmFiZWw6OlByb2plY3RNYW5hZ2VyOjpkZWZhdWx0UHJvamVjdE5hbWUo KS5sb2NhbDhCaXQoKSk7CiB9CiAKIHZvaWQgS0JhYmVsSW50ZXJmYWNlOjpvcGVuVGVtcGxhdGUo UUNTdHJpbmcgb3BlbkZpbGVuYW1lLCBRQ1N0cmluZyBzYXZlRmlsZW5hbWUsIFFDU3RyaW5nIHBh Y2thZ2UsIGludCBuZXdXaW5kb3csIFFDU3RyaW5nIHByb2plY3RGaWxlKQpAQCAtMzUxLDcgKzM1 NCw3IEBACiB2b2lkIEtCYWJlbEludGVyZmFjZTo6Z290b0ZpbGVFbnRyeShRQ1N0cmluZyB1cmws IFFDU3RyaW5nIG0pCiB7CiAgICAgY29uc3QgS1VSTCB1KCBRU3RyaW5nOjpmcm9tTG9jYWw4Qml0 KCB1cmwgKSApOwotICAgIEtCYWJlbE1XICprYiA9IGZpbmRJbnN0YW5jZSggdSwgS0JBQkVMX0RF RkFVTFRQUk9KRUNULCBRU3RyaW5nKCkgKTsKKyAgICBLQmFiZWxNVyAqa2IgPSBmaW5kSW5zdGFu Y2UoIHUsIEtCYWJlbDo6UHJvamVjdE1hbmFnZXI6OmRlZmF1bHRQcm9qZWN0TmFtZSgpLCBRU3Ry aW5nKCkgKTsKIAogICAgIGlmKCFrYikgcmV0dXJuOwogCkBAIC0zNjgsNyArMzcxLDcgQEAKIAog dm9pZCBLQmFiZWxJbnRlcmZhY2U6OmdvdG9GaWxlRW50cnkoUUNTdHJpbmcgdXJsLCBRQ1N0cmlu ZyBwYWNrYWdlLCBpbnQgbSkKIHsKLSAgICBnb3RvRmlsZUVudHJ5KHVybCwgcGFja2FnZSwgbSwg S0JBQkVMX0RFRkFVTFRQUk9KRUNULmxvY2FsOEJpdCgpICk7CisgICAgZ290b0ZpbGVFbnRyeSh1 cmwsIHBhY2thZ2UsIG0sIEtCYWJlbDo6UHJvamVjdE1hbmFnZXI6OmRlZmF1bHRQcm9qZWN0TmFt ZSgpLmxvY2FsOEJpdCgpICk7CiB9CiAKIHZvaWQgS0JhYmVsSW50ZXJmYWNlOjpnb3RvRmlsZUVu dHJ5KFFDU3RyaW5nIHVybCwgUUNTdHJpbmcgcGFja2FnZSwgaW50IG0sIFFDU3RyaW5nIHByb2pl Y3RGaWxlKQpAQCAtMzkzLDcgKzM5Niw3IEBACiAgICAga2REZWJ1ZyhLQkFCRUwpIDw8ICJmaW5k SW5GaWxlICgiIDw8ZmlsZVNvdXJjZTw8ICIpOiAiIDw8IHVybCA8PCAiIGZvciAiIDw8IGZpbmRT dHIgPDwgZW5kbDsKIAogICAgIGNvbnN0IEtVUkwgdSggUVN0cmluZzo6ZnJvbUxvY2FsOEJpdCgg dXJsICkgKTsKLSAgICBLQmFiZWxNVyAqa2IgPSBmaW5kSW5zdGFuY2UoIHUsIEtCQUJFTF9ERUZB VUxUUFJPSkVDVCwgUVN0cmluZygpICk7CisgICAgS0JhYmVsTVcgKmtiID0gZmluZEluc3RhbmNl KCB1LCBLQmFiZWw6OlByb2plY3RNYW5hZ2VyOjpkZWZhdWx0UHJvamVjdE5hbWUoKSwgUVN0cmlu ZygpICk7CiAKICAgICBpZigha2IpIHJldHVybiBmYWxzZTsKIApAQCAtNDI0LDcgKzQyNyw3IEBA CiAgICAga2REZWJ1ZyhLQkFCRUwpIDw8ICJyZXBsYWNlSW5GaWxlICgiIDw8ZmlsZVNvdXJjZTw8 ICIpOiAiIDw8IHVybCA8PCAiIGZvciAiIDw8IGZpbmRTdHIgPDwgZW5kbDsKIAogICAgIGNvbnN0 IEtVUkwgdSAoIFFTdHJpbmc6OmZyb21Mb2NhbDhCaXQoIHVybCApICk7Ci0gICAgS0JhYmVsTVcg KmtiID0gZmluZEluc3RhbmNlKCB1LCBLQkFCRUxfREVGQVVMVFBST0pFQ1QsIFFTdHJpbmcoKSAp OworICAgIEtCYWJlbE1XICprYiA9IGZpbmRJbnN0YW5jZSggdSwgS0JhYmVsOjpQcm9qZWN0TWFu YWdlcjo6ZGVmYXVsdFByb2plY3ROYW1lKCksIFFTdHJpbmcoKSApOwogCiAgICAgaWYoICFrYiAp IHJldHVybiBmYWxzZTsKIApAQCAtNDUyLDcgKzQ1NSw3IEBACiB2b2lkIEtCYWJlbEludGVyZmFj ZTo6c3BlbGxjaGVjayhRU3RyaW5nTGlzdCBmaWxlTGlzdCkKIHsKICAgICAvLyAjIyMgRklYTUU6 IHRoZSBkZWZhdWx0IHByb2plY3QgbWlnaHQgdXNlIHRoZSB3cm9uZyBsYW5ndWFnZSEKLSAgICBL QmFiZWxNVyAqa2IgPSBmaW5kSW5zdGFuY2UoIEtVUkwoKSwgS0JBQkVMX0RFRkFVTFRQUk9KRUNU LCBRU3RyaW5nKCkgKTsKKyAgICBLQmFiZWxNVyAqa2IgPSBmaW5kSW5zdGFuY2UoIEtVUkwoKSwg S0JhYmVsOjpQcm9qZWN0TWFuYWdlcjo6ZGVmYXVsdFByb2plY3ROYW1lKCksIFFTdHJpbmcoKSAp OwogICAgIGtiLT5zaG93KCk7CiAgICAga2ItPnNwZWxsY2hlY2tNb3JlRmlsZXMoIGZpbGVMaXN0 ICk7CiB9CkluZGV4OiBrYmFiZWwva2JhYmVsLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0ga2JhYmVsL2tiYWJl bC5oCShyZXZpc2lvbiA2MDU4NzkpCisrKyBrYmFiZWwva2JhYmVsLmgJKHdvcmtpbmcgY29weSkK QEAgLTg2LDEwICs4NiwxMCBAQAogICAgIC8qKgogICAgICAqIERlZmF1bHQgQ29uc3RydWN0b3IK ICAgICAgKi8KLSAgICBLQmFiZWxNVyhRU3RyaW5nIHByb2plY3RGaWxlID0gS0JBQkVMX0RFRkFV TFRQUk9KRUNUKTsKKyAgICBLQmFiZWxNVyhRU3RyaW5nIHByb2plY3RGaWxlID0gUVN0cmluZygp KTsKIAogICAgIC8qKiB1c2UgdGhpcyBjb250cnVjdG9yLCBpZiB5b3UganVzdCB3YW50IHRvIGNy ZWF0ZSBhIG5ldyB2aWV3IG9mIGFuIGV4aXN0aW5nIGNhdGFsb2cqLwotICAgIEtCYWJlbE1XKEtC Q2F0YWxvZyogY2F0YWxvZywgUVN0cmluZyBwcm9qZWN0RmlsZSA9IEtCQUJFTF9ERUZBVUxUUFJP SkVDVCk7CisgICAgS0JhYmVsTVcoS0JDYXRhbG9nKiBjYXRhbG9nLCBRU3RyaW5nIHByb2plY3RG aWxlID0gUVN0cmluZygpKTsKIAogICAgIC8qKgogICAgICAqIERlZmF1bHQgRGVzdHJ1Y3RvcgpJ bmRleDogY29tbW9uL2ticHJvamVjdG1hbmFnZXIuY3BwCj09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIGNvbW1vbi9r YnByb2plY3RtYW5hZ2VyLmNwcAkocmV2aXNpb24gNjA1ODU0KQorKysgY29tbW9uL2ticHJvamVj dG1hbmFnZXIuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0zMiw2ICszMiw3IEBACiAqKioqKioqKioq KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq KioqKioqKioqICovCiAKICNpbmNsdWRlIDxrZGVidWcuaD4KKyNpbmNsdWRlIDxrc3RhbmRhcmRk aXJzLmg+CiAKICNpbmNsdWRlICJrYnByb2plY3RtYW5hZ2VyLmgiCiAKQEAgLTM5LDYgKzQwLDcg QEAKIHsKIAogUVB0ckxpc3Q8UHJvamVjdD4gUHJvamVjdE1hbmFnZXI6OnBfbGlzdDsKK1FTdHJp bmcgUHJvamVjdE1hbmFnZXI6OnN0ckRlZmF1bHRQcm9qZWN0TmFtZSA9IFFTdHJpbmcoKTsKIAog UHJvamVjdDo6UHRyIFByb2plY3RNYW5hZ2VyOjpvcGVuKCBjb25zdCBRU3RyaW5nJiBmaWxlICkK IHsKQEAgLTc1LDYgKzc3LDEzIEBACiAgICAgcHJvamVjdC0+Y29uZmlnKCktPnN5bmMoKTsKIH0K IAorUVN0cmluZyBQcm9qZWN0TWFuYWdlcjo6ZGVmYXVsdFByb2plY3ROYW1lKCB2b2lkICkKK3sK KyAgICBpZiAoIHN0ckRlZmF1bHRQcm9qZWN0TmFtZS5pc0VtcHR5KCkgKQorICAgICAgICAgc3Ry RGVmYXVsdFByb2plY3ROYW1lID0gbG9jYXRlTG9jYWwoImNvbmZpZyIsICJrYmFiZWwuZGVmYXVs dHByb2plY3QiICk7CisgICAgcmV0dXJuIHN0ckRlZmF1bHRQcm9qZWN0TmFtZTsKK30KKwogUHJv amVjdDo6UHRyIFByb2plY3RNYW5hZ2VyOjpjcmVhdGUoKQogewogICAgIGtkV2FybmluZygpIDw8 IGtfZnVuY2luZm8gPDwgIiB3YXMgY2FsbGVkISIgPDwgZW5kbDsKSW5kZXg6IGNvbW1vbi9jYXRh bG9nLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PQotLS0gY29tbW9uL2NhdGFsb2cuaAkocmV2aXNpb24gNjA1ODU0KQor KysgY29tbW9uL2NhdGFsb2cuaAkod29ya2luZyBjb3B5KQpAQCAtNTYsOCArNTYsNiBAQAogY2xh c3MgS0RhdGFUb29sOwogY2xhc3MgS1VSTDsKIAotI2RlZmluZSBLQkFCRUxfREVGQVVMVFBST0pF Q1QJKEtHbG9iYWw6OmRpcnMoKS0+ZmluZFJlc291cmNlKCJjb25maWciLCJrYmFiZWwuZGVmYXVs dHByb2plY3QiKSkKLQogbmFtZXNwYWNlIEtCYWJlbAogewogCkBAIC0xMzMsNyArMTMxLDcgQEAK ICAgICogQHBhcmFtIG5hbWUgICB1bmlxdWUgbmFtZSBmb3IgdGhpcyBvYmplY3QKICAgICogQHBh cmFtIGNvbmZpZ0ZpbGUgY29uZmlndXJhdGlvbiBmaWxlIHRvIHJlYWQgY29uZmlnIGZyb20KICAg ICovCi0gICBDYXRhbG9nKFFPYmplY3QqIHBhcmVudD0wLCBjb25zdCBjaGFyKiBuYW1lPTAsIFFT dHJpbmcgcHJvamVjdEZpbGUgPSBLQkFCRUxfREVGQVVMVFBST0pFQ1QpOworICAgQ2F0YWxvZyhR T2JqZWN0KiBwYXJlbnQ9MCwgY29uc3QgY2hhciogbmFtZT0wLCBRU3RyaW5nIHByb2plY3RGaWxl ID0gUVN0cmluZygpICk7CiAKICAgIC8qKgogICAgKiBEZXByZWNhdGVkLiBBIGNvcHkgY29uc3Ry dWN0b3IuIERvIG5vdCB1c2Ugc2luY2UgZWFjaCBDYXRhbG9nIHJlZ2lzdGVycwpJbmRleDogY29t bW9uL3Jlc291cmNlcy5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIGNvbW1vbi9yZXNvdXJjZXMuaAkocmV2aXNp b24gNjA1ODU0KQorKysgY29tbW9uL3Jlc291cmNlcy5oCSh3b3JraW5nIGNvcHkpCkBAIC0zOSw2 ICszOSw1IEBACiAjZGVmaW5lIEtCQUJFTF9DQVRNQU4gODEwOQogCiAKLQogI2VuZGlmIC8vIFJF U09VUkNFU19ICiAKSW5kZXg6IGNvbW1vbi9rYnByb2plY3QuY3BwCj09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIGNv bW1vbi9rYnByb2plY3QuY3BwCShyZXZpc2lvbiA2MDU4NTQpCisrKyBjb21tb24va2Jwcm9qZWN0 LmNwcAkod29ya2luZyBjb3B5KQpAQCAtMzEsNiArMzEsNyBAQAogCiAqKioqKioqKioqKioqKioq KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq KioqICovCiAKKyNpbmNsdWRlICJyZXNvdXJjZXMuaCIKICNpbmNsdWRlICJrYnByb2plY3QuaCIK ICNpbmNsdWRlICJrYnByb2plY3RtYW5hZ2VyLmgiCiAjaW5jbHVkZSAia2Jwcm9qZWN0c2V0dGlu Z3MuaCIKQEAgLTkxLDExICs5MiwxMyBAQAogICAgIH0KICAgICAgICAgCiAgICAgX2NvbmZpZyA9 IEtTaGFyZWRDb25maWc6Om9wZW5Db25maWcgKF9maWxlbmFtZSwgZmFsc2UsIGZhbHNlKTsKLSAg ICBrZERlYnVnICgpIDw8ICJPcGVuZWQgcHJvamVjdCAiIDw8IF9maWxlbmFtZSA8PCBlbmRsOwor ICAgIGtkRGVidWcgKEtCQUJFTCkgPDwgIk9wZW5lZCBwcm9qZWN0ICIgPDwgX2ZpbGVuYW1lIDw8 IGVuZGw7CiAgICAgCiAgICAgLy8gcmVhZCB0aGUgcHJvamVjdCBuYW1lCiAgICAgX2NvbmZpZy0+ c2V0R3JvdXAoICJQcm9qZWN0IiApOwogICAgIF9uYW1lID0gX2NvbmZpZy0+cmVhZEVudHJ5KCAi TmFtZSIsIFFTdHJpbmcoKSApOworICAgIGlmICggX25hbWUuaXNFbXB0eSgpICkKKwlfbmFtZSA9 ICJEZWZhdWx0LVByb2plY3QiOyAvLyBzZXQgZGVmYXVsdCBwcm9qZWN0IG5hbWUKIAogICAgIC8v ICMjIyBGSVhNRTogd2h5IGlzIHRoZSBWZXJzaW9uIG51bWJlciBub3Qgd3JpdHRlbiB0byB0aGUg cHJvamVjdCBmaWxlPwogICAgIGlmICggX2NvbmZpZy0+cmVhZEVudHJ5KCAiVmVyc2lvbiIsIFFT dHJpbmcoKSApICE9ICIxLjAuMSIgKQpJbmRleDogY29tbW9uL2NhdGFsb2cuY3BwCj09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT0KLS0tIGNvbW1vbi9jYXRhbG9nLmNwcAkocmV2aXNpb24gNjA1ODU0KQorKysgY29tbW9uL2Nh dGFsb2cuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC03Myw2ICs3Myw4IEBACiBDYXRhbG9nOjpDYXRh bG9nKFFPYmplY3QqIHBhcmVudCwgY29uc3QgY2hhciogbmFtZSwgUVN0cmluZyBwcm9qZWN0Rmls ZSkKICAgICAgICAgOiBRT2JqZWN0KHBhcmVudCxuYW1lKQogeworICAgaWYgKCBwcm9qZWN0Rmls ZS5pc0VtcHR5KCkgKQorICAgICAgICBwcm9qZWN0RmlsZSA9IEtCYWJlbDo6UHJvamVjdE1hbmFn ZXI6OmRlZmF1bHRQcm9qZWN0TmFtZSgpOwogICAgZCA9IG5ldyBDYXRhbG9nUHJpdmF0ZShQcm9q ZWN0TWFuYWdlcjo6b3Blbihwcm9qZWN0RmlsZSkpOwogICAgcmVhZFByZWZlcmVuY2VzKCk7CiB9 CkluZGV4OiBjb21tb24va2Jwcm9qZWN0bWFuYWdlci5oCj09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIGNvbW1vbi9r YnByb2plY3RtYW5hZ2VyLmgJKHJldmlzaW9uIDYwNTg1NCkKKysrIGNvbW1vbi9rYnByb2plY3Rt YW5hZ2VyLmgJKHdvcmtpbmcgY29weSkKQEAgLTQ4LDExICs0OCwxMyBAQAogCSAgICBzdGF0aWMg UHJvamVjdDo6UHRyIG9wZW4oIGNvbnN0IFFTdHJpbmcmIGZpbGUgKTsKIAkgICAgc3RhdGljIHZv aWQgY2xvc2UoIFByb2plY3Q6OlB0ciBwcm9qZWN0ICk7CiAJICAgIHN0YXRpYyBQcm9qZWN0OjpQ dHIgY3JlYXRlKCk7CisJICAgIHN0YXRpYyBRU3RyaW5nIGRlZmF1bHRQcm9qZWN0TmFtZSggdm9p ZCApOwogCSAgICAKIAkgICAgZnJpZW5kIGNsYXNzIFByb2plY3Q7CiAJcHJpdmF0ZToKIAkgICAg c3RhdGljIHZvaWQgcmVtb3ZlIChQcm9qZWN0Kik7CiAJICAgIHN0YXRpYyBRUHRyTGlzdDxQcm9q ZWN0PiBwX2xpc3Q7CisgICAgICAgICAgICBzdGF0aWMgUVN0cmluZyBzdHJEZWZhdWx0UHJvamVj dE5hbWU7CiAgICAgfTsKIAogfQpJbmRleDogY2F0YWxvZ21hbmFnZXIvY2F0YWxvZ21hbmFnZXIu Y3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT0KLS0tIGNhdGFsb2dtYW5hZ2VyL2NhdGFsb2dtYW5hZ2VyLmNwcAkocmV2 aXNpb24gNjAxNzQ4KQorKysgY2F0YWxvZ21hbmFnZXIvY2F0YWxvZ21hbmFnZXIuY3BwCSh3b3Jr aW5nIGNvcHkpCkBAIC05Miw2ICs5Miw4IEBACiBDYXRhbG9nTWFuYWdlcjo6Q2F0YWxvZ01hbmFn ZXIoUVN0cmluZyBjb25maWdGaWxlICkKICAgICAgICAgICAgICAgICAgOktNYWluV2luZG93KDAs MCkKIHsKKyAgIGlmICggY29uZmlnRmlsZS5pc0VtcHR5KCkgKQorCWNvbmZpZ0ZpbGUgPSBLQmFi ZWw6OlByb2plY3RNYW5hZ2VyOjpkZWZhdWx0UHJvamVjdE5hbWUoKTsKICAgIF9jb25maWdGaWxl ID0gY29uZmlnRmlsZTsKIAogICAgaW5pdCgpOwpAQCAtMTI2LDggKzEyOCw4IEBACiAgICB7CiAJ S01lc3NhZ2VCb3g6OmVycm9yKCB0aGlzLCBpMThuKCJDYW5ub3Qgb3BlbiBwcm9qZWN0IGZpbGVc biUxIikuYXJnKF9jb25maWdGaWxlKQogCSAgICAsIGkxOG4oIlByb2plY3QgRmlsZSBFcnJvciIp KTsKLQkgICAgCi0JX3Byb2plY3QgPSBLQmFiZWw6OlByb2plY3RNYW5hZ2VyOjpvcGVuKEtCQUJF TF9ERUZBVUxUUFJPSkVDVCk7CisKKwlfcHJvamVjdCA9IEtCYWJlbDo6UHJvamVjdE1hbmFnZXI6 Om9wZW4oS0JhYmVsOjpQcm9qZWN0TWFuYWdlcjo6ZGVmYXVsdFByb2plY3ROYW1lKCkpOwogICAg fQogICAgCiAgICBjb25uZWN0KCBfcHJvamVjdCwgU0lHTkFMIChzaWduYWxDYXRNYW5TZXR0aW5n c0NoYW5nZWQoKSkKQEAgLTE1Niw3ICsxNTgsNyBAQAogICAgICAgICAgICAsdGhpcyxTTE9UKG9w ZW5GaWxlKFFTdHJpbmcsUVN0cmluZyxpbnQpKSk7CiAgICBjb25uZWN0KF9jYXRhbG9nTWFuYWdl ciwgU0lHTkFMKHNlbGVjdGVkQ2hhbmdlZCh1aW50KSksCiAgICAgICAgICAgIHRoaXMsIFNMT1Qo c2VsZWN0ZWRDaGFuZ2VkKHVpbnQpKSk7Ci0JICAgCisKICAgIEtXaW46OnNldEljb25zKHdpbklk KCksQmFySWNvbigiY2F0YWxvZ21hbmFnZXIiLDMyKQogICAgICAgICAgICAsU21hbGxJY29uKCJj YXRhbG9nbWFuYWdlciIpKTsKIApAQCAtMzM3LDggKzMzOSw5IEBACiAgICBhY3Rpb24gPSBuZXcg S0FjdGlvbihpMThuKCJDJmxvc2UiKSwgImZpbGVjbG9zZSIKICAgICAgICAgICAgLCB0aGlzLCBT TE9UKHByb2plY3RDbG9zZSgpKSxhY3Rpb25Db2xsZWN0aW9uKCkKICAgICAgICAgICAgLCJwcm9q ZWN0X2Nsb3NlIik7Ci0gICBhY3Rpb24tPnNldEVuYWJsZWQgKF9wcm9qZWN0LT5maWxlbmFtZSgp ICE9IEtCQUJFTF9ERUZBVUxUUFJPSkVDVCk7CiAKKyAgIGFjdGlvbi0+c2V0RW5hYmxlZCAoX3By b2plY3QtPmZpbGVuYW1lKCkgIT0gS0JhYmVsOjpQcm9qZWN0TWFuYWdlcjo6ZGVmYXVsdFByb2pl Y3ROYW1lKCkgKTsKKwogICAgYWN0aW9uID0gbmV3IEtBY3Rpb24oaTE4bigiJkNvbmZpZ3VyZS4u LiIpLCAiY29uZmlndXJlIgogICAgICAgICAgICAsIHRoaXMsIFNMT1QocHJvamVjdENvbmZpZ3Vy ZSgpKSxhY3Rpb25Db2xsZWN0aW9uKCkKICAgICAgICAgICAgLCJwcm9qZWN0X3NldHRpbmdzIik7 CkBAIC0xMTkwLDcgKzExOTMsNyBAQAogdm9pZCBDYXRhbG9nTWFuYWdlcjo6cHJvamVjdE9wZW4o KQogewogICAgIFFTdHJpbmcgb2xkcHJvamVjdCA9IF9wcm9qZWN0LT5maWxlbmFtZSgpOwotICAg IGlmKCBvbGRwcm9qZWN0ID09IEtCQUJFTF9ERUZBVUxUUFJPSkVDVCApCisgICAgaWYoIG9sZHBy b2plY3QgPT0gS0JhYmVsOjpQcm9qZWN0TWFuYWdlcjo6ZGVmYXVsdFByb2plY3ROYW1lKCkgKQog ICAgIHsKICAgICAgICAgb2xkcHJvamVjdCA9IFFTdHJpbmcoKTsKICAgICB9CkBAIC0xMjEzLDYg KzEyMTYsNyBAQAogCXVwZGF0ZVNldHRpbmdzKCk7CiAgICAgICAgIGNoYW5nZVByb2plY3RBY3Rp b25zKGZpbGUpOwogCWVtaXQgc2V0dGluZ3NDaGFuZ2VkKF9zZXR0aW5ncyk7CisKICAgICB9CiAg ICAgZWxzZQogICAgIHsKQEAgLTEyMjQsMTkgKzEyMjgsMTkgQEAKIHsKICAgICBkaXNjb25uZWN0 KCBfcHJvamVjdCwgU0lHTkFMIChzaWduYWxDYXRNYW5TZXR0aW5nc0NoYW5nZWQoKSkKIAkgICAg LCB0aGlzLCBTTE9UICh1cGRhdGVTZXR0aW5ncygpKSk7Ci0gICAgX3Byb2plY3QgPSBLQmFiZWw6 OlByb2plY3RNYW5hZ2VyOjpvcGVuKEtCQUJFTF9ERUZBVUxUUFJPSkVDVCk7CisgICAgX3Byb2pl Y3QgPSBLQmFiZWw6OlByb2plY3RNYW5hZ2VyOjpvcGVuKEtCYWJlbDo6UHJvamVjdE1hbmFnZXI6 OmRlZmF1bHRQcm9qZWN0TmFtZSgpKTsKICAgICBjb25uZWN0KCBfcHJvamVjdCwgU0lHTkFMIChz aWduYWxDYXRNYW5TZXR0aW5nc0NoYW5nZWQoKSkKIAkgICAgLCB0aGlzLCBTTE9UICh1cGRhdGVT ZXR0aW5ncygpKSk7CiAgICAgX2NvbmZpZ0ZpbGUgPSBfcHJvamVjdC0+ZmlsZW5hbWUoKTsKICAg ICByZXN0b3JlU2V0dGluZ3MoKTsKICAgICB1cGRhdGVTZXR0aW5ncygpOwotICAgIGNoYW5nZVBy b2plY3RBY3Rpb25zKEtCQUJFTF9ERUZBVUxUUFJPSkVDVCk7CisgICAgY2hhbmdlUHJvamVjdEFj dGlvbnMoS0JhYmVsOjpQcm9qZWN0TWFuYWdlcjo6ZGVmYXVsdFByb2plY3ROYW1lKCkpOwogICAg IGVtaXQgc2V0dGluZ3NDaGFuZ2VkKF9zZXR0aW5ncyk7CiB9CiAKIHZvaWQgQ2F0YWxvZ01hbmFn ZXI6OmNoYW5nZVByb2plY3RBY3Rpb25zKGNvbnN0IFFTdHJpbmcmIHByb2plY3QpCiB7Ci0gICAg Ym9vbCBkZWYgPSBwcm9qZWN0ID09IEtCQUJFTF9ERUZBVUxUUFJPSkVDVDsKKyAgICBib29sIGRl ZiA9ICggcHJvamVjdCA9PSBLQmFiZWw6OlByb2plY3RNYW5hZ2VyOjpkZWZhdWx0UHJvamVjdE5h bWUoKSApIDsKIAogICAgIEtBY3Rpb24qIHNhdmVBY3Rpb249KEtBY3Rpb24qKWFjdGlvbkNvbGxl Y3Rpb24oKS0+YWN0aW9uKCAicHJvamVjdF9jbG9zZSIgKTsKICAgICBzYXZlQWN0aW9uLT5zZXRF bmFibGVkKCAhIGRlZiApOwpJbmRleDogY2F0YWxvZ21hbmFnZXIvbWFpbi5jcHAKPT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PQotLS0gY2F0YWxvZ21hbmFnZXIvbWFpbi5jcHAJKHJldmlzaW9uIDYwMTc0OCkKKysrIGNhdGFs b2dtYW5hZ2VyL21haW4uY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0zMiw2ICszMiw3IEBACiAgIHlv dXIgdmVyc2lvbi4KICAgICAgIAogKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKiAqLworI2luY2x1ZGUgImti cHJvamVjdG1hbmFnZXIuaCIKICNpbmNsdWRlICJjYXRhbG9nbWFuYWdlci5oIgogI2luY2x1ZGUg ImNhdGFsb2dtYW5hZ2VyaWZhY2UuaCIKICNpbmNsdWRlICJjYXRhbG9nLmgiCkBAIC0zOSw2ICs0 MCw3IEBACiAjaW5jbHVkZSAicG9pbmZvLmgiCiAKICNpbmNsdWRlICJ2ZXJzaW9uLmgiCisjaW5j bHVkZSAicmVzb3VyY2VzLmgiCiAKICNpbmNsdWRlIDxkY29wY2xpZW50Lmg+CiAjaW5jbHVkZSA8 a2Fib3V0ZGF0YS5oPgpAQCAtMTM1LDcgKzEzNyw3IEBACiAJfQogCWVsc2UKIAl7Ci0JICAgIGNv bmZpZ2ZpbGUgPSBLQkFCRUxfREVGQVVMVFBST0pFQ1Q7CisJICAgIGNvbmZpZ2ZpbGUgPSBLQmFi ZWw6OlByb2plY3RNYW5hZ2VyOjpkZWZhdWx0UHJvamVjdE5hbWUoKTsKIAl9CiAKIAlfdmlldz1u ZXcgQ2F0YWxvZ01hbmFnZXIoY29uZmlnZmlsZSk7CkluZGV4OiBjYXRhbG9nbWFuYWdlci9jYXRh bG9nbWFuYWdlci5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIGNhdGFsb2dtYW5hZ2VyL2NhdGFsb2dtYW5hZ2Vy LmgJKHJldmlzaW9uIDYwNTg4MSkKKysrIGNhdGFsb2dtYW5hZ2VyL2NhdGFsb2dtYW5hZ2VyLmgJ KHdvcmtpbmcgY29weSkKQEAgLTcxLDcgKzcxLDcgQEAKIHsKICAgIFFfT0JKRUNUCiBwdWJsaWM6 Ci0gICBDYXRhbG9nTWFuYWdlcihRU3RyaW5nIGNvbmZpZ2ZpbGUgPSBLQkFCRUxfREVGQVVMVFBS T0pFQ1QpOworICAgQ2F0YWxvZ01hbmFnZXIoUVN0cmluZyBjb25maWdmaWxlID0gUVN0cmluZygp ICk7CiAgICB+Q2F0YWxvZ01hbmFnZXIoKTsKIAogICAgS0JhYmVsOjpDYXRNYW5TZXR0aW5ncyBz ZXR0aW5ncygpIGNvbnN0OwpAQCAtMjA0LDYgKzIwNCw3IEBACiAgICAKICAgIC8vLyBvcHRpb25z IHVzZWQgaW4gZmluZE5leHRGaWxlCiAgICBLQmFiZWw6OkZpbmRPcHRpb25zIF9maW5kT3B0aW9u czsKKwogICAgCiAgICAvLy8gcHJvamVjdCBjb25maWd1cmF0aW9uIGZpbGUKICAgIFFTdHJpbmcg X2NvbmZpZ0ZpbGU7Cg==