11348 2006-10-18 10:37:44 -0700 [S60] File transaction should handle the case of escaped file schemed url 2006-11-11 21:19:25 -0800 1 1 1 Unclassified WebKit Page Loading 420+ S60 Hardware S60 3rd edition CLOSED FIXED P3 Major --- 1 wei.liu webkit-unassigned oldest_to_newest 51959 0 wei.liu 2006-10-18 10:37:44 -0700 File transaction should handle the case of escaped file schemed url 51949 1 11136 wei.liu 2006-10-18 10:51:08 -0700 Created attachment 11136 file transaction fix for escaped file url 51622 2 11136 Sachin.Padma 2006-10-20 12:50:40 -0700 Comment on attachment 11136 file transaction fix for escaped file url The escaping should be generic. 49307 3 11258 joseph.ligman 2006-10-27 13:29:45 -0700 Created attachment 11258 Files: BrCtl.cpp, FileTransaction.cpp This patch uses the TUriParser::GetFileNameL(EUriFileNameFull) to generate the file path. 48569 4 11287 joseph.ligman 2006-10-30 11:32:40 -0800 Created attachment 11287 Files: BrCtl.cpp, FileTransaction.cpp Added a TRAP_IGNORE around TUriParser::GetFileNameL since invalid paths should return NULL and are not expected to leave. 47473 5 11330 joseph.ligman 2006-11-01 10:53:54 -0800 Created attachment 11330 Files: FileTransaction.cpp Remove any escaped characters in the file path with EscapeUtils::EscapeDecodeL. 47631 6 11330 Sachin.Padma 2006-11-03 10:19:57 -0800 Comment on attachment 11330 Files: FileTransaction.cpp r=me 47637 7 Sachin.Padma 2006-11-03 11:10:11 -0800 committed as r17576 11136 2006-10-18 10:51:08 -0700 2006-10-20 12:50:40 -0700 file transaction fix for escaped file url filetrans.patch text/plain 9096 wei.liu SW5kZXg6IFdlYktpdC9DaGFuZ2VMb2cNCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0NCi0tLSBXZWJLaXQvQ2hhbmdlTG9n CShyZXZpc2lvbiAxNzEwNykNCisrKyBXZWJLaXQvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpDQpA QCAtMSwzICsxLDE2IEBADQorMjAwNi0xMC0xOCAgdzNsaXUgIDx3ZWkubGl1QG5va2lhLmNvbT4N CisNCisgICAgICAgIFJldmlld2VkIGJ5IFphbGFuIEJ1anRhcy4NCisgICAgICAgIERFU0M6IEZp bGUgdHJhbnNhY3Rpb24gc2hvdWxkIGhhbmRsZSB0aGUgY2FzZSBvZiBlc2NhcGVkIGZpbGUgc2No ZW1lZCB1cmwNCisgICAgICAgIGh0dHA6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lk PTExMzg0DQorDQorICAgICAgICAqIFJlc291cmNlTG9hZGVyL3NyYy9GaWxlVHJhbnNhY3Rpb24u Y3BwOg0KKyAgICAgICAgKENGaWxlVHJhbnNhY3Rpb246OkRvU3VibWl0TCk6DQorICAgICAgICAo Q0ZpbGVUcmFuc2FjdGlvbjo6Q3JlYXRlSGVhZGVyUmVzcG9uc2VMQyk6DQorICAgICAgICAoQ0Zp bGVUcmFuc2FjdGlvbjo6UGFyc2VGaWxlTmFtZUxDKToNCisgICAgICAgIChDRmlsZVRyYW5zYWN0 aW9uOjpDb250ZW50VHlwZUxDKToNCisgICAgICAgIChDRmlsZVRyYW5zYWN0aW9uOjpDb250ZW50 RW5jb2RpbmcpOg0KKw0KIDIwMDYtMTAtMTMgIHpoYWx1ICA8emhhb3NvbmcubHVAbm9raWEuY29t Pg0KIA0KICAgICAgICAgUmV2aWV3ZWQgYnkgU2FjaGluLg0KSW5kZXg6IFdlYktpdC9SZXNvdXJj ZUxvYWRlci9zcmMvRmlsZVRyYW5zYWN0aW9uLmNwcA0KPT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQ0KLS0tIFdlYktpdC9S ZXNvdXJjZUxvYWRlci9zcmMvRmlsZVRyYW5zYWN0aW9uLmNwcAkocmV2aXNpb24gMTcxMDYpDQor KysgV2ViS2l0L1Jlc291cmNlTG9hZGVyL3NyYy9GaWxlVHJhbnNhY3Rpb24uY3BwCSh3b3JraW5n IGNvcHkpDQpAQCAtMiwxNyArMiwxNyBAQA0KICogPT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09DQogKiAg TmFtZSAgICAgICAgOiBGaWxlVHJhbnNhY3Rpb24uY3BwDQogKiAgUGFydCBvZiAgICAgOiBXZWJL aXQgLyBSZXNvdXJjZUxvYWRlcg0KLSogIEludGVyZmFjZSAgIDogDQorKiAgSW50ZXJmYWNlICAg Og0KICogIERlc2NyaXB0aW9uIDogSW1wbGVtZW50YXRpb24gb2YgQ0ZpbGVUcmFuc2FjdGlvbg0K ICogIFZlcnNpb24gICAgIDogJVZlcnNpb24lDQogKg0KICogICAgQ29weXJpZ2h0IChjKSAyMDA2 LCBOb2tpYSBDb3Jwb3JhdGlvbg0KICogICAgQWxsIHJpZ2h0cyByZXNlcnZlZC4NCi0qICANCisq DQogKiAgIFJlZGlzdHJpYnV0aW9uIGFuZCB1c2UgaW4gc291cmNlIGFuZCBiaW5hcnkgZm9ybXMs IHdpdGggb3Igd2l0aG91dA0KICogICBtb2RpZmljYXRpb24sIGFyZSBwZXJtaXR0ZWQgcHJvdmlk ZWQgdGhhdCB0aGUgZm9sbG93aW5nIGNvbmRpdGlvbnMNCiAqICAgYXJlIG1ldDoNCi0qICANCisq DQogKiAgICAgICogUmVkaXN0cmlidXRpb25zIG9mIHNvdXJjZSBjb2RlIG11c3QgcmV0YWluIHRo ZSBhYm92ZSBjb3B5cmlnaHQNCiAqICAgICAgICBub3RpY2UsIHRoaXMgbGlzdCBvZiBjb25kaXRp b25zIGFuZCB0aGUgZm9sbG93aW5nIGRpc2NsYWltZXIuDQogKiAgICAgICogUmVkaXN0cmlidXRp b25zIGluIGJpbmFyeSBmb3JtIG11c3QgcmVwcm9kdWNlIHRoZSBhYm92ZSBjb3B5cmlnaHQNCkBA IC0yMiw3ICsyMiw3IEBADQogKiAgICAgICogTmVpdGhlciB0aGUgbmFtZSBvZiB0aGUgTm9raWEg Q29ycG9yYXRpb24gbm9yIHRoZSBuYW1lcyBvZiBpdHMNCiAqICAgICAgICBjb250cmlidXRvcnMg bWF5IGJlIHVzZWQgdG8gZW5kb3JzZSBvciBwcm9tb3RlIHByb2R1Y3RzIGRlcml2ZWQNCiAqICAg ICAgICBmcm9tIHRoaXMgc29mdHdhcmUgd2l0aG91dCBzcGVjaWZpYyBwcmlvciB3cml0dGVuIHBl cm1pc3Npb24uDQotKiAgDQorKg0KICogICAgICBUSElTIFNPRlRXQVJFIElTIFBST1ZJREVEIEJZ IFRIRSBDT1BZUklHSFQgSE9MREVSUyBBTkQgQ09OVFJJQlVUT1JTDQogKiAgICAgICJBUyBJUyIg QU5EIEFOWSBFWFBSRVNTIE9SIElNUExJRUQgV0FSUkFOVElFUywgSU5DTFVESU5HLCBCVVQgTk9U DQogKiAgICAgIExJTUlURUQgVE8sIFRIRSBJTVBMSUVEIFdBUlJBTlRJRVMgT0YgTUVSQ0hBTlRB QklMSVRZIEFORCBGSVRORVNTIEZPUg0KQEAgLTM1LDcgKzM1LDcgQEANCiAqICAgICAgKElOQ0xV RElORyBORUdMSUdFTkNFIE9SIE9USEVSV0lTRSkgQVJJU0lORyBJTiBBTlkgV0FZIE9VVCBPRiBU SEUNCiAqICAgICAgVVNFIE9GIFRISVMgU09GVFdBUkUsIEVWRU4gSUYgQURWSVNFRCBPRiBUSEUg UE9TU0lCSUxJVFkgT0YgU1VDSA0KICogICAgICBEQU1BR0UuDQotKiAgDQorKg0KICogICAgUGxl YXNlIHNlZSBmaWxlIHBhdGVudGxpY2Vuc2UudHh0IGZvciBmdXJ0aGVyIGdyYW50cy4NCiAqID09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PQ0KICovDQpAQCAtMTc1LDEwICsxNzUsMTAgQEAgVEludCBDRmls ZVRyYW5zYWN0aW9uOjpEb1N1Ym1pdEwoKQ0KICAgICAvLw0KICAgICBpZiggc3VibWl0ZWQgIT0g S0Vyck5vbmUgKQ0KICAgICAgICAgew0KLSAgICAgICAgLy8gY2FuY2VsIHRoaXMgdHJhbnMgICAg ICAgICAgICAgICAgDQorICAgICAgICAvLyBjYW5jZWwgdGhpcyB0cmFucw0KICAgICAgICAgaVRy YW5zYWN0aW9uT2JzZXJ2ZXItPkNvbXBsZXRlKCAqdGhpcywgKmlSZXNwb25zZUluZm8sIHN1Ym1p dGVkICk7DQogICAgICAgICB9DQotICAgIA0KKw0KICAgICByZXR1cm4gS0Vyck5vbmU7DQogICAg IH0NCiANCkBAIC0yNDksOSArMjQ5LDkgQEAgQ1VybFJlc3BvbnNlSGVhZGVySW5mbyogQ0ZpbGVU cmFuc2FjdGlvbg0KICAgICAgICAgICAgIH0NCiAgICAgICAgIH0NCiAgICAgaGVhZGVyLT5TZXRS ZXF1ZXN0VXJsTCggZml4ZWRVcmwtPkRlcygpICk7DQotICAgIC8vIHJlcXVlc3QgYW5kIHJlc3Bv bnNlIHVybCBhcmUgdGhlIHNhbWUgDQorICAgIC8vIHJlcXVlc3QgYW5kIHJlc3BvbnNlIHVybCBh cmUgdGhlIHNhbWUNCiAgICAgaGVhZGVyLT5TZXRSZXNwb25zZVVybEwoIGZpeGVkVXJsLT5EZXMo KSApOw0KLSAgICBDbGVhbnVwU3RhY2s6OlBvcEFuZERlc3Ryb3koKTsgLy8gZml4ZWRVcmwgDQor ICAgIENsZWFudXBTdGFjazo6UG9wQW5kRGVzdHJveSgpOyAvLyBmaXhlZFVybA0KICAgICAvLyBz ZXQgY29udGVudCB0eXBlIGFuZCBjb250ZW50IGVuY29kaW5nDQogICAgIEhCdWZDOCogY29udGVu dFR5cGUgPSBDb250ZW50VHlwZUxDKCk7DQogICAgIGlmKCBjb250ZW50VHlwZSApDQpAQCAtMjgz LDcgKzI4Myw3IEBAIENVcmxSZXNwb25zZUhlYWRlckluZm8qIENGaWxlVHJhbnNhY3Rpb24NCiAg ICAgICAgIGZpZWxkTGlzdC0+QXBwZW5kTCggY29udGVudEVuY29kaW5nRmlsZWQgKTsNCiANCiAg ICAgICAgIGhlYWRlci0+U2V0UmVzcG9uc2VIZWFkZXJzTCggKmZpZWxkTGlzdCApOw0KLSAgICAg ICAgLy8gZGVsZXRlIGxpc3QgDQorICAgICAgICAvLyBkZWxldGUgbGlzdA0KICAgICAgICAgZmll bGRMaXN0LT5SZXNldEFuZERlc3Ryb3koKTsNCiAgICAgICAgIENsZWFudXBTdGFjazo6UG9wQW5k RGVzdHJveSggMiApOyAvLyBmaWVsZExpc3QsIGNvbnRlbnRUeXBlDQogICAgICAgICB9DQpAQCAt MzYxLDYgKzM2MSwxMSBAQCBUSW50IENGaWxlVHJhbnNhY3Rpb246Ok1IRlJ1bkVycm9yKA0KIC8v IFRyYW5zbGF0ZSB0aGUgZmlsZSBuYW1lIGZyb20gYSBVUkwgdG8gYSB2YWxpZCBmaWxlIG5hbWUg aW4gdGhlIHN5c3RlbS4NCiAvLyAtLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLQ0KIC8vDQorLy8gLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0NCisvLyBDRmlsZVRyYW5zYWN0aW9uOjpQYXJzZUZpbGVOYW1lTEMNCisv LyBUcmFuc2xhdGUgdGhlIGZpbGUgbmFtZSBmcm9tIGEgVVJMIHRvIGEgdmFsaWQgZmlsZSBuYW1l IGluIHRoZSBzeXN0ZW0uDQorLy8gLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0NCisvLw0KIEhCdWZDKiBD RmlsZVRyYW5zYWN0aW9uOjpQYXJzZUZpbGVOYW1lTEMoDQogICAgIGNvbnN0IFREZXNDJiBhVXJs ICkNCiAgICAgew0KQEAgLTM3MCwxMSArMzc1LDExIEBAIEhCdWZDKiBDRmlsZVRyYW5zYWN0aW9u OjpQYXJzZUZpbGVOYW1lTEMNCiAgICAgSEJ1ZkMqIGZpbGVOYW1lID0gTlVMTDsNCiANCiAgICAg c3RhdHVzID0gcGFyc2VyLlBhcnNlKCBhVXJsICk7DQotICAgIA0KKw0KICAgICBpZiggc3RhdHVz ID09IEtFcnJOb25lICkNCiAgICAgICAgIHsNCiAgICAgICAgIC8vIHRoaXMgbXVzdCBiZSB0aGUg ZHJpdmUgbGV0dGVyDQotICAgICAgICBUUHRyQyBob3N0ID0gcGFyc2VyLkV4dHJhY3QoIEVVcmlI b3N0ICk7ICAgICAgICANCisgICAgICAgIFRQdHJDIGhvc3QgPSBwYXJzZXIuRXh0cmFjdCggRVVy aUhvc3QgKTsNCiAgICAgICAgIFRQdHJDIHBhdGggPSBwYXJzZXIuRXh0cmFjdCggRVVyaVBhdGgg KTsNCiANCiAgICAgICAgIC8vIGFkZCBtaXNzaW5nICI6Ig0KQEAgLTM4Nyw3ICszOTIsNyBAQCBI QnVmQyogQ0ZpbGVUcmFuc2FjdGlvbjo6UGFyc2VGaWxlTmFtZUxDDQogICAgICAgICAgICAgZmls ZU5hbWVQdHIuQ29weSggaG9zdCApOw0KICAgICAgICAgICAgIGZpbGVOYW1lUHRyLkFwcGVuZCgg X0woIjoiKSApOw0KICAgICAgICAgICAgIH0NCi0gICAgICAgIGVsc2UgDQorICAgICAgICBlbHNl DQogICAgICAgICAgICAgew0KICAgICAgICAgICAgIC8vIGFjY29yZGluZyB0byBzeW1iaWFuIHVy aSBwYXJzZXIgaW4gY2FzZSBvZg0KICAgICAgICAgICAgIC8vIGZpbGU6Ly8vYzpcZm9vLmh0bWwN CkBAIC00MDEsMTUgKzQwNiwyNyBAQCBIQnVmQyogQ0ZpbGVUcmFuc2FjdGlvbjo6UGFyc2VGaWxl TmFtZUxDDQogICAgICAgICAgICAgICAgIH0NCiAgICAgICAgICAgICB9DQogICAgICAgICBmaWxl TmFtZVB0ci5BcHBlbmQoIHBhdGggKTsNCi0gICAgICAgIC8vIGZpeCBzbGFzaGVzDQotICAgICAg ICBmb3IoIFRJbnQgaSA9IDA7IGkgPCBmaWxlTmFtZVB0ci5MZW5ndGgoKTsgaSsrICkNCisgICAg ICAgIC8vIGZpeCBzbGFzaGVzIGFuZCBlc2NhcGluZ3MNCisgICAgICAgIGJvb2wgdW5lc2NhcGVk ID0gRUZhbHNlOw0KKyAgICAgICAgVEludCBqID0gMDsNCisgICAgICAgIGZvciggVEludCBpID0g MDsgaSA8IGZpbGVOYW1lUHRyLkxlbmd0aCgpOyBpKyssIGorKyApDQogICAgICAgICAgICAgew0K ICAgICAgICAgICAgIC8vDQogICAgICAgICAgICAgaWYoIGZpbGVOYW1lUHRyWyBpIF0gPT0gJy8n ICkNCiAgICAgICAgICAgICAgICAgew0KLSAgICAgICAgICAgICAgICBmaWxlTmFtZVB0clsgaSBd ID0gJ1xcJzsNCisgICAgICAgICAgICAgICAgZmlsZU5hbWVQdHJbIGogXSA9ICdcXCc7DQogICAg ICAgICAgICAgICAgIH0NCisgICAgICAgICAgICBlbHNlIGlmICggZmlsZU5hbWVQdHJbaV0gPT0g JyUnICYmICggaSA8IGZpbGVOYW1lUHRyLkxlbmd0aCgpIC0yICkgJiYgZmlsZU5hbWVQdHJbaSsx XSA9PSAnMicgJiYgZmlsZU5hbWVQdHJbaSsyXSA9PSAnMCcgKQ0KKyAgICAgICAgICAgICAgICB7 DQorICAgICAgICAgICAgICAgIGZpbGVOYW1lUHRyWyBqIF0gPSAweDIwOw0KKyAgICAgICAgICAg ICAgICBpICs9IDI7DQorICAgICAgICAgICAgICAgIHVuZXNjYXBlZCA9IEVUcnVlOw0KKyAgICAg ICAgICAgICAgICB9DQorICAgICAgICAgICAgZWxzZSBpZiAoIHVuZXNjYXBlZCApDQorICAgICAg ICAgICAgICAgIGZpbGVOYW1lUHRyWyBqIF0gPSBmaWxlTmFtZVB0clsgaSBdOw0KICAgICAgICAg ICAgIH0NCisgICAgICAgICAgICBpZiAoIHVuZXNjYXBlZCApDQorICAgICAgICAgICAgICAgIGZp bGVOYW1lUHRyLlNldExlbmd0aChqKTsNCiAgICAgICAgIH0NCiAgICAgcmV0dXJuIGZpbGVOYW1l Ow0KICAgICB9DQpAQCAtNDIwLDEzICs0MzcsMTMgQEAgSEJ1ZkMqIENGaWxlVHJhbnNhY3Rpb246 OlBhcnNlRmlsZU5hbWVMQw0KIC8vIERldGVybWluZSB0aGUgY29udGVudCB0eXBlIG9mIHRoZSBm aWxlLg0KIC8vIC0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tDQogSEJ1ZkM4KiBDRmlsZVRyYW5zYWN0aW9u OjpDb250ZW50VHlwZUxDKCkNCi0gICAgeyAgIA0KKyAgICB7DQogICAgIFRQdHJDOCBjb250ZW50 VHlwZVB0cjsNCiAgICAgSEJ1ZkM4KiBjb250ZW50VHlwZSA9IE5VTEw7DQogICAgIFREYXRhUmVj b2duaXRpb25SZXN1bHQgZGF0YVR5cGU7DQogICAgIFJBcGFMc1Nlc3Npb24gYXBhU2Vzc2lvbjsN CiAgICAgVEludCByZXQ7DQotICAgIA0KKw0KICAgICBVc2VyOjpMZWF2ZUlmRXJyb3IoIGFwYVNl c3Npb24uQ29ubmVjdCgpICk7DQogICAgIC8vIEFzayB0aGUgYXBwbGljYXRpb24gYXJjaGl0ZWN0 dXJlIHRvIGZpbmQgdGhlIGZpbGUgdHlwZQ0KICAgICBUUHRyQzggY2h1bmtQdHI7DQpAQCAtNDM0 LDcgKzQ1MSw3IEBAIEhCdWZDOCogQ0ZpbGVUcmFuc2FjdGlvbjo6Q29udGVudFR5cGVMQygNCiAg ICAgaUZpbGVSZWFkZXItPkdldENodW5rQnVmZmVyKCBjaHVua1B0ciApOw0KICAgICByZXQgPSBh cGFTZXNzaW9uLlJlY29nbml6ZURhdGEoIGlGaWxlTmFtZS0+RGVzKCksIGNodW5rUHRyLCBkYXRh VHlwZSApOw0KICAgICBhcGFTZXNzaW9uLkNsb3NlKCk7DQotICAgIA0KKw0KICAgICBpZiggcmV0 ID09IEtFcnJOb25lICYmDQogICAgICAgICAoIGRhdGFUeXBlLmlDb25maWRlbmNlID09IENBcGFE YXRhUmVjb2duaXplclR5cGU6OkVDZXJ0YWluICkgfHwNCiAgICAgICAgICggZGF0YVR5cGUuaUNv bmZpZGVuY2UgPT0gQ0FwYURhdGFSZWNvZ25pemVyVHlwZTo6RVByb2JhYmxlICkgKQ0KQEAgLTQ0 MywxNCArNDYwLDE0IEBAIEhCdWZDOCogQ0ZpbGVUcmFuc2FjdGlvbjo6Q29udGVudFR5cGVMQygN CiAgICAgICAgIGNvbnRlbnRUeXBlUHRyLlNldCggZGF0YVR5cGUuaURhdGFUeXBlLkRlczgoKSAp Ow0KICAgICAgICAgfQ0KICAgICBlbHNlDQotICAgICAgICB7ICAgIA0KKyAgICAgICAgew0KICAg ICAgICAgLy8gZXh0ZW5zaW9ucw0KICAgICAgICAgX0xJVCggS0Nzc0V4dCwgIi5jc3MiICk7DQog ICAgICAgICBfTElUKEtXYm1wRXh0LCAiLndibXAiKTsNCiAgICAgICAgIF9MSVQoS0VjbWFTY3Jp cHRFeHQsICIuZXMiKTsNCiAgICAgICAgIF9MSVQoS0phdmFTY3JpcHRFeHQsICIuanMiKTsNCiAN Ci0gICAgICAgIFRQdHJDIGV4dFB0ciggaUZpbGVOYW1lLT5SaWdodCggaUZpbGVOYW1lLT5MZW5n dGgoKSANCisgICAgICAgIFRQdHJDIGV4dFB0ciggaUZpbGVOYW1lLT5SaWdodCggaUZpbGVOYW1l LT5MZW5ndGgoKQ0KICAgICAgICAgICAgIC0gIGlGaWxlTmFtZS0+TG9jYXRlUmV2ZXJzZSgnLicp ICkgKTsNCiANCiAgICAgICAgIGlmKCBleHRQdHIuQ29tcGFyZUYoIEtDc3NFeHQoKSApID09IDAg KQ0KQEAgLTQ2MSwxMiArNDc4LDEyIEBAIEhCdWZDOCogQ0ZpbGVUcmFuc2FjdGlvbjo6Q29udGVu dFR5cGVMQygNCiAgICAgICAgICAgICB7DQogICAgICAgICAgICAgY29udGVudFR5cGVQdHIuU2V0 KCBfTDgoICJpbWFnZS92bmQud2FwLndibXAiICkgKTsNCiAgICAgICAgICAgICB9DQotICAgICAg ICBlbHNlIGlmKCBleHRQdHIuQ29tcGFyZUYoIEtFY21hU2NyaXB0RXh0KCkgKSA9PSAwIHx8IA0K KyAgICAgICAgZWxzZSBpZiggZXh0UHRyLkNvbXBhcmVGKCBLRWNtYVNjcmlwdEV4dCgpICkgPT0g MCB8fA0KICAgICAgICAgICAgICAgICAgZXh0UHRyLkNvbXBhcmVGKCBLSmF2YVNjcmlwdEV4dCgp ICkgKQ0KICAgICAgICAgICAgIHsNCiAgICAgICAgICAgICBjb250ZW50VHlwZVB0ci5TZXQoIF9M OCggInRleHQvZWNtYXNjcmlwdCIgKSApOw0KICAgICAgICAgICAgIH0NCi0gICAgICAgIA0KKw0K ICAgICAgICAgLy8gdG9kbyBwbHVnaW4gaXMgbWlzc2luZw0KICAgICAgICAgLy8gQ2hlY2sgaWYg aXQgaXMgYSBzdXBwb3J0ZWQgcGx1Z2luDQogICAgICAgICAvLyBDUGx1Z2luSGFuZGxlciogcGx1 Z2luSGFuZGxlciA9IENQbHVnaW5IYW5kbGVyOjpHZXRTaW5nbGV0b24oKTsNCkBAIC00ODUsNyAr NTAyLDcgQEAgSEJ1ZkM4KiBDRmlsZVRyYW5zYWN0aW9uOjpDb250ZW50VHlwZUxDKA0KIC8vIERl dGVybWluZSB0aGUgY29udGVudCBlbmNvZGluZyBvZiB0aGUgZmlsZS4NCiAvLyAtLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLQ0KIC8vDQotVFB0ckM4IENGaWxlVHJhbnNhY3Rpb246OkNvbnRlbnRFbmNvZGlu ZyggDQorVFB0ckM4IENGaWxlVHJhbnNhY3Rpb246OkNvbnRlbnRFbmNvZGluZygNCiAgICAgY29u c3QgVERlc0M4JiBhQ29udGVudFR5cGVTdHJpbmcgKSBjb25zdA0KICAgICB7DQogICAgIC8vIEFz c3VtZSBMYXRpbi0xIGZvciB4aHRtbCBhbmQgaHRtbC4gdWNzMiBmb3IgYW55IG90aGVyDQpAQCAt NDkzLDcgKzUxMCw3IEBAIFRQdHJDOCBDRmlsZVRyYW5zYWN0aW9uOjpDb250ZW50RW5jb2RpbmcN CiANCiAgICAgVFB0ckM4IGh0dHBBcHBTdHJpbmcoIEtSZXNMb2FkZXJXYXBXbWxjICk7DQogICAg IFRQdHJDOCBjb250ZW50U3RyaW5nKCBhQ29udGVudFR5cGVTdHJpbmcgKTsNCi0gICAgDQorDQog ICAgIC8vIElzIHRoZSBjb250ZW50VHlwZSBhIEhUVFBfYXBwbGljYXRpb25fdm5kX3dhcF93bWxj X3N0cmluZw0KICAgICBUVWludCBpbmRleCA9IGNvbnRlbnRTdHJpbmcuRmluZEYoIGh0dHBBcHBT dHJpbmcgKTsNCiAgICAgaWYoIGluZGV4ID09IDAgKQ0K 11258 2006-10-27 13:29:45 -0700 2006-10-30 11:32:40 -0800 Files: BrCtl.cpp, FileTransaction.cpp bug11348.patch text/plain 6477 joseph.ligman SW5kZXg6IFdlYktpdC9DaGFuZ2VMb2cNCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0NCi0tLSBXZWJLaXQvQ2hhbmdlTG9n CShyZXZpc2lvbiAxNzM4NSkNCisrKyBXZWJLaXQvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpDQpA QCAtMSwzICsxLDE0IEBADQorMjAwNi0xMC0yNyAgbGlnbWFuICA8am9zZXBoLmxpZ21hbkBub2tp YS5jb20+DQorDQorICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4NCisgICAgICAg IERFU0M6IFVzZSB0aGUgVFVyaVBhcnNlcidzIEdldEZpbGVOYW1lTCB0byBoYW5kbGUgdGhlIGNh c2Ugb2YgZXNjYXBlZCBmaWxlIHNjaGVtZWQgdXJsLiANCisgICAgICAgIGh0dHA6Ly9idWdzLndl YmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTExMzg0DQorDQorICAgICAgICAqIEJyb3dzZXJDb250 cm9sL3NyYy9CckN0bC5jcHA6DQorICAgICAgICAoQ0JyQ3RsOjpGaWxlTmFtZVRvVXJsTEMpOg0K KyAgICAgICAgKiBSZXNvdXJjZUxvYWRlci9zcmMvRmlsZVRyYW5zYWN0aW9uLmNwcDoNCisgICAg ICAgIChDRmlsZVRyYW5zYWN0aW9uOjpQYXJzZUZpbGVOYW1lTEMpOg0KKw0KIDIwMDYtMTAtMjcg IHNhcmVlbiAgPHNoeWFtLnNhcmVlbkBub2tpYS5jb20+DQogDQogICAgICAgICBSZXZpZXdlZCBi eSBzYWNoaW4ucGFkbWFAbm9raWEuY29tLg0KSW5kZXg6IFdlYktpdC9Ccm93c2VyQ29udHJvbC9z cmMvQnJDdGwuY3BwDQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09DQotLS0gV2ViS2l0L0Jyb3dzZXJDb250cm9sL3NyYy9C ckN0bC5jcHAJKHJldmlzaW9uIDE3MzY2KQ0KKysrIFdlYktpdC9Ccm93c2VyQ29udHJvbC9zcmMv QnJDdGwuY3BwCSh3b3JraW5nIGNvcHkpDQpAQCAtNTQsNiArNTQsNyBAQA0KICNpbmNsdWRlIDxH VUxJQ09OLmg+DQogI2luY2x1ZGUgPGUzMnVpZC5oPg0KICNpbmNsdWRlIDxvb20uaD4NCisjaW5j bHVkZSA8dXJpMTYuaD4NCiANCiAjaW5jbHVkZSAiQnJDdGwuaCINCiAjaW5jbHVkZSAiQnJDdGxM YXlvdXRPYnNlcnZlckltcGwuaCINCkBAIC0xODAxLDM0ICsxODAyLDIxIEBAIHZvaWQgQ0JyQ3Rs OjpTZXRXbWxNb2RlKFRCb29sIGFNb2RlKQ0KIC8vDQogSEJ1ZkMqIENCckN0bDo6RmlsZU5hbWVU b1VybExDKGNvbnN0IFREZXNDJiBhRmlsZU5hbWUpDQogICAgIHsNCi0gICAgaWYgKGFGaWxlTmFt ZS5MZW5ndGgoKSA9PSAwIHx8IGFGaWxlTmFtZS5QdHIoKSA9PSBOVUxMKQ0KKyAgICAgICAgDQor ICAgIGlmIChhRmlsZU5hbWUuTGVuZ3RoKCkgPT0gMCkNCiAgICAgICAgIHsNCiAgICAgICAgIFVz ZXI6OkxlYXZlKEtFcnJBcmd1bWVudCk7DQogICAgICAgICB9DQotICAgIC8vIFNpemUgb2YgImZp bGU6Ly8iIGFuZCBOVUxMIHRlcm1pbmF0b3IgaXMgOA0KLSAgICBfTElUKEtGaWxlU2NoZW1lLCAi ZmlsZTovLy8iKTsNCi0gICAgSEJ1ZkMqIHVybE5hbWUgPSBIQnVmQzo6TmV3TChhRmlsZU5hbWUu TGVuZ3RoKCkgKyBLRmlsZVNjaGVtZSgpLkxlbmd0aCgpICk7DQotICAgIHVybE5hbWUtPkRlcygp LkNvcHkoS0ZpbGVTY2hlbWUpOyAvLyBDb3B5IHRoZSBmaWxlIHNjaGVtZQ0KLSAgICB1cmxOYW1l LT5EZXMoKS5BcHBlbmQoYUZpbGVOYW1lKTsgLy8gQXBwZW5kIHRoZSBmaWxlIG5hbWUNCi0gICAg VEludCBpbmRleCA9IDA7DQotICAgIFRQdHJDIHB0cigqdXJsTmFtZSk7DQotICAgIFRVaW50MTYq IHN0ciA9IChUVWludDE2KilwdHIuUHRyKCk7DQotDQotICAgIC8vIFJlcGxhY2UgYWxsICdcXCcg d2l0aCAnLycNCi0gICAgZG8NCi0gICAgICAgIHsNCi0gICAgICAgIHB0ci5TZXQoKHB0ci5NaWQo aW5kZXgpKSk7DQotICAgICAgICBzdHIgPSAoVFVpbnQxNiopcHRyLlB0cigpOw0KLSAgICAgICAg aW5kZXggPSBwdHIuTG9jYXRlKCdcXCcpOw0KLSAgICAgICAgaWYgKGluZGV4ICE9IEtFcnJOb3RG b3VuZCkNCi0gICAgICAgICAgICB7DQotICAgICAgICAgICAgKihzdHIgKyBpbmRleCkgPSAnLyc7 DQotICAgICAgICAgICAgfQ0KLSAgICAgICAgfQ0KLSAgICB3aGlsZSAoaW5kZXggIT0gS0Vyck5v dEZvdW5kKTsNCisgICAgICAgIA0KKyAgICBDVXJpMTYgKnVyaTE2ID0gQ1VyaTE2OjpDcmVhdGVG aWxlVXJpTChhRmlsZU5hbWUpOw0KKyAgICBDbGVhbnVwU3RhY2s6OlB1c2hMKHVyaTE2KTsNCisg ICAgSEJ1ZkMqIHVybE5hbWUgPSB1cmkxNi0+VXJpKCkuVXJpRGVzKCkuQWxsb2NMKCk7DQorICAg IENsZWFudXBTdGFjazo6UG9wQW5kRGVzdHJveSh1cmkxNik7DQogICAgIENsZWFudXBTdGFjazo6 UHVzaEwodXJsTmFtZSk7DQorICAgIA0KICAgICByZXR1cm4gdXJsTmFtZTsNCiAgICAgfQ0KKw0K IA0KIC8vIC0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tDQogLy8gQ0JyQ3RsOjpBZGRPbmVNZW51SXRlbUFm dGVyTA0KSW5kZXg6IFdlYktpdC9SZXNvdXJjZUxvYWRlci9zcmMvRmlsZVRyYW5zYWN0aW9uLmNw cA0KPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PQ0KLS0tIFdlYktpdC9SZXNvdXJjZUxvYWRlci9zcmMvRmlsZVRyYW5zYWN0 aW9uLmNwcAkocmV2aXNpb24gMTczNjYpDQorKysgV2ViS2l0L1Jlc291cmNlTG9hZGVyL3NyYy9G aWxlVHJhbnNhY3Rpb24uY3BwCSh3b3JraW5nIGNvcHkpDQpAQCAtMzYwLDYwICszNjAsNjUgQEAg VEludCBDRmlsZVRyYW5zYWN0aW9uOjpNSEZSdW5FcnJvcigNCiAvLyBDRmlsZVRyYW5zYWN0aW9u OjpQYXJzZUZpbGVOYW1lTEMNCiAvLyBUcmFuc2xhdGUgdGhlIGZpbGUgbmFtZSBmcm9tIGEgVVJM IHRvIGEgdmFsaWQgZmlsZSBuYW1lIGluIHRoZSBzeXN0ZW0uDQogLy8gLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0NCi0vLw0KKy8vICAgICAgICANCiBIQnVmQyogQ0ZpbGVUcmFuc2FjdGlvbjo6UGFyc2VG aWxlTmFtZUxDKA0KICAgICBjb25zdCBURGVzQyYgYVVybCApDQogICAgIHsNCi0gICAgVEludCBz dGF0dXM7DQogICAgIFRVcmlQYXJzZXIgcGFyc2VyOw0KLQ0KICAgICBIQnVmQyogZmlsZU5hbWUg PSBOVUxMOw0KLQ0KLSAgICBzdGF0dXMgPSBwYXJzZXIuUGFyc2UoIGFVcmwgKTsNCi0gICAgDQot ICAgIGlmKCBzdGF0dXMgPT0gS0Vyck5vbmUgKQ0KLSAgICAgICAgew0KLSAgICAgICAgLy8gdGhp cyBtdXN0IGJlIHRoZSBkcml2ZSBsZXR0ZXINCi0gICAgICAgIFRQdHJDIGhvc3QgPSBwYXJzZXIu RXh0cmFjdCggRVVyaUhvc3QgKTsgICAgICAgIA0KLSAgICAgICAgVFB0ckMgcGF0aCA9IHBhcnNl ci5FeHRyYWN0KCBFVXJpUGF0aCApOw0KLQ0KLSAgICAgICAgLy8gYWRkIG1pc3NpbmcgIjoiDQot ICAgICAgICBmaWxlTmFtZSA9IEhCdWZDOjpOZXdMQyggKGhvc3QuTGVuZ3RoKCk/aG9zdC5MZW5n dGgoKSsxOjApICsgcGF0aC5MZW5ndGgoKSApOw0KLSAgICAgICAgVFB0ciBmaWxlTmFtZVB0cigg ZmlsZU5hbWUtPkRlcygpICk7DQotDQotICAgICAgICBpZiggaG9zdC5MZW5ndGgoKSA9PSAxICkN Ci0gICAgICAgICAgICB7DQotICAgICAgICAgICAgLy8gZml4IGMgdG8gYzoNCi0gICAgICAgICAg ICBmaWxlTmFtZVB0ci5Db3B5KCBob3N0ICk7DQotICAgICAgICAgICAgZmlsZU5hbWVQdHIuQXBw ZW5kKCBfTCgiOiIpICk7DQotICAgICAgICAgICAgfQ0KLSAgICAgICAgZWxzZSANCisgICAgaWYo IHBhcnNlci5QYXJzZSggYVVybCApID09IEtFcnJOb25lICkNCisgICAgICAgIHsgICAgICAgICAg ICAgICAgIA0KKyAgICAgICAgLy9yZXdyaXRlIHRoZSBmb2xsb3dpbmcgdXJscw0KKyAgICAgICAg Ly9maWxlOi8vYy9mb28uaHRtbA0KKyAgICAgICAgLy9maWxlOi8vYzovZm9vLmh0bWwNCisgICAg ICAgIC8vZmlsZTovLy9jOi9mb28uaHRtbCAgICAgICAgICAgICAgICAgICAgDQorICAgICAgICAv L3RvIHRoaXMgZm9ybQ0KKyAgICAgICAgLy9maWxlOi8vL2MvZm9vLmh0bWwNCisgICAgICAgIEhC dWZDKiB1cmwgPSBIQnVmQzo6TmV3TEMoYVVybC5MZW5ndGgoKSsxKTsNCisgICAgICAgIFRQdHIg dXJsUHRyID0gdXJsLT5EZXMoKTsNCisgICAgICAgICAgICANCisgICAgICAgIGlmICggcGFyc2Vy LklzUHJlc2VudChFVXJpU2NoZW1lKSAmJiBwYXJzZXIuSXNQcmVzZW50KEVVcmlIb3N0KSAmJiBw YXJzZXIuSXNQcmVzZW50KEVVcmlQYXRoKSApICAgICAgICAgDQogICAgICAgICAgICAgew0KLSAg ICAgICAgICAgIC8vIGFjY29yZGluZyB0byBzeW1iaWFuIHVyaSBwYXJzZXIgaW4gY2FzZSBvZg0K LSAgICAgICAgICAgIC8vIGZpbGU6Ly8vYzpcZm9vLmh0bWwNCi0gICAgICAgICAgICAvLyBob3N0 OiAvYzpcZm9vLmh0bWwNCi0gICAgICAgICAgICAvLyBwYXRoOiAvYzpcZm9vLmh0bWwNCi0gICAg ICAgICAgICAvLyByZW1vdmU6IC8gZnJvbSB0aGUgYmVnZW5uaW5nIG9mIHRoZSBwYXRoDQotICAg ICAgICAgICAgaWYoIHBhdGguTGVuZ3RoKCkgPiAyICYmIHBhdGhbMF0gPT0gJy8nICYmIHBhdGhb Ml0gPT0gJzonICkNCisgICAgICAgICAgICANCisgICAgICAgICAgICBUUHRyQyBzY2hlbWUgPSBw YXJzZXIuRXh0cmFjdCggRVVyaVNjaGVtZSApOw0KKyAgICAgICAgICAgIFRQdHJDIGhvc3QgPSBw YXJzZXIuRXh0cmFjdCggRVVyaUhvc3QgKTsgICAgICAgIA0KKyAgICAgICAgICAgIFRQdHJDIHBh dGggPSBwYXJzZXIuRXh0cmFjdCggRVVyaVBhdGggKTsNCisgICAgICAgICAgICANCisgICAgICAg ICAgICB1cmxQdHIuQXBwZW5kKHNjaGVtZSk7DQorICAgICAgICAgICAgdXJsUHRyLkFwcGVuZChf TCgiOi8vIikpOyAgICAgICAgICAgICAgICANCisgICAgICAgICAgICAgICAgICAgICAgICANCisg ICAgICAgICAgICAvL2ZpbGU6Ly9jOi9mb28uaHRtbA0KKyAgICAgICAgICAgIGlmICggaG9zdC5M ZW5ndGgoKSA+IDApDQorICAgICAgICAgICAgICAgIHsgICAgICAgICAgICAgICANCisgICAgICAg ICAgICAgICAgdXJsUHRyLkFwcGVuZChfTCgiLyIpKTsNCisgICAgICAgICAgICAgICAgdXJsUHRy LkFwcGVuZChob3N0KTsNCisgICAgICAgICAgICAgICAgfSAgICAgICAgICAgICAgICANCisNCisg ICAgICAgICAgICAvL2ZpbGU6Ly8vYzovZm9vLmh0bWwNCisgICAgICAgICAgICBUSW50IHNjcG9z ID0gcGF0aC5Mb2NhdGUoVENoYXIoJzonKSk7DQorICAgICAgICAgICAgaWYgKHNjcG9zICE9IEtF cnJOb3RGb3VuZCkNCiAgICAgICAgICAgICAgICAgew0KLSAgICAgICAgICAgICAgICAvLyBtb3Zl IHBvaW50ZXIgZnJvbSAiL2M6XCIgdG8gImM6XCINCi0gICAgICAgICAgICAgICAgcGF0aC5TZXQo IHBhdGguTWlkKCAxICkgKTsNCisgICAgICAgICAgICAgICAgdXJsUHRyLkFwcGVuZChwYXRoLkxl ZnQoc2Nwb3MpKTsNCisgICAgICAgICAgICAgICAgdXJsUHRyLkFwcGVuZChwYXRoLk1pZChzY3Bv cysxKSk7DQogICAgICAgICAgICAgICAgIH0NCi0gICAgICAgICAgICB9DQotICAgICAgICBmaWxl TmFtZVB0ci5BcHBlbmQoIHBhdGggKTsNCi0gICAgICAgIC8vIGZpeCBzbGFzaGVzDQotICAgICAg ICBmb3IoIFRJbnQgaSA9IDA7IGkgPCBmaWxlTmFtZVB0ci5MZW5ndGgoKTsgaSsrICkNCi0gICAg ICAgICAgICB7DQotICAgICAgICAgICAgLy8NCi0gICAgICAgICAgICBpZiggZmlsZU5hbWVQdHJb IGkgXSA9PSAnLycgKQ0KKyAgICAgICAgICAgIGVsc2UNCiAgICAgICAgICAgICAgICAgew0KLSAg ICAgICAgICAgICAgICBmaWxlTmFtZVB0clsgaSBdID0gJ1xcJzsNCisgICAgICAgICAgICAgICAg dXJsUHRyLkFwcGVuZChwYXRoKTsNCisgICAgICAgICAgICAgICAgfSAgICAgICAgICAgIA0KKyAg ICAgICAgICAgIA0KKyAgICAgICAgICAgIGlmICggcGFyc2VyLlBhcnNlKCAqdXJsICkgPT0gS0Vy ck5vbmUgKQ0KKyAgICAgICAgICAgICAgICB7DQorICAgICAgICAgICAgICAgIGZpbGVOYW1lID0g cGFyc2VyLkdldEZpbGVOYW1lTChFVXJpRmlsZU5hbWVGdWxsKTsgICAgICAgICAgICANCiAgICAg ICAgICAgICAgICAgfQ0KKyAgICAgICAgICAgIA0KICAgICAgICAgICAgIH0NCisgICAgICAgIA0K KyAgICAgICAgQ2xlYW51cFN0YWNrOjpQb3BBbmREZXN0cm95KHVybCk7ICAgICAgICAgICAgDQog ICAgICAgICB9DQotICAgIHJldHVybiBmaWxlTmFtZTsNCisgICAgICAgIA0KKyAgICBDbGVhbnVw U3RhY2s6OlB1c2hMKGZpbGVOYW1lKTsgICAgICAgICAgICAgICAgICAgIA0KKyAgICByZXR1cm4g ZmlsZU5hbWU7ICAgICAgDQogICAgIH0NCi0NCiANCiAvLyAtLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLQ0K IC8vIENGaWxlVHJhbnNhY3Rpb246OkNvbnRlbnRUeXBlTA0K 11287 2006-10-30 11:32:40 -0800 2006-11-01 10:53:54 -0800 Files: BrCtl.cpp, FileTransaction.cpp bug11348.patch text/plain 6490 joseph.ligman SW5kZXg6IFdlYktpdC9DaGFuZ2VMb2cNCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0NCi0tLSBXZWJLaXQvQ2hhbmdlTG9n CShyZXZpc2lvbiAxNzQzNSkNCisrKyBXZWJLaXQvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpDQpA QCAtMSwzICsxLDE0IEBADQorMjAwNi0xMC0yNyAgbGlnbWFuICA8am9zZXBoLmxpZ21hbkBub2tp YS5jb20+DQorDQorICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4NCisgICAgICAg IERFU0M6IFVzZSB0aGUgVFVyaVBhcnNlcidzIEdldEZpbGVOYW1lTCB0byBoYW5kbGUgdGhlIGNh c2Ugb2YgZXNjYXBlZCBmaWxlIHNjaGVtZWQgdXJsLiANCisgICAgICAgIGh0dHA6Ly9idWdzLndl YmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTExMzg0DQorDQorICAgICAgICAqIEJyb3dzZXJDb250 cm9sL3NyYy9CckN0bC5jcHA6DQorICAgICAgICAoQ0JyQ3RsOjpGaWxlTmFtZVRvVXJsTEMpOg0K KyAgICAgICAgKiBSZXNvdXJjZUxvYWRlci9zcmMvRmlsZVRyYW5zYWN0aW9uLmNwcDoNCisgICAg ICAgIChDRmlsZVRyYW5zYWN0aW9uOjpQYXJzZUZpbGVOYW1lTEMpOg0KKw0KIDIwMDYtMTAtMjcg IHNhcmVlbiAgPHNoeWFtLnNhcmVlbkBub2tpYS5jb20+DQogDQogICAgICAgICBSZXZpZXdlZCBi eSBzYWNoaW4ucGFkbWFAbm9raWEuY29tLg0KSW5kZXg6IFdlYktpdC9Ccm93c2VyQ29udHJvbC9z cmMvQnJDdGwuY3BwDQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09DQotLS0gV2ViS2l0L0Jyb3dzZXJDb250cm9sL3NyYy9C ckN0bC5jcHAJKHJldmlzaW9uIDE3NDM1KQ0KKysrIFdlYktpdC9Ccm93c2VyQ29udHJvbC9zcmMv QnJDdGwuY3BwCSh3b3JraW5nIGNvcHkpDQpAQCAtNTQsNiArNTQsNyBAQA0KICNpbmNsdWRlIDxH VUxJQ09OLmg+DQogI2luY2x1ZGUgPGUzMnVpZC5oPg0KICNpbmNsdWRlIDxvb20uaD4NCisjaW5j bHVkZSA8dXJpMTYuaD4NCiANCiAjaW5jbHVkZSAiQnJDdGwuaCINCiAjaW5jbHVkZSAiQnJDdGxM YXlvdXRPYnNlcnZlckltcGwuaCINCkBAIC0xODAxLDM0ICsxODAyLDIxIEBAIHZvaWQgQ0JyQ3Rs OjpTZXRXbWxNb2RlKFRCb29sIGFNb2RlKQ0KIC8vDQogSEJ1ZkMqIENCckN0bDo6RmlsZU5hbWVU b1VybExDKGNvbnN0IFREZXNDJiBhRmlsZU5hbWUpDQogICAgIHsNCi0gICAgaWYgKGFGaWxlTmFt ZS5MZW5ndGgoKSA9PSAwIHx8IGFGaWxlTmFtZS5QdHIoKSA9PSBOVUxMKQ0KKyAgICAgICAgDQor ICAgIGlmIChhRmlsZU5hbWUuTGVuZ3RoKCkgPT0gMCkNCiAgICAgICAgIHsNCiAgICAgICAgIFVz ZXI6OkxlYXZlKEtFcnJBcmd1bWVudCk7DQogICAgICAgICB9DQotICAgIC8vIFNpemUgb2YgImZp bGU6Ly8iIGFuZCBOVUxMIHRlcm1pbmF0b3IgaXMgOA0KLSAgICBfTElUKEtGaWxlU2NoZW1lLCAi ZmlsZTovLy8iKTsNCi0gICAgSEJ1ZkMqIHVybE5hbWUgPSBIQnVmQzo6TmV3TChhRmlsZU5hbWUu TGVuZ3RoKCkgKyBLRmlsZVNjaGVtZSgpLkxlbmd0aCgpICk7DQotICAgIHVybE5hbWUtPkRlcygp LkNvcHkoS0ZpbGVTY2hlbWUpOyAvLyBDb3B5IHRoZSBmaWxlIHNjaGVtZQ0KLSAgICB1cmxOYW1l LT5EZXMoKS5BcHBlbmQoYUZpbGVOYW1lKTsgLy8gQXBwZW5kIHRoZSBmaWxlIG5hbWUNCi0gICAg VEludCBpbmRleCA9IDA7DQotICAgIFRQdHJDIHB0cigqdXJsTmFtZSk7DQotICAgIFRVaW50MTYq IHN0ciA9IChUVWludDE2KilwdHIuUHRyKCk7DQotDQotICAgIC8vIFJlcGxhY2UgYWxsICdcXCcg d2l0aCAnLycNCi0gICAgZG8NCi0gICAgICAgIHsNCi0gICAgICAgIHB0ci5TZXQoKHB0ci5NaWQo aW5kZXgpKSk7DQotICAgICAgICBzdHIgPSAoVFVpbnQxNiopcHRyLlB0cigpOw0KLSAgICAgICAg aW5kZXggPSBwdHIuTG9jYXRlKCdcXCcpOw0KLSAgICAgICAgaWYgKGluZGV4ICE9IEtFcnJOb3RG b3VuZCkNCi0gICAgICAgICAgICB7DQotICAgICAgICAgICAgKihzdHIgKyBpbmRleCkgPSAnLyc7 DQotICAgICAgICAgICAgfQ0KLSAgICAgICAgfQ0KLSAgICB3aGlsZSAoaW5kZXggIT0gS0Vyck5v dEZvdW5kKTsNCisgICAgICAgIA0KKyAgICBDVXJpMTYgKnVyaTE2ID0gQ1VyaTE2OjpDcmVhdGVG aWxlVXJpTChhRmlsZU5hbWUpOw0KKyAgICBDbGVhbnVwU3RhY2s6OlB1c2hMKHVyaTE2KTsNCisg ICAgSEJ1ZkMqIHVybE5hbWUgPSB1cmkxNi0+VXJpKCkuVXJpRGVzKCkuQWxsb2NMKCk7DQorICAg IENsZWFudXBTdGFjazo6UG9wQW5kRGVzdHJveSh1cmkxNik7DQogICAgIENsZWFudXBTdGFjazo6 UHVzaEwodXJsTmFtZSk7DQorICAgIA0KICAgICByZXR1cm4gdXJsTmFtZTsNCiAgICAgfQ0KKw0K IA0KIC8vIC0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tDQogLy8gQ0JyQ3RsOjpBZGRPbmVNZW51SXRlbUFm dGVyTA0KSW5kZXg6IFdlYktpdC9SZXNvdXJjZUxvYWRlci9zcmMvRmlsZVRyYW5zYWN0aW9uLmNw cA0KPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PQ0KLS0tIFdlYktpdC9SZXNvdXJjZUxvYWRlci9zcmMvRmlsZVRyYW5zYWN0 aW9uLmNwcAkocmV2aXNpb24gMTc0MzUpDQorKysgV2ViS2l0L1Jlc291cmNlTG9hZGVyL3NyYy9G aWxlVHJhbnNhY3Rpb24uY3BwCSh3b3JraW5nIGNvcHkpDQpAQCAtMzYwLDYwICszNjAsNjUgQEAg VEludCBDRmlsZVRyYW5zYWN0aW9uOjpNSEZSdW5FcnJvcigNCiAvLyBDRmlsZVRyYW5zYWN0aW9u OjpQYXJzZUZpbGVOYW1lTEMNCiAvLyBUcmFuc2xhdGUgdGhlIGZpbGUgbmFtZSBmcm9tIGEgVVJM IHRvIGEgdmFsaWQgZmlsZSBuYW1lIGluIHRoZSBzeXN0ZW0uDQogLy8gLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0NCi0vLw0KKy8vICAgICAgICANCiBIQnVmQyogQ0ZpbGVUcmFuc2FjdGlvbjo6UGFyc2VG aWxlTmFtZUxDKA0KICAgICBjb25zdCBURGVzQyYgYVVybCApDQogICAgIHsNCi0gICAgVEludCBz dGF0dXM7DQogICAgIFRVcmlQYXJzZXIgcGFyc2VyOw0KLQ0KICAgICBIQnVmQyogZmlsZU5hbWUg PSBOVUxMOw0KLQ0KLSAgICBzdGF0dXMgPSBwYXJzZXIuUGFyc2UoIGFVcmwgKTsNCi0gICAgDQot ICAgIGlmKCBzdGF0dXMgPT0gS0Vyck5vbmUgKQ0KLSAgICAgICAgew0KLSAgICAgICAgLy8gdGhp cyBtdXN0IGJlIHRoZSBkcml2ZSBsZXR0ZXINCi0gICAgICAgIFRQdHJDIGhvc3QgPSBwYXJzZXIu RXh0cmFjdCggRVVyaUhvc3QgKTsgICAgICAgIA0KLSAgICAgICAgVFB0ckMgcGF0aCA9IHBhcnNl ci5FeHRyYWN0KCBFVXJpUGF0aCApOw0KLQ0KLSAgICAgICAgLy8gYWRkIG1pc3NpbmcgIjoiDQot ICAgICAgICBmaWxlTmFtZSA9IEhCdWZDOjpOZXdMQyggKGhvc3QuTGVuZ3RoKCk/aG9zdC5MZW5n dGgoKSsxOjApICsgcGF0aC5MZW5ndGgoKSApOw0KLSAgICAgICAgVFB0ciBmaWxlTmFtZVB0cigg ZmlsZU5hbWUtPkRlcygpICk7DQotDQotICAgICAgICBpZiggaG9zdC5MZW5ndGgoKSA9PSAxICkN Ci0gICAgICAgICAgICB7DQotICAgICAgICAgICAgLy8gZml4IGMgdG8gYzoNCi0gICAgICAgICAg ICBmaWxlTmFtZVB0ci5Db3B5KCBob3N0ICk7DQotICAgICAgICAgICAgZmlsZU5hbWVQdHIuQXBw ZW5kKCBfTCgiOiIpICk7DQotICAgICAgICAgICAgfQ0KLSAgICAgICAgZWxzZSANCisgICAgaWYo IHBhcnNlci5QYXJzZSggYVVybCApID09IEtFcnJOb25lICkNCisgICAgICAgIHsgICAgICAgICAg ICAgICAgIA0KKyAgICAgICAgLy9yZXdyaXRlIHRoZSBmb2xsb3dpbmcgdXJscw0KKyAgICAgICAg Ly9maWxlOi8vYy9mb28uaHRtbA0KKyAgICAgICAgLy9maWxlOi8vYzovZm9vLmh0bWwNCisgICAg ICAgIC8vZmlsZTovLy9jOi9mb28uaHRtbCAgICAgICAgICAgICAgICAgICAgDQorICAgICAgICAv L3RvIHRoaXMgZm9ybQ0KKyAgICAgICAgLy9maWxlOi8vL2MvZm9vLmh0bWwNCisgICAgICAgIEhC dWZDKiB1cmwgPSBIQnVmQzo6TmV3TEMoYVVybC5MZW5ndGgoKSsxKTsNCisgICAgICAgIFRQdHIg dXJsUHRyID0gdXJsLT5EZXMoKTsNCisgICAgICAgICAgICANCisgICAgICAgIGlmICggcGFyc2Vy LklzUHJlc2VudChFVXJpU2NoZW1lKSAmJiBwYXJzZXIuSXNQcmVzZW50KEVVcmlIb3N0KSAmJiBw YXJzZXIuSXNQcmVzZW50KEVVcmlQYXRoKSApICAgICAgICAgDQogICAgICAgICAgICAgew0KLSAg ICAgICAgICAgIC8vIGFjY29yZGluZyB0byBzeW1iaWFuIHVyaSBwYXJzZXIgaW4gY2FzZSBvZg0K LSAgICAgICAgICAgIC8vIGZpbGU6Ly8vYzpcZm9vLmh0bWwNCi0gICAgICAgICAgICAvLyBob3N0 OiAvYzpcZm9vLmh0bWwNCi0gICAgICAgICAgICAvLyBwYXRoOiAvYzpcZm9vLmh0bWwNCi0gICAg ICAgICAgICAvLyByZW1vdmU6IC8gZnJvbSB0aGUgYmVnZW5uaW5nIG9mIHRoZSBwYXRoDQotICAg ICAgICAgICAgaWYoIHBhdGguTGVuZ3RoKCkgPiAyICYmIHBhdGhbMF0gPT0gJy8nICYmIHBhdGhb Ml0gPT0gJzonICkNCisgICAgICAgICAgICANCisgICAgICAgICAgICBUUHRyQyBzY2hlbWUgPSBw YXJzZXIuRXh0cmFjdCggRVVyaVNjaGVtZSApOw0KKyAgICAgICAgICAgIFRQdHJDIGhvc3QgPSBw YXJzZXIuRXh0cmFjdCggRVVyaUhvc3QgKTsgICAgICAgIA0KKyAgICAgICAgICAgIFRQdHJDIHBh dGggPSBwYXJzZXIuRXh0cmFjdCggRVVyaVBhdGggKTsNCisgICAgICAgICAgICANCisgICAgICAg ICAgICB1cmxQdHIuQXBwZW5kKHNjaGVtZSk7DQorICAgICAgICAgICAgdXJsUHRyLkFwcGVuZChf TCgiOi8vIikpOyAgICAgICAgICAgICAgICANCisgICAgICAgICAgICAgICAgICAgICAgICANCisg ICAgICAgICAgICAvL2ZpbGU6Ly9jOi9mb28uaHRtbA0KKyAgICAgICAgICAgIGlmICggaG9zdC5M ZW5ndGgoKSA+IDApDQorICAgICAgICAgICAgICAgIHsgICAgICAgICAgICAgICANCisgICAgICAg ICAgICAgICAgdXJsUHRyLkFwcGVuZChfTCgiLyIpKTsNCisgICAgICAgICAgICAgICAgdXJsUHRy LkFwcGVuZChob3N0KTsNCisgICAgICAgICAgICAgICAgfSAgICAgICAgICAgICAgICANCisNCisg ICAgICAgICAgICAvL2ZpbGU6Ly8vYzovZm9vLmh0bWwNCisgICAgICAgICAgICBUSW50IHNjcG9z ID0gcGF0aC5Mb2NhdGUoVENoYXIoJzonKSk7DQorICAgICAgICAgICAgaWYgKHNjcG9zICE9IEtF cnJOb3RGb3VuZCkNCiAgICAgICAgICAgICAgICAgew0KLSAgICAgICAgICAgICAgICAvLyBtb3Zl IHBvaW50ZXIgZnJvbSAiL2M6XCIgdG8gImM6XCINCi0gICAgICAgICAgICAgICAgcGF0aC5TZXQo IHBhdGguTWlkKCAxICkgKTsNCisgICAgICAgICAgICAgICAgdXJsUHRyLkFwcGVuZChwYXRoLkxl ZnQoc2Nwb3MpKTsNCisgICAgICAgICAgICAgICAgdXJsUHRyLkFwcGVuZChwYXRoLk1pZChzY3Bv cysxKSk7DQogICAgICAgICAgICAgICAgIH0NCi0gICAgICAgICAgICB9DQotICAgICAgICBmaWxl TmFtZVB0ci5BcHBlbmQoIHBhdGggKTsNCi0gICAgICAgIC8vIGZpeCBzbGFzaGVzDQotICAgICAg ICBmb3IoIFRJbnQgaSA9IDA7IGkgPCBmaWxlTmFtZVB0ci5MZW5ndGgoKTsgaSsrICkNCi0gICAg ICAgICAgICB7DQotICAgICAgICAgICAgLy8NCi0gICAgICAgICAgICBpZiggZmlsZU5hbWVQdHJb IGkgXSA9PSAnLycgKQ0KKyAgICAgICAgICAgIGVsc2UNCiAgICAgICAgICAgICAgICAgew0KLSAg ICAgICAgICAgICAgICBmaWxlTmFtZVB0clsgaSBdID0gJ1xcJzsNCisgICAgICAgICAgICAgICAg dXJsUHRyLkFwcGVuZChwYXRoKTsNCisgICAgICAgICAgICAgICAgfSAgICAgICAgICAgIA0KKyAg ICAgICAgICAgIA0KKyAgICAgICAgICAgIGlmICggcGFyc2VyLlBhcnNlKCAqdXJsICkgPT0gS0Vy ck5vbmUgKQ0KKyAgICAgICAgICAgICAgICB7DQorICAgICAgICAgICAgICAgIFRSQVBfSUdOT1JF KGZpbGVOYW1lID0gcGFyc2VyLkdldEZpbGVOYW1lTChFVXJpRmlsZU5hbWVGdWxsKSk7ICAgICAg ICAgICAgDQogICAgICAgICAgICAgICAgIH0NCisgICAgICAgICAgICANCiAgICAgICAgICAgICB9 DQorICAgICAgICANCisgICAgICAgIENsZWFudXBTdGFjazo6UG9wQW5kRGVzdHJveSh1cmwpOyAg ICAgICAgICAgIA0KICAgICAgICAgfQ0KLSAgICByZXR1cm4gZmlsZU5hbWU7DQorICAgICAgICAN CisgICAgQ2xlYW51cFN0YWNrOjpQdXNoTChmaWxlTmFtZSk7ICAgICAgICAgICAgICAgICAgICAN CisgICAgcmV0dXJuIGZpbGVOYW1lOyAgICAgIA0KICAgICB9DQotDQogDQogLy8gLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0NCiAvLyBDRmlsZVRyYW5zYWN0aW9uOjpDb250ZW50VHlwZUwNCg== 11330 2006-11-01 10:53:54 -0800 2006-11-03 10:19:57 -0800 Files: FileTransaction.cpp bug11348.patch text/plain 1727 joseph.ligman SW5kZXg6IFdlYktpdC9DaGFuZ2VMb2cNCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0NCi0tLSBXZWJLaXQvQ2hhbmdlTG9n CShyZXZpc2lvbiAxNzUxNykNCisrKyBXZWJLaXQvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpDQpA QCAtMSwzICsxLDEyIEBADQorMjAwNi0xMS0wMSAgbGlnbWFuICA8am9zZXBoLmxpZ21hbkBub2tp YS5jb20+DQorDQorICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4NCisgICAgICAg IERFU0M6IFVzZSB0aGUgRXNjYXBlVXRpbHM6OkVzY2FwZURlY29kZUwgdG8gcmVtb3ZlIGVzY2Fw ZWQgY2hhcmFjdGVycyBpbiB0aGUgcGF0aC4NCisgICAgICAgIGh0dHA6Ly9idWdzLndlYmtpdC5v cmcvc2hvd19idWcuY2dpP2lkPTExMzQ4DQorICAgICAgICANCisgICAgICAgICogUmVzb3VyY2VM b2FkZXIvc3JjL0ZpbGVUcmFuc2FjdGlvbi5jcHA6DQorICAgICAgICAoQ0ZpbGVUcmFuc2FjdGlv bjo6UGFyc2VGaWxlTmFtZUxDKToNCisNCiAyMDA2LTExLTAxICBzYXJlZW4gIDxzaHlhbS5zYXJl ZW5Abm9raWEuY29tPg0KIA0KICAgICAgICAgUmV2aWV3ZWQgYnkgeW9uZ2p1bi56aGFuZ0Bub2tp YS5jb20uDQpJbmRleDogV2ViS2l0L1Jlc291cmNlTG9hZGVyL3NyYy9GaWxlVHJhbnNhY3Rpb24u Y3BwDQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09DQotLS0gV2ViS2l0L1Jlc291cmNlTG9hZGVyL3NyYy9GaWxlVHJhbnNh Y3Rpb24uY3BwCShyZXZpc2lvbiAxNzUxNykNCisrKyBXZWJLaXQvUmVzb3VyY2VMb2FkZXIvc3Jj L0ZpbGVUcmFuc2FjdGlvbi5jcHAJKHdvcmtpbmcgY29weSkNCkBAIC00Niw2ICs0Niw3IEBADQog I2luY2x1ZGUgIlVybFJlcXVlc3RJbmZvLmgiDQogI2luY2x1ZGUgIlVybFJlc3BvbnNlSGVhZGVy SW5mby5oIg0KICNpbmNsdWRlIDxVcmkxNi5oPg0KKyNpbmNsdWRlIDxFc2NhcGVVdGlscy5oPg0K ICNpbmNsdWRlIDxhcG1yZWMuaD4NCiAjaW5jbHVkZSA8YXBnY2xpLmg+DQogDQpAQCAtNDAwLDcg KzQwMSwyMSBAQCBIQnVmQyogQ0ZpbGVUcmFuc2FjdGlvbjo6UGFyc2VGaWxlTmFtZUxDDQogICAg ICAgICAgICAgICAgIHBhdGguU2V0KCBwYXRoLk1pZCggMSApICk7DQogICAgICAgICAgICAgICAg IH0NCiAgICAgICAgICAgICB9DQotICAgICAgICBmaWxlTmFtZVB0ci5BcHBlbmQoIHBhdGggKTsN CisNCisgICAgICAgIEhCdWZDKiBmaWxlVXJpUGF0aCA9IE5VTEw7DQorICAgICAgICBUUkFQX0lH Tk9SRShmaWxlVXJpUGF0aCA9IEVzY2FwZVV0aWxzOjpFc2NhcGVEZWNvZGVMKHBhdGgpKTsgICAg DQorDQorICAgICAgICBpZiAoZmlsZVVyaVBhdGgpDQorICAgICAgICAgICAgew0KKyAgICAgICAg ICAgIGZpbGVOYW1lUHRyLkFwcGVuZCgqZmlsZVVyaVBhdGgpOyAgICANCisgICAgICAgICAgICB9 DQorICAgICAgICBlbHNlDQorICAgICAgICAgICAgeyAgICAgICAgICAgIA0KKyAgICAgICAgICAg IGZpbGVOYW1lUHRyLkFwcGVuZChwYXRoKTsNCisgICAgICAgICAgICB9ICAgICAgICANCisNCisg ICAgICAgIGRlbGV0ZSBmaWxlVXJpUGF0aDsNCisNCiAgICAgICAgIC8vIGZpeCBzbGFzaGVzDQog ICAgICAgICBmb3IoIFRJbnQgaSA9IDA7IGkgPCBmaWxlTmFtZVB0ci5MZW5ndGgoKTsgaSsrICkN CiAgICAgICAgICAgICB7DQo=