Merge pull request #669 from jpnurmi/help

Allow wildcards in help command args
This commit is contained in:
Alexey Sokolov
2014-09-13 23:41:56 +01:00
3 changed files with 21 additions and 9 deletions
+7 -4
View File
@@ -51,7 +51,7 @@ class CAdminMod : public CModule {
const CString sCmdFilter = sLine.Token(1, false);
const CString::size_type iCmdLength = sCmdFilter.size();
const CString sVarFilter = sLine.Token(2, true);
const CString sVarFilter = sLine.Token(2, true).AsLower();
const CString::size_type iVarLength = sVarFilter.size();
if (sCmdFilter.empty() || sCmdFilter.Equals("Set", false, iCmdLength) || sCmdFilter.Equals("Get", false, iCmdLength)) {
@@ -89,7 +89,8 @@ class CAdminMod : public CModule {
#endif
};
for (unsigned int i = 0; i != ARRAY_SIZE(vars); ++i) {
if (sVarFilter.empty() || sVarFilter.Equals(vars[i][0], false, iVarLength)) {
CString sVar = CString(vars[i][0]).AsLower();
if (sVarFilter.empty() || sVarFilter.Equals(sVar, true, iVarLength) || sVar.WildCmp(sVarFilter)) {
VarTable.AddRow();
VarTable.SetCell("Variable", vars[i][0]);
VarTable.SetCell("Type", vars[i][1]);
@@ -119,7 +120,8 @@ class CAdminMod : public CModule {
{"QuitMsg", str},
};
for (unsigned int i = 0; i != ARRAY_SIZE(nvars); ++i) {
if (sVarFilter.empty() || sVarFilter.Equals(nvars[i][0], false, iVarLength)) {
CString sVar = CString(nvars[i][0]).AsLower();
if (sVarFilter.empty() || sVarFilter.Equals(sVar, true, iVarLength) || sVar.WildCmp(sVarFilter)) {
NVarTable.AddRow();
NVarTable.SetCell("Variable", nvars[i][0]);
NVarTable.SetCell("Type", nvars[i][1]);
@@ -144,7 +146,8 @@ class CAdminMod : public CModule {
{"Detached", boolean}
};
for (unsigned int i = 0; i != ARRAY_SIZE(cvars); ++i) {
if (sVarFilter.empty() || sVarFilter.Equals(cvars[i][0], false, iVarLength)) {
CString sVar = CString(cvars[i][0]).AsLower();
if (sVarFilter.empty() || sVarFilter.Equals(sVar, true, iVarLength) || sVar.WildCmp(sVarFilter)) {
CVarTable.AddRow();
CVarTable.SetCell("Variable", cvars[i][0]);
CVarTable.SetCell("Type", cvars[i][1]);