Changeset fef7813

Timestamp:

2010-09-05T11:31:22Z (14 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

ed320e8

Parents:

41e0c00

Message:

Fix compiler warnings. Also fixing irc_send_motd(), which so far got away
with a horrible practice of reading the MOTD file one by one.

Files:

• bitlbee.c (modified) (1 diff)
• help.c (modified) (1 diff)
• irc_send.c (modified) (5 diffs)
• motd.txt (modified) (1 diff)
• protocols/oscar/ssi.c (modified) (1 diff)
• unix.c (modified) (1 diff)

bitlbee.c

@@ -136 +136 @@
                 
                 setsid();
-                chdir( "/" );
+                i = chdir( "/" );
+                /* Don't use i, just make gcc happy. :-/ */
                 
                 if( getenv( "_BITLBEE_RESTART_STATE" ) == NULL )

help.c

@@ -157 +157 @@
                         }
                         
-                        lseek( h->fd, h->offset.file_offset, SEEK_SET );
-                        read( h->fd, s, h->length );
+                        if( lseek( h->fd, h->offset.file_offset, SEEK_SET ) == -1 ||
+                            read( h->fd, s, h->length ) != h->length )
+                                return NULL;
                 }
                 else

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 );
-        }
 }
 

motd.txt

@@ -17 +17 @@
  
 ... Buzzing, haha, get it?
+%

protocols/oscar/ssi.c

@@ -415 +415 @@
                 if (!parentgroup) {
                         char *newgroup;
-                        newgroup = (char*)g_malloc(strlen("Unknown")*sizeof(char));
+                        newgroup = (char*)g_malloc(strlen("Unknown")+1);
                         strcpy(newgroup, "Unknown");
                         aim_ssi_addgroups(sess, conn, &newgroup, 1);

unix.c

@@ -167 +167 @@
                    doesn't make a copy. Odd. */
                 
-                chdir( old_cwd );
+                i = chdir( old_cwd );
                 close( global.listen_socket );