39944 2010-05-31 02:06:14 -0700 [GTK] GtkLauncher should support relative file paths 2010-11-02 17:14:21 -0700 1 1 1 Unclassified WebKit WebKitGTK 528+ (Nightly build) PC Linux RESOLVED FIXED P2 Normal --- 1 mrobinson webkit-unassigned abarth eric webkit.review.bot xan.lopez oldest_to_newest 232287 0 mrobinson 2010-05-31 02:06:14 -0700 This is supported for WinLauncher. It makes GtkLauncher much easier to use for debugging failing tests. 232296 1 57444 mrobinson 2010-05-31 02:36:06 -0700 Created attachment 57444 Patch for this issue 232297 2 webkit.review.bot 2010-05-31 02:37:01 -0700 Attachment 57444 did not pass style-queue: Failed to run "['WebKitTools/Scripts/check-webkit-style', '--no-squash']" exit_code: 1 WebKitTools/GtkLauncher/main.c:191: Extra space before ( in function call [whitespace/parens] [4] WebKitTools/GtkLauncher/main.c:193: Declaration has space between * and variable name in GFile* gfile [whitespace/declaration] [3] WebKitTools/GtkLauncher/main.c:193: Extra space before ( in function call [whitespace/parens] [4] WebKitTools/GtkLauncher/main.c:197: Declaration has space between * and variable name in gchar* full_path [whitespace/declaration] [3] WebKitTools/GtkLauncher/main.c:197: Extra space before ( in function call [whitespace/parens] [4] WebKitTools/GtkLauncher/main.c:197: full_path is incorrectly named. Don't use underscores in your identifier names. [readability/naming] [4] WebKitTools/GtkLauncher/main.c:201: Declaration has space between * and variable name in gchar* file_url [whitespace/declaration] [3] WebKitTools/GtkLauncher/main.c:201: Extra space before ( in function call [whitespace/parens] [4] WebKitTools/GtkLauncher/main.c:201: file_url is incorrectly named. Don't use underscores in your identifier names. [readability/naming] [4] WebKitTools/GtkLauncher/main.c:223: Declaration has space between * and variable name in gchar* file_url [whitespace/declaration] [3] WebKitTools/GtkLauncher/main.c:223: file_url is incorrectly named. Don't use underscores in your identifier names. [readability/naming] [4] WebKitTools/GtkLauncher/main.c:226: Extra space before ( in function call [whitespace/parens] [4] WebKitTools/GtkLauncher/main.c:229: Extra space before ( in function call [whitespace/parens] [4] Total errors found: 13 in 2 files If any of these errors are false positives, please file a bug against check-webkit-style. 232302 3 mrobinson 2010-05-31 02:46:36 -0700 > Failed to run "['WebKitTools/Scripts/check-webkit-style', '--no-squash']" exit_code: 1 > WebKitTools/GtkLauncher/main.c:191: Extra space before ( in function call [whitespace/parens] Bug for check-webkit-style false positives filed here: https://bugs.webkit.org/show_bug.cgi?id=39947 232308 4 57449 mrobinson 2010-05-31 03:22:47 -0700 Created attachment 57449 Patch with style and memory leak fix Xan is saying that GtkLauncher should gradually move to WebKit style, so I've redone my patch using WebKit style and with a small memory leak fix. 232688 5 57449 xan.lopez 2010-06-01 05:11:50 -0700 Comment on attachment 57449 Patch with style and memory leak fix >+static gchar* filenameToURL(const char* filename) >+{ >+ GFile *gFile = g_file_new_for_path(filename); >+ if (!g_file_query_exists(gFile, 0)) { >+ g_object_unref(gFile); >+ return 0; >+ } >+ g_object_unref(gFile); Maybe use g_file_test if you only create the object to check that the path is valid? >+ >+ gchar *fullPath = realpath(filename, 0); >+ if (!fullPath) >+ return 0; >+ >+ gchar *fileURL = g_filename_to_uri(fullPath, 0, 0); >+ free(fullPath); GOwnPtr for fullPath. >+ >+ return fileURL; >+} >+ > int > main (int argc, char* argv[]) > { >@@ -201,8 +221,15 @@ main (int argc, char* argv[]) > main_window = create_window (); > gtk_container_add (GTK_CONTAINER (main_window), vbox); > >- gchar* uri = (gchar*) (argc > 1 ? argv[1] : "http://www.google.com/"); >- webkit_web_view_load_uri (web_view, uri); >+ gchar *uri = (gchar*) (argc > 1 ? argv[1] : "http://www.google.com/"); >+ gchar *fileURL = filenameToURL(uri); >+ >+ if (fileURL) { >+ webkit_web_view_load_uri(web_view, fileURL); >+ g_free(fileURL); >+ } else { >+ webkit_web_view_load_uri(web_view, uri); >+ } You can use GOwnPtr for fileURL, and have only one branch with fileURI ? fileURI : uri > > gtk_widget_grab_focus (GTK_WIDGET (web_view)); > gtk_widget_show_all (main_window); 232689 6 xan.lopez 2010-06-01 05:15:04 -0700 Eh, ok, you can't use GOwnPtr ok, so disregard that part. 232690 7 xan.lopez 2010-06-01 05:16:13 -0700 I meant GOwnPtr here... you can still keep a single branch since it's ok to call g_free with a NULL pointer though. 234007 8 57836 mrobinson 2010-06-03 17:15:20 -0700 Created attachment 57836 Patch with fixes 234292 9 mrobinson 2010-06-04 11:01:57 -0700 Thanks for the review! As we discussed recently, GOwnPtr cannot be used in GtkLauncher. I've implemented your other suggestions though. 234386 10 57836 xan.lopez 2010-06-04 14:40:39 -0700 Comment on attachment 57836 Patch with fixes r=me 234401 11 57836 mrobinson 2010-06-04 15:19:47 -0700 Comment on attachment 57836 Patch with fixes Clearing flags on attachment: 57836 Committed r60713: <http://trac.webkit.org/changeset/60713> 234402 12 mrobinson 2010-06-04 15:19:53 -0700 All reviewed patches have been landed. Closing bug. 234408 13 webkit.review.bot 2010-06-04 15:58:25 -0700 http://trac.webkit.org/changeset/60713 might have broken GTK Linux 32-bit Release The following changes are on the blame list: http://trac.webkit.org/changeset/60712 http://trac.webkit.org/changeset/60713 http://trac.webkit.org/changeset/60709 http://trac.webkit.org/changeset/60710 http://trac.webkit.org/changeset/60711 57444 2010-05-31 02:36:06 -0700 2010-05-31 03:22:40 -0700 Patch for this issue bug-39944-20100531113604.patch text/plain 2185 mrobinson ZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL0NoYW5nZUxvZyBiL1dlYktpdFRvb2xzL0NoYW5nZUxv ZwppbmRleCBhMjNjNzcwZDc4OWQyMDNhMzZlN2FkNjdlNTJjMTk4YjQ1ZmJkNzBjLi4zMjAyZThh MmE3Zjg5Mjc4NjRkNWIxMGU2MThmZjAzYjk3NzVkNzc4IDEwMDY0NAotLS0gYS9XZWJLaXRUb29s cy9DaGFuZ2VMb2cKKysrIGIvV2ViS2l0VG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTYgQEAK KzIwMTAtMDUtMzEgIE1hcnRpbiBSb2JpbnNvbiAgPG1yb2JpbnNvbkBpZ2FsaWEuY29tPgorCisg ICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFtHVEtdIEd0a0xh dW5jaGVyIHNob3VsZCBzdXBwb3J0IHJlbGF0aXZlIGZpbGUgcGF0aHMKKyAgICAgICAgaHR0cHM6 Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTM5OTQ0CisKKyAgICAgICAgQWxsb3cg R3RrTGF1bmNoZXIgdG8gaGFuZGxlIHJlbGF0aXZlIGZpbGUgcGF0aHMgcGFzc2VkIHZpYSBjb21t YW5kLWxpbmUgYXJndW1lbnRzLgorCisgICAgICAgICogR3RrTGF1bmNoZXIvbWFpbi5jOgorICAg ICAgICAoZmlsZW5hbWVfdG9fdXJsKTogQWRkZWQuCisgICAgICAgIChtYWluKTogVHJ5IHRvIHJl c29sdmUgYXJndW1lbnRzIGFzIHJlbGF0aXZlIGZpbGUgVVJMcyBmaXJzdC4KKwogMjAxMC0wNS0z MCAgS2VudCBUYW11cmEgIDx0a2VudEBjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgUmV2aWV3ZWQg YnkgRGltaXRyaSBHbGF6a292LgpkaWZmIC0tZ2l0IGEvV2ViS2l0VG9vbHMvR3RrTGF1bmNoZXIv bWFpbi5jIGIvV2ViS2l0VG9vbHMvR3RrTGF1bmNoZXIvbWFpbi5jCmluZGV4IDJmOTM1MGQ1YzA4 MmY5NDFjOTlkMDQ0NzI2YTAzZjJkNzBlNWIzNWUuLjQ4Yzg4OGU2ZGY4YTkzMjc0YzZiYTljMjQw ODlhYWFiZjgxZDA0YWQgMTAwNjQ0Ci0tLSBhL1dlYktpdFRvb2xzL0d0a0xhdW5jaGVyL21haW4u YworKysgYi9XZWJLaXRUb29scy9HdGtMYXVuY2hlci9tYWluLmMKQEAgLTI1LDYgKzI1LDcgQEAK ICAqLwogCiAjaW5jbHVkZSA8Z3RrL2d0ay5oPgorI2luY2x1ZGUgPHN0ZGxpYi5oPgogI2luY2x1 ZGUgPHdlYmtpdC93ZWJraXQuaD4KIAogc3RhdGljIEd0a1dpZGdldCogbWFpbl93aW5kb3c7CkBA IC0xODYsNiArMTg3LDIzIEBAIGNyZWF0ZV93aW5kb3cgKCkKICAgICByZXR1cm4gd2luZG93Owog fQogCitzdGF0aWMgZ2NoYXIqCitmaWxlbmFtZV90b191cmwgKGNvbnN0IGNoYXIqIGZpbGVuYW1l KQoreworICAgIEdGaWxlKiBnZmlsZSA9IGdfZmlsZV9uZXdfZm9yX3BhdGggKGZpbGVuYW1lKTsK KyAgICBpZiAoIWdfZmlsZV9xdWVyeV9leGlzdHMgKGdmaWxlLCBOVUxMKSkKKyAgICAgICAgcmV0 dXJuIE5VTEw7CisKKyAgICBnY2hhciogZnVsbF9wYXRoID0gcmVhbHBhdGggKGZpbGVuYW1lLCBO VUxMKTsKKyAgICBpZiAoIWZ1bGxfcGF0aCkKKyAgICAgICAgcmV0dXJuIE5VTEw7CisKKyAgICBn Y2hhciogZmlsZV91cmwgPSBnX2ZpbGVuYW1lX3RvX3VyaSAoZnVsbF9wYXRoLCBOVUxMLCBOVUxM KTsKKyAgICBmcmVlKGZ1bGxfcGF0aCk7CisKKyAgICByZXR1cm4gZmlsZV91cmw7Cit9CisKIGlu dAogbWFpbiAoaW50IGFyZ2MsIGNoYXIqIGFyZ3ZbXSkKIHsKQEAgLTIwMiw3ICsyMjAsMTQgQEAg bWFpbiAoaW50IGFyZ2MsIGNoYXIqIGFyZ3ZbXSkKICAgICBndGtfY29udGFpbmVyX2FkZCAoR1RL X0NPTlRBSU5FUiAobWFpbl93aW5kb3cpLCB2Ym94KTsKIAogICAgIGdjaGFyKiB1cmkgPSAoZ2No YXIqKSAoYXJnYyA+IDEgPyBhcmd2WzFdIDogImh0dHA6Ly93d3cuZ29vZ2xlLmNvbS8iKTsKLSAg ICB3ZWJraXRfd2ViX3ZpZXdfbG9hZF91cmkgKHdlYl92aWV3LCB1cmkpOworICAgIGdjaGFyKiBm aWxlX3VybCA9IGZpbGVuYW1lX3RvX3VybCh1cmkpOworCisgICAgaWYgKGZpbGVfdXJsKSB7Cisg ICAgICAgIHdlYmtpdF93ZWJfdmlld19sb2FkX3VyaSAod2ViX3ZpZXcsIGZpbGVfdXJsKTsKKyAg ICAgICAgZ19mcmVlKGZpbGVfdXJsKTsKKyAgICB9IGVsc2UgeworICAgICAgICB3ZWJraXRfd2Vi X3ZpZXdfbG9hZF91cmkgKHdlYl92aWV3LCB1cmkpOworICAgIH0KIAogICAgIGd0a193aWRnZXRf Z3JhYl9mb2N1cyAoR1RLX1dJREdFVCAod2ViX3ZpZXcpKTsKICAgICBndGtfd2lkZ2V0X3Nob3df YWxsIChtYWluX3dpbmRvdyk7Cg== 57449 2010-05-31 03:22:47 -0700 2010-06-03 17:15:16 -0700 Patch with style and memory leak fix bug-39944-20100531122244.patch text/plain 2327 mrobinson ZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL0NoYW5nZUxvZyBiL1dlYktpdFRvb2xzL0NoYW5nZUxv ZwppbmRleCBhMjNjNzcwZDc4OWQyMDNhMzZlN2FkNjdlNTJjMTk4YjQ1ZmJkNzBjLi4zMjAyZThh MmE3Zjg5Mjc4NjRkNWIxMGU2MThmZjAzYjk3NzVkNzc4IDEwMDY0NAotLS0gYS9XZWJLaXRUb29s cy9DaGFuZ2VMb2cKKysrIGIvV2ViS2l0VG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTYgQEAK KzIwMTAtMDUtMzEgIE1hcnRpbiBSb2JpbnNvbiAgPG1yb2JpbnNvbkBpZ2FsaWEuY29tPgorCisg ICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFtHVEtdIEd0a0xh dW5jaGVyIHNob3VsZCBzdXBwb3J0IHJlbGF0aXZlIGZpbGUgcGF0aHMKKyAgICAgICAgaHR0cHM6 Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTM5OTQ0CisKKyAgICAgICAgQWxsb3cg R3RrTGF1bmNoZXIgdG8gaGFuZGxlIHJlbGF0aXZlIGZpbGUgcGF0aHMgcGFzc2VkIHZpYSBjb21t YW5kLWxpbmUgYXJndW1lbnRzLgorCisgICAgICAgICogR3RrTGF1bmNoZXIvbWFpbi5jOgorICAg ICAgICAoZmlsZW5hbWVfdG9fdXJsKTogQWRkZWQuCisgICAgICAgIChtYWluKTogVHJ5IHRvIHJl c29sdmUgYXJndW1lbnRzIGFzIHJlbGF0aXZlIGZpbGUgVVJMcyBmaXJzdC4KKwogMjAxMC0wNS0z MCAgS2VudCBUYW11cmEgIDx0a2VudEBjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgUmV2aWV3ZWQg YnkgRGltaXRyaSBHbGF6a292LgpkaWZmIC0tZ2l0IGEvV2ViS2l0VG9vbHMvR3RrTGF1bmNoZXIv bWFpbi5jIGIvV2ViS2l0VG9vbHMvR3RrTGF1bmNoZXIvbWFpbi5jCmluZGV4IDJmOTM1MGQ1YzA4 MmY5NDFjOTlkMDQ0NzI2YTAzZjJkNzBlNWIzNWUuLmQwYzY2OWZjNTUxMjdjNmM2Y2NjMDZiYjJj NGU2ZjZjMjE3YTQxY2UgMTAwNjQ0Ci0tLSBhL1dlYktpdFRvb2xzL0d0a0xhdW5jaGVyL21haW4u YworKysgYi9XZWJLaXRUb29scy9HdGtMYXVuY2hlci9tYWluLmMKQEAgLTI1LDYgKzI1LDcgQEAK ICAqLwogCiAjaW5jbHVkZSA8Z3RrL2d0ay5oPgorI2luY2x1ZGUgPHN0ZGxpYi5oPgogI2luY2x1 ZGUgPHdlYmtpdC93ZWJraXQuaD4KIAogc3RhdGljIEd0a1dpZGdldCogbWFpbl93aW5kb3c7CkBA IC0xODYsNiArMTg3LDI1IEBAIGNyZWF0ZV93aW5kb3cgKCkKICAgICByZXR1cm4gd2luZG93Owog fQogCitzdGF0aWMgZ2NoYXIqIGZpbGVuYW1lVG9VUkwoY29uc3QgY2hhciogZmlsZW5hbWUpCit7 CisgICAgR0ZpbGUgKmdGaWxlID0gZ19maWxlX25ld19mb3JfcGF0aChmaWxlbmFtZSk7CisgICAg aWYgKCFnX2ZpbGVfcXVlcnlfZXhpc3RzKGdGaWxlLCAwKSkgeworICAgICAgICBnX29iamVjdF91 bnJlZihnRmlsZSk7CisgICAgICAgIHJldHVybiAwOworICAgIH0KKyAgICBnX29iamVjdF91bnJl ZihnRmlsZSk7CisKKyAgICBnY2hhciAqZnVsbFBhdGggPSByZWFscGF0aChmaWxlbmFtZSwgMCk7 CisgICAgaWYgKCFmdWxsUGF0aCkKKyAgICAgICAgcmV0dXJuIDA7CisKKyAgICBnY2hhciAqZmls ZVVSTCA9IGdfZmlsZW5hbWVfdG9fdXJpKGZ1bGxQYXRoLCAwLCAwKTsKKyAgICBmcmVlKGZ1bGxQ YXRoKTsKKworICAgIHJldHVybiBmaWxlVVJMOworfQorCiBpbnQKIG1haW4gKGludCBhcmdjLCBj aGFyKiBhcmd2W10pCiB7CkBAIC0yMDEsOCArMjIxLDE1IEBAIG1haW4gKGludCBhcmdjLCBjaGFy KiBhcmd2W10pCiAgICAgbWFpbl93aW5kb3cgPSBjcmVhdGVfd2luZG93ICgpOwogICAgIGd0a19j b250YWluZXJfYWRkIChHVEtfQ09OVEFJTkVSIChtYWluX3dpbmRvdyksIHZib3gpOwogCi0gICAg Z2NoYXIqIHVyaSA9IChnY2hhciopIChhcmdjID4gMSA/IGFyZ3ZbMV0gOiAiaHR0cDovL3d3dy5n b29nbGUuY29tLyIpOwotICAgIHdlYmtpdF93ZWJfdmlld19sb2FkX3VyaSAod2ViX3ZpZXcsIHVy aSk7CisgICAgZ2NoYXIgKnVyaSA9IChnY2hhciopIChhcmdjID4gMSA/IGFyZ3ZbMV0gOiAiaHR0 cDovL3d3dy5nb29nbGUuY29tLyIpOworICAgIGdjaGFyICpmaWxlVVJMID0gZmlsZW5hbWVUb1VS TCh1cmkpOworCisgICAgaWYgKGZpbGVVUkwpIHsKKyAgICAgICAgd2Via2l0X3dlYl92aWV3X2xv YWRfdXJpKHdlYl92aWV3LCBmaWxlVVJMKTsKKyAgICAgICAgZ19mcmVlKGZpbGVVUkwpOworICAg IH0gZWxzZSB7CisgICAgICAgIHdlYmtpdF93ZWJfdmlld19sb2FkX3VyaSh3ZWJfdmlldywgdXJp KTsKKyAgICB9CiAKICAgICBndGtfd2lkZ2V0X2dyYWJfZm9jdXMgKEdUS19XSURHRVQgKHdlYl92 aWV3KSk7CiAgICAgZ3RrX3dpZGdldF9zaG93X2FsbCAobWFpbl93aW5kb3cpOwo= 57836 2010-06-03 17:15:20 -0700 2010-11-02 17:14:21 -0700 Patch with fixes bug-39944-20100603171519.patch text/plain 2129 mrobinson ZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL0NoYW5nZUxvZyBiL1dlYktpdFRvb2xzL0NoYW5nZUxv ZwppbmRleCBlYThlYTdmYTZmODkzOTVmZmZmY2Q4ZTMzYzY1N2U5NWZlZTk0NzQxLi5kZTkwYjEy YTA2M2M5MDc5NmE2ZjQ2ZmYwNTMzYjg4ZDdmNzQyYTZmIDEwMDY0NAotLS0gYS9XZWJLaXRUb29s cy9DaGFuZ2VMb2cKKysrIGIvV2ViS2l0VG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTYgQEAK KzIwMTAtMDYtMDMgIE1hcnRpbiBSb2JpbnNvbiAgPG1yb2JpbnNvbkBpZ2FsaWEuY29tPgorCisg ICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFtHVEtdIEd0a0xh dW5jaGVyIHNob3VsZCBzdXBwb3J0IHJlbGF0aXZlIGZpbGUgcGF0aHMKKyAgICAgICAgaHR0cHM6 Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTM5OTQ0CisKKyAgICAgICAgQWxsb3cg R3RrTGF1bmNoZXIgdG8gaGFuZGxlIHJlbGF0aXZlIGZpbGUgcGF0aHMgcGFzc2VkIHZpYSBjb21t YW5kLWxpbmUgYXJndW1lbnRzLgorCisgICAgICAgICogR3RrTGF1bmNoZXIvbWFpbi5jOgorICAg ICAgICAoZmlsZW5hbWVfdG9fdXJsKTogQWRkZWQuCisgICAgICAgIChtYWluKTogVHJ5IHRvIHJl c29sdmUgYXJndW1lbnRzIGFzIHJlbGF0aXZlIGZpbGUgVVJMcyBmaXJzdC4KKwogMjAxMC0wNS0x NCAgT2phbiBWYWZhaSAgPG9qYW5AY2hyb21pdW0ub3JnPgogCiAgICAgICAgIFJldmlld2VkIGJ5 IEFkYW0gQmFydGguCmRpZmYgLS1naXQgYS9XZWJLaXRUb29scy9HdGtMYXVuY2hlci9tYWluLmMg Yi9XZWJLaXRUb29scy9HdGtMYXVuY2hlci9tYWluLmMKaW5kZXggMmY5MzUwZDVjMDgyZjk0MWM5 OWQwNDQ3MjZhMDNmMmQ3MGU1YjM1ZS4uZTZkNjlhOWU2ZjJhYWVhNmMyOGYyMTY0NzNiZTZmODY1 NDE1OWUxMiAxMDA2NDQKLS0tIGEvV2ViS2l0VG9vbHMvR3RrTGF1bmNoZXIvbWFpbi5jCisrKyBi L1dlYktpdFRvb2xzL0d0a0xhdW5jaGVyL21haW4uYwpAQCAtMjUsNiArMjUsNyBAQAogICovCiAK ICNpbmNsdWRlIDxndGsvZ3RrLmg+CisjaW5jbHVkZSA8c3RkbGliLmg+CiAjaW5jbHVkZSA8d2Vi a2l0L3dlYmtpdC5oPgogCiBzdGF0aWMgR3RrV2lkZ2V0KiBtYWluX3dpbmRvdzsKQEAgLTE4Niw2 ICsxODcsMjEgQEAgY3JlYXRlX3dpbmRvdyAoKQogICAgIHJldHVybiB3aW5kb3c7CiB9CiAKK3N0 YXRpYyBnY2hhciogZmlsZW5hbWVUb1VSTChjb25zdCBjaGFyKiBmaWxlbmFtZSkKK3sKKyAgICBp ZiAoIWdfZmlsZV90ZXN0KGZpbGVuYW1lLCBHX0ZJTEVfVEVTVF9FWElTVFMpKQorICAgICAgICBy ZXR1cm4gMDsKKworICAgIGdjaGFyICpmdWxsUGF0aCA9IHJlYWxwYXRoKGZpbGVuYW1lLCAwKTsK KyAgICBpZiAoIWZ1bGxQYXRoKQorICAgICAgICByZXR1cm4gMDsKKworICAgIGdjaGFyICpmaWxl VVJMID0gZ19maWxlbmFtZV90b191cmkoZnVsbFBhdGgsIDAsIDApOworICAgIGZyZWUoZnVsbFBh dGgpOworCisgICAgcmV0dXJuIGZpbGVVUkw7Cit9CisKIGludAogbWFpbiAoaW50IGFyZ2MsIGNo YXIqIGFyZ3ZbXSkKIHsKQEAgLTIwMSw4ICsyMTcsMTEgQEAgbWFpbiAoaW50IGFyZ2MsIGNoYXIq IGFyZ3ZbXSkKICAgICBtYWluX3dpbmRvdyA9IGNyZWF0ZV93aW5kb3cgKCk7CiAgICAgZ3RrX2Nv bnRhaW5lcl9hZGQgKEdUS19DT05UQUlORVIgKG1haW5fd2luZG93KSwgdmJveCk7CiAKLSAgICBn Y2hhciogdXJpID0gKGdjaGFyKikgKGFyZ2MgPiAxID8gYXJndlsxXSA6ICJodHRwOi8vd3d3Lmdv b2dsZS5jb20vIik7Ci0gICAgd2Via2l0X3dlYl92aWV3X2xvYWRfdXJpICh3ZWJfdmlldywgdXJp KTsKKyAgICBnY2hhciAqdXJpID0gKGdjaGFyKikgKGFyZ2MgPiAxID8gYXJndlsxXSA6ICJodHRw Oi8vd3d3Lmdvb2dsZS5jb20vIik7CisgICAgZ2NoYXIgKmZpbGVVUkwgPSBmaWxlbmFtZVRvVVJM KHVyaSk7CisKKyAgICB3ZWJraXRfd2ViX3ZpZXdfbG9hZF91cmkod2ViX3ZpZXcsIGZpbGVVUkwg PyBmaWxlVVJMIDogdXJpKTsKKyAgICBnX2ZyZWUoZmlsZVVSTCk7CiAKICAgICBndGtfd2lkZ2V0 X2dyYWJfZm9jdXMgKEdUS19XSURHRVQgKHdlYl92aWV3KSk7CiAgICAgZ3RrX3dpZGdldF9zaG93 X2FsbCAobWFpbl93aW5kb3cpOwo=