diff options
| author | Adam <Adam@anope.org> | 2010-06-21 13:27:41 -0400 |
|---|---|---|
| committer | Adam <Adam@anope.org> | 2010-06-21 17:51:34 -0400 |
| commit | 4d8f68e0cc31f6b29ee6b3f2945c407025cf4ab0 (patch) | |
| tree | 71fbfcb8cd13e10538a82f6cdfd01f3dbb7718f0 | |
| parent | 7956bd839c0dc809c8796387ab64a95271e768dd (diff) | |
Fixed some more problems with db-convert
| -rw-r--r-- | src/core/db_plain.cpp | 2 | ||||
| -rw-r--r-- | src/tools/db-convert.c | 6 |
2 files changed, 5 insertions, 3 deletions
diff --git a/src/core/db_plain.cpp b/src/core/db_plain.cpp index 23bc774a7..02f319c30 100644 --- a/src/core/db_plain.cpp +++ b/src/core/db_plain.cpp @@ -72,6 +72,8 @@ static void ReadDatabase(Module *m = NULL) buf.erase(buf.begin()); if (!buf.empty() && !sep.StreamEnd()) params.push_back(buf + " " + sep.GetRemaining()); + else if (!sep.StreamEnd()) + params.push_back(sep.GetRemaining()); else if (!buf.empty()) params.push_back(buf); break; diff --git a/src/tools/db-convert.c b/src/tools/db-convert.c index b7df080a8..883e99447 100644 --- a/src/tools/db-convert.c +++ b/src/tools/db-convert.c @@ -839,7 +839,7 @@ int main(int argc, char *argv[]) << ((ci->flags & CI_SIGNKICK_LEVEL) ? " SIGNKICKLEVEL" : "") << ((ci->flags & CI_XOP ) ? " XOP" : "") << ((ci->flags & CI_SUSPENDED ) ? " SUSPENDED" : "") << std::endl; - if (ci->desc) + if (ci->desc && *ci->desc) fs << "MD DESC :" << ci->desc << std::endl; if (ci->url) fs << "MD URL :" << ci->url << std::endl; @@ -962,8 +962,8 @@ int main(int argc, char *argv[]) fs << "MD BI BADWORD " << (( ci->badwords[j].type == 0 ) ? "ANY " : "" ) << (( ci->badwords[j].type == 1 ) ? "SINGLE " : "" ) - << (( ci->badwords[j].type == 3 ) ? "START " : "" ) - << (( ci->badwords[j].type == 4 ) ? "END " : "" ) + << (( ci->badwords[j].type == 2 ) ? "START " : "" ) + << (( ci->badwords[j].type == 3 ) ? "END " : "" ) << ":" << ci->badwords[j].word << std::endl; } } |