mirrors/ngircd
1
0
Fork 0
mirror of https://github.com/osmarks/ngircd.git synced 2024-10-28 04:46:17 +00:00
Code Issues Releases Wiki Activity

simplify IRC_Show_MOTD()

Browse Source
This commit is contained in:
Florian Westphal 2006-01-27 17:19:58 +00:00
parent 7215737038
commit c8fb6a2258
1 changed files with 32 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
src/ngircd/irc-info.c
View File

@ -14,7 +14,7 @@
#include "portab.h" #include "portab.h"
static char UNUSED id[] = "$Id: irc-info.c,v 1.30 2005/06/17 19:15:43 fw Exp $"; static char UNUSED id[] = "$Id: irc-info.c,v 1.31 2006/01/27 17:19:58 fw Exp $";
#include "imp.h" #include "imp.h"
#include <assert.h> #include <assert.h>
@ -870,47 +870,59 @@ IRC_Send_LUSERS( CLIENT *Client )
} /* IRC_Send_LUSERS */ } /* IRC_Send_LUSERS */
static bool Show_MOTD_Start(CLIENT *Client)
{
return IRC_WriteStrClient(Client, RPL_MOTDSTART_MSG,
Client_ID( Client ), Client_ID( Client_ThisServer( )));
}
static bool Show_MOTD_Sendline(CLIENT *Client, const char *msg)
{
return IRC_WriteStrClient(Client, RPL_MOTD_MSG, Client_ID( Client ), msg);
}
static bool Show_MOTD_End(CLIENT *Client)
{
return IRC_WriteStrClient( Client, RPL_ENDOFMOTD_MSG, Client_ID( Client ));
}
GLOBAL bool GLOBAL bool
IRC_Show_MOTD( CLIENT *Client ) IRC_Show_MOTD( CLIENT *Client )
{ {
bool ok;
char line[127]; char line[127];
FILE *fd; FILE *fd;
assert( Client != NULL ); assert( Client != NULL );
if( Conf_MotdPhrase[0] ) if (Conf_MotdPhrase[0]) {
{ if (!Show_MOTD_Start(Client))
if( ! IRC_WriteStrClient( Client, RPL_MOTDSTART_MSG, Client_ID( Client ), Client_ID( Client_ThisServer( )))) return DISCONNECTED; return DISCONNECTED;
if( ! IRC_WriteStrClient( Client, RPL_MOTD_MSG, Client_ID( Client ), Conf_MotdPhrase )) return DISCONNECTED; if (!Show_MOTD_Sendline(Client, Conf_MotdPhrase))
return IRC_WriteStrClient( Client, RPL_ENDOFMOTD_MSG, Client_ID( Client )); return DISCONNECTED;
return Show_MOTD_End(Client);
} }
fd = fopen( Conf_MotdFile, "r" ); fd = fopen( Conf_MotdFile, "r" );
if( ! fd ) if( ! fd ) {
{
Log( LOG_WARNING, "Can't read MOTD file \"%s\": %s", Conf_MotdFile, strerror( errno )); Log( LOG_WARNING, "Can't read MOTD file \"%s\": %s", Conf_MotdFile, strerror( errno ));
return IRC_WriteStrClient( Client, ERR_NOMOTD_MSG, Client_ID( Client ) ); return IRC_WriteStrClient( Client, ERR_NOMOTD_MSG, Client_ID( Client ) );
} }
if( ! IRC_WriteStrClient( Client, RPL_MOTDSTART_MSG, Client_ID( Client ), Client_ID( Client_ThisServer( )))) return DISCONNECTED; if (!Show_MOTD_Start( Client ))
while( true ) return DISCONNECTED;
{
if( ! fgets( line, sizeof( line ), fd )) break;
while (fgets( line, sizeof( line ), fd )) {
ngt_TrimLastChr( line, '\n'); ngt_TrimLastChr( line, '\n');
if( ! IRC_WriteStrClient( Client, RPL_MOTD_MSG, Client_ID( Client ), line )) if( ! Show_MOTD_Sendline( Client, line)) {
{
fclose( fd ); fclose( fd );
return false; return false;
} }
} }
ok = IRC_WriteStrClient( Client, RPL_ENDOFMOTD_MSG, Client_ID( Client ) ); fclose(fd);
return Show_MOTD_End(Client);
fclose( fd );
return ok;
} /* IRC_Show_MOTD */ } /* IRC_Show_MOTD */