Tidier /modules generation. faster for non-opers, neater for all, and doesnt use all the strlcpys on stuff that isnt needed any more

git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@10354 e03df62e-2008-0410-955e-edbf42e46eb7

2 files changed, 18 insertions, 33 deletions

diff --git a/src/commands/cmd_modules.cpp b/src/commands/cmd_modules.cpp
index d01bd365a..b45490175 100644
--- a/src/commands/cmd_modules.cpp
+++ b/src/commands/cmd_modules.cpp
@@ -29,27 +29,20 @@ CmdResult CommandModules::Handle (const std::vector<std::string>&, User *user)
 	{
 		Module* m = ServerInstance->Modules->Find(module_names[i]);
 		Version V = m->GetVersion();
-		char modulename[MAXBUF];
-		char flagstate[MAXBUF];
-		*flagstate = 0;
-		if (V.Flags & VF_STATIC)
-			strlcat(flagstate,", static",MAXBUF);
-		if (V.Flags & VF_VENDOR)
-			strlcat(flagstate,", vendor",MAXBUF);
-		if (V.Flags & VF_COMMON)
-			strlcat(flagstate,", common",MAXBUF);
-		if (V.Flags & VF_SERVICEPROVIDER)
-			strlcat(flagstate,", service provider",MAXBUF);
-		if (!flagstate[0])
-			strcpy(flagstate,"  <no flags>");
-		strlcpy(modulename,module_names[i].c_str(),256);
+
 		if (IS_OPER(user))
 		{
-			user->WriteNumeric(702, "%s :0x%08lx %s %s (%s)",user->nick.c_str(),(unsigned long)m,V.version.c_str(),ServerConfig::CleanFilename(modulename),flagstate+2);
+			std::string flags("Svsc");
+			int pos = 0;
+			for (int mult = 1; mult <= VF_SERVICEPROVIDER; mult *= 2, ++pos)
+				if (!(V.Flags & mult))
+					flags[pos] = '-';
+
+			user->WriteNumeric(702, "%s :0x%08lx %s %s :%s", user->nick.c_str(), (unsigned long)m, module_names[i].c_str(), flags.c_str(), V.version.c_str());
 		}
 		else
 		{
-			user->WriteNumeric(702, "%s :%s",user->nick.c_str(),ServerConfig::CleanFilename(modulename));
+			user->WriteNumeric(702, "%s :%s",user->nick.c_str(), module_names[i].c_str());
 		}
 	}
 	user->WriteNumeric(703, "%s :End of MODULES list",user->nick.c_str());
diff --git a/src/modules/m_spanningtree/modules.cpp b/src/modules/m_spanningtree/modules.cpp
index 63821d7b5..fe6ca8434 100644
--- a/src/modules/m_spanningtree/modules.cpp
+++ b/src/modules/m_spanningtree/modules.cpp
@@ -48,28 +48,20 @@ bool TreeSocket::Modules(const std::string &prefix, std::deque<std::string> &par
 	{
 		Module* m = Instance->Modules->Find(module_names[i]);
 		Version V = m->GetVersion();
-		char modulename[MAXBUF];
-		char flagstate[MAXBUF];
-		*flagstate = 0;
-		if (V.Flags & VF_STATIC)
-			strlcat(flagstate,", static",MAXBUF);
-		if (V.Flags & VF_VENDOR)
-			strlcat(flagstate,", vendor",MAXBUF);
-		if (V.Flags & VF_COMMON)
-			strlcat(flagstate,", common",MAXBUF);
-		if (V.Flags & VF_SERVICEPROVIDER)
-			strlcat(flagstate,", service provider",MAXBUF);
-		if (!flagstate[0])
-			strcpy(flagstate,"  <no flags>");
-		strlcpy(modulename,module_names[i].c_str(),256);
+
 		if (IS_OPER(source))
 		{
-			snprintf(strbuf, MAXBUF, "::%s 702 %s :0x%08lx %s %s (%s)",Instance->Config->ServerName,source->nick.c_str(),(unsigned long)m,
-					V.version.c_str(),ServerConfig::CleanFilename(modulename),flagstate+2);
+                        std::string flags("Svsc");
+			int pos = 0;
+			for (int mult = 1; mult <= VF_SERVICEPROVIDER; mult *= 2, ++pos)
+				if (!(V.Flags & mult))
+					flags[pos] = '-';
+
+			snprintf(strbuf, MAXBUF, "::%s 702 %s :0x%08lx %s %s :%s", Instance->Config->ServerName, source->nick.c_str(),(unsigned long)m, module_names[i].c_str(), flags.c_str(), V.version.c_str());
 		}
 		else
 		{
-			snprintf(strbuf, MAXBUF, "::%s 702 %s :%s",Instance->Config->ServerName,source->nick.c_str(),ServerConfig::CleanFilename(modulename));
+			snprintf(strbuf, MAXBUF, "::%s 702 %s :%s", Instance->Config->ServerName, source->nick.c_str(), module_names[i].c_str());
 		}
 		par[1] = strbuf;
 		Utils->DoOneToOne(Instance->Config->GetSID(), "PUSH", par, source->server);