From 0298d1195bb76c1e400695916b4cf65480b0dd76 Mon Sep 17 00:00:00 2001
From: Wilmer van der Gaast <wilmer@gaast.net>
Date: Sat, 14 Jan 2006 00:51:21 +0100
Subject: Moved all IRC commands to separate functions in irc_commands.c. At
 least the PASS command doesn't work yet in this form.

---
 irc_commands.c | 646 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 646 insertions(+)
 create mode 100644 irc_commands.c

(limited to 'irc_commands.c')

diff --git a/irc_commands.c b/irc_commands.c
new file mode 100644
index 00000000..b6eeab37
--- /dev/null
+++ b/irc_commands.c
@@ -0,0 +1,646 @@
+  /********************************************************************\
+  * BitlBee -- An IRC to other IM-networks gateway                     *
+  *                                                                    *
+  * Copyright 2002-2006 Wilmer van der Gaast and others                *
+  \********************************************************************/
+
+/* IRC commands                                                         */
+
+/*
+  This program is free software; you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation; either version 2 of the License, or
+  (at your option) any later version.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License with
+  the Debian GNU/Linux distribution in /usr/share/common-licenses/GPL;
+  if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+  Suite 330, Boston, MA  02111-1307  USA
+*/
+
+#define BITLBEE_CORE
+#include "bitlbee.h"
+
+static int irc_cmd_pass( irc_t *irc, char **cmd )
+{
+	if( strcmp( cmd[1], (global.conf)->auth_pass ) == 0 )
+	{
+		irc->status = USTATUS_AUTHORIZED;
+	}
+	else
+	{
+		irc_reply( irc, 464, ":Nope, maybe you should try it again..." );
+	}
+	
+	return( 1 );
+}
+
+static int irc_cmd_user( irc_t *irc, char **cmd )
+{
+	if( irc->user )
+	{
+		irc_reply( irc, 462, ":You can't change your nick/userinfo" );
+	}
+	else
+	{
+		irc->user = g_strdup( cmd[1] );
+		irc->realname = g_strdup( cmd[4] );
+		if( irc->nick ) irc_login( irc );
+	}
+	
+	return( 1 );
+}
+
+static int irc_cmd_nick( irc_t *irc, char **cmd )
+{
+	if( irc->nick )
+	{
+		irc_reply( irc, 438, ":The hand of the deity is upon thee, thy nick may not change" );
+	}
+	/* This is not clean, but for now it'll have to be like this... */
+	else if( ( nick_cmp( cmd[1], irc->mynick ) == 0 ) || ( nick_cmp( cmd[1], NS_NICK ) == 0 ) )
+	{
+		irc_reply( irc, 433, ":This nick is already in use" );
+	}
+	else if( !nick_ok( cmd[1] ) )
+	{
+		/* [SH] Invalid characters. */
+		irc_reply( irc, 432, ":This nick contains invalid characters" );
+	}
+	else
+	{
+		irc->nick = g_strdup( cmd[1] );
+		if( irc->user ) irc_login( irc );
+	}
+	
+	return( 1 );
+}
+
+static int irc_cmd_quit( irc_t *irc, char **cmd )
+{
+	irc_write( irc, "ERROR :%s%s", cmd[1]?"Quit: ":"", cmd[1]?cmd[1]:"Client Quit" );
+	g_io_channel_close( irc->io_channel );
+	
+	return( 0 );
+}
+
+/*
+	if( !irc->user || !irc->nick )
+	{
+		irc_reply( irc, 451, ":Register first" );
+		return( 1 );
+	}
+*/
+
+static int irc_cmd_ping( irc_t *irc, char **cmd )
+{
+	irc_write( irc, ":%s PONG %s :%s", irc->myhost, irc->myhost, cmd[1]?cmd[1]:irc->myhost );
+	
+	return( 1 );
+}
+
+static int irc_cmd_oper( irc_t *irc, char **cmd )
+{
+	if( strcmp( cmd[2], global.conf->oper_pass ) == 0 )
+		irc_umode_set( irc, "+o", 1 );
+	// else
+		/* FIXME/TODO: Find out which reply to send now. */
+	
+	return( 1 );
+}
+
+static int irc_cmd_mode( irc_t *irc, char **cmd )
+{
+	if( *cmd[1] == '#' || *cmd[1] == '&' )
+	{
+		if( cmd[2] )
+		{
+			if( *cmd[2] == '+' || *cmd[2] == '-' )
+				irc_reply( irc, 477, "%s :Can't change channel modes", cmd[1] );
+			else if( *cmd[2] == 'b' )
+				irc_reply( irc, 368, "%s :No bans possible", cmd[1] );
+		}
+		else
+			irc_reply( irc, 324, "%s +%s", cmd[1], CMODE );
+	}
+	else
+	{
+		if( nick_cmp( cmd[1], irc->nick ) == 0 )
+		{
+			if( cmd[2] )
+				irc_umode_set( irc, cmd[2], 0 );
+		}
+		else
+			irc_reply( irc, 502, ":Don't touch their modes" );
+	}
+	
+	return( 1 );
+}
+
+static int irc_cmd_names( irc_t *irc, char **cmd )
+{
+	irc_names( irc, cmd[1]?cmd[1]:irc->channel );
+	
+	return( 1 );
+}
+
+static int irc_cmd_part( irc_t *irc, char **cmd )
+{
+	struct conversation *c;
+	
+	if( g_strcasecmp( cmd[1], irc->channel ) == 0 )
+	{
+		user_t *u = user_find( irc, irc->nick );
+		
+		/* Not allowed to leave control channel */
+		irc_part( irc, u, irc->channel );
+		irc_join( irc, u, irc->channel );
+	}
+	else if( ( c = conv_findchannel( cmd[1] ) ) )
+	{
+		user_t *u = user_find( irc, irc->nick );
+		
+		irc_part( irc, u, c->channel );
+		
+		if( c->gc && c->gc->prpl )
+		{
+			c->joined = 0;
+			c->gc->prpl->chat_leave( c->gc, c->id );
+		}
+	}
+	else
+	{
+		irc_reply( irc, 403, "%s :No such channel", cmd[1] );
+	}
+	
+	return( 1 );
+}
+
+static int irc_cmd_join( irc_t *irc, char **cmd )
+{
+	if( g_strcasecmp( cmd[1], irc->channel ) == 0 )
+		; /* Dude, you're already there...
+		     RFC doesn't have any reply for that though? */
+	else if( cmd[1] )
+	{
+		if( ( cmd[1][0] == '#' || cmd[1][0] == '&' ) && cmd[1][1] )
+		{
+			user_t *u = user_find( irc, cmd[1] + 1 );
+			
+			if( u && u->gc && u->gc->prpl && u->gc->prpl->chat_open )
+			{
+				irc_reply( irc, 403, "%s :Initializing groupchat in a different channel", cmd[1] );
+				
+				if( !u->gc->prpl->chat_open( u->gc, u->handle ) )
+				{
+					irc_usermsg( irc, "Could not open a groupchat with %s, maybe you don't have a connection to him/her yet?", u->nick );
+				}
+			}
+			else if( u )
+			{
+				irc_reply( irc, 403, "%s :Groupchats are not possible with %s", cmd[1], cmd[1]+1 );
+			}
+			else
+			{
+				irc_reply( irc, 403, "%s :No such nick", cmd[1] );
+			}
+		}
+		else
+		{
+			irc_reply( irc, 403, "%s :No such channel", cmd[1] );
+		}
+	}
+	
+	return( 1 );
+}
+
+static int irc_cmd_invite( irc_t *irc, char **cmd )
+{
+	char *nick = cmd[1], *channel = cmd[2];
+	struct conversation *c = conv_findchannel( channel );
+	user_t *u = user_find( irc, nick );
+	
+	if( u && c && ( u->gc == c->gc ) )
+		if( c->gc && c->gc->prpl && c->gc->prpl->chat_invite )
+		{
+			c->gc->prpl->chat_invite( c->gc, c->id, "", u->handle );
+			irc_reply( irc, 341, "%s %s", nick, channel );
+			return( 1 );
+		}
+	
+	irc_reply( irc, 482, "%s :Invite impossible; User/Channel non-existent or incompatible", channel );
+	
+	return( 1 );
+}
+
+/* TODO: Attach this one to NOTICE too! */
+static int irc_cmd_privmsg( irc_t *irc, char **cmd )
+{
+	if ( !cmd[2] ) 
+	{
+		irc_reply( irc, 412, ":No text to send" );
+	}
+	else if ( irc->nick && g_strcasecmp( cmd[1], irc->nick ) == 0 ) 
+	{
+		irc_write( irc, ":%s!%s@%s %s %s :%s", irc->nick, irc->user, irc->host, cmd[0], cmd[1], cmd[2] ); 
+	}
+	else 
+	{
+		if( g_strcasecmp( cmd[1], irc->channel ) == 0 )
+		{
+			unsigned int i;
+			char *t = set_getstr( irc, "default_target" );
+			
+			if( g_strcasecmp( t, "last" ) == 0 && irc->last_target )
+				cmd[1] = irc->last_target;
+			else if( g_strcasecmp( t, "root" ) == 0 )
+				cmd[1] = irc->mynick;
+			
+			for( i = 0; i < strlen( cmd[2] ); i ++ )
+			{
+				if( cmd[2][i] == ' ' ) break;
+				if( cmd[2][i] == ':' || cmd[2][i] == ',' )
+				{
+					cmd[1] = cmd[2];
+					cmd[2] += i;
+					*cmd[2] = 0;
+					while( *(++cmd[2]) == ' ' );
+					break;
+				}
+			}
+			
+			irc->is_private = 0;
+			
+			if( cmd[1] != irc->last_target )
+			{
+				if( irc->last_target )
+					g_free( irc->last_target );
+				irc->last_target = g_strdup( cmd[1] );
+			}
+		}
+		else
+		{
+			irc->is_private = 1;
+		}
+		irc_send( irc, cmd[1], cmd[2], ( g_strcasecmp( cmd[0], "NOTICE" ) == 0 ) ? IM_FLAG_AWAY : 0 );
+	}
+	
+	return( 1 );
+}
+
+static int irc_cmd_who( irc_t *irc, char **cmd )
+{
+	char *channel = cmd[1];
+	user_t *u = irc->users;
+	struct conversation *c;
+	GList *l;
+	
+	if( !channel || *channel == '0' || *channel == '*' || !*channel )
+		while( u )
+		{
+			irc_reply( irc, 352, "%s %s %s %s %s %c :0 %s", u->online ? irc->channel : "*", u->user, u->host, irc->myhost, u->nick, u->online ? ( u->away ? 'G' : 'H' ) : 'G', u->realname );
+			u = u->next;
+		}
+	else if( g_strcasecmp( channel, irc->channel ) == 0 )
+		while( u )
+		{
+			if( u->online )
+				irc_reply( irc, 352, "%s %s %s %s %s %c :0 %s", channel, u->user, u->host, irc->myhost, u->nick, u->away ? 'G' : 'H', u->realname );
+			u = u->next;
+		}
+	else if( ( c = conv_findchannel( channel ) ) )
+		for( l = c->in_room; l; l = l->next )
+		{
+			if( ( u = user_findhandle( c->gc, l->data ) ) )
+				irc_reply( irc, 352, "%s %s %s %s %s %c :0 %s", channel, u->user, u->host, irc->myhost, u->nick, u->away ? 'G' : 'H', u->realname );
+		}
+	else if( ( u = user_find( irc, channel ) ) )
+		irc_reply( irc, 352, "%s %s %s %s %s %c :0 %s", channel, u->user, u->host, irc->myhost, u->nick, u->online ? ( u->away ? 'G' : 'H' ) : 'G', u->realname );
+	
+	irc_reply( irc, 315, "%s :End of /WHO list.", channel?channel:"**" );
+	
+	return( 1 );
+}
+
+static int irc_cmd_userhost( irc_t *irc, char **cmd )
+{
+	user_t *u;
+	int i;
+	
+	/* [TV] Usable USERHOST-implementation according to
+		RFC1459. Without this, mIRC shows an error
+		while connecting, and the used way of rejecting
+		breaks standards.
+	*/
+	
+	for( i = 1; cmd[i]; i ++ )
+		if( ( u = user_find( irc, cmd[i] ) ) )
+		{
+			if( u->online && u->away )
+				irc_reply( irc, 302, ":%s=-%s@%s", u->nick, u->user, u->host );
+			else
+				irc_reply( irc, 302, ":%s=+%s@%s", u->nick, u->user, u->host );
+		}
+	
+	return( 1 );
+}
+
+static int irc_cmd_ison( irc_t *irc, char **cmd )
+{
+	user_t *u;
+	char buff[IRC_MAX_LINE];
+	int lenleft, i;
+	
+	buff[0] = '\0';
+	
+	/* [SH] Leave room for : and \0 */
+	lenleft = IRC_MAX_LINE - 2;
+	
+	for( i = 1; cmd[i]; i ++ )
+	{
+		if( ( u = user_find( irc, cmd[i] ) ) && u->online )
+		{
+			/* [SH] Make sure we don't use too much buffer space. */
+			lenleft -= strlen( u->nick ) + 1;
+			
+			if( lenleft < 0 )
+			{
+				break;
+			}
+			
+			/* [SH] Add the nick to the buffer. Note
+			 * that an extra space is always added. Even
+			 * if it's the last nick in the list. Who
+			 * cares?
+			 */
+			
+			strcat( buff, u->nick );
+			strcat( buff, " " );
+		}
+	}
+	
+	/* [WvG] Well, maybe someone cares, so why not remove it? */
+	if( strlen( buff ) > 0 )
+		buff[strlen(buff)-1] = '\0';
+	
+	irc_reply( irc, 303, ":%s", buff );
+	
+	return( 1 );
+}
+
+static int irc_cmd_watch( irc_t *irc, char **cmd )
+{
+	int i;
+	
+	/* Obviously we could also mark a user structure as being
+	   watched, but what if the WATCH command is sent right
+	   after connecting? The user won't exist yet then... */
+	for( i = 1; cmd[i]; i ++ )
+	{
+		char *nick;
+		user_t *u;
+		
+		if( !cmd[i][0] || !cmd[i][1] )
+			break;
+		
+		nick = g_strdup( cmd[i] + 1 );
+		nick_lc( nick );
+		
+		u = user_find( irc, nick );
+		
+		if( cmd[i][0] == '+' )
+		{
+			if( !g_hash_table_lookup( irc->watches, nick ) )
+				g_hash_table_insert( irc->watches, nick, nick );
+			
+			if( u && u->online )
+				irc_reply( irc, 604, "%s %s %s %d :%s", u->nick, u->user, u->host, time( NULL ), "is online" );
+			else
+				irc_reply( irc, 605, "%s %s %s %d :%s", nick, "*", "*", time( NULL ), "is offline" );
+		}
+		else if( cmd[i][0] == '-' )
+		{
+			gpointer okey, ovalue;
+			
+			if( g_hash_table_lookup_extended( irc->watches, nick, &okey, &ovalue ) )
+			{
+				g_free( okey );
+				g_hash_table_remove( irc->watches, okey );
+				
+				irc_reply( irc, 602, "%s %s %s %d :%s", nick, "*", "*", 0, "Stopped watching" );
+			}
+		}
+	}
+	
+	return( 1 );
+}
+
+static int irc_cmd_topic( irc_t *irc, char **cmd )
+{
+	if( cmd[2] )
+		irc_reply( irc, 482, "%s :Cannot change topic", cmd[1] );
+	else
+		irc_topic( irc, cmd[1] );
+	
+	return( 1 );
+}
+
+static int irc_cmd_away( irc_t *irc, char **cmd )
+{
+	user_t *u = user_find( irc, irc->nick );
+	GSList *c = get_connections();
+	char *away = cmd[1];
+	
+	if( !u ) return( 1 );
+	
+	if( away && *away )
+	{
+		int i, j;
+		
+		/* Copy away string, but skip control chars. Mainly because
+		   Jabber really doesn't like them. */
+		u->away = g_malloc( strlen( away ) + 1 );
+		for( i = j = 0; away[i]; i ++ )
+			if( ( u->away[j] = away[i] ) >= ' ' )
+				j ++;
+		u->away[j] = 0;
+		
+		irc_reply( irc, 306, ":You're now away: %s", u->away );
+		/* irc_umode_set( irc, irc->myhost, "+a" ); */
+	}
+	else
+	{
+		if( u->away ) g_free( u->away );
+		u->away = NULL;
+		/* irc_umode_set( irc, irc->myhost, "-a" ); */
+		irc_reply( irc, 305, ":Welcome back" );
+	}
+	
+	while( c )
+	{
+		if( ((struct gaim_connection *)c->data)->flags & OPT_LOGGED_IN )
+			proto_away( c->data, u->away );
+		
+		c = c->next;
+	}
+	
+	return( 1 );
+}
+
+static int irc_cmd_whois( irc_t *irc, char **cmd )
+{
+	char *nick = cmd[1];
+	user_t *u = user_find( irc, nick );
+	
+	if( u )
+	{
+		irc_reply( irc, 311, "%s %s %s * :%s", u->nick, u->user, u->host, u->realname );
+		
+		if( u->gc )
+			irc_reply( irc, 312, "%s %s.%s :%s network", u->nick, u->gc->user->username,
+			           *u->gc->user->proto_opt[0] ? u->gc->user->proto_opt[0] : "", u->gc->prpl->name );
+		else
+			irc_reply( irc, 312, "%s %s :%s", u->nick, irc->myhost, IRCD_INFO );
+		
+		if( !u->online )
+			irc_reply( irc, 301, "%s :%s", u->nick, "User is offline" );
+		else if( u->away )
+			irc_reply( irc, 301, "%s :%s", u->nick, u->away );
+		
+		irc_reply( irc, 318, "%s :End of /WHOIS list", nick );
+	}
+	else
+	{
+		irc_reply( irc, 401, "%s :Nick does not exist", nick );
+	}
+	
+	return( 1 );
+}
+
+static int irc_cmd_whowas( irc_t *irc, char **cmd )
+{
+	/* For some reason irssi tries a whowas when whois fails. We can
+	   ignore this, but then the user never gets a "user not found"
+	   message from irssi which is a bit annoying. So just respond
+	   with not-found and irssi users will get better error messages */
+	
+	irc_reply( irc, 406, "%s :Nick does not exist", cmd[1] );
+	irc_reply( irc, 369, "%s :End of WHOWAS", cmd[1] );
+	
+	return( 1 );
+}
+
+/* TODO: Alias to NS */
+static int irc_cmd_nickserv( irc_t *irc, char **cmd )
+{
+	/* [SH] This aliases the NickServ command to PRIVMSG root */
+	/* [TV] This aliases the NS command to PRIVMSG root as well */
+	root_command( irc, cmd + 1 );
+	
+	return( 1 );
+}
+
+static int irc_cmd_motd( irc_t *irc, char **cmd )
+{
+	irc_motd( irc );
+	
+	return( 1 );
+}
+
+static int irc_cmd_pong( irc_t *irc, char **cmd )
+{
+	/* We could check the value we get back from the user, but in
+	   fact we don't care, we're just happy he's still alive. */
+	irc->last_pong = gettime();
+	irc->pinging = 0;
+	
+	return( 1 );
+}
+
+static int irc_cmd_completions( irc_t *irc, char **cmd )
+{
+	user_t *u = user_find( irc, irc->mynick );
+	help_t *h;
+	set_t *s;
+	int i;
+	
+	irc_privmsg( irc, u, "NOTICE", irc->nick, "COMPLETIONS ", "OK" );
+	
+	for( i = 0; commands[i].command; i ++ )
+		irc_privmsg( irc, u, "NOTICE", irc->nick, "COMPLETIONS ", commands[i].command );
+	
+	for( h = global.help; h; h = h->next )
+		irc_privmsg( irc, u, "NOTICE", irc->nick, "COMPLETIONS help ", h->string );
+	
+	for( s = irc->set; s; s = s->next )
+		irc_privmsg( irc, u, "NOTICE", irc->nick, "COMPLETIONS set ", s->key );
+	
+	irc_privmsg( irc, u, "NOTICE", irc->nick, "COMPLETIONS ", "END" );
+	
+	return( 1 );
+}
+
+static const command_t irc_commands[] = {
+	{ "pass",        1, irc_cmd_pass,        IRC_CMD_PRE_LOGIN },
+	{ "user",        4, irc_cmd_user,        IRC_CMD_PRE_LOGIN },
+	{ "nick",        1, irc_cmd_nick,        0 },
+	{ "quit",        0, irc_cmd_quit,        0 },
+	{ "ping",        0, irc_cmd_ping,        0 },
+	{ "oper",        2, irc_cmd_oper,        IRC_CMD_LOGGED_IN },
+	{ "mode",        1, irc_cmd_mode,        IRC_CMD_LOGGED_IN },
+	{ "names",       0, irc_cmd_names,       IRC_CMD_LOGGED_IN },
+	{ "part",        1, irc_cmd_part,        IRC_CMD_LOGGED_IN },
+	{ "join",        1, irc_cmd_join,        IRC_CMD_LOGGED_IN },
+	{ "invite",      2, irc_cmd_invite,      IRC_CMD_LOGGED_IN },
+	{ "privmsg",     1, irc_cmd_privmsg,     IRC_CMD_LOGGED_IN },
+	{ "notice",      1, irc_cmd_privmsg,     IRC_CMD_LOGGED_IN },
+	{ "who",         0, irc_cmd_who,         IRC_CMD_LOGGED_IN },
+	{ "userhost",    1, irc_cmd_userhost,    IRC_CMD_LOGGED_IN },
+	{ "ison",        1, irc_cmd_ison,        IRC_CMD_LOGGED_IN },
+	{ "watch",       1, irc_cmd_watch,       IRC_CMD_LOGGED_IN },
+	{ "topic",       1, irc_cmd_topic,       IRC_CMD_LOGGED_IN },
+	{ "away",        0, irc_cmd_away,        IRC_CMD_LOGGED_IN },
+	{ "whois",       1, irc_cmd_whois,       IRC_CMD_LOGGED_IN },
+	{ "whowas",      1, irc_cmd_whowas,      IRC_CMD_LOGGED_IN },
+	{ "nickserv",    1, irc_cmd_nickserv,    IRC_CMD_LOGGED_IN },
+	{ "ns",          1, irc_cmd_nickserv,    IRC_CMD_LOGGED_IN },
+	{ "motd",        0, irc_cmd_motd,        IRC_CMD_LOGGED_IN },
+	{ "pong",        0, irc_cmd_pong,        IRC_CMD_LOGGED_IN },
+	{ "completions", 0, irc_cmd_completions, IRC_CMD_LOGGED_IN },
+	{ NULL }
+};
+
+int irc_exec( irc_t *irc, char *cmd[] )
+{	
+	int i, j;
+	
+	if( !cmd[0] )
+		return( 1 );
+	
+	for( i = 0; irc_commands[i].command; i++ )
+		if( g_strcasecmp( irc_commands[i].command, cmd[0] ) == 0 )
+		{
+			if( irc_commands[i].flags & IRC_CMD_PRE_LOGIN && irc->status > USTATUS_AUTHORIZED )
+				continue;
+			if( irc_commands[i].flags & IRC_CMD_LOGGED_IN && irc->status < USTATUS_LOGGED_IN )
+				continue;
+			if( irc_commands[i].flags & IRC_CMD_OPER_ONLY && !strchr( irc->umode, 'o' ) )
+				continue;
+			
+			for( j = 1; j <= irc_commands[i].required_parameters; j ++ )
+				if( !cmd[j] )
+				{
+					irc_reply( irc, 461, "%s :Need more parameters", cmd[0] );
+					return( 1 );
+				}
+			
+			return irc_commands[i].execute( irc, cmd );
+		}
+	
+	return( 1 );
+}
-- 
cgit v1.2.3


From c22c210f560aee8a43b9fbff63c3dc408b434094 Mon Sep 17 00:00:00 2001
From: Wilmer van der Gaast <wilmer@gaast.net>
Date: Sat, 14 Jan 2006 18:48:29 +0100
Subject: Checks if there's an OPER password set before checking it, to prevent
 crashes.

---
 irc_commands.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'irc_commands.c')

diff --git a/irc_commands.c b/irc_commands.c
index b6eeab37..37d530ea 100644
--- a/irc_commands.c
+++ b/irc_commands.c
@@ -106,7 +106,7 @@ static int irc_cmd_ping( irc_t *irc, char **cmd )
 
 static int irc_cmd_oper( irc_t *irc, char **cmd )
 {
-	if( strcmp( cmd[2], global.conf->oper_pass ) == 0 )
+	if( global.conf->oper_pass && strcmp( cmd[2], global.conf->oper_pass ) == 0 )
 		irc_umode_set( irc, "+o", 1 );
 	// else
 		/* FIXME/TODO: Find out which reply to send now. */
-- 
cgit v1.2.3


From edf965753380a165ec615b79d45251931ac3ea62 Mon Sep 17 00:00:00 2001
From: Wilmer van der Gaast <wilmer@gaast.net>
Date: Sat, 14 Jan 2006 19:25:00 +0100
Subject: Fixed the PASS-command, added error messages for invalid commands to
 irc_exec().

---
 irc_commands.c | 47 ++++++++++++++++++++++-------------------------
 1 file changed, 22 insertions(+), 25 deletions(-)

(limited to 'irc_commands.c')

diff --git a/irc_commands.c b/irc_commands.c
index 37d530ea..696c45d4 100644
--- a/irc_commands.c
+++ b/irc_commands.c
@@ -28,13 +28,14 @@
 
 static int irc_cmd_pass( irc_t *irc, char **cmd )
 {
-	if( strcmp( cmd[1], (global.conf)->auth_pass ) == 0 )
+	if( global.conf->auth_pass && strcmp( cmd[1], global.conf->auth_pass ) == 0 )
 	{
 		irc->status = USTATUS_AUTHORIZED;
+		irc_check_login();
 	}
 	else
 	{
-		irc_reply( irc, 464, ":Nope, maybe you should try it again..." );
+		irc_reply( irc, 464, ":Incorrect password." );
 	}
 	
 	return( 1 );
@@ -42,16 +43,10 @@ static int irc_cmd_pass( irc_t *irc, char **cmd )
 
 static int irc_cmd_user( irc_t *irc, char **cmd )
 {
-	if( irc->user )
-	{
-		irc_reply( irc, 462, ":You can't change your nick/userinfo" );
-	}
-	else
-	{
-		irc->user = g_strdup( cmd[1] );
-		irc->realname = g_strdup( cmd[4] );
-		if( irc->nick ) irc_login( irc );
-	}
+	irc->user = g_strdup( cmd[1] );
+	irc->realname = g_strdup( cmd[4] );
+	
+	irc_check_login( irc );
 	
 	return( 1 );
 }
@@ -75,7 +70,8 @@ static int irc_cmd_nick( irc_t *irc, char **cmd )
 	else
 	{
 		irc->nick = g_strdup( cmd[1] );
-		if( irc->user ) irc_login( irc );
+		
+		irc_check_login( irc );
 	}
 	
 	return( 1 );
@@ -89,14 +85,6 @@ static int irc_cmd_quit( irc_t *irc, char **cmd )
 	return( 0 );
 }
 
-/*
-	if( !irc->user || !irc->nick )
-	{
-		irc_reply( irc, 451, ":Register first" );
-		return( 1 );
-	}
-*/
-
 static int irc_cmd_ping( irc_t *irc, char **cmd )
 {
 	irc_write( irc, ":%s PONG %s :%s", irc->myhost, irc->myhost, cmd[1]?cmd[1]:irc->myhost );
@@ -625,12 +613,21 @@ int irc_exec( irc_t *irc, char *cmd[] )
 	for( i = 0; irc_commands[i].command; i++ )
 		if( g_strcasecmp( irc_commands[i].command, cmd[0] ) == 0 )
 		{
-			if( irc_commands[i].flags & IRC_CMD_PRE_LOGIN && irc->status > USTATUS_AUTHORIZED )
-				continue;
+			if( irc_commands[i].flags & IRC_CMD_PRE_LOGIN && irc->status >= USTATUS_LOGGED_IN )
+			{
+				irc_reply( irc, 462, ":Only allowed before logging in" );
+				return( 1 );
+			}
 			if( irc_commands[i].flags & IRC_CMD_LOGGED_IN && irc->status < USTATUS_LOGGED_IN )
-				continue;
+			{
+				irc_reply( irc, 451, ":Register first" );
+				return( 1 );
+			}
 			if( irc_commands[i].flags & IRC_CMD_OPER_ONLY && !strchr( irc->umode, 'o' ) )
-				continue;
+			{
+				irc_reply( irc, 481, ":Permission denied - You're not an IRC operator" );
+				return( 1 );
+			}
 			
 			for( j = 1; j <= irc_commands[i].required_parameters; j ++ )
 				if( !cmd[j] )
-- 
cgit v1.2.3


From b23c5c758097e7c7e9e0141ba9467177c0c32114 Mon Sep 17 00:00:00 2001
From: Wilmer van der Gaast <wilmer@gaast.net>
Date: Sat, 14 Jan 2006 20:12:48 +0100
Subject: Added correct responses for OPER command, stripped some unnecessary
 periods.

---
 irc_commands.c | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

(limited to 'irc_commands.c')

diff --git a/irc_commands.c b/irc_commands.c
index 696c45d4..81b3d60b 100644
--- a/irc_commands.c
+++ b/irc_commands.c
@@ -35,7 +35,7 @@ static int irc_cmd_pass( irc_t *irc, char **cmd )
 	}
 	else
 	{
-		irc_reply( irc, 464, ":Incorrect password." );
+		irc_reply( irc, 464, ":Incorrect password" );
 	}
 	
 	return( 1 );
@@ -95,9 +95,14 @@ static int irc_cmd_ping( irc_t *irc, char **cmd )
 static int irc_cmd_oper( irc_t *irc, char **cmd )
 {
 	if( global.conf->oper_pass && strcmp( cmd[2], global.conf->oper_pass ) == 0 )
+	{
 		irc_umode_set( irc, "+o", 1 );
-	// else
-		/* FIXME/TODO: Find out which reply to send now. */
+		irc_reply( irc, 381, ":Password accepted" );
+	}
+	else
+	{
+		irc_reply( irc, 432, ":Incorrect password" );
+	}
 	
 	return( 1 );
 }
@@ -310,7 +315,7 @@ static int irc_cmd_who( irc_t *irc, char **cmd )
 	else if( ( u = user_find( irc, channel ) ) )
 		irc_reply( irc, 352, "%s %s %s %s %s %c :0 %s", channel, u->user, u->host, irc->myhost, u->nick, u->online ? ( u->away ? 'G' : 'H' ) : 'G', u->realname );
 	
-	irc_reply( irc, 315, "%s :End of /WHO list.", channel?channel:"**" );
+	irc_reply( irc, 315, "%s :End of /WHO list", channel?channel:"**" );
 	
 	return( 1 );
 }
-- 
cgit v1.2.3


From de3e100b7fa676bb628ead4cca2b8cee91fc3a84 Mon Sep 17 00:00:00 2001
From: Wilmer van der Gaast <wilmer@gaast.net>
Date: Sat, 14 Jan 2006 21:31:59 +0100
Subject: Separated the IRC line splitting/parsing code (to use it for IPC
 too), and improved the splitting to deal with empty arguments.

---
 irc_commands.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'irc_commands.c')

diff --git a/irc_commands.c b/irc_commands.c
index 81b3d60b..a7cb9963 100644
--- a/irc_commands.c
+++ b/irc_commands.c
@@ -31,7 +31,7 @@ static int irc_cmd_pass( irc_t *irc, char **cmd )
 	if( global.conf->auth_pass && strcmp( cmd[1], global.conf->auth_pass ) == 0 )
 	{
 		irc->status = USTATUS_AUTHORIZED;
-		irc_check_login();
+		irc_check_login( irc );
 	}
 	else
 	{
-- 
cgit v1.2.3


From e0ca412a709c80cc7fe26db0576c2bc38be4a45a Mon Sep 17 00:00:00 2001
From: Wilmer van der Gaast <wilmer@gaast.net>
Date: Sun, 15 Jan 2006 12:33:54 +0100
Subject: s/WALLOP/WALLOPS/, added LILO command.

---
 irc_commands.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'irc_commands.c')

diff --git a/irc_commands.c b/irc_commands.c
index 3ef5566e..b2bde17b 100644
--- a/irc_commands.c
+++ b/irc_commands.c
@@ -607,7 +607,8 @@ static const command_t irc_commands[] = {
 	{ "pong",        0, irc_cmd_pong,        IRC_CMD_LOGGED_IN },
 	{ "completions", 0, irc_cmd_completions, IRC_CMD_LOGGED_IN },
 	{ "die",         0, NULL,                IRC_CMD_OPER_ONLY | IRC_CMD_TO_MASTER },
-	{ "wallop",      0, NULL,                IRC_CMD_OPER_ONLY | IRC_CMD_TO_MASTER },
+	{ "wallops",     0, NULL,                IRC_CMD_OPER_ONLY | IRC_CMD_TO_MASTER },
+	{ "lilo",        0, NULL,                IRC_CMD_OPER_ONLY | IRC_CMD_TO_MASTER },
 	{ NULL }
 };
 
-- 
cgit v1.2.3


From f4a59408250b76173418fad090d4623e5300c90f Mon Sep 17 00:00:00 2001
From: Wilmer van der Gaast <wilmer@gaast.net>
Date: Sun, 15 Jan 2006 21:31:59 +0100
Subject: Added REHASH command, IPC emulation in daemon (non-forked) mode.

---
 irc_commands.c | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

(limited to 'irc_commands.c')

diff --git a/irc_commands.c b/irc_commands.c
index b2bde17b..5f666702 100644
--- a/irc_commands.c
+++ b/irc_commands.c
@@ -232,7 +232,6 @@ static int irc_cmd_invite( irc_t *irc, char **cmd )
 	return( 1 );
 }
 
-/* TODO: Attach this one to NOTICE too! */
 static int irc_cmd_privmsg( irc_t *irc, char **cmd )
 {
 	if ( !cmd[2] ) 
@@ -529,7 +528,6 @@ static int irc_cmd_whowas( irc_t *irc, char **cmd )
 	return( 1 );
 }
 
-/* TODO: Alias to NS */
 static int irc_cmd_nickserv( irc_t *irc, char **cmd )
 {
 	/* [SH] This aliases the NickServ command to PRIVMSG root */
@@ -579,6 +577,15 @@ static int irc_cmd_completions( irc_t *irc, char **cmd )
 	return( 1 );
 }
 
+static int irc_cmd_rehash( irc_t *irc, char **cmd )
+{
+	ipc_to_master( cmd );
+	
+	irc_reply( irc, 382, "%s :Rehashing", CONF_FILE );
+	
+	return( 1 );
+}
+
 static const command_t irc_commands[] = {
 	{ "pass",        1, irc_cmd_pass,        IRC_CMD_PRE_LOGIN },
 	{ "user",        4, irc_cmd_user,        IRC_CMD_PRE_LOGIN },
@@ -609,6 +616,7 @@ static const command_t irc_commands[] = {
 	{ "die",         0, NULL,                IRC_CMD_OPER_ONLY | IRC_CMD_TO_MASTER },
 	{ "wallops",     0, NULL,                IRC_CMD_OPER_ONLY | IRC_CMD_TO_MASTER },
 	{ "lilo",        0, NULL,                IRC_CMD_OPER_ONLY | IRC_CMD_TO_MASTER },
+	{ "rehash",      0, irc_cmd_rehash,      IRC_CMD_OPER_ONLY },
 	{ NULL }
 };
 
-- 
cgit v1.2.3


From 48721c328e574e0ff76c41734b78aab217edbf65 Mon Sep 17 00:00:00 2001
From: Wilmer van der Gaast <wilmer@gaast.net>
Date: Tue, 17 Jan 2006 22:15:42 +0100
Subject: A KILL command. Unfortunately the user doesn't see the KILL message
 yet. :-(

---
 irc_commands.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'irc_commands.c')

diff --git a/irc_commands.c b/irc_commands.c
index 5f666702..2e225702 100644
--- a/irc_commands.c
+++ b/irc_commands.c
@@ -614,9 +614,10 @@ static const command_t irc_commands[] = {
 	{ "pong",        0, irc_cmd_pong,        IRC_CMD_LOGGED_IN },
 	{ "completions", 0, irc_cmd_completions, IRC_CMD_LOGGED_IN },
 	{ "die",         0, NULL,                IRC_CMD_OPER_ONLY | IRC_CMD_TO_MASTER },
-	{ "wallops",     0, NULL,                IRC_CMD_OPER_ONLY | IRC_CMD_TO_MASTER },
-	{ "lilo",        0, NULL,                IRC_CMD_OPER_ONLY | IRC_CMD_TO_MASTER },
+	{ "wallops",     1, NULL,                IRC_CMD_OPER_ONLY | IRC_CMD_TO_MASTER },
+	{ "lilo",        1, NULL,                IRC_CMD_OPER_ONLY | IRC_CMD_TO_MASTER },
 	{ "rehash",      0, irc_cmd_rehash,      IRC_CMD_OPER_ONLY },
+	{ "kill",        2, NULL,                IRC_CMD_OPER_ONLY | IRC_CMD_TO_MASTER },
 	{ NULL }
 };
 
-- 
cgit v1.2.3


From 5424c76c7813f82e2f98546f6a46b73d80181877 Mon Sep 17 00:00:00 2001
From: Wilmer van der Gaast <wilmer@gaast.net>
Date: Thu, 19 Jan 2006 18:52:19 +0100
Subject: Rehash command now also works in inetd mode. Other "IPC" commands
 only make sense in daemon mode.

---
 irc_commands.c | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'irc_commands.c')

diff --git a/irc_commands.c b/irc_commands.c
index 152df767..e31a92e8 100644
--- a/irc_commands.c
+++ b/irc_commands.c
@@ -579,7 +579,10 @@ static int irc_cmd_completions( irc_t *irc, char **cmd )
 
 static int irc_cmd_rehash( irc_t *irc, char **cmd )
 {
-	ipc_to_master( cmd );
+	if( global.conf->runmode == RUNMODE_INETD )
+		ipc_master_cmd_rehash( NULL, NULL );
+	else
+		ipc_to_master( cmd );
 	
 	irc_reply( irc, 382, "%s :Rehashing", CONF_FILE );
 	
@@ -655,6 +658,8 @@ int irc_exec( irc_t *irc, char *cmd[] )
 				}
 			
 			if( irc_commands[i].flags & IRC_CMD_TO_MASTER )
+				/* IPC doesn't make sense in inetd mode,
+				    but the function will catch that. */
 				ipc_to_master( cmd );
 			else
 				return irc_commands[i].execute( irc, cmd );
-- 
cgit v1.2.3


From f73b9697f9be18e04ec7458634520f9dd2e2432f Mon Sep 17 00:00:00 2001
From: Wilmer van der Gaast <wilmer@gaast.net>
Date: Fri, 20 Jan 2006 16:15:49 +0100
Subject: Renamed commands.c, got rid of return values in all command
 functions.

---
 irc_commands.c | 147 +++++++++++++++++++--------------------------------------
 1 file changed, 48 insertions(+), 99 deletions(-)

(limited to 'irc_commands.c')

diff --git a/irc_commands.c b/irc_commands.c
index e31a92e8..e4dc4f3e 100644
--- a/irc_commands.c
+++ b/irc_commands.c
@@ -27,7 +27,7 @@
 #include "bitlbee.h"
 #include "ipc.h"
 
-static int irc_cmd_pass( irc_t *irc, char **cmd )
+static void irc_cmd_pass( irc_t *irc, char **cmd )
 {
 	if( global.conf->auth_pass && strcmp( cmd[1], global.conf->auth_pass ) == 0 )
 	{
@@ -38,21 +38,17 @@ static int irc_cmd_pass( irc_t *irc, char **cmd )
 	{
 		irc_reply( irc, 464, ":Incorrect password" );
 	}
-	
-	return( 1 );
 }
 
-static int irc_cmd_user( irc_t *irc, char **cmd )
+static void irc_cmd_user( irc_t *irc, char **cmd )
 {
 	irc->user = g_strdup( cmd[1] );
 	irc->realname = g_strdup( cmd[4] );
 	
 	irc_check_login( irc );
-	
-	return( 1 );
 }
 
-static int irc_cmd_nick( irc_t *irc, char **cmd )
+static void irc_cmd_nick( irc_t *irc, char **cmd )
 {
 	if( irc->nick )
 	{
@@ -74,26 +70,22 @@ static int irc_cmd_nick( irc_t *irc, char **cmd )
 		
 		irc_check_login( irc );
 	}
-	
-	return( 1 );
 }
 
-static int irc_cmd_quit( irc_t *irc, char **cmd )
+static void irc_cmd_quit( irc_t *irc, char **cmd )
 {
-	irc_write( irc, "ERROR :%s%s", cmd[1]?"Quit: ":"", cmd[1]?cmd[1]:"Client Quit" );
-	/* g_io_channel_close( irc->io_channel ); */
-	
-	return( 0 );
+	if( cmd[1] && *cmd[1] )
+		irc_abort( irc, 0, "Quit: %s", cmd[1] );
+	else
+		irc_abort( irc, 0, "Leaving..." );
 }
 
-static int irc_cmd_ping( irc_t *irc, char **cmd )
+static void irc_cmd_ping( irc_t *irc, char **cmd )
 {
 	irc_write( irc, ":%s PONG %s :%s", irc->myhost, irc->myhost, cmd[1]?cmd[1]:irc->myhost );
-	
-	return( 1 );
 }
 
-static int irc_cmd_oper( irc_t *irc, char **cmd )
+static void irc_cmd_oper( irc_t *irc, char **cmd )
 {
 	if( global.conf->oper_pass && strcmp( cmd[2], global.conf->oper_pass ) == 0 )
 	{
@@ -104,11 +96,9 @@ static int irc_cmd_oper( irc_t *irc, char **cmd )
 	{
 		irc_reply( irc, 432, ":Incorrect password" );
 	}
-	
-	return( 1 );
 }
 
-static int irc_cmd_mode( irc_t *irc, char **cmd )
+static void irc_cmd_mode( irc_t *irc, char **cmd )
 {
 	if( *cmd[1] == '#' || *cmd[1] == '&' )
 	{
@@ -132,18 +122,14 @@ static int irc_cmd_mode( irc_t *irc, char **cmd )
 		else
 			irc_reply( irc, 502, ":Don't touch their modes" );
 	}
-	
-	return( 1 );
 }
 
-static int irc_cmd_names( irc_t *irc, char **cmd )
+static void irc_cmd_names( irc_t *irc, char **cmd )
 {
 	irc_names( irc, cmd[1]?cmd[1]:irc->channel );
-	
-	return( 1 );
 }
 
-static int irc_cmd_part( irc_t *irc, char **cmd )
+static void irc_cmd_part( irc_t *irc, char **cmd )
 {
 	struct conversation *c;
 	
@@ -171,11 +157,9 @@ static int irc_cmd_part( irc_t *irc, char **cmd )
 	{
 		irc_reply( irc, 403, "%s :No such channel", cmd[1] );
 	}
-	
-	return( 1 );
 }
 
-static int irc_cmd_join( irc_t *irc, char **cmd )
+static void irc_cmd_join( irc_t *irc, char **cmd )
 {
 	if( g_strcasecmp( cmd[1], irc->channel ) == 0 )
 		; /* Dude, you're already there...
@@ -209,11 +193,9 @@ static int irc_cmd_join( irc_t *irc, char **cmd )
 			irc_reply( irc, 403, "%s :No such channel", cmd[1] );
 		}
 	}
-	
-	return( 1 );
 }
 
-static int irc_cmd_invite( irc_t *irc, char **cmd )
+static void irc_cmd_invite( irc_t *irc, char **cmd )
 {
 	char *nick = cmd[1], *channel = cmd[2];
 	struct conversation *c = conv_findchannel( channel );
@@ -224,15 +206,13 @@ static int irc_cmd_invite( irc_t *irc, char **cmd )
 		{
 			c->gc->prpl->chat_invite( c->gc, c->id, "", u->handle );
 			irc_reply( irc, 341, "%s %s", nick, channel );
-			return( 1 );
+			return;
 		}
 	
 	irc_reply( irc, 482, "%s :Invite impossible; User/Channel non-existent or incompatible", channel );
-	
-	return( 1 );
 }
 
-static int irc_cmd_privmsg( irc_t *irc, char **cmd )
+static void irc_cmd_privmsg( irc_t *irc, char **cmd )
 {
 	if ( !cmd[2] ) 
 	{
@@ -282,11 +262,9 @@ static int irc_cmd_privmsg( irc_t *irc, char **cmd )
 		}
 		irc_send( irc, cmd[1], cmd[2], ( g_strcasecmp( cmd[0], "NOTICE" ) == 0 ) ? IM_FLAG_AWAY : 0 );
 	}
-	
-	return( 1 );
 }
 
-static int irc_cmd_who( irc_t *irc, char **cmd )
+static void irc_cmd_who( irc_t *irc, char **cmd )
 {
 	char *channel = cmd[1];
 	user_t *u = irc->users;
@@ -316,11 +294,9 @@ static int irc_cmd_who( irc_t *irc, char **cmd )
 		irc_reply( irc, 352, "%s %s %s %s %s %c :0 %s", channel, u->user, u->host, irc->myhost, u->nick, u->online ? ( u->away ? 'G' : 'H' ) : 'G', u->realname );
 	
 	irc_reply( irc, 315, "%s :End of /WHO list", channel?channel:"**" );
-	
-	return( 1 );
 }
 
-static int irc_cmd_userhost( irc_t *irc, char **cmd )
+static void irc_cmd_userhost( irc_t *irc, char **cmd )
 {
 	user_t *u;
 	int i;
@@ -339,11 +315,9 @@ static int irc_cmd_userhost( irc_t *irc, char **cmd )
 			else
 				irc_reply( irc, 302, ":%s=+%s@%s", u->nick, u->user, u->host );
 		}
-	
-	return( 1 );
 }
 
-static int irc_cmd_ison( irc_t *irc, char **cmd )
+static void irc_cmd_ison( irc_t *irc, char **cmd )
 {
 	user_t *u;
 	char buff[IRC_MAX_LINE];
@@ -382,11 +356,9 @@ static int irc_cmd_ison( irc_t *irc, char **cmd )
 		buff[strlen(buff)-1] = '\0';
 	
 	irc_reply( irc, 303, ":%s", buff );
-	
-	return( 1 );
 }
 
-static int irc_cmd_watch( irc_t *irc, char **cmd )
+static void irc_cmd_watch( irc_t *irc, char **cmd )
 {
 	int i;
 	
@@ -429,27 +401,23 @@ static int irc_cmd_watch( irc_t *irc, char **cmd )
 			}
 		}
 	}
-	
-	return( 1 );
 }
 
-static int irc_cmd_topic( irc_t *irc, char **cmd )
+static void irc_cmd_topic( irc_t *irc, char **cmd )
 {
 	if( cmd[2] )
 		irc_reply( irc, 482, "%s :Cannot change topic", cmd[1] );
 	else
 		irc_topic( irc, cmd[1] );
-	
-	return( 1 );
 }
 
-static int irc_cmd_away( irc_t *irc, char **cmd )
+static void irc_cmd_away( irc_t *irc, char **cmd )
 {
 	user_t *u = user_find( irc, irc->nick );
 	GSList *c = get_connections();
 	char *away = cmd[1];
 	
-	if( !u ) return( 1 );
+	if( !u ) return;
 	
 	if( away && *away )
 	{
@@ -481,11 +449,9 @@ static int irc_cmd_away( irc_t *irc, char **cmd )
 		
 		c = c->next;
 	}
-	
-	return( 1 );
 }
 
-static int irc_cmd_whois( irc_t *irc, char **cmd )
+static void irc_cmd_whois( irc_t *irc, char **cmd )
 {
 	char *nick = cmd[1];
 	user_t *u = user_find( irc, nick );
@@ -511,11 +477,9 @@ static int irc_cmd_whois( irc_t *irc, char **cmd )
 	{
 		irc_reply( irc, 401, "%s :Nick does not exist", nick );
 	}
-	
-	return( 1 );
 }
 
-static int irc_cmd_whowas( irc_t *irc, char **cmd )
+static void irc_cmd_whowas( irc_t *irc, char **cmd )
 {
 	/* For some reason irssi tries a whowas when whois fails. We can
 	   ignore this, but then the user never gets a "user not found"
@@ -524,37 +488,29 @@ static int irc_cmd_whowas( irc_t *irc, char **cmd )
 	
 	irc_reply( irc, 406, "%s :Nick does not exist", cmd[1] );
 	irc_reply( irc, 369, "%s :End of WHOWAS", cmd[1] );
-	
-	return( 1 );
 }
 
-static int irc_cmd_nickserv( irc_t *irc, char **cmd )
+static void irc_cmd_nickserv( irc_t *irc, char **cmd )
 {
 	/* [SH] This aliases the NickServ command to PRIVMSG root */
 	/* [TV] This aliases the NS command to PRIVMSG root as well */
 	root_command( irc, cmd + 1 );
-	
-	return( 1 );
 }
 
-static int irc_cmd_motd( irc_t *irc, char **cmd )
+static void irc_cmd_motd( irc_t *irc, char **cmd )
 {
 	irc_motd( irc );
-	
-	return( 1 );
 }
 
-static int irc_cmd_pong( irc_t *irc, char **cmd )
+static void irc_cmd_pong( irc_t *irc, char **cmd )
 {
 	/* We could check the value we get back from the user, but in
 	   fact we don't care, we're just happy he's still alive. */
 	irc->last_pong = gettime();
 	irc->pinging = 0;
-	
-	return( 1 );
 }
 
-static int irc_cmd_completions( irc_t *irc, char **cmd )
+static void irc_cmd_completions( irc_t *irc, char **cmd )
 {
 	user_t *u = user_find( irc, irc->mynick );
 	help_t *h;
@@ -573,11 +529,9 @@ static int irc_cmd_completions( irc_t *irc, char **cmd )
 		irc_privmsg( irc, u, "NOTICE", irc->nick, "COMPLETIONS set ", s->key );
 	
 	irc_privmsg( irc, u, "NOTICE", irc->nick, "COMPLETIONS ", "END" );
-	
-	return( 1 );
 }
 
-static int irc_cmd_rehash( irc_t *irc, char **cmd )
+static void irc_cmd_rehash( irc_t *irc, char **cmd )
 {
 	if( global.conf->runmode == RUNMODE_INETD )
 		ipc_master_cmd_rehash( NULL, NULL );
@@ -585,8 +539,6 @@ static int irc_cmd_rehash( irc_t *irc, char **cmd )
 		ipc_to_master( cmd );
 	
 	irc_reply( irc, 382, "%s :Rehashing", CONF_FILE );
-	
-	return( 1 );
 }
 
 static const command_t irc_commands[] = {
@@ -624,12 +576,12 @@ static const command_t irc_commands[] = {
 	{ NULL }
 };
 
-int irc_exec( irc_t *irc, char *cmd[] )
+void irc_exec( irc_t *irc, char *cmd[] )
 {	
-	int i, j;
+	int i;
 	
 	if( !cmd[0] )
-		return( 1 );
+		return;
 	
 	for( i = 0; irc_commands[i].command; i++ )
 		if( g_strcasecmp( irc_commands[i].command, cmd[0] ) == 0 )
@@ -637,33 +589,30 @@ int irc_exec( irc_t *irc, char *cmd[] )
 			if( irc_commands[i].flags & IRC_CMD_PRE_LOGIN && irc->status >= USTATUS_LOGGED_IN )
 			{
 				irc_reply( irc, 462, ":Only allowed before logging in" );
-				return( 1 );
 			}
-			if( irc_commands[i].flags & IRC_CMD_LOGGED_IN && irc->status < USTATUS_LOGGED_IN )
+			else if( irc_commands[i].flags & IRC_CMD_LOGGED_IN && irc->status < USTATUS_LOGGED_IN )
 			{
 				irc_reply( irc, 451, ":Register first" );
-				return( 1 );
 			}
-			if( irc_commands[i].flags & IRC_CMD_OPER_ONLY && !strchr( irc->umode, 'o' ) )
+			else if( irc_commands[i].flags & IRC_CMD_OPER_ONLY && !strchr( irc->umode, 'o' ) )
 			{
 				irc_reply( irc, 481, ":Permission denied - You're not an IRC operator" );
-				return( 1 );
 			}
-			
-			for( j = 1; j <= irc_commands[i].required_parameters; j ++ )
-				if( !cmd[j] )
-				{
-					irc_reply( irc, 461, "%s :Need more parameters", cmd[0] );
-					return( 1 );
-				}
-			
-			if( irc_commands[i].flags & IRC_CMD_TO_MASTER )
+			else if( !cmd[irc_commands[i].required_parameters] )
+			{
+				irc_reply( irc, 461, "%s :Need more parameters", cmd[0] );
+			}
+			else if( irc_commands[i].flags & IRC_CMD_TO_MASTER )
+			{
 				/* IPC doesn't make sense in inetd mode,
 				    but the function will catch that. */
 				ipc_to_master( cmd );
+			}
 			else
-				return irc_commands[i].execute( irc, cmd );
+			{
+				irc_commands[i].execute( irc, cmd );
+			}
+			
+			break;
 		}
-	
-	return( 1 );
 }
-- 
cgit v1.2.3


From f1d38f20f760376f43b90a105486cf3ff2fbf2c4 Mon Sep 17 00:00:00 2001
From: Wilmer van der Gaast <wilmer@gaast.net>
Date: Sat, 21 Jan 2006 23:23:58 +0100
Subject: Fixed counting of arguments in i[rp]c_exec(), made them a bit too
 simple.

---
 irc_commands.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'irc_commands.c')

diff --git a/irc_commands.c b/irc_commands.c
index e4dc4f3e..9e47b83b 100644
--- a/irc_commands.c
+++ b/irc_commands.c
@@ -578,7 +578,7 @@ static const command_t irc_commands[] = {
 
 void irc_exec( irc_t *irc, char *cmd[] )
 {	
-	int i;
+	int i, n_arg;
 	
 	if( !cmd[0] )
 		return;
@@ -586,6 +586,9 @@ void irc_exec( irc_t *irc, char *cmd[] )
 	for( i = 0; irc_commands[i].command; i++ )
 		if( g_strcasecmp( irc_commands[i].command, cmd[0] ) == 0 )
 		{
+			/* There should be no typo in the next line: */
+			for( n_arg = 0; cmd[n_arg]; n_arg ++ ); n_arg --;
+			
 			if( irc_commands[i].flags & IRC_CMD_PRE_LOGIN && irc->status >= USTATUS_LOGGED_IN )
 			{
 				irc_reply( irc, 462, ":Only allowed before logging in" );
@@ -598,7 +601,7 @@ void irc_exec( irc_t *irc, char *cmd[] )
 			{
 				irc_reply( irc, 481, ":Permission denied - You're not an IRC operator" );
 			}
-			else if( !cmd[irc_commands[i].required_parameters] )
+			else if( n_arg < irc_commands[i].required_parameters )
 			{
 				irc_reply( irc, 461, "%s :Need more parameters", cmd[0] );
 			}
-- 
cgit v1.2.3


From a91ecee010fdbd8e62e874e23a443206a48308c0 Mon Sep 17 00:00:00 2001
From: Wilmer van der Gaast <wilmer@gaast.net>
Date: Mon, 23 Jan 2006 15:20:18 +0100
Subject: /AWAY now only sets the IM-protocols away that belong to the current
 IRC /connection (was an issue in single-process daemon mode).

---
 irc_commands.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'irc_commands.c')

diff --git a/irc_commands.c b/irc_commands.c
index 9e47b83b..66c39bc5 100644
--- a/irc_commands.c
+++ b/irc_commands.c
@@ -414,8 +414,8 @@ static void irc_cmd_topic( irc_t *irc, char **cmd )
 static void irc_cmd_away( irc_t *irc, char **cmd )
 {
 	user_t *u = user_find( irc, irc->nick );
-	GSList *c = get_connections();
 	char *away = cmd[1];
+	account_t *a;
 	
 	if( !u ) return;
 	
@@ -442,12 +442,12 @@ static void irc_cmd_away( irc_t *irc, char **cmd )
 		irc_reply( irc, 305, ":Welcome back" );
 	}
 	
-	while( c )
+	for( a = irc->accounts; a; a = a->next )
 	{
-		if( ((struct gaim_connection *)c->data)->flags & OPT_LOGGED_IN )
-			proto_away( c->data, u->away );
+		struct gaim_connection *gc = a->gc;
 		
-		c = c->next;
+		if( gc && gc->flags & OPT_LOGGED_IN )
+			proto_away( gc, u->away );
 	}
 }
 
-- 
cgit v1.2.3