===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/rdistd/server.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -c -r1.9 -r1.10
*** src/usr.bin/rdistd/server.c	2001/09/19 10:58:07	1.9
--- src/usr.bin/rdistd/server.c	2001/11/19 19:02:15	1.10
***************
*** 1,4 ****
! /*	$OpenBSD: server.c,v 1.9 2001/09/19 10:58:07 mpech Exp $	*/
  
  /*
   * Copyright (c) 1983 Regents of the University of California.
--- 1,4 ----
! /*	$OpenBSD: server.c,v 1.10 2001/11/19 19:02:15 mpech Exp $	*/
  
  /*
   * Copyright (c) 1983 Regents of the University of California.
***************
*** 38,44 ****
  "$From: server.c,v 6.85 1996/03/12 22:55:38 mcooper Exp $";
  #else
  static char RCSid[] = 
! "$OpenBSD: server.c,v 1.9 2001/09/19 10:58:07 mpech Exp $";
  #endif
  
  static char sccsid[] = "@(#)server.c	5.3 (Berkeley) 6/7/86";
--- 38,44 ----
  "$From: server.c,v 6.85 1996/03/12 22:55:38 mcooper Exp $";
  #else
  static char RCSid[] = 
! "$OpenBSD: server.c,v 1.10 2001/11/19 19:02:15 mpech Exp $";
  #endif
  
  static char sccsid[] = "@(#)server.c	5.3 (Berkeley) 6/7/86";
***************
*** 196,202 ****
  	static UID_T last_uid = (UID_T)-2;
  	static GID_T last_primegid;
  	extern char *locuser;
! 	register int i;
  	UID_T uid;
  	GID_T gid;
  	GID_T primegid = (GID_T)-2;
--- 196,202 ----
  	static UID_T last_uid = (UID_T)-2;
  	static GID_T last_primegid;
  	extern char *locuser;
! 	int i;
  	UID_T uid;
  	GID_T gid;
  	GID_T primegid = (GID_T)-2;
***************
*** 324,330 ****
  {
  	DIR *d;
  	static DIRENTRY *dp;
! 	register char *cp;
  	struct stat stb;
  	char *optarget;
  	int len, failures = 0;
--- 324,330 ----
  {
  	DIR *d;
  	static DIRENTRY *dp;
! 	char *cp;
  	struct stat stb;
  	char *optarget;
  	int len, failures = 0;
***************
*** 413,422 ****
   * for extraneous files and remove them.
   */
  static void doclean(cp)
! 	register char *cp;
  {
  	DIR *d;
! 	register DIRENTRY *dp;
  	struct stat stb;
  	char *optarget, *ep;
  	int len;
--- 413,422 ----
   * for extraneous files and remove them.
   */
  static void doclean(cp)
! 	char *cp;
  {
  	DIR *d;
! 	DIRENTRY *dp;
  	struct stat stb;
  	char *optarget, *ep;
  	int len;
***************
*** 480,486 ****
   * Frontend to doclean().
   */
  static void clean(cp)
! 	register char *cp;
  {
  	doclean(cp);
  	(void) sendcmd(CC_END, NULL);
--- 480,486 ----
   * Frontend to doclean().
   */
  static void clean(cp)
! 	char *cp;
  {
  	doclean(cp);
  	(void) sendcmd(CC_END, NULL);
***************
*** 508,514 ****
   */
  static void docmdspecial()
  {
! 	register char *cp;
  	char *cmd, *env = NULL;
  	int n;
  	int len;
--- 508,514 ----
   */
  static void docmdspecial()
  {
! 	char *cp;
  	char *cmd, *env = NULL;
  	int n;
  	int len;
***************
*** 666,672 ****
  	char *name;
  	opt_t opts;
  {
! 	register char *cp;
  	struct stat stb;
  	int r = -1;
  
--- 666,672 ----
  	char *name;
  	opt_t opts;
  {
! 	char *cp;
  	struct stat stb;
  	int r = -1;
  
***************
*** 759,765 ****
  {
  	int f, wrerr, olderrno, lastwashole = 0, wassparse = 0;
  	off_t i;
! 	register char *cp;
  	char *savefile = NULL;
  	static struct stat statbuff;
  
--- 759,765 ----
  {
  	int f, wrerr, olderrno, lastwashole = 0, wassparse = 0;
  	off_t i;
! 	char *cp;
  	char *savefile = NULL;
  	static struct stat statbuff;
  
***************
*** 986,992 ****
  	char *owner, *group;
  {
  	static char lowner[100], lgroup[100];
! 	register char *cp;
  	struct stat stb;
  	int s;
  
--- 986,992 ----
  	char *owner, *group;
  {
  	static char lowner[100], lgroup[100];
! 	char *cp;
  	struct stat stb;
  	int s;
  
***************
*** 1304,1310 ****
  static void setconfig(cmd)
  	char *cmd;
  {
! 	register char *cp = cmd;
  	char *estr;
  
  	switch (*cp++) {
--- 1304,1310 ----
  static void setconfig(cmd)
  	char *cmd;
  {
! 	char *cp = cmd;
  	char *estr;
  
  	switch (*cp++) {
***************
*** 1581,1588 ****
  extern void server()
  {
  	static char cmdbuf[BUFSIZ];
! 	register char *cp;
! 	register int n;
  	extern jmp_buf finish_jmpbuf;
  
  	if (setjmp(finish_jmpbuf)) {
--- 1581,1588 ----
  extern void server()
  {
  	static char cmdbuf[BUFSIZ];
! 	char *cp;
! 	int n;
  	extern jmp_buf finish_jmpbuf;
  
  	if (setjmp(finish_jmpbuf)) {