117308 2005-11-29 23:46:39 +0000 Important settings in projects are silently overriden by default projects settings 2006-12-25 09:05:29 +0000 1 1 10 Unmaintained kbabel CatalogManager unspecified FreeBSD Ports FreeBSD RESOLVED FIXED NOR normal --- 1 yury_tarasievich visnovsky 0 oldest_to_newest 393993 0 yury_tarasievich 2005-11-29 23:46:39 +0000 Version: 3.4.3 (using KDE KDE 3.4.2) Installed from: FreeBSD Ports OS: FreeBSD Language code set in project is overriden, under certain conditions, by language code set in default project (~/.kde/share/config/kbabel.defaultproject) One way to reproduce is to start 'find in files' operation from catalogmanager. If language codes in your project and default projects differ, each hit produces 'Database empty' modal msgbox, and TDB's with langcode taken from default project are created in TDB directory after first hit (if they weren't already there). Related to this seems the problem with TDB filename parameter of the project (section [KDBSearchEngine], record Filename=<...>) being overriden by similar parameter set in default project. Reproducible in similar manner. 494611 1 lucardus 2006-12-18 10:03:42 +0000 This is due to an insufficient dcop interface for "find in files" and "replace in files". KBabel does not get the current project from catalogmanager and starts using the default project. The dcop interface has to be changed accordingly. 495167 2 18989 lucardus 2006-12-20 18:28:01 +0000 Created attachment 18989 Find/Replace is now open with the project file opened in catalogmanager This patch adds two dcop calls for findInFile and replaceInFile where the caller (catalogmanager in this case) passes the project name to the receiver. This way kbabel does not start with the default project but with the same project catalogmanager has opened. 495904 3 lucardus 2006-12-25 09:05:26 +0000 SVN commit 616403 by johach: Use the same project for all Find/Replace in Files operations as catalogmanager. BUG:117308 M +14 -2 catalogmanager/catalogmanager.cpp M +8 -0 kbabel/kbabeliface.h M +35 -2 kbabel/main.cpp --- branches/KDE/3.5/kdesdk/kbabel/catalogmanager/catalogmanager.cpp #616402:616403 @@ -958,6 +958,7 @@ { if( startKBabel() ) { + QCString funcCall("findInFile(QCString,QCString,QString,int,int,int,int,int,int,int,int,int,int)"); DCOPClient *client = kapp->dcopClient(); QByteArray data; QDataStream arg(data, IO_WriteOnly); @@ -974,8 +975,13 @@ arg << (_findOptions.ignoreContextInfo ? 1 : 0); arg << (_findOptions.askForNextFile ? 1 : 0); arg << (_findOptions.askForSave ? 1 : 0); + if(_configFile != "kbabelrc" ) { + arg << _configFile.utf8(); + funcCall="findInFile(QCString,QCString,QString,int,int,int,int,int,int,int,int,int,int,QCString)"; + } + kdDebug(KBABEL) << "DCOP: " << QString(data.data()) << endl; if( !client->send("kbabel","KBabelIFace", - "findInFile(QCString,QCString,QString,int,int,int,int,int,int,int,int,int,int)", data) + funcCall, data) ) { KMessageBox::error( this, i18n("DCOP communication with KBabel failed."), i18n("DCOP Communication Error")); stopSearching(); @@ -1037,9 +1043,11 @@ { if( startKBabel() ) { + QCString funcCall("replaceInFile(QCString,QCString,QString,QString,int,int,int,int,int,int,int,int,int,int,int)"); DCOPClient *client = kapp->dcopClient(); QByteArray data; QDataStream arg(data, IO_WriteOnly); + arg << client->appId(); arg << url.utf8(); arg << options.findStr; @@ -1055,8 +1063,12 @@ arg << (options.ask ? 1 : 0); arg << (options.askForNextFile ? 1 : 0); arg << (options.askForSave ? 1 : 0); + if(_configFile != "kbabelrc" ) { + arg << _configFile.utf8(); + funcCall="replaceInFile(QCString,QCString,QString,QString,int,int,int,int,int,int,int,int,int,int,int,QCString)"; + } if( !client->send("kbabel","KBabelIFace", - "replaceInFile(QCString,QCString,QString,QString,int,int,int,int,int,int,int,int,int,int,int)", data) + funcCall, data) ) { KMessageBox::error( this, i18n("DCOP communication with KBabel failed."), i18n("DCOP Communication Error")); stopSearching(); --- branches/KDE/3.5/kdesdk/kbabel/kbabel/kbabeliface.h #616402:616403 @@ -67,6 +67,14 @@ QString findStr, QString replaceStr, int caseSensitive, int wholeWords, int isRegExp, int inMsgid, int inMsgstr, int inComment, int ignoreAccelMarker, int ignoreContextInfo, int ask, int askForNextFile, int askForSave)=0; + virtual bool findInFile(QCString fileSource, QCString url, + QString findStr, int caseSensitive, int wholeWords, int isRegExp, + int inMsgid, int inMsgstr, int inComment, + int ignoreAccelMarker, int ignoreContextInfo, int askForNextFile, int askForSave, QCString project )=0; + virtual bool replaceInFile(QCString fileSource, QCString url, + QString findStr, QString replaceStr, int caseSensitive, int wholeWords, int isRegExp, + int inMsgid, int inMsgstr, int inComment, int ignoreAccelMarker, + int ignoreContextInfo, int ask, int askForNextFile, int askForSave, QCString project )=0; virtual void spellcheck(QStringList fileList)=0; }; --- branches/KDE/3.5/kdesdk/kbabel/kbabel/main.cpp #616402:616403 @@ -73,6 +73,14 @@ QString findStr, QString replaceStr, int caseSensitive, int wholeWords, int isRegExp, int inMsgid, int inMsgstr, int inComment, int ignoreAccelMarker, int ignoreContextInfo, int ask, int askForNextFile, int askForSave); + virtual bool findInFile(QCString fileSource, QCString url, + QString findStr, int caseSensitive, int wholeWords, int isRegExp, + int inMsgid, int inMsgstr, int inComment, + int ignoreAccelMarker, int ignoreContextInfo, int askForNextFile, int askForSave, QCString project ); + virtual bool replaceInFile(QCString fileSource, QCString url, + QString findStr, QString replaceStr, int caseSensitive, int wholeWords, int isRegExp, + int inMsgid, int inMsgstr, int inComment, + int ignoreAccelMarker, int ignoreContextInfo, int ask, int askForNextFile, int askForSave, QCString project ); virtual void spellcheck(QStringList fileList); private: KBabelMW* findInstance( const KURL& url, const QString& project, const QString& package) const; @@ -393,10 +401,22 @@ int inMsgid, int inMsgstr, int inComment, int ignoreAccelMarker, int ignoreContextInfo, int askForNextFile, int askForSave) { + // no project given, open with default project + return findInFile ( fileSource, url, findStr, caseSensitive, + wholeWords, isRegExp, inMsgid, inMsgstr, inComment, ignoreAccelMarker, ignoreContextInfo, + askForNextFile, askForSave, + KBabel::ProjectManager::defaultProjectName().utf8() ); +} + +bool KBabelInterface::findInFile(QCString fileSource, QCString url, + QString findStr, int caseSensitive, int wholeWords, int isRegExp, + int inMsgid, int inMsgstr, int inComment, + int ignoreAccelMarker, int ignoreContextInfo, int askForNextFile, int askForSave, QCString project ) +{ kdDebug(KBABEL) << "findInFile (" <<fileSource<< "): " << url << " for " << findStr << endl; const KURL u( QString::fromLocal8Bit( url ) ); - KBabelMW *kb = findInstance( u, KBabel::ProjectManager::defaultProjectName(), QString() ); + KBabelMW *kb = findInstance( u, QString::fromLocal8Bit(project), QString() ); if(!kb) return false; @@ -424,10 +444,23 @@ int inMsgid, int inMsgstr, int inComment, int ignoreAccelMarker, int ignoreContextInfo, int ask, int askForNextFile, int askForSave) { + return replaceInFile( fileSource, url, + findStr, replaceStr, caseSensitive, wholeWords, isRegExp, + inMsgid, inMsgstr, inComment, ignoreAccelMarker, ignoreContextInfo, + ask, askForNextFile, askForSave, + KBabel::ProjectManager::defaultProjectName().utf8() ); +} + +bool KBabelInterface::replaceInFile(QCString fileSource, QCString url, + QString findStr, QString replaceStr, int caseSensitive, int wholeWords, int isRegExp, + int inMsgid, int inMsgstr, int inComment, + int ignoreAccelMarker, int ignoreContextInfo, int ask, int askForNextFile, int askForSave, + QCString project ) +{ kdDebug(KBABEL) << "replaceInFile (" <<fileSource<< "): " << url << " for " << findStr << endl; const KURL u ( QString::fromLocal8Bit( url ) ); - KBabelMW *kb = findInstance( u, KBabel::ProjectManager::defaultProjectName(), QString() ); + KBabelMW *kb = findInstance( u, QString::fromLocal8Bit(project), QString() ); if( !kb ) return false; 18989 2006-12-20 18:28:01 +0000 2006-12-20 18:28:01 +0000 Find/Replace is now open with the project file opened in catalogmanager kbabel-BR117308.patch text/plain 7441 lucardus SW5kZXg6IGtiYWJlbC9rYmFiZWxpZmFjZS5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIGtiYWJlbC9rYmFiZWxp ZmFjZS5oCShyZXZpc2lvbiA2MTUyMDkpCisrKyBrYmFiZWwva2JhYmVsaWZhY2UuaAkod29ya2lu ZyBjb3B5KQpAQCAtNjcsNiArNjcsMTQgQEAKIAlRU3RyaW5nIGZpbmRTdHIsIFFTdHJpbmcgcmVw bGFjZVN0ciwgaW50IGNhc2VTZW5zaXRpdmUsIGludCB3aG9sZVdvcmRzLCBpbnQgaXNSZWdFeHAs IAogCWludCBpbk1zZ2lkLCBpbnQgaW5Nc2dzdHIsIGludCBpbkNvbW1lbnQsIGludCBpZ25vcmVB Y2NlbE1hcmtlciwgCiAJaW50IGlnbm9yZUNvbnRleHRJbmZvLCBpbnQgYXNrLCBpbnQgYXNrRm9y TmV4dEZpbGUsIGludCBhc2tGb3JTYXZlKT0wOworICB2aXJ0dWFsIGJvb2wgZmluZEluRmlsZShR Q1N0cmluZyBmaWxlU291cmNlLCBRQ1N0cmluZyB1cmwsIAorCVFTdHJpbmcgZmluZFN0ciwgaW50 IGNhc2VTZW5zaXRpdmUsIGludCB3aG9sZVdvcmRzLCBpbnQgaXNSZWdFeHAsIAorCWludCBpbk1z Z2lkLCBpbnQgaW5Nc2dzdHIsIGludCBpbkNvbW1lbnQsIAorCWludCBpZ25vcmVBY2NlbE1hcmtl ciwgaW50IGlnbm9yZUNvbnRleHRJbmZvLCBpbnQgYXNrRm9yTmV4dEZpbGUsIGludCBhc2tGb3JT YXZlLCBRQ1N0cmluZyBwcm9qZWN0ICk9MDsKKyAgdmlydHVhbCBib29sIHJlcGxhY2VJbkZpbGUo UUNTdHJpbmcgZmlsZVNvdXJjZSwgUUNTdHJpbmcgdXJsLCAKKwlRU3RyaW5nIGZpbmRTdHIsIFFT dHJpbmcgcmVwbGFjZVN0ciwgaW50IGNhc2VTZW5zaXRpdmUsIGludCB3aG9sZVdvcmRzLCBpbnQg aXNSZWdFeHAsIAorCWludCBpbk1zZ2lkLCBpbnQgaW5Nc2dzdHIsIGludCBpbkNvbW1lbnQsIGlu dCBpZ25vcmVBY2NlbE1hcmtlciwgCisJaW50IGlnbm9yZUNvbnRleHRJbmZvLCBpbnQgYXNrLCBp bnQgYXNrRm9yTmV4dEZpbGUsIGludCBhc2tGb3JTYXZlLCBRQ1N0cmluZyBwcm9qZWN0ICk9MDsK ICAgdmlydHVhbCB2b2lkIHNwZWxsY2hlY2soUVN0cmluZ0xpc3QgZmlsZUxpc3QpPTA7CiB9Owog CkluZGV4OiBrYmFiZWwvbWFpbi5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0ga2JhYmVsL21haW4uY3BwCShy ZXZpc2lvbiA2MTUyMDkpCisrKyBrYmFiZWwvbWFpbi5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTcz LDYgKzczLDE0IEBACiAJUVN0cmluZyBmaW5kU3RyLCBRU3RyaW5nIHJlcGxhY2VTdHIsIGludCBj YXNlU2Vuc2l0aXZlLCBpbnQgd2hvbGVXb3JkcywgaW50IGlzUmVnRXhwLAogCWludCBpbk1zZ2lk LCBpbnQgaW5Nc2dzdHIsIGludCBpbkNvbW1lbnQsCiAJaW50IGlnbm9yZUFjY2VsTWFya2VyLCBp bnQgaWdub3JlQ29udGV4dEluZm8sIGludCBhc2ssIGludCBhc2tGb3JOZXh0RmlsZSwgaW50IGFz a0ZvclNhdmUpOworICAgIHZpcnR1YWwgYm9vbCBmaW5kSW5GaWxlKFFDU3RyaW5nIGZpbGVTb3Vy Y2UsIFFDU3RyaW5nIHVybCwKKwlRU3RyaW5nIGZpbmRTdHIsIGludCBjYXNlU2Vuc2l0aXZlLCBp bnQgd2hvbGVXb3JkcywgaW50IGlzUmVnRXhwLAorCWludCBpbk1zZ2lkLCBpbnQgaW5Nc2dzdHIs IGludCBpbkNvbW1lbnQsCisJaW50IGlnbm9yZUFjY2VsTWFya2VyLCBpbnQgaWdub3JlQ29udGV4 dEluZm8sIGludCBhc2tGb3JOZXh0RmlsZSwgaW50IGFza0ZvclNhdmUsIFFDU3RyaW5nIHByb2pl Y3QgKTsKKyAgICB2aXJ0dWFsIGJvb2wgcmVwbGFjZUluRmlsZShRQ1N0cmluZyBmaWxlU291cmNl LCBRQ1N0cmluZyB1cmwsCisJUVN0cmluZyBmaW5kU3RyLCBRU3RyaW5nIHJlcGxhY2VTdHIsIGlu dCBjYXNlU2Vuc2l0aXZlLCBpbnQgd2hvbGVXb3JkcywgaW50IGlzUmVnRXhwLAorCWludCBpbk1z Z2lkLCBpbnQgaW5Nc2dzdHIsIGludCBpbkNvbW1lbnQsCisJaW50IGlnbm9yZUFjY2VsTWFya2Vy LCBpbnQgaWdub3JlQ29udGV4dEluZm8sIGludCBhc2ssIGludCBhc2tGb3JOZXh0RmlsZSwgaW50 IGFza0ZvclNhdmUsIFFDU3RyaW5nIHByb2plY3QgKTsKICAgICB2aXJ0dWFsIHZvaWQgc3BlbGxj aGVjayhRU3RyaW5nTGlzdCBmaWxlTGlzdCk7CiBwcml2YXRlOgogICAgIEtCYWJlbE1XKiBmaW5k SW5zdGFuY2UoIGNvbnN0IEtVUkwmIHVybCwgY29uc3QgUVN0cmluZyYgcHJvamVjdCwgY29uc3Qg UVN0cmluZyYgcGFja2FnZSkgY29uc3Q7CkBAIC0zOTMsMTAgKzQwMSwyMiBAQAogCWludCBpbk1z Z2lkLCBpbnQgaW5Nc2dzdHIsIGludCBpbkNvbW1lbnQsCiAJaW50IGlnbm9yZUFjY2VsTWFya2Vy LCBpbnQgaWdub3JlQ29udGV4dEluZm8sIGludCBhc2tGb3JOZXh0RmlsZSwgaW50IGFza0ZvclNh dmUpCiB7CisJLy8gbm8gcHJvamVjdCBnaXZlbiwgb3BlbiB3aXRoIGRlZmF1bHQgcHJvamVjdAor CXJldHVybiBmaW5kSW5GaWxlICggZmlsZVNvdXJjZSwgdXJsLCBmaW5kU3RyLCBjYXNlU2Vuc2l0 aXZlLCAKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgd2hvbGVXb3JkcywgaXNSZWdFeHAs IGluTXNnaWQsIGluTXNnc3RyLCBpbkNvbW1lbnQsIGlnbm9yZUFjY2VsTWFya2VyLCBpZ25vcmVD b250ZXh0SW5mbywKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgYXNrRm9yTmV4dEZpbGUs IGFza0ZvclNhdmUsCisJCQkgICAgIEtCYWJlbDo6UHJvamVjdE1hbmFnZXI6OmRlZmF1bHRQcm9q ZWN0TmFtZSgpLnV0ZjgoKSApOworfQorCitib29sIEtCYWJlbEludGVyZmFjZTo6ZmluZEluRmls ZShRQ1N0cmluZyBmaWxlU291cmNlLCBRQ1N0cmluZyB1cmwsCisJUVN0cmluZyBmaW5kU3RyLCBp bnQgY2FzZVNlbnNpdGl2ZSwgaW50IHdob2xlV29yZHMsIGludCBpc1JlZ0V4cCwKKwlpbnQgaW5N c2dpZCwgaW50IGluTXNnc3RyLCBpbnQgaW5Db21tZW50LAorCWludCBpZ25vcmVBY2NlbE1hcmtl ciwgaW50IGlnbm9yZUNvbnRleHRJbmZvLCBpbnQgYXNrRm9yTmV4dEZpbGUsIGludCBhc2tGb3JT YXZlLCBRQ1N0cmluZyBwcm9qZWN0ICkKK3sKICAgICBrZERlYnVnKEtCQUJFTCkgPDwgImZpbmRJ bkZpbGUgKCIgPDxmaWxlU291cmNlPDwgIik6ICIgPDwgdXJsIDw8ICIgZm9yICIgPDwgZmluZFN0 ciA8PCBlbmRsOwogCiAgICAgY29uc3QgS1VSTCB1KCBRU3RyaW5nOjpmcm9tTG9jYWw4Qml0KCB1 cmwgKSApOwotICAgIEtCYWJlbE1XICprYiA9IGZpbmRJbnN0YW5jZSggdSwgS0JhYmVsOjpQcm9q ZWN0TWFuYWdlcjo6ZGVmYXVsdFByb2plY3ROYW1lKCksIFFTdHJpbmcoKSApOworICAgIEtCYWJl bE1XICprYiA9IGZpbmRJbnN0YW5jZSggdSwgUVN0cmluZzo6ZnJvbUxvY2FsOEJpdChwcm9qZWN0 KSwgUVN0cmluZygpICk7CiAKICAgICBpZigha2IpIHJldHVybiBmYWxzZTsKIApAQCAtNDI0LDEw ICs0NDQsMjMgQEAKIAlpbnQgaW5Nc2dpZCwgaW50IGluTXNnc3RyLCBpbnQgaW5Db21tZW50LAog CWludCBpZ25vcmVBY2NlbE1hcmtlciwgaW50IGlnbm9yZUNvbnRleHRJbmZvLCBpbnQgYXNrLCBp bnQgYXNrRm9yTmV4dEZpbGUsIGludCBhc2tGb3JTYXZlKQogeworCXJldHVybiByZXBsYWNlSW5G aWxlKCBmaWxlU291cmNlLCB1cmwsCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgZmlu ZFN0ciwgcmVwbGFjZVN0ciwgY2FzZVNlbnNpdGl2ZSwgd2hvbGVXb3JkcywgaXNSZWdFeHAsCisg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgaW5Nc2dpZCwgaW5Nc2dzdHIsIGluQ29tbWVu dCwgaWdub3JlQWNjZWxNYXJrZXIsIGlnbm9yZUNvbnRleHRJbmZvLAorICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgIGFzaywgYXNrRm9yTmV4dEZpbGUsIGFza0ZvclNhdmUsCisJCQkgICAg ICAgS0JhYmVsOjpQcm9qZWN0TWFuYWdlcjo6ZGVmYXVsdFByb2plY3ROYW1lKCkudXRmOCgpICk7 CQorfQorCitib29sIEtCYWJlbEludGVyZmFjZTo6cmVwbGFjZUluRmlsZShRQ1N0cmluZyBmaWxl U291cmNlLCBRQ1N0cmluZyB1cmwsCisJUVN0cmluZyBmaW5kU3RyLCBRU3RyaW5nIHJlcGxhY2VT dHIsIGludCBjYXNlU2Vuc2l0aXZlLCBpbnQgd2hvbGVXb3JkcywgaW50IGlzUmVnRXhwLAorCWlu dCBpbk1zZ2lkLCBpbnQgaW5Nc2dzdHIsIGludCBpbkNvbW1lbnQsCisJaW50IGlnbm9yZUFjY2Vs TWFya2VyLCBpbnQgaWdub3JlQ29udGV4dEluZm8sIGludCBhc2ssIGludCBhc2tGb3JOZXh0Rmls ZSwgaW50IGFza0ZvclNhdmUsCisgICAgICAgIFFDU3RyaW5nIHByb2plY3QgKQorewogICAgIGtk RGVidWcoS0JBQkVMKSA8PCAicmVwbGFjZUluRmlsZSAoIiA8PGZpbGVTb3VyY2U8PCAiKTogIiA8 PCB1cmwgPDwgIiBmb3IgIiA8PCBmaW5kU3RyIDw8IGVuZGw7CiAKICAgICBjb25zdCBLVVJMIHUg KCBRU3RyaW5nOjpmcm9tTG9jYWw4Qml0KCB1cmwgKSApOwotICAgIEtCYWJlbE1XICprYiA9IGZp bmRJbnN0YW5jZSggdSwgS0JhYmVsOjpQcm9qZWN0TWFuYWdlcjo6ZGVmYXVsdFByb2plY3ROYW1l KCksIFFTdHJpbmcoKSApOworICAgIEtCYWJlbE1XICprYiA9IGZpbmRJbnN0YW5jZSggdSwgUVN0 cmluZzo6ZnJvbUxvY2FsOEJpdChwcm9qZWN0KSwgUVN0cmluZygpICk7CiAKICAgICBpZiggIWti ICkgcmV0dXJuIGZhbHNlOwogCkluZGV4OiBjYXRhbG9nbWFuYWdlci9jYXRhbG9nbWFuYWdlci5j cHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PQotLS0gY2F0YWxvZ21hbmFnZXIvY2F0YWxvZ21hbmFnZXIuY3BwCShyZXZp c2lvbiA2MTUyMDkpCisrKyBjYXRhbG9nbWFuYWdlci9jYXRhbG9nbWFuYWdlci5jcHAJKHdvcmtp bmcgY29weSkKQEAgLTk1OCw2ICs5NTgsNyBAQAogICAgICAgICB7CiAgICAgICAgICAgICBpZigg c3RhcnRLQmFiZWwoKSApCiAgICAgICAgICAgICB7CisgICAgICAgICAgICAgICAgUUNTdHJpbmcg ZnVuY0NhbGwoImZpbmRJbkZpbGUoUUNTdHJpbmcsUUNTdHJpbmcsUVN0cmluZyxpbnQsaW50LGlu dCxpbnQsaW50LGludCxpbnQsaW50LGludCxpbnQpIik7CiAgICAgICAgICAgICAgICAgRENPUENs aWVudCAqY2xpZW50ID0ga2FwcC0+ZGNvcENsaWVudCgpOwogICAgICAgICAgICAgICAgIFFCeXRl QXJyYXkgZGF0YTsKICAgICAgICAgICAgICAgICBRRGF0YVN0cmVhbSBhcmcoZGF0YSwgSU9fV3Jp dGVPbmx5KTsKQEAgLTk3NCw4ICs5NzUsMTMgQEAKICAgICAgICAgICAgICAgICBhcmcgPDwgKF9m aW5kT3B0aW9ucy5pZ25vcmVDb250ZXh0SW5mbyA/IDEgOiAwKTsKICAgICAgICAgICAgICAgICBh cmcgPDwgKF9maW5kT3B0aW9ucy5hc2tGb3JOZXh0RmlsZSA/IDEgOiAwKTsKICAgICAgICAgICAg ICAgICBhcmcgPDwgKF9maW5kT3B0aW9ucy5hc2tGb3JTYXZlID8gMSA6IDApOworCQlpZihfY29u ZmlnRmlsZSAhPSAia2JhYmVscmMiICkgeworICAgICAgICAJICAgYXJnIDw8IF9jb25maWdGaWxl LnV0ZjgoKTsKKyAgICAgICAgICAgICAgICAgICBmdW5jQ2FsbD0iZmluZEluRmlsZShRQ1N0cmlu ZyxRQ1N0cmluZyxRU3RyaW5nLGludCxpbnQsaW50LGludCxpbnQsaW50LGludCxpbnQsaW50LGlu dCxRQ1N0cmluZykiOworICAgICAgICAgICAgICAgIH0KKwkJa2REZWJ1ZyhLQkFCRUwpIDw8ICJE Q09QOiAiIDw8IFFTdHJpbmcoZGF0YS5kYXRhKCkpIDw8IGVuZGw7CiAgICAgICAgICAgICAgICAg aWYoICFjbGllbnQtPnNlbmQoImtiYWJlbCIsIktCYWJlbElGYWNlIiwKLSAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAiZmluZEluRmlsZShRQ1N0cmluZyxRQ1N0cmluZyxRU3RyaW5n LGludCxpbnQsaW50LGludCxpbnQsaW50LGludCxpbnQsaW50LGludCkiLCBkYXRhKQorICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgIGZ1bmNDYWxsLCBkYXRhKQogICAgICAgICAgICAg ICAgICAgICApIHsKICAgICAgICAgICAgICAgICAgICAgS01lc3NhZ2VCb3g6OmVycm9yKCB0aGlz LCBpMThuKCJEQ09QIGNvbW11bmljYXRpb24gd2l0aCBLQmFiZWwgZmFpbGVkLiIpLCBpMThuKCJE Q09QIENvbW11bmljYXRpb24gRXJyb3IiKSk7CiAgICAgICAgICAgICAgICAgICAgIHN0b3BTZWFy Y2hpbmcoKTsKQEAgLTEwMzcsOSArMTA0MywxMSBAQAogICAgICAgICB7CiAgICAgICAgICAgICBp Ziggc3RhcnRLQmFiZWwoKSApCiAgICAgICAgICAgICB7CisJCVFDU3RyaW5nIGZ1bmNDYWxsKCJy ZXBsYWNlSW5GaWxlKFFDU3RyaW5nLFFDU3RyaW5nLFFTdHJpbmcsUVN0cmluZyxpbnQsaW50LGlu dCxpbnQsaW50LGludCxpbnQsaW50LGludCxpbnQsaW50KSIpOwogICAgICAgICAgICAgICAgIERD T1BDbGllbnQgKmNsaWVudCA9IGthcHAtPmRjb3BDbGllbnQoKTsKICAgICAgICAgICAgICAgICBR Qnl0ZUFycmF5IGRhdGE7CiAgICAgICAgICAgICAgICAgUURhdGFTdHJlYW0gYXJnKGRhdGEsIElP X1dyaXRlT25seSk7CisgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgYXJnIDw8IGNs aWVudC0+YXBwSWQoKTsKICAgICAgICAgICAgICAgICBhcmcgPDwgdXJsLnV0ZjgoKTsKICAgICAg ICAgICAgICAgICBhcmcgPDwgb3B0aW9ucy5maW5kU3RyOwpAQCAtMTA1NSw4ICsxMDYzLDEyIEBA CiAgICAgICAgICAgICAgICAgYXJnIDw8IChvcHRpb25zLmFzayA/IDEgOiAwKTsKICAgICAgICAg ICAgICAgICBhcmcgPDwgKG9wdGlvbnMuYXNrRm9yTmV4dEZpbGUgPyAxIDogMCk7CiAgICAgICAg ICAgICAgICAgYXJnIDw8IChvcHRpb25zLmFza0ZvclNhdmUgPyAxIDogMCk7CisJCWlmKF9jb25m aWdGaWxlICE9ICJrYmFiZWxyYyIgKSB7CisgICAgICAgIAkgICBhcmcgPDwgX2NvbmZpZ0ZpbGUu dXRmOCgpOworICAgICAgICAgICAgICAgICAgIGZ1bmNDYWxsPSJyZXBsYWNlSW5GaWxlKFFDU3Ry aW5nLFFDU3RyaW5nLFFTdHJpbmcsUVN0cmluZyxpbnQsaW50LGludCxpbnQsaW50LGludCxpbnQs aW50LGludCxpbnQsaW50LFFDU3RyaW5nKSI7CisgICAgICAgICAgICAgICAgfQogICAgICAgICAg ICAgICAgIGlmKCAhY2xpZW50LT5zZW5kKCJrYmFiZWwiLCJLQmFiZWxJRmFjZSIsCi0gICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgInJlcGxhY2VJbkZpbGUoUUNTdHJpbmcsUUNTdHJp bmcsUVN0cmluZyxRU3RyaW5nLGludCxpbnQsaW50LGludCxpbnQsaW50LGludCxpbnQsaW50LGlu dCxpbnQpIiwgZGF0YSkKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBmdW5jQ2Fs bCwgZGF0YSkKICAgICAgICAgICAgICAgICAgICAgKSB7CiAgICAgICAgICAgICAgICAgICAgIEtN ZXNzYWdlQm94OjplcnJvciggdGhpcywgaTE4bigiRENPUCBjb21tdW5pY2F0aW9uIHdpdGggS0Jh YmVsIGZhaWxlZC4iKSwgaTE4bigiRENPUCBDb21tdW5pY2F0aW9uIEVycm9yIikpOwogICAgICAg ICAgICAgICAgICAgICBzdG9wU2VhcmNoaW5nKCk7Cg==