117774 2005-12-06 08:56:09 +0000 Calculator doesn't do nothing 2005-12-30 10:54:47 +0000 1 1 2 Applications kalzium Calculator unspecified Slackware Linux RESOLVED FIXED NOR normal --- 0 vito.detullio kalzium 0 oldest_to_newest 396030 0 vito.detullio 2005-12-06 08:56:09 +0000 Version: (using KDE KDE 3.5.0) Installed from: Slackware Packages OS: Linux If I try to calculate anything (from 2+2 to aH2O + bCO2 -> cH2CO3) I got nothing. Nor an error, nor the window I see in the help... I didn't see anything neither on the STDOUT! 396073 1 vide80 2005-12-06 11:49:44 +0000 I can reproduce it on KDE 3.5.0 compiled from tarballs on Gentoo (so Kalzium 1.4.2) There is no output at all, neither an error box. It seems that the Calculate button simply does nothing. 396100 2 pino 2005-12-06 13:26:20 +0000 > If I try to calculate anything (from 2+2 to aH2O + bCO2 -> cH2CO3) Wait. What are you trying to calculate, and where? Kalzium has two types of calculators: - one of them is in the sidebar and calculates the weight of a molecule (like C6H12O6) - the other one (reachable from Tools->Equation Solver) solves equation like the last one you wrote (aH2O + bCO2 -> cH2CO3). And this calculator solves prefectly this eqations, giving a=1, b=1 and c=1 as correct result. So, I don't see any issue; otherwise, could you please be more precise? 396341 3 vito.detullio 2005-12-07 08:54:51 +0000 Well... I can see just *ONE* calculator! (the one in the sidebar) In Tools menu I can see just (from italian, re-translated to english) "data diagram" and "glossary". No "equation solver" or something similar! This is strange! As corncerns the sidebar calculator, if I enter just a molecule (like H2O or your C6H12O6) it runs smootly, but if I enter something else it does nothing. Coud be useful if kalzium pop up a "error" window, or something similar. 396352 4 cniehaus 2005-12-07 09:39:38 +0000 >I can see just *ONE* calculator! (the one in the sidebar) >In Tools menu I can see just (from italian, re-translated to english) "data >diagram" and "glossary". No "equation solver" or something similar! This is >strange! No, that is not strange. That is a "bug" in slackware: The new Kalzium is offering the new calculator only if on compiletime (!) OCamls and libfacile if found. You are using a binary version of Kalzium so you did nothing wrong. Please tell the Kalzium-packager of slackware that he needs to have ocaml and libfacile installed when configuring Kalzium. You can read this up in the README.packagers in Kalzium. Again: The two packages are *not* needed on runtime! >As corncerns the sidebar calculator, if I enter just a molecule (like H2O or >your C6H12O6) it runs smootly, but if I enter something else it does nothing. >Coud be useful if kalzium pop up a "error" window, or something similar. What is "something" else? Please tell us exactly what is not working (which strings). You can only enter the symbols of existing elements. 396387 5 vito.detullio 2005-12-07 12:43:11 +0000 My only problem in the molecular calculator is that it pass "silently" errors, and don'd do anything if I enter wrong values such as "H+H" or, even worster, show "partially right" values if I enter "H2ZO" (it rekognize the "H2" part, and it show it's just H_2). 396531 6 pino 2005-12-07 19:50:50 +0000 > if I enter wrong values such as "H+H" Kalzium calculator is more a molecular weight measure than a really calculator, so that expression is not valid. > show "partially right" values if I enter "H2ZO" (it rekognize the "H2" part, > and it show it's just H_2). Ok, that one is a fault, and should be fixed, along with a notofication of the failed molecule parsing. 402223 7 cniehaus 2005-12-29 13:59:06 +0000 Hi In Kalzium you can calculate the molecular weight of a molecule. Calculate "CO2Of". Of course there is no element "f". The result is (on the shell) kalzium: Found element C kalzium: Found element O kalzium: Weight of term = 12.0107 kalzium: [Element* MoleculeParser::lookupElement(const QString&)] no such element: Of kalzium: Weight of term = 31.9988 kalzium: Mass of CO2Of = 44.0095 The GUI presents 44.0095 as the result to the user. No errormessage. This is wrong for two reasons: 1 - As the input was invalid there should be no result 2 - *If* we show a result it be neglect the "f" and display "60.0089" as a result because the would be correct for "CO2O". Now calculate "CO2O": kalzium: Found element C kalzium: Found element O kalzium: Weight of term = 12.0107 kalzium: Found element O kalzium: Weight of term = 31.9988 kalzium: Weight of term = 15.9994 kalzium: Mass of CO2O = 60.0089 The result is correct and presented as 60.0089. Solution: Display a "Invalid input"-error. Question 1: Is this the same as BUG 117774? Question 2 (for the kde-i18n-folks): Would it be ok to display the new errormessage? I would introduce the new string today. I am not sure if this bugfix+new message would be covered by the current message-policy... Carsten 402238 8 14063 cniehaus 2005-12-29 15:05:29 +0000 Created attachment 14063 Patch for this bug 402244 9 cniehaus 2005-12-29 15:37:45 +0000 Am Donnerstag, 29. Dezember 2005 15:05 schrieb Carsten Niehaus: [bugs.kde.org quoted mail] > ------- Additional Comments From cniehaus kde org 2005-12-29 15:05 ------- > Created an attachment (id=14063) > --> (http://bugs.kde.org/attachment.cgi?id=14063&action=view) > Patch for this bug This patch fixes both bugs: 1: H2f <-- recoqnized as invalid input 2: Invalid input will be displayed as such Ok to commit? This introduces one new string (i18n("Invalid input") Carsten 402491 10 cniehaus 2005-12-30 10:54:46 +0000 SVN commit 492531 by cniehaus: This fixes bug #117774 The calculator has two issues. First, it didn't tell the user when the string was invalid (eg H2Ojdfkjd). Second, it didn't stop calculating in some cases (H2g produces a different error than H2Og, only the first stopped the calculation). With this commit I am introducing a new string "Invalid input" which is displayed when the parser notices an error. CCMAIL:kalzium@kde.org BUG:117774 M +47 -43 molcalcwidget.cpp M +1 -0 molcalcwidget.h M +13 -6 moleculeparser.cpp M +3 -2 moleculeparser.h --- branches/KDE/3.5/kdeedu/kalzium/src/molcalcwidget.cpp #492530:492531 @@ -68,41 +68,53 @@ void MolcalcWidget::updateUI() { - QString str; + if ( m_validInput ){ - // The complexString stores the whole molecule like this: - // 1 Seaborgium. Cumulative Mass: 263.119 u (39.2564 %) - QString complexString; - - // Create the list of elements making up the molecule - ElementCountMap::Iterator it = m_elementMap.begin(); - ElementCountMap::Iterator itEnd = m_elementMap.end(); - for ( ; it != itEnd; ++it ) { - // Update the resultLabel - str += i18n( "For example: \"1 Carbon\" or \"3 Oxygen\"", "%1 %2\n" ) - .arg( (*it)->count() ) - .arg( (*it)->element()->elname() ); + QString str; - complexString - += i18n( "For example: 1 Seaborgium. Cumulative Mass: 263.119 u (39.25%)", - "%1 %2. Cumulative Mass: %3 u (%4%)\n" ) - .arg( (*it)->count() ) - .arg( (*it)->element()->elname() ) - .arg( (*it)->count() * (*it)->element()->mass() ) - .arg( KalziumUtils::strippedValue( (( (*it)->count() * (*it)->element()->mass() ) - / m_mass ) * 100 ) ); + // The complexString stores the whole molecule like this: + // 1 Seaborgium. Cumulative Mass: 263.119 u (39.2564 %) + QString complexString; + + // Create the list of elements making up the molecule + ElementCountMap::Iterator it = m_elementMap.begin(); + ElementCountMap::Iterator itEnd = m_elementMap.end(); + for ( ; it != itEnd; ++it ) { + // Update the resultLabel + str += i18n( "For example: \"1 Carbon\" or \"3 Oxygen\"", "%1 %2\n" ) + .arg( (*it)->count() ) + .arg( (*it)->element()->elname() ); + + complexString + += i18n( "For example: 1 Seaborgium. Cumulative Mass: 263.119 u (39.25%)", + "%1 %2. Cumulative Mass: %3 u (%4%)\n" ) + .arg( (*it)->count() ) + .arg( (*it)->element()->elname() ) + .arg( (*it)->count() * (*it)->element()->mass() ) + .arg( KalziumUtils::strippedValue( (( (*it)->count() * (*it)->element()->mass() ) + / m_mass ) * 100 ) ); + } + resultLabel->setText( str ); + + // The composition + resultComposition->setText( compositionString(m_elementMap) ); + + // The mass + resultMass->setText( i18n( "Molecular mass: %1 u" ).arg( m_mass ) ); + + QToolTip::add( resultMass, complexString ); + QToolTip::add( resultComposition, complexString ); + QToolTip::add( resultLabel, complexString ); } - resultLabel->setText( str ); - - // The composition - resultComposition->setText( compositionString(m_elementMap) ); - - // The mass - resultMass->setText( i18n( "Molecular mass: %1 u" ).arg( m_mass ) ); - - QToolTip::add( resultMass, complexString ); - QToolTip::add( resultComposition, complexString ); - QToolTip::add( resultLabel, complexString ); + else{//the input was invalid, so tell this the user + resultComposition->setText( i18n( "Invalid input" ) ); + resultLabel->setText( QString() ); + resultMass->setText( QString() ); + + QToolTip::add( resultMass, i18n( "Invalid input" ) ); + QToolTip::add( resultComposition, i18n( "Invalid input" ) ); + QToolTip::add( resultLabel, i18n( "Invalid input" ) ); + } } @@ -132,17 +144,9 @@ // Parse the molecule, and at the same time calculate the total // mass, and the composition of it. - bool parseOk = m_parser.weight(molecule, &m_mass, &m_elementMap); - - if (parseOk) { - kdDebug() << "Mass of " << molecule << " = " << m_mass << endl; - - updateUI(); - } - else { - // FIXME: Do something better here. - kdDebug() << "Parse error" << endl; - } + m_validInput = m_parser.weight(molecule, &m_mass, &m_elementMap); + + updateUI(); } --- branches/KDE/3.5/kdeedu/kalzium/src/molcalcwidget.h #492530:492531 @@ -72,6 +72,7 @@ MoleculeParser m_parser; double m_mass; + bool m_validInput; ElementCountMap m_elementMap; }; --- branches/KDE/3.5/kdeedu/kalzium/src/moleculeparser.cpp #492530:492531 @@ -124,8 +124,9 @@ double *_resultMass, ElementCountMap *_resultMap) { - // Clear the result variables. + // Clear the result variables and set m_error to false _resultMap->clear(); + m_error = false; *_resultMass = 0.0; // Initialize the parsing process, and parse te molecule. @@ -135,6 +136,9 @@ if (nextToken() != -1) return false; + if ( m_error )//there was an error in the input... + return false; + return true; } @@ -286,12 +290,15 @@ const EList::ConstIterator end = elementList.constEnd(); for (; it != end; ++it) { - if ( (*it)->symbol() == _name ) { - kdDebug() << "Found element " << _name << endl; - return *it; - } + if ( (*it)->symbol() == _name ) { + kdDebug() << "Found element " << _name << endl; + return *it; + } } - kdDebug() << k_funcinfo << "no such element: " << _name << endl; + //if there is an error make m_error true. + m_error = true; + + kdDebug() << k_funcinfo << "no such element, parsing error!: " << _name << endl; return NULL; } --- branches/KDE/3.5/kdeedu/kalzium/src/moleculeparser.h #492530:492531 @@ -103,8 +103,6 @@ bool weight(QString _moleculeString, double *_resultMass, ElementCountMap *_resultMap); - //QMap<Element*, int> elementMap(); - //QValueList<Element*> elementList(); private: // Helper functions @@ -117,6 +115,9 @@ QMap<Element*, int> m_elementMap; + //if this booloean is "true" the parser found an error + bool m_error; + protected: /** 14063 2005-12-29 15:05:29 +0000 2005-12-29 15:05:29 +0000 Patch for this bug moleculeparserbug.patch text/plain 5908 cniehaus SW5kZXg6IG1vbGVjdWxlcGFyc2VyLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gbW9sZWN1bGVwYXJzZXIuaAko cmV2aXNpb24gNDkyMjgyKQorKysgbW9sZWN1bGVwYXJzZXIuaAkod29ya2luZyBjb3B5KQpAQCAt MTAzLDggKzEwMyw2IEBACiAgICAgYm9vbCAgd2VpZ2h0KFFTdHJpbmcgICAgICAgICBfbW9sZWN1 bGVTdHJpbmcsCiAJCQkJIGRvdWJsZSAgICAgICAgICAqX3Jlc3VsdE1hc3MsCiAJCQkJIEVsZW1l bnRDb3VudE1hcCAqX3Jlc3VsdE1hcCk7Ci0gICAgLy9RTWFwPEVsZW1lbnQqLCBpbnQ+ICAgZWxl bWVudE1hcCgpOwotICAgIC8vUVZhbHVlTGlzdDxFbGVtZW50Kj4gIGVsZW1lbnRMaXN0KCk7CiAK ICBwcml2YXRlOgogICAgIC8vIEhlbHBlciBmdW5jdGlvbnMKQEAgLTExNyw2ICsxMTUsOSBAQAog CiAgICAgUU1hcDxFbGVtZW50KiwgaW50PiBtX2VsZW1lbnRNYXA7CiAKKwkvL2lmIHRoaXMgYm9v bG9lYW4gaXMgInRydWUiIHRoZSBwYXJzZXIgZm91bmQgYW4gZXJyb3IKKwlib29sIG1fZXJyb3I7 CisKIHByb3RlY3RlZDoKIAogICAgIC8qKgpJbmRleDogbW9sY2FsY3dpZGdldC5jcHAKPT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PQotLS0gbW9sY2FsY3dpZGdldC5jcHAJKHJldmlzaW9uIDQ5MjI4MikKKysrIG1vbGNhbGN3 aWRnZXQuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC02OCw0MSArNjgsNTMgQEAKIAogdm9pZCBNb2xj YWxjV2lkZ2V0Ojp1cGRhdGVVSSgpCiB7Ci0JUVN0cmluZyBzdHI7CisJaWYgKCBtX3ZhbGlkSW5w dXQgKXsKIAotCS8vIFRoZSBjb21wbGV4U3RyaW5nIHN0b3JlcyB0aGUgd2hvbGUgbW9sZWN1bGUg bGlrZSB0aGlzOgotCS8vIDEgU2VhYm9yZ2l1bS4gQ3VtdWxhdGl2ZSBNYXNzOiAyNjMuMTE5IHUg KDM5LjI1NjQgJSkKLQlRU3RyaW5nIGNvbXBsZXhTdHJpbmc7Ci0JCi0JLy8gQ3JlYXRlIHRoZSBs aXN0IG9mIGVsZW1lbnRzIG1ha2luZyB1cCB0aGUgbW9sZWN1bGUKLQlFbGVtZW50Q291bnRNYXA6 Okl0ZXJhdG9yICBpdCAgICA9IG1fZWxlbWVudE1hcC5iZWdpbigpOwotCUVsZW1lbnRDb3VudE1h cDo6SXRlcmF0b3IgIGl0RW5kID0gbV9lbGVtZW50TWFwLmVuZCgpOwotCWZvciAoIDsgaXQgIT0g aXRFbmQ7ICsraXQgKSB7Ci0JCS8vIFVwZGF0ZSB0aGUgcmVzdWx0TGFiZWwKLQkJc3RyICs9IGkx OG4oICJGb3IgZXhhbXBsZTogXCIxIENhcmJvblwiIG9yIFwiMyBPeHlnZW5cIiIsICIlMSAlMlxu IiApCi0JCSAgLmFyZyggKCppdCktPmNvdW50KCkgKQotCQkgIC5hcmcoICgqaXQpLT5lbGVtZW50 KCktPmVsbmFtZSgpICk7CisJCVFTdHJpbmcgc3RyOwogCi0JCWNvbXBsZXhTdHJpbmcKLQkJICAr PSBpMThuKCAiRm9yIGV4YW1wbGU6IDEgU2VhYm9yZ2l1bS4gQ3VtdWxhdGl2ZSBNYXNzOiAyNjMu MTE5IHUgKDM5LjI1JSkiLAotCQkJCSAgICIlMSAlMi4gQ3VtdWxhdGl2ZSBNYXNzOiAlMyB1ICgl NCUpXG4iICkKLQkJICAuYXJnKCAoKml0KS0+Y291bnQoKSApCi0JCSAgLmFyZyggKCppdCktPmVs ZW1lbnQoKS0+ZWxuYW1lKCkgKQotCQkgIC5hcmcoICgqaXQpLT5jb3VudCgpICogKCppdCktPmVs ZW1lbnQoKS0+bWFzcygpICkKLQkJICAuYXJnKCBLYWx6aXVtVXRpbHM6OnN0cmlwcGVkVmFsdWUo ICgoICgqaXQpLT5jb3VudCgpICogKCppdCktPmVsZW1lbnQoKS0+bWFzcygpICkKLQkJCQkJCQkJ CQkJICAvIG1fbWFzcyApICogMTAwICkgKTsKKwkJLy8gVGhlIGNvbXBsZXhTdHJpbmcgc3RvcmVz IHRoZSB3aG9sZSBtb2xlY3VsZSBsaWtlIHRoaXM6CisJCS8vIDEgU2VhYm9yZ2l1bS4gQ3VtdWxh dGl2ZSBNYXNzOiAyNjMuMTE5IHUgKDM5LjI1NjQgJSkKKwkJUVN0cmluZyBjb21wbGV4U3RyaW5n OworCisJCS8vIENyZWF0ZSB0aGUgbGlzdCBvZiBlbGVtZW50cyBtYWtpbmcgdXAgdGhlIG1vbGVj dWxlCisJCUVsZW1lbnRDb3VudE1hcDo6SXRlcmF0b3IgIGl0ICAgID0gbV9lbGVtZW50TWFwLmJl Z2luKCk7CisJCUVsZW1lbnRDb3VudE1hcDo6SXRlcmF0b3IgIGl0RW5kID0gbV9lbGVtZW50TWFw LmVuZCgpOworCQlmb3IgKCA7IGl0ICE9IGl0RW5kOyArK2l0ICkgeworCQkJLy8gVXBkYXRlIHRo ZSByZXN1bHRMYWJlbAorCQkJc3RyICs9IGkxOG4oICJGb3IgZXhhbXBsZTogXCIxIENhcmJvblwi IG9yIFwiMyBPeHlnZW5cIiIsICIlMSAlMlxuIiApCisJCQkJLmFyZyggKCppdCktPmNvdW50KCkg KQorCQkJCS5hcmcoICgqaXQpLT5lbGVtZW50KCktPmVsbmFtZSgpICk7CisKKwkJCWNvbXBsZXhT dHJpbmcKKwkJCQkrPSBpMThuKCAiRm9yIGV4YW1wbGU6IDEgU2VhYm9yZ2l1bS4gQ3VtdWxhdGl2 ZSBNYXNzOiAyNjMuMTE5IHUgKDM5LjI1JSkiLAorCQkJCQkJIiUxICUyLiBDdW11bGF0aXZlIE1h c3M6ICUzIHUgKCU0JSlcbiIgKQorCQkJCS5hcmcoICgqaXQpLT5jb3VudCgpICkKKwkJCQkuYXJn KCAoKml0KS0+ZWxlbWVudCgpLT5lbG5hbWUoKSApCisJCQkJLmFyZyggKCppdCktPmNvdW50KCkg KiAoKml0KS0+ZWxlbWVudCgpLT5tYXNzKCkgKQorCQkJCS5hcmcoIEthbHppdW1VdGlsczo6c3Ry aXBwZWRWYWx1ZSggKCggKCppdCktPmNvdW50KCkgKiAoKml0KS0+ZWxlbWVudCgpLT5tYXNzKCkg KQorCQkJCQkJCQkvIG1fbWFzcyApICogMTAwICkgKTsKKwkJfQorCQlyZXN1bHRMYWJlbC0+c2V0 VGV4dCggc3RyICk7CisKKwkJLy8gVGhlIGNvbXBvc2l0aW9uCisJCXJlc3VsdENvbXBvc2l0aW9u LT5zZXRUZXh0KCBjb21wb3NpdGlvblN0cmluZyhtX2VsZW1lbnRNYXApICk7CisKKwkJLy8gVGhl IG1hc3MKKwkJcmVzdWx0TWFzcy0+c2V0VGV4dCggaTE4biggIk1vbGVjdWxhciBtYXNzOiAlMSB1 IiApLmFyZyggbV9tYXNzICkgKTsKKworCQlRVG9vbFRpcDo6YWRkKCByZXN1bHRNYXNzLCAgICAg ICAgY29tcGxleFN0cmluZyApOworCQlRVG9vbFRpcDo6YWRkKCByZXN1bHRDb21wb3NpdGlvbiwg Y29tcGxleFN0cmluZyApOworCQlRVG9vbFRpcDo6YWRkKCByZXN1bHRMYWJlbCwgICAgICAgY29t cGxleFN0cmluZyApOwogCX0KLQlyZXN1bHRMYWJlbC0+c2V0VGV4dCggc3RyICk7Ci0JCi0JLy8g VGhlIGNvbXBvc2l0aW9uCi0JcmVzdWx0Q29tcG9zaXRpb24tPnNldFRleHQoIGNvbXBvc2l0aW9u U3RyaW5nKG1fZWxlbWVudE1hcCkgKTsKLQkKLQkvLyBUaGUgbWFzcwotCXJlc3VsdE1hc3MtPnNl dFRleHQoIGkxOG4oICJNb2xlY3VsYXIgbWFzczogJTEgdSIgKS5hcmcoIG1fbWFzcyApICk7Ci0J Ci0JUVRvb2xUaXA6OmFkZCggcmVzdWx0TWFzcywgICAgICAgIGNvbXBsZXhTdHJpbmcgKTsKLQlR VG9vbFRpcDo6YWRkKCByZXN1bHRDb21wb3NpdGlvbiwgY29tcGxleFN0cmluZyApOwotCVFUb29s VGlwOjphZGQoIHJlc3VsdExhYmVsLCAgICAgICBjb21wbGV4U3RyaW5nICk7CisJZWxzZXsvL3Ro ZSBpbnB1dCB3YXMgaW52YWxpZCwgc28gdGVsbCB0aGlzIHRoZSB1c2VyCisJCXJlc3VsdENvbXBv c2l0aW9uLT5zZXRUZXh0KCBpMThuKCAiSW52YWxpZCBpbnB1dCIgKSApOworCQlyZXN1bHRMYWJl bC0+c2V0VGV4dCggUVN0cmluZygpICk7CisJCXJlc3VsdE1hc3MtPnNldFRleHQoIFFTdHJpbmco KSApOworCQkKKwkJUVRvb2xUaXA6OmFkZCggcmVzdWx0TWFzcywgICAgICAgIGkxOG4oICJJbnZh bGlkIGlucHV0IiApICk7CisJCVFUb29sVGlwOjphZGQoIHJlc3VsdENvbXBvc2l0aW9uLCBpMThu KCAiSW52YWxpZCBpbnB1dCIgKSApOworCQlRVG9vbFRpcDo6YWRkKCByZXN1bHRMYWJlbCwgICAg ICAgaTE4biggIkludmFsaWQgaW5wdXQiICkgKTsKKwl9CiB9CiAKIApAQCAtMTMyLDE3ICsxNDQs OSBAQAogCiAJLy8gUGFyc2UgdGhlIG1vbGVjdWxlLCBhbmQgYXQgdGhlIHNhbWUgdGltZSBjYWxj dWxhdGUgdGhlIHRvdGFsCiAJLy8gbWFzcywgYW5kIHRoZSBjb21wb3NpdGlvbiBvZiBpdC4KLQli b29sIHBhcnNlT2sgPSBtX3BhcnNlci53ZWlnaHQobW9sZWN1bGUsICZtX21hc3MsICZtX2VsZW1l bnRNYXApOwotCi0JaWYgKHBhcnNlT2spIHsKLQkJa2REZWJ1ZygpIDw8ICJNYXNzIG9mICIgPDwg bW9sZWN1bGUgPDwgIiA9ICIgPDwgbV9tYXNzIDw8IGVuZGw7Ci0KLQkJdXBkYXRlVUkoKTsKLQl9 Ci0JZWxzZSB7Ci0JCS8vIEZJWE1FOiBEbyBzb21ldGhpbmcgYmV0dGVyIGhlcmUuCi0JCWtkRGVi dWcoKSA8PCAiUGFyc2UgZXJyb3IiIDw8IGVuZGw7Ci0JfQorCW1fdmFsaWRJbnB1dCA9IG1fcGFy c2VyLndlaWdodChtb2xlY3VsZSwgJm1fbWFzcywgJm1fZWxlbWVudE1hcCk7CisJCisJdXBkYXRl VUkoKTsKIH0KIAogCkluZGV4OiBtb2xlY3VsZXBhcnNlci5jcHAKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gbW9s ZWN1bGVwYXJzZXIuY3BwCShyZXZpc2lvbiA0OTIyODIpCisrKyBtb2xlY3VsZXBhcnNlci5jcHAJ KHdvcmtpbmcgY29weSkKQEAgLTEyNCw4ICsxMjQsOSBAQAogCQkJCQkgICBkb3VibGUgICAgICAg ICAgKl9yZXN1bHRNYXNzLAogCQkJCQkgICBFbGVtZW50Q291bnRNYXAgKl9yZXN1bHRNYXApCiB7 Ci0gICAgLy8gQ2xlYXIgdGhlIHJlc3VsdCB2YXJpYWJsZXMuCisgICAgLy8gQ2xlYXIgdGhlIHJl c3VsdCB2YXJpYWJsZXMgYW5kIHNldCBtX2Vycm9yIHRvIGZhbHNlCiAgICAgX3Jlc3VsdE1hcC0+ Y2xlYXIoKTsKKwltX2Vycm9yID0gZmFsc2U7CiAgICAgKl9yZXN1bHRNYXNzID0gMC4wOwogCiAJ Ly8gSW5pdGlhbGl6ZSB0aGUgcGFyc2luZyBwcm9jZXNzLCBhbmQgcGFyc2UgdGUgbW9sZWN1bGUu CkBAIC0xMzUsNiArMTM2LDkgQEAKICAgICBpZiAobmV4dFRva2VuKCkgIT0gLTEpCiAJCXJldHVy biBmYWxzZTsKIAorCWlmICggbV9lcnJvciApLy90aGVyZSB3YXMgYW4gZXJyb3IgaW4gdGhlIGlu cHV0Li4uCisJCXJldHVybiBmYWxzZTsKKwogICAgIHJldHVybiB0cnVlOwogfQogCkBAIC0yODYs MTIgKzI5MCwxNSBAQAogICAgIGNvbnN0IEVMaXN0OjpDb25zdEl0ZXJhdG9yICBlbmQgPSBlbGVt ZW50TGlzdC5jb25zdEVuZCgpOwogCiAgICAgZm9yICg7IGl0ICE9IGVuZDsgKytpdCkgewotCWlm ICggKCppdCktPnN5bWJvbCgpID09IF9uYW1lICkgewotCSAgICBrZERlYnVnKCkgPDwgIkZvdW5k IGVsZW1lbnQgIiA8PCBfbmFtZSA8PCBlbmRsOwotCSAgICByZXR1cm4gKml0OwotCX0KKwkJaWYg KCAoKml0KS0+c3ltYm9sKCkgPT0gX25hbWUgKSB7CisJCQlrZERlYnVnKCkgPDwgIkZvdW5kIGVs ZW1lbnQgIiA8PCBfbmFtZSA8PCBlbmRsOworCQkJcmV0dXJuICppdDsKKwkJfQogICAgIH0KIAot ICAgIGtkRGVidWcoKSA8PCBrX2Z1bmNpbmZvIDw8ICJubyBzdWNoIGVsZW1lbnQ6ICIgPDwgX25h bWUgPDwgZW5kbDsKKwkvL2lmIHRoZXJlIGlzIGFuIGVycm9yIG1ha2UgbV9lcnJvciB0cnVlLgor CW1fZXJyb3IgPSB0cnVlOworCisgICAga2REZWJ1ZygpIDw8IGtfZnVuY2luZm8gPDwgIm5vIHN1 Y2ggZWxlbWVudCwgcGFyc2luZyBlcnJvciE6ICIgPDwgX25hbWUgPDwgZW5kbDsKICAgICByZXR1 cm4gTlVMTDsKIH0KSW5kZXg6IG1vbGNhbGN3aWRnZXQuaAo9PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBtb2xjYWxj d2lkZ2V0LmgJKHJldmlzaW9uIDQ5MjI4MikKKysrIG1vbGNhbGN3aWRnZXQuaAkod29ya2luZyBj b3B5KQpAQCAtNzIsNiArNzIsNyBAQAogCQlNb2xlY3VsZVBhcnNlciAgIG1fcGFyc2VyOwogCQkK IAkJZG91YmxlICAgICAgICAgICBtX21hc3M7CisJCWJvb2wgCQkJIG1fdmFsaWRJbnB1dDsKIAkJ RWxlbWVudENvdW50TWFwICBtX2VsZW1lbnRNYXA7CiB9OwogCg==