ircd startup: avoid black magic with file descriptors

[solanum.git] / ircd / send.c

diff --git a/ircd/send.c b/ircd/send.c
index d89c1d610c34dbbdd37ad9c11f23bb2b590ab8fd..29f308581f0aa19a767cacb7a2e0451fa61600ba 100644 (file)
--- a/ircd/send.c
+++ b/ircd/send.c
@@ -20,8 +20,6 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
  *  USA
- *
- *  $Id: send.c 3520 2007-06-30 22:15:35Z jilles $
  */
 
 #include "stdinc.h"
@@ -29,7 +27,6 @@
 #include "channel.h"
 #include "class.h"
 #include "client.h"
-#include "common.h"
 #include "match.h"
 #include "ircd.h"
 #include "numeric.h"
@@ -220,12 +217,12 @@ send_queued_write(rb_fde_t *F, void *data)
 static void
 linebuf_put_msgvbuf(struct MsgBuf *msgbuf, buf_head_t *linebuf, unsigned int capmask, const char *pattern, va_list *va)
 {
-       char buf[IRCD_BUFSIZE];
+       char buf[BUFSIZE];
 
        rb_linebuf_newbuf(linebuf);
        msgbuf_unparse_prefix(buf, sizeof buf, msgbuf, capmask);
        rb_linebuf_putprefix(linebuf, pattern, va, buf);
-} 
+}
 
 /* linebuf_put_msgbuf
  *
@@ -261,10 +258,12 @@ build_msgbuf_from(struct MsgBuf *msgbuf, struct Client *from, const char *cmd)
        msgbuf->origin = buf;
        msgbuf->cmd = cmd;
 
-       if (IsPerson(from))
+       if (from != NULL && IsPerson(from))
                snprintf(buf, sizeof buf, "%s!%s@%s", from->name, from->username, from->host);
-       else
+       else if (from != NULL)
                rb_strlcpy(buf, from->name, sizeof buf);
+       else
+               rb_strlcpy(buf, me.name, sizeof buf);
 
        hdata.client = from;
        hdata.arg1 = msgbuf;
@@ -484,7 +483,6 @@ sendto_server(struct Client *one, struct Channel *chptr, unsigned long caps,
        }
 
        rb_linebuf_donebuf(&linebuf);
-
 }
 
 /* sendto_channel_flags()
@@ -497,7 +495,7 @@ void
 sendto_channel_flags(struct Client *one, int type, struct Client *source_p,
                     struct Channel *chptr, const char *pattern, ...)
 {
-       char buf[IRCD_BUFSIZE];
+       char buf[BUFSIZE];
        va_list args;
        buf_head_t rb_linebuf_local;
        buf_head_t rb_linebuf_id;
@@ -505,7 +503,7 @@ sendto_channel_flags(struct Client *one, int type, struct Client *source_p,
        struct membership *msptr;
        rb_dlink_node *ptr;
        rb_dlink_node *next_ptr;
-       unsigned int current_capmask = 0;
+       int current_capmask = 0;
        struct MsgBuf msgbuf;
 
        rb_linebuf_newbuf(&rb_linebuf_local);