===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/server-fn.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -c -r1.13 -r1.14
*** src/usr.bin/tmux/server-fn.c	2009/08/08 21:52:43	1.13
--- src/usr.bin/tmux/server-fn.c	2009/08/11 17:18:35	1.14
***************
*** 1,4 ****
! /* $OpenBSD: server-fn.c,v 1.13 2009/08/08 21:52:43 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
--- 1,4 ----
! /* $OpenBSD: server-fn.c,v 1.14 2009/08/11 17:18:35 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
***************
*** 55,72 ****
  server_write_client(
      struct client *c, enum msgtype type, const void *buf, size_t len)
  {
! 	struct hdr	 hdr;
  
  	if (c->flags & CLIENT_BAD)
  		return;
! 	log_debug("writing %d to client %d", type, c->fd);
! 
! 	hdr.type = type;
! 	hdr.size = len;
! 
! 	buffer_write(c->out, &hdr, sizeof hdr);
! 	if (buf != NULL && len > 0)
! 		buffer_write(c->out, buf, len);
  }
  
  void
--- 55,66 ----
  server_write_client(
      struct client *c, enum msgtype type, const void *buf, size_t len)
  {
! 	struct imsgbuf	*ibuf = &c->ibuf;
  
  	if (c->flags & CLIENT_BAD)
  		return;
! 	log_debug("writing %d to client %d", type, c->ibuf.fd);
! 	imsg_compose(ibuf, type, PROTOCOL_VERSION, -1, -1, (void *) buf, len);
  }
  
  void