===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/rdist/distopt.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -c -r1.3 -r1.4
*** src/usr.bin/rdist/distopt.c	1996/06/26 05:38:11	1.3
--- src/usr.bin/rdist/distopt.c	1998/06/26 21:21:07	1.4
***************
*** 1,4 ****
! /*	$OpenBSD: distopt.c,v 1.3 1996/06/26 05:38:11 deraadt Exp $	*/
  
  /*
   * Copyright (c) 1983 Regents of the University of California.
--- 1,4 ----
! /*	$OpenBSD: distopt.c,v 1.4 1998/06/26 21:21:07 millert Exp $	*/
  
  /*
   * Copyright (c) 1983 Regents of the University of California.
***************
*** 34,41 ****
   */
  
  #ifndef lint
  static char RCSid[] = 
! "$OpenBSD: distopt.c,v 1.3 1996/06/26 05:38:11 deraadt Exp $";
  
  static char sccsid[] = "@(#)distopt.c";
  
--- 34,46 ----
   */
  
  #ifndef lint
+ #if 0
  static char RCSid[] = 
! "$From: distopt.c,v 6.10 1996/01/30 01:52:07 mcooper Exp $";
! #else
! static char RCSid[] = 
! "$OpenBSD: distopt.c,v 1.4 1998/06/26 21:21:07 millert Exp $";
! #endif
  
  static char sccsid[] = "@(#)distopt.c";
  
***************
*** 89,95 ****
  		if (strcasecmp(name, distoptinfo[i].do_name) == 0)
  			return(&distoptinfo[i]);
  
! 	return((DISTOPTINFO *) NULL);
  }
  
  /*
--- 94,100 ----
  		if (strcasecmp(name, distoptinfo[i].do_name) == 0)
  			return(&distoptinfo[i]);
  
! 	return(NULL);
  }
  
  /*
***************
*** 110,116 ****
  	string = strdup(str);
  
  	for (optstr = strtok(string, ","); optstr;
! 	     optstr = strtok((char *) NULL, ",")) {
  		if (strncasecmp(optstr, "no", 2) == 0)
  			negate = TRUE;
  		else
--- 115,121 ----
  	string = strdup(str);
  
  	for (optstr = strtok(string, ","); optstr;
! 	     optstr = strtok(NULL, ",")) {
  		if (strncasecmp(optstr, "no", 2) == 0)
  			negate = TRUE;
  		else
***************
*** 121,127 ****
  		 * and the option starts with "no", strip "no"
  		 * from option and retry lookup.
  		 */
! 		if (distopt = getdistopt(optstr)) {
  			FLAG_ON(*optptr, distopt->do_value);
  			continue;
  		}
--- 126,132 ----
  		 * and the option starts with "no", strip "no"
  		 * from option and retry lookup.
  		 */
! 		if ((distopt = getdistopt(optstr))) {
  			FLAG_ON(*optptr, distopt->do_value);
  			continue;
  		}