===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/oldrdist/Attic/expand.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -c -r1.7 -r1.8
*** src/usr.bin/oldrdist/Attic/expand.c	2001/07/18 17:17:39	1.7
--- src/usr.bin/oldrdist/Attic/expand.c	2001/11/19 19:02:15	1.8
***************
*** 1,4 ****
! /*	$OpenBSD: expand.c,v 1.7 2001/07/18 17:17:39 pvalchev Exp $	*/
  
  /*
   * Copyright (c) 1983, 1993
--- 1,4 ----
! /*	$OpenBSD: expand.c,v 1.8 2001/11/19 19:02:15 mpech Exp $	*/
  
  /*
   * Copyright (c) 1983, 1993
***************
*** 35,41 ****
  
  #ifndef lint
  /* from: static char sccsid[] = "@(#)expand.c	8.1 (Berkeley) 6/9/93"; */
! static char *rcsid = "$OpenBSD: expand.c,v 1.7 2001/07/18 17:17:39 pvalchev Exp $";
  #endif /* not lint */
  
  #include "defs.h"
--- 35,41 ----
  
  #ifndef lint
  /* from: static char sccsid[] = "@(#)expand.c	8.1 (Berkeley) 6/9/93"; */
! static char *rcsid = "$OpenBSD: expand.c,v 1.8 2001/11/19 19:02:15 mpech Exp $";
  #endif /* not lint */
  
  #include "defs.h"
***************
*** 88,95 ****
  	struct namelist *list;
  	int wh;
  {
! 	register struct namelist *nl, *prev;
! 	register int n;
  	char pathbuf[BUFSIZ];
  	char *argvbuf[GAVSIZ];
  
--- 88,95 ----
  	struct namelist *list;
  	int wh;
  {
! 	struct namelist *nl, *prev;
! 	int n;
  	char pathbuf[BUFSIZ];
  	char *argvbuf[GAVSIZ];
  
***************
*** 99,105 ****
  	}
  
  	if (wh == 0) {
! 		register char *cp;
  
  		for (nl = list; nl != NULL; nl = nl->n_next)
  			for (cp = nl->n_name; *cp; cp++)
--- 99,105 ----
  	}
  
  	if (wh == 0) {
! 		char *cp;
  
  		for (nl = list; nl != NULL; nl = nl->n_next)
  			for (cp = nl->n_name; *cp; cp++)
***************
*** 146,153 ****
  expstr(s)
  	char *s;
  {
! 	register char *cp, *cp1;
! 	register struct namelist *tp;
  	char *tail;
  	char buf[BUFSIZ];
  	int savec, oeargc;
--- 146,153 ----
  expstr(s)
  	char *s;
  {
! 	char *cp, *cp1;
! 	struct namelist *tp;
  	char *tail;
  	char buf[BUFSIZ];
  	int savec, oeargc;
***************
*** 260,267 ****
  expsh(s)
  	char *s;
  {
! 	register char *cp;
! 	register char *spathp, *oldcp;
  	struct stat stb;
  
  	spathp = pathp;
--- 260,267 ----
  expsh(s)
  	char *s;
  {
! 	char *cp;
! 	char *spathp, *oldcp;
  	struct stat stb;
  
  	spathp = pathp;
***************
*** 299,305 ****
  	char *pattern;
  {
  	struct stat stb;
! 	register struct direct *dp;
  	DIR *dirp;
  
  	dirp = opendir(path);
--- 299,305 ----
  	char *pattern;
  {
  	struct stat stb;
! 	struct direct *dp;
  	DIR *dirp;
  
  	dirp = opendir(path);
***************
*** 340,346 ****
  	char *p, *s;
  {
  	char restbuf[BUFSIZ + 2];
! 	register char *pe, *pm, *pl;
  	int brclev = 0;
  	char *lm, savec, *spathp;
  
--- 340,346 ----
  	char *p, *s;
  {
  	char restbuf[BUFSIZ + 2];
! 	char *pe, *pm, *pl;
  	int brclev = 0;
  	char *lm, savec, *spathp;
  
***************
*** 419,426 ****
  match(s, p)
  	char *s, *p;
  {
! 	register int c;
! 	register char *sentp;
  	char sexpany = expany;
  
  	if (*s == '.' && *p != '.')
--- 419,426 ----
  match(s, p)
  	char *s, *p;
  {
! 	int c;
! 	char *sentp;
  	char sexpany = expany;
  
  	if (*s == '.' && *p != '.')
***************
*** 435,443 ****
  
  static int
  amatch(s, p)
! 	register char *s, *p;
  {
! 	register int scc;
  	int ok, lc;
  	char *spathp;
  	struct stat stb;
--- 435,443 ----
  
  static int
  amatch(s, p)
! 	char *s, *p;
  {
! 	int scc;
  	int ok, lc;
  	char *spathp;
  	struct stat stb;
***************
*** 524,532 ****
  
  static int
  smatch(s, p)
! 	register char *s, *p;
  {
! 	register int scc;
  	int ok, lc;
  	int c, cc;
  
--- 524,532 ----
  
  static int
  smatch(s, p)
! 	char *s, *p;
  {
! 	int scc;
  	int ok, lc;
  	int c, cc;
  
***************
*** 583,592 ****
  
  static void
  Cat(s1, s2)
! 	register char *s1, *s2;
  {
  	int len = strlen(s1) + strlen(s2) + 1;
! 	register char *s;
  
  	nleft -= len;
  	if (nleft <= 0 || ++eargc >= GAVSIZ)
--- 583,592 ----
  
  static void
  Cat(s1, s2)
! 	char *s1, *s2;
  {
  	int len = strlen(s1) + strlen(s2) + 1;
! 	char *s;
  
  	nleft -= len;
  	if (nleft <= 0 || ++eargc >= GAVSIZ)
***************
*** 623,632 ****
  char *
  exptilde(buf, file, maxlen)
  	char buf[];
! 	register char *file;
  	int maxlen;
  {
! 	register char *s1, *s2, *s3;
  	extern char homedir[];
  
  	if (*file != '~') {
--- 623,632 ----
  char *
  exptilde(buf, file, maxlen)
  	char buf[];
! 	char *file;
  	int maxlen;
  {
! 	char *s1, *s2, *s3;
  	extern char homedir[];
  
  	if (*file != '~') {