Commit Diff
Diff:
721573703874030aa7d5c3091282cf45f5230573
c8fb6a22584dae026557da9f7654cbc14e909da9
Commit:
c8fb6a22584dae026557da9f7654cbc14e909da9
Tree:
e8596ff49ba3e24f90653be4da615a693c477442
Author:
Florian Westphal <fw@strlen.de>
Committer:
Florian Westphal <fw@strlen.de>
Date:
Fri Jan 27 17:19:58 2006 UTC
Message:
simplify IRC_Show_MOTD()
blob - e4f65a51f697c083b8afbb8d78e54e293bae3f53
blob + 45fc814d33076712895b556a59e65df41cdcb184
--- src/ngircd/irc-info.c
+++ src/ngircd/irc-info.c
@@ -14,7 +14,7 @@
#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 <assert.h>
@@ -870,47 +870,59 @@ IRC_Send_LUSERS( CLIENT *Client )
} /* 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
IRC_Show_MOTD( CLIENT *Client )
{
- bool ok;
char line[127];
FILE *fd;
assert( Client != NULL );
- if( Conf_MotdPhrase[0] )
- {
- if( ! IRC_WriteStrClient( Client, RPL_MOTDSTART_MSG, Client_ID( Client ), Client_ID( Client_ThisServer( )))) return DISCONNECTED;
- if( ! IRC_WriteStrClient( Client, RPL_MOTD_MSG, Client_ID( Client ), Conf_MotdPhrase )) return DISCONNECTED;
- return IRC_WriteStrClient( Client, RPL_ENDOFMOTD_MSG, Client_ID( Client ));
+ if (Conf_MotdPhrase[0]) {
+ if (!Show_MOTD_Start(Client))
+ return DISCONNECTED;
+ if (!Show_MOTD_Sendline(Client, Conf_MotdPhrase))
+ return DISCONNECTED;
+
+ return Show_MOTD_End(Client);
}
fd = fopen( Conf_MotdFile, "r" );
- if( ! fd )
- {
+ if( ! fd ) {
Log( LOG_WARNING, "Can't read MOTD file \"%s\": %s", Conf_MotdFile, strerror( errno ));
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;
- while( true )
- {
- if( ! fgets( line, sizeof( line ), fd )) break;
+ if (!Show_MOTD_Start( Client ))
+ return DISCONNECTED;
+ while (fgets( line, sizeof( line ), fd )) {
ngt_TrimLastChr( line, '\n');
- if( ! IRC_WriteStrClient( Client, RPL_MOTD_MSG, Client_ID( Client ), line ))
- {
+ if( ! Show_MOTD_Sendline( Client, line)) {
fclose( fd );
return false;
}
}
- ok = IRC_WriteStrClient( Client, RPL_ENDOFMOTD_MSG, Client_ID( Client ) );
-
- fclose( fd );
-
- return ok;
+ fclose(fd);
+ return Show_MOTD_End(Client);
} /* IRC_Show_MOTD */
IRCNow