9485 2006-06-17 09:17:17 -0700 Teach svn-apply and svn-unapply to use full path names 2006-06-19 10:52:30 -0700 1 1 1 Unclassified WebKit Tools / Tests 420+ Mac OS X 10.4 RESOLVED FIXED P2 Normal --- 1 ddkilzer webkit-unassigned darin oldest_to_newest 46096 0 ddkilzer 2006-06-17 09:17:17 -0700 It annoys me when using svn-apply and svn-unapply that full path names to files are not used. I have a patch that will fix this, along with some general clean-up of both scripts. 46097 1 8887 ddkilzer 2006-06-17 09:27:49 -0700 Created attachment 8887 Patch v1 Patch v1 does the following: svn-apply: - Added "use warnings;" - Used subroutine prototypes - Added command-line argument validation and a -h|--help argument with a help message - Changed merge feature to operate on full paths - Added "exit 0;" statement at end of main code path - Renamed $fullpath to $fullPath - Changed patch() subroutine to use $fullPath instead of $base and to inline usages of $prefix - Changed handleBinaryChange() subroutine to use a full path - Renamed chdirAddingDirectoriesIfNeeded() to addDirectoriesIfNeeded() and chdir back to $startDir when done svn-unapply: - Added new missing feature for removing newly added directories - Added "use warnings;" - Used subroutine prototypes - Added command-line argument validation and a -h|--help argument with a help message - Added "exit 0;" statement at end of main code path - Renamed $fullpath to $fullPath - Changed patch() subroutine to use $fullPath instead of $base and to remove usages of $prefix 46098 2 ddkilzer 2006-06-17 09:33:33 -0700 (In reply to comment #1) > svn-unapply: > - Added new missing feature for removing newly added directories That is, I added the item to the missing-feature list. I haven't implemented that feature (yet). 46198 3 8887 darin 2006-06-18 16:48:14 -0700 Comment on attachment 8887 Patch v1 cvs couldn't handle full paths; that's why the code was doing complicated unnecessary stuff before. Once we switched to svn, we didn't need that code. I don't understand why we need to chdir at all any more. I think that addDirectoriesIfNeeded also should use full paths. r=me 46201 4 ddkilzer 2006-06-18 16:54:17 -0700 (In reply to comment #3) > I don't understand why we need to chdir at all any more. I think that > addDirectoriesIfNeeded also should use full paths. Hmm...you must add the top-level directory in SVN: pbookw:~/WebKit ddkilzer$ mkdir foo pbookw:~/WebKit ddkilzer$ mkdir foo/bar pbookw:~/WebKit ddkilzer$ svn add foo/bar subversion/libsvn_wc/lock.c:377: (apr_err=155007) svn: 'foo' is not a working copy pbookw:~/WebKit ddkilzer$ svn add foo A foo A foo/bar pbookw:~/WebKit ddkilzer$ 46202 5 ddkilzer 2006-06-18 16:55:50 -0700 Committed revision 14909. 46286 6 darin 2006-06-19 10:52:30 -0700 (In reply to comment #4) > (In reply to comment #3) > > I don't understand why we need to chdir at all any more. I think that > > addDirectoriesIfNeeded also should use full paths. > > Hmm...you must add the top-level directory in SVN: Sure, you need to add one directory at a time. But we don't need to chdir. We can use a full path for each directory as we add it. 8887 2006-06-17 09:27:49 -0700 2006-06-18 16:48:14 -0700 Patch v1 bug-9485-v1.diff text/plain 9122 ddkilzer SW5kZXg6IFdlYktpdFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJLaXRUb29scy9D aGFuZ2VMb2cJKHJldmlzaW9uIDE0ODk5KQorKysgV2ViS2l0VG9vbHMvQ2hhbmdlTG9nCSh3b3Jr aW5nIGNvcHkpCkBAIC0xLDMgKzEsMTMgQEAKKzIwMDYtMDYtMTcgIERhdmlkIEtpbHplciAgPGRk a2lsemVyQGtpbHplci5uZXQ+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISku CisKKyAgICAgICAgaHR0cDovL2J1Z3ppbGxhLm9wZW5kYXJ3aW4ub3JnL3Nob3dfYnVnLmNnaT9p ZD05NDg1CisgICAgICAgIFRlYWNoIHN2bi1hcHBseSBhbmQgc3ZuLXVuYXBwbHkgdG8gdXNlIGZ1 bGwgcGF0aCBuYW1lcworCisgICAgICAgICogU2NyaXB0cy9zdm4tYXBwbHk6IENoYW5nZWQgdG8g dXNlIGZ1bGwgcGF0aCBuYW1lcy4gIENsZWFuZWQgdXAgY29kZS4KKyAgICAgICAgKiBTY3JpcHRz L3N2bi11bmFwcGx5OiBEaXR0by4KKwogMjAwNi0wNi0xMSAgRGF2aWQgS2lsemVyICA8ZGRraWx6 ZXJAa2lsemVyLm5ldD4KIAogICAgICAgICBSZXZpZXdlZCBieSBkYXJpbi4KSW5kZXg6IFdlYktp dFRvb2xzL1NjcmlwdHMvc3ZuLWFwcGx5Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYktpdFRvb2xzL1Njcmlw dHMvc3ZuLWFwcGx5CShyZXZpc2lvbiAxNDg5OSkKKysrIFdlYktpdFRvb2xzL1NjcmlwdHMvc3Zu LWFwcGx5CSh3b3JraW5nIGNvcHkpCkBAIC01MCwxMiArNTAsMjUgQEAKICMgICAgICAgZ29pbmcg dG8gZmFpbCAocHJvYmFibHkgdG9vIHN0cmljdCB1bmxlc3Mgd2UgZG8gdGhlIENoYW5nZUxvZyB0 aGluZykuCiAKIHVzZSBzdHJpY3Q7Cit1c2Ugd2FybmluZ3M7CisKIHVzZSBDd2Q7Cit1c2UgRmls ZTo6QmFzZW5hbWU7Cit1c2UgRmlsZTo6U3BlYzsKIHVzZSBHZXRvcHQ6Okxvbmc7CiB1c2UgTUlN RTo6QmFzZTY0OwogCitzdWIgYWRkRGlyZWN0b3JpZXNJZk5lZWRlZCgkKTsKK3N1YiBhcHBseVBh dGNoKCQkOyQpOworc3ViIGhhbmRsZUJpbmFyeUNoYW5nZSgkJCk7CitzdWIgcGF0Y2goJCk7CisK IG15ICRtZXJnZSA9IDA7Ci1HZXRPcHRpb25zKCJtZXJnZSIgPT4gXCRtZXJnZSk7IAorbXkgJHNo b3dIZWxwID0gMDsKK2lmICghR2V0T3B0aW9ucygibWVyZ2UhIiA9PiBcJG1lcmdlLCAiaGVscCEi ID0+IFwkc2hvd0hlbHApIHx8ICRzaG93SGVscCkgeworICAgIHByaW50IFNUREVSUiBiYXNlbmFt ZSgkMCkgLiAiIFstaHwtLWhlbHBdIFstbXwtLW1lcmdlXSBwYXRjaDEgW3BhdGNoMiAuLi5dXG4i OworICAgIGV4aXQgMTsKK30KIAogbXkgJHN0YXJ0RGlyID0gZ2V0Y3dkKCk7CiAKQEAgLTk0LDEz ICsxMDcsNyBAQCBwdXNoIEBwYXRjaGVzLCAkcGF0Y2ggaWYgJHBhdGNoOwogaWYgKCRtZXJnZSkg ewogICAgIGZvciBteSAkZmlsZSAoc29ydCBrZXlzICV2ZXJzaW9ucykgewogICAgICAgICBwcmlu dCAiR2V0dGluZyB2ZXJzaW9uICR2ZXJzaW9uc3skZmlsZX0gb2YgJGZpbGVcbiI7Ci0gICAgICAg ICRmaWxlID1+IG18XigoW14vXG5dKi8pKikoW14vXG5dKykkfCBvciBkaWU7Ci0gICAgICAgIG15 ICgkcHJlZml4LCAkYmFzZSkgPSAoJDEsICQzKTsKLSAgICAgICAgaWYgKCRwcmVmaXgpIHsKLSAg ICAgICAgICAgIGNoZGlyICRwcmVmaXggb3IgZGllOwotICAgICAgICB9Ci0gICAgICAgIHN5c3Rl bSAic3ZuIHVwZGF0ZSAtciAkdmVyc2lvbnN7JGZpbGV9ICRiYXNlIjsKLSAgICAgICAgY2hkaXIg JHN0YXJ0RGlyOworICAgICAgICBzeXN0ZW0gInN2biIsICJ1cGRhdGUiLCAiLXIiLCAkdmVyc2lv bnN7JGZpbGV9LCAkZmlsZTsKICAgICB9CiB9CiAKQEAgLTEwOCwyMyArMTE1LDI1IEBAIGZvciAk cGF0Y2ggKEBwYXRjaGVzKSB7CiAgICAgcGF0Y2goJHBhdGNoKTsKIH0KIAotc3ViIGFwcGx5UGF0 Y2gKK2V4aXQgMDsKKworc3ViIGFwcGx5UGF0Y2goJCQ7JCkKIHsKLSAgICBteSAoJHBhdGNoLCAk ZnVsbHBhdGgsICRvcHRpb25zKSA9IEBfOworICAgIG15ICgkcGF0Y2gsICRmdWxsUGF0aCwgJG9w dGlvbnMpID0gQF87CiAgICAgJG9wdGlvbnMgPSBbXSBpZiAoISAkb3B0aW9ucyk7CiAgICAgbXkg JGNvbW1hbmQgPSAicGF0Y2ggIiAuIGpvaW4oIiAiLCAiLXAwIiwgQHskb3B0aW9uc30pOwotICAg IG9wZW4gUEFUQ0gsICJ8ICRjb21tYW5kIiBvciBkaWUgIkZhaWxlZCB0byBwYXRjaCAkZnVsbHBh dGhcbiI7CisgICAgb3BlbiBQQVRDSCwgInwgJGNvbW1hbmQiIG9yIGRpZSAiRmFpbGVkIHRvIHBh dGNoICRmdWxsUGF0aFxuIjsKICAgICBwcmludCBQQVRDSCAkcGF0Y2g7CiAgICAgY2xvc2UgUEFU Q0g7CiB9CiAKLXN1YiBwYXRjaAorc3ViIHBhdGNoKCQpCiB7CiAgICAgbXkgKCRwYXRjaCkgPSBA XzsKICAgICByZXR1cm4gaWYgISRwYXRjaDsKIAotICAgICRwYXRjaCA9fiBtfF5JbmRleDogKCgo W14vXG5dKi8pKikoW14vXG5dKykpfCBvciBkaWUgIkZhaWxlZCB0byBmaW5kIEluZGV4OiBpbiBc IiRwYXRjaFwiXG4iOwotICAgIG15ICgkZnVsbHBhdGgsICRwcmVmaXgsICRiYXNlKSA9ICgkMSwg JDIsICQ0KTsKKyAgICAkcGF0Y2ggPX4gbXxeSW5kZXg6IChbXlxuXSspfCBvciBkaWUgIkZhaWxl ZCB0byBmaW5kIEluZGV4OiBpbiBcIiRwYXRjaFwiXG4iOworICAgIG15ICRmdWxsUGF0aCA9ICQx OwogCiAgICAgbXkgJGRlbGV0aW9uID0gMDsKICAgICBteSAkYWRkaXRpb24gPSAwOwpAQCAtMTM2 LDI1ICsxNDUsMjQgQEAgc3ViIHBhdGNoCiAKICAgICBpZiAoISRhZGRpdGlvbiAmJiAhJGRlbGV0 aW9uICYmICEkaXNCaW5hcnkpIHsKICAgICAgICAgIyBTdGFuZGFyZCBwYXRjaCwgcGF0Y2ggdG9v bCBjYW4gaGFuZGxlIHRoaXMuCi0gICAgICAgIGlmICgkYmFzZSBlcSAiQ2hhbmdlTG9nIikgewot ICAgICAgICAgICAgbXkgJGNoYW5nZUxvZ0RvdE9yaWdFeGlzdGVkID0gLWYgIiR7ZnVsbHBhdGh9 Lm9yaWciOwotICAgICAgICAgICAgYXBwbHlQYXRjaCgkcGF0Y2gsICRmdWxscGF0aCwgWyItLWZ1 eno9MyJdKTsKLSAgICAgICAgICAgIHVubGluaygiJHtmdWxscGF0aH0ub3JpZyIpIGlmICghICRj aGFuZ2VMb2dEb3RPcmlnRXhpc3RlZCk7CisgICAgICAgIGlmIChiYXNlbmFtZSgkZnVsbFBhdGgp IGVxICJDaGFuZ2VMb2ciKSB7CisgICAgICAgICAgICBteSAkY2hhbmdlTG9nRG90T3JpZ0V4aXN0 ZWQgPSAtZiAiJHtmdWxsUGF0aH0ub3JpZyI7CisgICAgICAgICAgICBhcHBseVBhdGNoKCRwYXRj aCwgJGZ1bGxQYXRoLCBbIi0tZnV6ej0zIl0pOworICAgICAgICAgICAgdW5saW5rKCIke2Z1bGxQ YXRofS5vcmlnIikgaWYgKCEgJGNoYW5nZUxvZ0RvdE9yaWdFeGlzdGVkKTsKICAgICAgICAgfSBl bHNlIHsKLSAgICAgICAgICAgIGFwcGx5UGF0Y2goJHBhdGNoLCAkZnVsbHBhdGgpOworICAgICAg ICAgICAgYXBwbHlQYXRjaCgkcGF0Y2gsICRmdWxsUGF0aCk7CiAgICAgICAgIH0KICAgICB9IGVs c2UgewogICAgICAgICAjIEVpdGhlciBhIGRlbGV0aW9uLCBhbiBhZGRpdGlvbiBvciBhIGJpbmFy eSBjaGFuZ2UuCiAKLSAgICAgICAgIyBDaGFuZ2UgZGlyZWN0b3J5IGRvd24gaW50byB0aGUgZGly ZWN0b3J5IGluIHF1ZXN0aW9uLgotICAgICAgICBjaGRpckFkZGluZ0RpcmVjdG9yaWVzSWZOZWVk ZWQoJHByZWZpeCk7CisgICAgICAgIGFkZERpcmVjdG9yaWVzSWZOZWVkZWQoZGlybmFtZSgkZnVs bFBhdGgpKTsKIAogICAgICAgICBpZiAoJGlzQmluYXJ5KSB7CiAgICAgICAgICAgICAjIEJpbmFy eSBjaGFuZ2UKLSAgICAgICAgICAgIGhhbmRsZUJpbmFyeUNoYW5nZSgkYmFzZSwgJHBhdGNoKTsK KyAgICAgICAgICAgIGhhbmRsZUJpbmFyeUNoYW5nZSgkZnVsbFBhdGgsICRwYXRjaCk7CiAgICAg ICAgIH0gZWxzaWYgKCRkZWxldGlvbikgewogICAgICAgICAgICAgIyBEZWxldGlvbi4KLSAgICAg ICAgICAgIHN5c3RlbSAic3ZuIiwgInJtIiwgJGJhc2U7CisgICAgICAgICAgICBzeXN0ZW0gInN2 biIsICJybSIsICRmdWxsUGF0aDsKICAgICAgICAgfSBlbHNlIHsKICAgICAgICAgICAgICMgQWRk aXRpb24uCiAgICAgICAgICAgICBteSAkY29udGVudHMgPSAkcGF0Y2g7CkBAIC0xNjYsNDkgKzE3 NCw0OCBAQCBzdWIgcGF0Y2gKICAgICAgICAgICAgICAgICAkY29udGVudHMgPX4gcy9eXCsvLzsK ICAgICAgICAgICAgICAgICAkY29udGVudHMgPX4gcy9cblwrL1xuL2c7CiAgICAgICAgICAgICB9 Ci0gICAgICAgICAgICBvcGVuIEZJTEUsICI+IiwgJGJhc2Ugb3IgZGllOworICAgICAgICAgICAg b3BlbiBGSUxFLCAiPiIsICRmdWxsUGF0aCBvciBkaWU7CiAgICAgICAgICAgICBwcmludCBGSUxF ICRjb250ZW50czsKICAgICAgICAgICAgIGNsb3NlIEZJTEU7Ci0gICAgICAgICAgICBzeXN0ZW0g InN2biIsICJhZGQiLCAiJGJhc2UiOworICAgICAgICAgICAgc3lzdGVtICJzdm4iLCAiYWRkIiwg JGZ1bGxQYXRoOwogICAgICAgICB9Ci0KLSAgICAgICAgY2hkaXIgJHN0YXJ0RGlyIGlmICRwcmVm aXg7CiAgICAgfQogfQogCi1zdWIgaGFuZGxlQmluYXJ5Q2hhbmdlCitzdWIgaGFuZGxlQmluYXJ5 Q2hhbmdlKCQkKQogewotICAgIG15ICgkYmFzZSwgJGNvbnRlbnRzKSA9IEBfOworICAgIG15ICgk ZnVsbFBhdGgsICRjb250ZW50cykgPSBAXzsKICAgICBpZiAoJGNvbnRlbnRzID1+IG0jKChcbltB LVphLXowLTkrL117NzZ9KStcbltBLVphLXowLTkrLz1dezQsNzZ9XG4pXG4jKSB7CiAgICAgICAg ICMgQWRkaXRpb24gb3IgTW9kaWZpY2F0aW9uCi0gICAgICAgIG9wZW4gRklMRSwgIj4iLCAkYmFz ZSBvciBkaWU7CisgICAgICAgIG9wZW4gRklMRSwgIj4iLCAkZnVsbFBhdGggb3IgZGllOwogICAg ICAgICBwcmludCBGSUxFIGRlY29kZV9iYXNlNjQoJDEpOwogICAgICAgICBjbG9zZSBGSUxFOwot ICAgICAgICBvcGVuIFNWTiwgInN2biBzdGF0ICckYmFzZScgfCIgb3IgZGllOworICAgICAgICBv cGVuIFNWTiwgInN2biBzdGF0ICckZnVsbFBhdGgnIHwiIG9yIGRpZTsKICAgICAgICAgbXkgJHN2 blN0YXR1cyA9IDxTVk4+OwogICAgICAgICBjbG9zZSBTVk47CiAgICAgICAgIGlmIChzdWJzdHIo JHN2blN0YXR1cywgMCAsMSkgZXEgIj8iKSB7CiAgICAgICAgICAgICAjIEFkZGl0aW9uCi0gICAg ICAgICAgICBzeXN0ZW0gInN2biIsICJhZGQiLCAiJGJhc2UiOworICAgICAgICAgICAgc3lzdGVt ICJzdm4iLCAiYWRkIiwgJGZ1bGxQYXRoOwogICAgICAgICB9IGVsc2UgewogICAgICAgICAgICAg IyBNb2RpZmljYXRpb24KICAgICAgICAgICAgIHByaW50ICRzdm5TdGF0dXM7CiAgICAgICAgIH0K ICAgICB9IGVsc2UgewogICAgICAgICAjIERlbGV0aW9uCi0gICAgICAgIHN5c3RlbSAic3ZuIiwg InJtIiwgIiRiYXNlIjsKKyAgICAgICAgc3lzdGVtICJzdm4iLCAicm0iLCAkZnVsbFBhdGg7CiAg ICAgfQogfQogCi1zdWIgY2hkaXJBZGRpbmdEaXJlY3Rvcmllc0lmTmVlZGVkCitzdWIgYWRkRGly ZWN0b3JpZXNJZk5lZWRlZCgkKQogewotICAgIG15ICRwYXRoID0gc2hpZnQ7Ci0gICAgbXkgQGRp cnMgPSBzcGxpdCgnLycsICRwYXRoKTsKKyAgICBteSAoJHBhdGgpID0gQF87CisgICAgbXkgQGRp cnMgPSBGaWxlOjpTcGVjLT5zcGxpdGRpcigkcGF0aCk7CiAgICAgd2hpbGUgKG15ICRkaXIgPSBz aGlmdCBAZGlycykgewotICAgICAgICBpZiAoIS14ICRkaXIpIHsKKyAgICAgICAgaWYgKCEgLXgg JGRpcikgewogICAgICAgICAgICAgbWtkaXIgJGRpciBvciBkaWUgIkZhaWxlZCBjcmVhdGUgcmVx dWlyZWQgZGlyZWN0b3J5OiAkZGlyIGZvciBwYXRoOiAkcGF0aFxuIjsKLSAgICAgICAgICAgIHN5 c3RlbSAic3ZuIiwgImFkZCIsICIkZGlyIjsKKyAgICAgICAgICAgIHN5c3RlbSAic3ZuIiwgImFk ZCIsICRkaXI7CiAgICAgICAgIH0KICAgICAgICAgY2hkaXIgJGRpciBvciBkaWUgIkZhaWxlZCB0 byBjaGRpciB0byAkZGlyXG4iOwogICAgIH0KKyAgICBjaGRpciAkc3RhcnREaXIgb3IgZGllICJG YWlsZWQgdG8gY2hkaXIgdG8gJHN0YXJ0RGlyXG4iOwogfQpJbmRleDogV2ViS2l0VG9vbHMvU2Ny aXB0cy9zdm4tdW5hcHBseQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJLaXRUb29scy9TY3JpcHRzL3N2bi11 bmFwcGx5CShyZXZpc2lvbiAxNDg5OSkKKysrIFdlYktpdFRvb2xzL1NjcmlwdHMvc3ZuLXVuYXBw bHkJKHdvcmtpbmcgY29weSkKQEAgLTQ3LDkgKzQ3LDIzIEBACiAjICAgTm90aWNlIGEgcGF0Y2gg dGhhdCdzIGJlaW5nIHVuYXBwbGllZCBhdCB0aGUgIndyb25nIGxldmVsIiBhbmQgbWFrZSBpdCB3 b3JrIGFueXdheS4KICMgICBEbyBhIGRyeSBydW4gb24gdGhlIHdob2xlIHBhdGNoIGFuZCBkb24n dCBkbyBhbnl0aGluZyBpZiBwYXJ0IG9mIHRoZSBwYXRjaCBpcwogIyAgICAgICBnb2luZyB0byBm YWlsIChwcm9iYWJseSB0b28gc3RyaWN0IHVubGVzcyB3ZSBkbyB0aGUgQ2hhbmdlTG9nIHRoaW5n KS4KKyMgICBSZW1vdmUgbmV3IGRpcmVjdG9yaWVzIHRoYXQgd2VyZSBwcmV2aW91c2x5IGFkZGVk IGJ5IHN2bi1hcHBseS4KIAogdXNlIHN0cmljdDsKK3VzZSB3YXJuaW5nczsKKwogdXNlIEN3ZDsK K3VzZSBGaWxlOjpCYXNlbmFtZTsKK3VzZSBHZXRvcHQ6Okxvbmc7CisKK3N1YiBwYXRjaCgkKTsK K3N1YiB1bmFwcGx5UGF0Y2goJCQ7JCk7CisKK215ICRzaG93SGVscCA9IDA7CitpZiAoIUdldE9w dGlvbnMoImhlbHAhIiA9PiBcJHNob3dIZWxwKSB8fCAkc2hvd0hlbHApIHsKKyAgICBwcmludCBT VERFUlIgYmFzZW5hbWUoJDApIC4gIiBbLWh8LS1oZWxwXSBwYXRjaDEgW3BhdGNoMiAuLi5dXG4i OworICAgIGV4aXQgMTsKK30KIAogbXkgJHN0YXJ0RGlyID0gZ2V0Y3dkKCk7CiAKQEAgLTc3LDIz ICs5MSwyNSBAQCB3aGlsZSAoPD4pIHsKIH0KIHBhdGNoKCRwYXRjaCk7CiAKLXN1YiB1bmFwcGx5 UGF0Y2gKK2V4aXQgMDsKKworc3ViIHVuYXBwbHlQYXRjaCgkJDskKQogewotICAgIG15ICgkcGF0 Y2gsICRmdWxscGF0aCwgJG9wdGlvbnMpID0gQF87CisgICAgbXkgKCRwYXRjaCwgJGZ1bGxQYXRo LCAkb3B0aW9ucykgPSBAXzsKICAgICAkb3B0aW9ucyA9IFtdIGlmICghICRvcHRpb25zKTsKICAg ICBteSAkY29tbWFuZCA9ICJwYXRjaCAiIC4gam9pbigiICIsICItcDAiLCAiLVIiLCBAeyRvcHRp b25zfSk7Ci0gICAgb3BlbiBQQVRDSCwgInwgJGNvbW1hbmQiIG9yIGRpZSAiRmFpbGVkIHRvIHBh dGNoICRmdWxscGF0aFxuIjsKKyAgICBvcGVuIFBBVENILCAifCAkY29tbWFuZCIgb3IgZGllICJG YWlsZWQgdG8gcGF0Y2ggJGZ1bGxQYXRoXG4iOwogICAgIHByaW50IFBBVENIICRwYXRjaDsKICAg ICBjbG9zZSBQQVRDSDsKIH0KIAotc3ViIHBhdGNoCitzdWIgcGF0Y2goJCkKIHsKICAgICBteSAo JHBhdGNoKSA9IEBfOwogICAgIHJldHVybiBpZiAhJHBhdGNoOwogCi0gICAgJHBhdGNoID1+IG18 XkluZGV4OiAoKChbXi9cbl0qLykqKShbXi9cbl0rKSl8IG9yIGRpZSAiRmFpbGVkIHRvIGZpbmQg SW5kZXg6IGluIFwiJHBhdGNoXCJcbiI7Ci0gICAgbXkgKCRmdWxscGF0aCwgJHByZWZpeCwgJGJh c2UpID0gKCQxLCAkMiwgJDQpOworICAgICRwYXRjaCA9fiBtfF5JbmRleDogKFteXG5dKyl8IG9y IGRpZSAiRmFpbGVkIHRvIGZpbmQgSW5kZXg6IGluIFwiJHBhdGNoXCJcbiI7CisgICAgbXkgJGZ1 bGxQYXRoID0gJDE7CiAKICAgICBteSAkZGVsZXRpb24gPSAwOwogICAgIG15ICRhZGRpdGlvbiA9 IDA7CkBAIC0xMDUsMjcgKzEyMSwyMCBAQCBzdWIgcGF0Y2gKIAogICAgIGlmICghJGFkZGl0aW9u ICYmICEkZGVsZXRpb24gJiYgISRpc0JpbmFyeSkgewogICAgICAgICAjIFN0YW5kYXJkIHBhdGNo LCBwYXRjaCB0b29sIGNhbiBoYW5kbGUgdGhpcy4KLSAgICAgICAgaWYgKCRiYXNlIGVxICJDaGFu Z2VMb2ciKSB7Ci0gICAgICAgICAgICBteSAkY2hhbmdlTG9nRG90T3JpZ0V4aXN0ZWQgPSAtZiAi JHtmdWxscGF0aH0ub3JpZyI7Ci0gICAgICAgICAgICB1bmFwcGx5UGF0Y2goJHBhdGNoLCAkZnVs bHBhdGgsIFsiLS1mdXp6PTMiXSk7Ci0gICAgICAgICAgICB1bmxpbmsoIiR7ZnVsbHBhdGh9Lm9y aWciKSBpZiAoISAkY2hhbmdlTG9nRG90T3JpZ0V4aXN0ZWQpOworICAgICAgICBpZiAoYmFzZW5h bWUoJGZ1bGxQYXRoKSBlcSAiQ2hhbmdlTG9nIikgeworICAgICAgICAgICAgbXkgJGNoYW5nZUxv Z0RvdE9yaWdFeGlzdGVkID0gLWYgIiR7ZnVsbFBhdGh9Lm9yaWciOworICAgICAgICAgICAgdW5h cHBseVBhdGNoKCRwYXRjaCwgJGZ1bGxQYXRoLCBbIi0tZnV6ej0zIl0pOworICAgICAgICAgICAg dW5saW5rKCIke2Z1bGxQYXRofS5vcmlnIikgaWYgKCEgJGNoYW5nZUxvZ0RvdE9yaWdFeGlzdGVk KTsKICAgICAgICAgfSBlbHNlIHsKLSAgICAgICAgICAgIHVuYXBwbHlQYXRjaCgkcGF0Y2gsICRm dWxscGF0aCk7CisgICAgICAgICAgICB1bmFwcGx5UGF0Y2goJHBhdGNoLCAkZnVsbFBhdGgpOwog ICAgICAgICB9CiAgICAgfSBlbHNlIHsKICAgICAgICAgIyBFaXRoZXIgYSBkZWxldGlvbiwgYW4g YWRkaXRpb24gb3IgYSBiaW5hcnkgY2hhbmdlLgogCi0gICAgICAgICMgQ2hhbmdlIGRpcmVjdG9y eSBkb3duIGludG8gdGhlIGRpcmVjdG9yeSBpbiBxdWVzdGlvbi4KLSAgICAgICAgaWYgKCRwcmVm aXgpIHsKLSAgICAgICAgICAgIGNoZGlyICRwcmVmaXggb3IgZGllICJGYWlsZWQgdG8gY2hkaXIg dG8gJHByZWZpeCI7Ci0gICAgICAgIH0KLQogICAgICAgICAjIFJldmVyc2UgY2hhbmdlIGJ5IGRl bGV0aW5nIGN1cnJlbnQgY29weSBpZiBpdCBleGlzdHMgZmlyc3QKLSAgICAgICAgdW5saW5rKCRi YXNlKSBpZiAoLWUgJGJhc2UpOworICAgICAgICB1bmxpbmsoJGZ1bGxQYXRoKSBpZiAoLWUgJGZ1 bGxQYXRoKTsKIAogICAgICAgICAjIFRoZW4gcnVuIHN2biByZXZlcnQKLSAgICAgICAgc3lzdGVt ICJzdm4iLCAicmV2ZXJ0IiwgIiRiYXNlIjsKLQotICAgICAgICBjaGRpciAkc3RhcnREaXIgb3Ig ZGllOworICAgICAgICBzeXN0ZW0gInN2biIsICJyZXZlcnQiLCAkZnVsbFBhdGg7CiAgICAgfQog fQo=