===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/rdist/expand.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -c -r1.6 -r1.7
*** src/usr.bin/rdist/expand.c	1998/08/13 03:29:09	1.6
--- src/usr.bin/rdist/expand.c	2001/11/19 19:02:15	1.7
***************
*** 1,4 ****
! /*	$OpenBSD: expand.c,v 1.6 1998/08/13 03:29:09 deraadt Exp $	*/
  
  /*
   * Copyright (c) 1983 Regents of the University of California.
--- 1,4 ----
! /*	$OpenBSD: expand.c,v 1.7 2001/11/19 19:02:15 mpech Exp $	*/
  
  /*
   * Copyright (c) 1983 Regents of the University of California.
***************
*** 39,45 ****
  "$From: expand.c,v 6.18 1998/03/24 00:37:10 michaelc Exp $";
  #else
  static char RCSid[] = 
! "$OpenBSD: expand.c,v 1.6 1998/08/13 03:29:09 deraadt Exp $";
  #endif
  
  static char sccsid[] = "@(#)expand.c	5.2 (Berkeley) 3/28/86";
--- 39,45 ----
  "$From: expand.c,v 6.18 1998/03/24 00:37:10 michaelc Exp $";
  #else
  static char RCSid[] = 
! "$OpenBSD: expand.c,v 1.7 2001/11/19 19:02:15 mpech Exp $";
  #endif
  
  static char sccsid[] = "@(#)expand.c	5.2 (Berkeley) 3/28/86";
***************
*** 80,88 ****
  		      sizeof(*sortbase), argcmp), sortbase = &eargv[eargc]
  
  static void Cat(s1, s2)				/* quote in s1 and s2 */
! 	register u_char *s1, *s2;
  {
! 	register char *cp;
  	int len = strlen((char *)s1) + strlen((char *)s2) + 2;
  
  	if ((eargc + 1) >= MAXEARGS) {
--- 80,88 ----
  		      sizeof(*sortbase), argcmp), sortbase = &eargv[eargc]
  
  static void Cat(s1, s2)				/* quote in s1 and s2 */
! 	u_char *s1, *s2;
  {
! 	char *cp;
  	int len = strlen((char *)s1) + strlen((char *)s2) + 2;
  
  	if ((eargc + 1) >= MAXEARGS) {
***************
*** 130,137 ****
  	struct namelist *list;
  	int wh;
  {
! 	register struct namelist *nl, *prev;
! 	register int n;
  	char pathbuf[BUFSIZ];
  
  	if (debug)
--- 130,137 ----
  	struct namelist *list;
  	int wh;
  {
! 	struct namelist *nl, *prev;
! 	int n;
  	char pathbuf[BUFSIZ];
  
  	if (debug)
***************
*** 181,187 ****
  	u_char *str;
  	int ch;
  {
! 	register u_char *cp;
  
  	for (cp = str; cp && *cp != CNULL; ++cp)
  		if (ch == *cp)
--- 181,187 ----
  	u_char *str;
  	int ch;
  {
! 	u_char *cp;
  
  	for (cp = str; cp && *cp != CNULL; ++cp)
  		if (ch == *cp)
***************
*** 193,200 ****
  void expstr(s)
  	u_char *s;
  {
! 	register u_char *cp, *cp1;
! 	register struct namelist *tp;
  	u_char *tail;
  	u_char ebuf[BUFSIZ];
  	u_char varbuff[BUFSIZ];
--- 193,200 ----
  void expstr(s)
  	u_char *s;
  {
! 	u_char *cp, *cp1;
! 	struct namelist *tp;
  	u_char *tail;
  	u_char ebuf[BUFSIZ];
  	u_char varbuff[BUFSIZ];
***************
*** 340,347 ****
  void expsh(s)				/* quote in s */
  	u_char *s;
  {
! 	register u_char *cp, *oldcp;
! 	register char *spathp;
  	struct stat stb;
  
  	spathp = pathp;
--- 340,347 ----
  void expsh(s)				/* quote in s */
  	u_char *s;
  {
! 	u_char *cp, *oldcp;
! 	char *spathp;
  	struct stat stb;
  
  	spathp = pathp;
***************
*** 379,385 ****
  	char *pattern;
  {
  	struct stat stb;
! 	register DIRENTRY *dp;
  	DIR *dirp;
  
  	dirp = opendir(path);
--- 379,385 ----
  	char *pattern;
  {
  	struct stat stb;
! 	DIRENTRY *dp;
  	DIR *dirp;
  
  	dirp = opendir(path);
***************
*** 420,426 ****
  	u_char *p, *s;
  {
  	u_char restbuf[BUFSIZ + 2];
! 	register u_char *pe, *pm, *pl;
  	int brclev = 0;
  	u_char *lm, savec;
  	char *spathp;
--- 420,426 ----
  	u_char *p, *s;
  {
  	u_char restbuf[BUFSIZ + 2];
! 	u_char *pe, *pm, *pl;
  	int brclev = 0;
  	u_char *lm, savec;
  	char *spathp;
***************
*** 510,517 ****
  match(s, p)					/* quote in p */
  	char *s, *p;
  {
! 	register int c;
! 	register char *sentp;
  	char sexpany = expany;
  
  	if (*s == '.' && *p != '.')
--- 510,517 ----
  match(s, p)					/* quote in p */
  	char *s, *p;
  {
! 	int c;
! 	char *sentp;
  	char sexpany = expany;
  
  	if (*s == '.' && *p != '.')
***************
*** 526,535 ****
  
  int
  amatch(s, p)					/* quote in p */
! 	register char *s;
! 	register u_char *p;
  {
! 	register int scc;
  	int ok, lc;
  	char *spathp;
  	struct stat stb;
--- 526,535 ----
  
  int
  amatch(s, p)					/* quote in p */
! 	char *s;
! 	u_char *p;
  {
! 	int scc;
  	int ok, lc;
  	char *spathp;
  	struct stat stb;