===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/rdist/common.c,v
retrieving revision 1.23
retrieving revision 1.24
diff -c -r1.23 -r1.24
*** src/usr.bin/rdist/common.c	2009/10/27 23:59:42	1.23
--- src/usr.bin/rdist/common.c	2011/04/10 15:47:28	1.24
***************
*** 1,4 ****
! /*	$OpenBSD: common.c,v 1.23 2009/10/27 23:59:42 deraadt Exp $	*/
  
  /*
   * Copyright (c) 1983 Regents of the University of California.
--- 1,4 ----
! /*	$OpenBSD: common.c,v 1.24 2011/04/10 15:47:28 krw Exp $	*/
  
  /*
   * Copyright (c) 1983 Regents of the University of California.
***************
*** 69,75 ****
  char			defgroup[64] = "bin";	/* Default group */
  
  static int sendcmdmsg(int, char *, size_t);
! static int remread(int, u_char *, int);
  static int remmore(void);
  
  /* 
--- 69,75 ----
  char			defgroup[64] = "bin";	/* Default group */
  
  static int sendcmdmsg(int, char *, size_t);
! static ssize_t remread(int, u_char *, size_t);
  static int remmore(void);
  
  /* 
***************
*** 354,368 ****
   */
  static u_char rembuf[BUFSIZ];
  static u_char *remptr;
! static int remleft;
  
  #define remc() (--remleft < 0 ? remmore() : *remptr++)
  
  /*
   * Back end to remote read()
   */
! static int
! remread(int fd, u_char *buf, int bufsiz)
  {
  	return(read(fd, (char *)buf, bufsiz));
  }
--- 354,368 ----
   */
  static u_char rembuf[BUFSIZ];
  static u_char *remptr;
! static ssize_t remleft;
  
  #define remc() (--remleft < 0 ? remmore() : *remptr++)
  
  /*
   * Back end to remote read()
   */
! static ssize_t 
! remread(int fd, u_char *buf, size_t bufsiz)
  {
  	return(read(fd, (char *)buf, bufsiz));
  }
***************
*** 452,459 ****
  /*
   * Non-line-oriented remote read.
   */
! int
! readrem(char *p, int space)
  {
  	if (remleft <= 0) {
  		/*
--- 452,459 ----
  /*
   * Non-line-oriented remote read.
   */
! ssize_t
! readrem(char *p, ssize_t space)
  {
  	if (remleft <= 0) {
  		/*