[NeoStats-Devel] NeoStats [Commits] r3060 - in /trunk: ChangeLog modules/statserv/channel.c modules/statserv/server.c modules/statserv/ss_help.c

Author: Mark
Date: Sat Dec 23 05:37:22 2006
New Revision: 3060

URL: http://svn.neostats.net/cgi-bin/viewvc.cgi?rev=3060&root=NeoStats&view=rev
Log:
StatServ COPY command is now RENAME since that is what it does and fix segfault when command used

Modified:
    trunk/ChangeLog
    trunk/modules/statserv/channel.c
    trunk/modules/statserv/server.c
    trunk/modules/statserv/ss_help.c

Modified: trunk/ChangeLog
URL: http://svn.neostats.net/cgi-bin/viewvc.cgi/trunk/ChangeLog?rev=3060&root=NeoStats&r1=3059&r2=3060&view=diff
==============================================================================
--- trunk/ChangeLog (original)
+++ trunk/ChangeLog Sat Dec 23 05:37:22 2006
@@ -5,6 +5,8 @@
 Fish (F), Mark (M), DeadNotBuried (D)
 ===============================================================================
 * NeoStats * Version 3.0.b1-dev
+ - StatServ COPY command is now RENAME since that is what it does. (M)
+ - Fix segfault in StatServ COPY. (M)
  - Fix StatServ oper counts. (M)
  - Fix 4 year old bug in module loading.  (M)
  - Fix up neostats startup script etc for cron related issues - Thanks to

Modified: trunk/modules/statserv/channel.c
URL: http://svn.neostats.net/cgi-bin/viewvc.cgi/trunk/modules/statserv/channel.c?rev=3060&root=NeoStats&r1=3059&r2=3060&view=diff
==============================================================================
--- trunk/modules/statserv/channel.c (original)
+++ trunk/modules/statserv/channel.c Sat Dec 23 05:37:22 2006
@@ -191,7 +191,7 @@
  *  @return pointer to stat
  */
 
-static channelstat *LoadChannel( char *name ) 
+static channelstat *LoadChannel( const char *name ) 
 {
 	channelstat *cs;
 

Modified: trunk/modules/statserv/server.c
URL: http://svn.neostats.net/cgi-bin/viewvc.cgi/trunk/modules/statserv/server.c?rev=3060&root=NeoStats&r1=3059&r2=3060&view=diff
==============================================================================
--- trunk/modules/statserv/server.c (original)
+++ trunk/modules/statserv/server.c Sat Dec 23 05:37:22 2006
@@ -465,17 +465,19 @@
 	return NS_SUCCESS;
 }
 
-/** @brief ss_server_copy
- *
- *  SERVER COPY command handler
- *  Reports current statistics to requesting user
- *
- *  @param cmdparams
- *
- *  @return NS_SUCCESS if succeeds, else NS_FAILURE
- */
-
-static int ss_server_copy( const CmdParams *cmdparams )
+/** @brief ss_server_rename
+ *
+ *  SERVER RENAME command handler
+ *  Renames a server statistic entry
+ *
+ *  @param cmdparams
+ *    cmdparams->av[1] = old name
+ *    cmdparams->av[2] = new name
+ *
+ *  @return NS_SUCCESS if succeeds, else NS_FAILURE
+ */
+
+static int ss_server_rename( const CmdParams *cmdparams )
 {
 	serverstat *dest;
 	serverstat *src;
@@ -501,11 +503,10 @@
 			cmdparams->av[1] );
 		return NS_SUCCESS;
 	}
-	memcpy( dest, src, sizeof( serverstat ) );
 	strlcpy( dest->name, cmdparams->av[2], MAXHOST );
-	irc_prefmsg( ss_bot, cmdparams->source, "Copied database entry for %s to %s", 
+	irc_prefmsg( ss_bot, cmdparams->source, "Renamed database entry for %s to %s", 
 		cmdparams->av[1], cmdparams->av[2] );
-	nlog( LOG_NOTICE, "%s requested STATS COPY %s to %s", cmdparams->source->name, 
+	nlog( LOG_NOTICE, "%s requested STATS RENAME %s to %s", cmdparams->source->name, 
 		cmdparams->av[1], cmdparams->av[2] );
 	return NS_SUCCESS;
 }
@@ -604,8 +605,8 @@
 		return ss_cmd_server_list( cmdparams );
 	if( ircstrcasecmp( cmdparams->av[0], "DEL" ) == 0 )
 		return ss_server_del( cmdparams );
-	if( ircstrcasecmp( cmdparams->av[0], "COPY" ) == 0 )
-		return ss_server_copy( cmdparams );	
+	if( ircstrcasecmp( cmdparams->av[0], "RENAME" ) == 0 )
+		return ss_server_rename( cmdparams );	
 	return ss_cmd_server_stats( cmdparams );
 }
 

Modified: trunk/modules/statserv/ss_help.c
URL: http://svn.neostats.net/cgi-bin/viewvc.cgi/trunk/modules/statserv/ss_help.c?rev=3060&root=NeoStats&r1=3059&r2=3060&view=diff
==============================================================================
--- trunk/modules/statserv/ss_help.c (original)
+++ trunk/modules/statserv/ss_help.c Sat Dec 23 05:37:22 2006
@@ -143,7 +143,7 @@
 	"Syntax: \2SERVER <server name>\2",
 	"        \2SERVER LIST\2",
 	"        \2SERVER DEL <servername>\2",
-	"        \2SERVER COPY <oldservername> <newservername>\2",
+	"        \2SERVER RENAME <oldservername> <newservername>\2",
 	"",
 	"Display server statistics for passed server name.",
 	"",
@@ -151,7 +151,7 @@
 	"",
 	"DEL removes an entry.",
 	"",
-	"COPY copies an entry.",
+	"RENAME renames an entry.",
 	NULL
 };