Changes in irc_send.c [a72af0d:ed320e8]

File:

• irc_send.c (modified) (5 diffs)

irc_send.c

@@ -53 +53 @@
 void irc_send_motd( irc_t *irc )
 {
+        char motd[2048];
+        size_t len;
         int fd;
         
         fd = open( global.conf->motdfile, O_RDONLY );
-        if( fd == -1 )
+        if( fd == -1 || ( len = read( fd, motd, sizeof( motd ) - 1 ) ) <= 0 )
         {
                 irc_send_num( irc, 422, ":We don't need MOTDs." );
@@ -62 +64 @@
         else
         {
-                char linebuf[80];       /* Max. line length for MOTD's is 79 chars. It's what most IRC networks seem to do. */
-                char *add, max;
-                int len;
-                
+                char linebuf[80];
+                char *add = "", max, *in;
+                
+                in = motd;
+                motd[len] = '\0';
                 linebuf[79] = len = 0;
                 max = sizeof( linebuf ) - 1;
                 
                 irc_send_num( irc, 375, ":- %s Message Of The Day - ", irc->root->host );
-                while( read( fd, linebuf + len, 1 ) == 1 )
+                while( ( linebuf[len] = *(in++) ) )
                 {
                         if( linebuf[len] == '\n' || len == max )
@@ -80 +83 @@
                         else if( linebuf[len] == '%' )
                         {
-                                read( fd, linebuf + len, 1 );
+                                linebuf[len] = *(in++);
                                 if( linebuf[len] == 'h' )
                                         add = irc->root->host;
@@ -87 +90 @@
                                 else if( linebuf[len] == 'n' )
                                         add = irc->user->nick;
+                                else if( linebuf[len] == '\0' )
+                                        in --;
                                 else
                                         add = "%";
@@ -99 +104 @@
                 }
                 irc_send_num( irc, 376, ":End of MOTD" );
+        }
+        
+        if( fd != -1 )
                 close( fd );
-        }
 }