Don't assert() when a pre-defined channel has no topic.

[ngircd.git] / src / ngircd / channel.c

diff --git a/src/ngircd/channel.c b/src/ngircd/channel.c
index edb0f6205dfee3ac896142aa931e0a6fef5c9f2c..922b308337bb310d8ce8f2471df5a04e81cc1597 100644 (file)
--- a/src/ngircd/channel.c
+++ b/src/ngircd/channel.c
@@ -17,7 +17,7 @@
 
 #include "portab.h"
 
-static char UNUSED id[] = "$Id: channel.c,v 1.52 2005/07/28 16:23:55 fw Exp $";
+static char UNUSED id[] = "$Id: channel.c,v 1.56 2006/07/24 22:54:09 alex Exp $";
 
 #include "imp.h"
 #include <assert.h>
@@ -50,16 +50,16 @@ static char UNUSED id[] = "$Id: channel.c,v 1.52 2005/07/28 16:23:55 fw Exp $";
 #define REMOVE_KICK 2
 
 
-LOCAL CHANNEL *My_Channels;
-LOCAL CL2CHAN *My_Cl2Chan;
+static CHANNEL *My_Channels;
+static CL2CHAN *My_Cl2Chan;
 
 
-LOCAL CL2CHAN *Get_Cl2Chan PARAMS(( CHANNEL *Chan, CLIENT *Client ));
-LOCAL CL2CHAN *Add_Client PARAMS(( CHANNEL *Chan, CLIENT *Client ));
-LOCAL bool Remove_Client PARAMS(( int Type, CHANNEL *Chan, CLIENT *Client, CLIENT *Origin, char *Reason, bool InformServer ));
-LOCAL CL2CHAN *Get_First_Cl2Chan PARAMS(( CLIENT *Client, CHANNEL *Chan ));
-LOCAL CL2CHAN *Get_Next_Cl2Chan PARAMS(( CL2CHAN *Start, CLIENT *Client, CHANNEL *Chan ));
-LOCAL bool Delete_Channel PARAMS(( CHANNEL *Chan ));
+static CL2CHAN *Get_Cl2Chan PARAMS(( CHANNEL *Chan, CLIENT *Client ));
+static CL2CHAN *Add_Client PARAMS(( CHANNEL *Chan, CLIENT *Client ));
+static bool Remove_Client PARAMS(( int Type, CHANNEL *Chan, CLIENT *Client, CLIENT *Origin, char *Reason, bool InformServer ));
+static CL2CHAN *Get_First_Cl2Chan PARAMS(( CLIENT *Client, CHANNEL *Chan ));
+static CL2CHAN *Get_Next_Cl2Chan PARAMS(( CL2CHAN *Start, CLIENT *Client, CHANNEL *Chan ));
+static bool Delete_Channel PARAMS(( CHANNEL *Chan ));
 
 
 GLOBAL void
@@ -100,22 +100,26 @@ Channel_InitPredefined( void )
                        array_free(&Conf_Channel[i].topic);
                        continue;
                }
-               
-               /* Channel anlegen */
-               chan = Channel_Create( Conf_Channel[i].name );
-               if( chan )
-               {
-                       Channel_ModeAdd( chan, 'P' );
-                       if (!array_copy(&chan->topic, &Conf_Channel[i].topic)) {
-                               Log( LOG_WARNING, "Could not set topic for new pre-defined channel: %s",
-                                                                                       strerror(errno));
-                       }
+
+               /* Create channel */
+               chan = Channel_Create(Conf_Channel[i].name);
+               if (chan) {
+                       Channel_ModeAdd(chan, 'P');
+
+                       if (array_start(&Conf_Channel[i].topic) != NULL)
+                               Channel_SetTopic(chan, NULL,
+                                        array_start(&Conf_Channel[i].topic));
                        array_free(&Conf_Channel[i].topic);
+
                        c = Conf_Channel[i].modes;
-                       while( *c ) Channel_ModeAdd( chan, *c++ );
-                       Log( LOG_INFO, "Created pre-defined channel \"%s\".", Conf_Channel[i].name );
+                       while (*c)
+                               Channel_ModeAdd(chan, *c++);
+               
+                       Log(LOG_INFO, "Created pre-defined channel \"%s\".",
+                                                       Conf_Channel[i].name );
                }
-               else Log( LOG_ERR, "Can't create pre-defined channel \"%s\"!", Conf_Channel[i].name );
+               else Log(LOG_ERR, "Can't create pre-defined channel \"%s\"!",
+                                                       Conf_Channel[i].name );
        }
 } /* Channel_InitPredefined */
 
@@ -155,17 +159,13 @@ Channel_Join( CLIENT *Client, char *Name )
        assert( Client != NULL );
        assert( Name != NULL );
 
-       /* Valider Channel-Name? */
-       if( ! Channel_IsValidName( Name ))
-       {
+       if( ! Channel_IsValidName( Name )) {
                IRC_WriteStrClient( Client, ERR_NOSUCHCHANNEL_MSG, Client_ID( Client ), Name );
                return false;
        }
 
-       /* Channel suchen */
        chan = Channel_Search( Name );
-       if( chan )
-       {
+       if( chan ) {
                /* Ist der Client bereits Mitglied? */
                if( Get_Cl2Chan( chan, Client )) return false;
        }
@@ -191,7 +191,6 @@ Channel_Part( CLIENT *Client, CLIENT *Origin, char *Name, char *Reason )
        assert( Name != NULL );
        assert( Reason != NULL );
 
-       /* Channel suchen */
        chan = Channel_Search( Name );
        if(( ! chan ) || ( ! Get_Cl2Chan( chan, Client )))
        {
@@ -223,21 +222,20 @@ Channel_Kick( CLIENT *Client, CLIENT *Origin, char *Name, char *Reason )
                return;
        }
 
-       /* Ist der User Mitglied in dem Channel? */
        if( ! Channel_IsMemberOf( chan, Origin ))
        {
                IRC_WriteStrClient( Origin, ERR_NOTONCHANNEL_MSG, Client_ID( Origin ), Name );
                return;
        }
 
-       /* Ist der User Channel-Operator? */
+       /* Is User Channel-Operator? */
        if( ! strchr( Channel_UserModes( chan, Origin ), 'o' ))
        {
                IRC_WriteStrClient( Origin, ERR_CHANOPRIVSNEEDED_MSG, Client_ID( Origin ), Name);
                return;
        }
 
-       /* Ist der Ziel-User Mitglied im Channel? */
+       /* Ist the kickED User member of channel? */
        if( ! Channel_IsMemberOf( chan, Client ))
        {
                IRC_WriteStrClient( Origin, ERR_USERNOTINCHANNEL_MSG, Client_ID( Origin ), Client_ID( Client ), Name );
@@ -517,13 +515,11 @@ Channel_ModeDel( CHANNEL *Chan, char Mode )
         * if the mode was removed return true.
         * if the channel did not have the mode, return false.
        */
-       char x[2], *p;
+       char *p;
 
        assert( Chan != NULL );
 
-       x[0] = Mode; x[1] = '\0';
-
-       p = strchr( Chan->modes, x[0] );
+       p = strchr( Chan->modes, Mode );
        if( ! p ) return false;
 
        /* Channel has mode -> delete */
@@ -573,7 +569,7 @@ Channel_UserModeDel( CHANNEL *Chan, CLIENT *Client, char Mode )
         */
 
        CL2CHAN *cl2chan;
-       char x[2], *p;
+       char *p;
 
        assert( Chan != NULL );
        assert( Client != NULL );
@@ -581,9 +577,7 @@ Channel_UserModeDel( CHANNEL *Chan, CLIENT *Client, char Mode )
        cl2chan = Get_Cl2Chan( Chan, Client );
        assert( cl2chan != NULL );
 
-       x[0] = Mode; x[1] = '\0';
-
-       p = strchr( cl2chan->modes, x[0] );
+       p = strchr( cl2chan->modes, Mode );
        if( ! p ) return false;
 
        /* Client has Mode -> delete */
@@ -635,9 +629,29 @@ Channel_Topic( CHANNEL *Chan )
        return ret ? ret : "";
 } /* Channel_Topic */
 
+       
+#ifndef STRICT_RFC
+
+GLOBAL unsigned int
+Channel_TopicTime(CHANNEL *Chan)
+{
+       assert(Chan != NULL);
+       return (unsigned int) Chan->topic_time;
+} /* Channel_TopicTime */
+
+
+GLOBAL char *
+Channel_TopicWho(CHANNEL *Chan)
+{
+       assert(Chan != NULL);
+       return Chan->topic_who;
+} /* Channel_TopicWho */
+
+#endif
+
 
 GLOBAL void
-Channel_SetTopic( CHANNEL *Chan, char *Topic )
+Channel_SetTopic(CHANNEL *Chan, CLIENT *Client, char *Topic)
 {
        size_t len;
        assert( Chan != NULL );
@@ -648,9 +662,22 @@ Channel_SetTopic( CHANNEL *Chan, char *Topic )
                array_free(&Chan->topic);
 
        if (!array_copyb(&Chan->topic, Topic, len))
-               Log(LOG_WARNING, "could not set new Topic %s: %s", Topic, strerror(errno));
+               Log(LOG_WARNING, "could not set new Topic \"%s\" on %s: %s",
+                                       Topic, Chan->name, strerror(errno));
 
        array_cat0(&Chan->topic);
+
+#ifndef STRICT_RFC
+       Chan->topic_time = time(NULL);
+       if (Client != NULL && Client_Type(Client) != CLIENT_SERVER)
+               strlcpy(Chan->topic_who, Client_ID(Client),
+                       sizeof Chan->topic_who);
+       else
+               strlcpy(Chan->topic_who, DEFAULT_TOPIC_ID,
+                       sizeof Chan->topic_who);
+#else
+       (void) Client;
+#endif
 } /* Channel_SetTopic */
 
 
@@ -707,7 +734,7 @@ Channel_Write( CHANNEL *Chan, CLIENT *From, CLIENT *Client, char *Text )
        /* Is the client banned? */
        if( Lists_CheckBanned( From, Chan ))
        {
-               /* Client is banned, bus is he channel operator or has voice? */
+               /* Client is banned, but is he channel operator or has voice? */
                if(( ! has_voice ) && ( ! is_op )) ok = false;
        }
 
@@ -745,7 +772,7 @@ Channel_Create( char *Name )
 } /* Channel_Create */
 
 
-LOCAL CL2CHAN *
+static CL2CHAN *
 Get_Cl2Chan( CHANNEL *Chan, CLIENT *Client )
 {
        CL2CHAN *cl2chan;
@@ -763,7 +790,7 @@ Get_Cl2Chan( CHANNEL *Chan, CLIENT *Client )
 } /* Get_Cl2Chan */
 
 
-LOCAL CL2CHAN *
+static CL2CHAN *
 Add_Client( CHANNEL *Chan, CLIENT *Client )
 {
        CL2CHAN *cl2chan;
@@ -792,7 +819,7 @@ Add_Client( CHANNEL *Chan, CLIENT *Client )
 } /* Add_Client */
 
 
-LOCAL bool
+static bool
 Remove_Client( int Type, CHANNEL *Chan, CLIENT *Client, CLIENT *Origin, char *Reason, bool InformServer )
 {
        CL2CHAN *cl2chan, *last_cl2chan;
@@ -855,14 +882,14 @@ Remove_Client( int Type, CHANNEL *Chan, CLIENT *Client, CLIENT *Origin, char *Re
 } /* Remove_Client */
 
 
-LOCAL CL2CHAN *
+static CL2CHAN *
 Get_First_Cl2Chan( CLIENT *Client, CHANNEL *Chan )
 {
        return Get_Next_Cl2Chan( My_Cl2Chan, Client, Chan );
 } /* Get_First_Cl2Chan */
 
 
-LOCAL CL2CHAN *
+static CL2CHAN *
 Get_Next_Cl2Chan( CL2CHAN *Start, CLIENT *Client, CHANNEL *Channel )
 {
        CL2CHAN *cl2chan;
@@ -880,7 +907,7 @@ Get_Next_Cl2Chan( CL2CHAN *Start, CLIENT *Client, CHANNEL *Channel )
 } /* Get_Next_Cl2Chan */
 
 
-LOCAL bool
+static bool
 Delete_Channel( CHANNEL *Chan )
 {
        /* Channel-Struktur loeschen */