*** src/glob.c.orig	Fri Apr  1 20:03:42 1994
--- src/glob.c	Sat Jan 14 09:37:55 1995
***************
*** 65,71 ****
  static	int gargc;		/* Number args in gargv */
  static	int gnleft;
  static	short gflag;
! static	int tglob();
  char	**ftpglob();
  char	*globerr;
  char	*home;
--- 65,71 ----
  static	int gargc;		/* Number args in gargv */
  static	int gnleft;
  static	short gflag;
! static	int tglob(register char);
  char	**ftpglob();
  char	*globerr;
  char	*home;
***************
*** 74,80 ****
  static	char *strend();
  char	**copyblk();
  
! static void acollect(), addpath(), collect(), expand(), Gcat();
  static void ginit(), matchdir(), rscan(), sort();
  static int amatch(), execbrc(), match();
  
--- 74,80 ----
  static	char *strend();
  char	**copyblk();
  
! static void acollect(), addpath(char), collect(), expand(), Gcat();
  static void ginit(), matchdir(), rscan(), sort();
  static int amatch(), execbrc(), match();
  
***************
*** 87,95 ****
  static	char *entp;
  static	char **sortbas;
  
  char **
! ftpglob(v)
! 	register char *v;
  {
  	char agpath[BUFSIZ];
  	char *agargv[GAVSIZ];
--- 87,100 ----
  static	char *entp;
  static	char **sortbas;
  
+ void blkfree(char **);
+ int letter(register char);
+ int digit(register char);
+ int gethdir(char *);
+ int any(register int, register char *);
+ 
  char **
! ftpglob(register char *v)
  {
  	char agpath[BUFSIZ];
  	char *agargv[GAVSIZ];
***************
*** 116,123 ****
  }
  
  static void
! ginit(agargv)
! 	char **agargv;
  {
  
  	agargv[0] = 0; gargv = agargv; sortbas = agargv; gargc = 0;
--- 121,127 ----
  }
  
  static void
! ginit(char ** agargv)
  {
  
  	agargv[0] = 0; gargv = agargv; sortbas = agargv; gargc = 0;
***************
*** 125,132 ****
  }
  
  static void
! collect(as)
! 	register char *as;
  {
  	if (eq(as, "{") || eq(as, "{}")) {
  		Gcat(as, "");
--- 129,135 ----
  }
  
  static void
! collect(register char *as)
  {
  	if (eq(as, "{") || eq(as, "{}")) {
  		Gcat(as, "");
***************
*** 136,143 ****
  }
  
  static void
! acollect(as)
! 	register char *as;
  {
  	register int ogargc = gargc;
  
--- 139,145 ----
  }
  
  static void
! acollect(register char *as)
  {
  	register int ogargc = gargc;
  
***************
*** 165,172 ****
  }
  
  static void
! expand(as)
! 	char *as;
  {
  	register char *cs;
  	register char *sgpathp, *oldcs;
--- 167,173 ----
  }
  
  static void
! expand(char *as)
  {
  	register char *cs;
  	register char *sgpathp, *oldcs;
***************
*** 218,225 ****
  }
  
  static void
! matchdir(pattern)
! 	char *pattern;
  {
  	struct stat stb;
  
--- 219,225 ----
  }
  
  static void
! matchdir(char *pattern)
  {
  	struct stat stb;
  
***************
*** 261,268 ****
  }
  
  static int
! execbrc(p, s)
! 	char *p, *s;
  {
  	char restbuf[BUFSIZ + 2];
  	register char *pe, *pm, *pl;
--- 261,267 ----
  }
  
  static int
! execbrc(char *p, char *s)
  {
  	char restbuf[BUFSIZ + 2];
  	register char *pe, *pm, *pl;
***************
*** 341,348 ****
  }
  
  static int
! match(s, p)
! 	char *s, *p;
  {
  	register int c;
  	register char *sentp;
--- 340,346 ----
  }
  
  static int
! match(char *s, char *p)
  {
  	register int c;
  	register char *sentp;
***************
*** 359,366 ****
  }
  
  static int
! amatch(s, p)
! 	register char *s, *p;
  {
  	register int scc;
  	int ok, lc;
--- 357,363 ----
  }
  
  static int
! amatch(register char *s, register char *p)
  {
  	register int scc;
  	int ok, lc;
***************
*** 448,456 ****
  	}
  }
  
! static
! Gmatch(s, p)
! 	register char *s, *p;
  {
  	register int scc;
  	int ok, lc;
--- 445,452 ----
  	}
  }
  
! static int
! Gmatch(register char *s, register char *p)
  {
  	register int scc;
  	int ok, lc;
***************
*** 509,516 ****
  }
  
  static void
! Gcat(s1, s2)
! 	register char *s1, *s2;
  {
  	register int len = strlen(s1) + strlen(s2) + 1;
  
--- 505,511 ----
  }
  
  static void
! Gcat(register char *s1, register char *s2)
  {
  	register int len = strlen(s1) + strlen(s2) + 1;
  
***************
*** 525,532 ****
  }
  
  static void
! addpath(c)
! 	char c;
  {
  
  	if (gpathp >= lastgpathp)
--- 520,526 ----
  }
  
  static void
! addpath(char c)
  {
  
  	if (gpathp >= lastgpathp)
***************
*** 538,546 ****
  }
  
  static void
! rscan(t, f)
! 	register char **t;
! 	int (*f)();
  {
  	register char *p, c;
  
--- 532,538 ----
  }
  
  static void
! rscan(register char **t, int (*f)())
  {
  	register char *p, c;
  
***************
*** 556,564 ****
  }
  /*
  static
! scan(t, f)
! 	register char **t;
! 	int (*f)();
  {
  	register char *p, c;
  
--- 548,554 ----
  }
  /*
  static
! scan(register char **t, int (*f)())
  {
  	register char *p, c;
  
***************
*** 567,575 ****
  			*p++ = (*f)(c);
  } */
  
! static
! tglob(c)
! 	register char c;
  {
  
  	if (any(c, globchars))
--- 557,564 ----
  			*p++ = (*f)(c);
  } */
  
! static int
! tglob(register char c)
  {
  
  	if (any(c, globchars))
***************
*** 578,608 ****
  }
  /*
  static
! trim(c)
! 	char c;
  {
  
  	return (c & TRIM);
  } */
  
! 
! letter(c)
! 	register char c;
  {
  
! 	return (c >= 'a' && c <= 'z' || c >= 'A' && c <= 'Z' || c == '_');
  }
  
! digit(c)
! 	register char c;
  {
  
  	return (c >= '0' && c <= '9');
  }
  
! any(c, s)
! 	register int c;
! 	register char *s;
  {
  
  	while (*s)
--- 567,595 ----
  }
  /*
  static
! trim(char c)
  {
  
  	return (c & TRIM);
  } */
  
! int
! letter(register char c)
  {
  
! 	return ((c >= 'a') && (c <= 'z') || (c >= 'A') && (c <= 'Z')
! 		|| (c == '_'));
  }
  
! int
! digit(register char c)
  {
  
  	return (c >= '0' && c <= '9');
  }
  
! int
! any(register int c, register char *s)
  {
  
  	while (*s)
***************
*** 610,617 ****
  			return(1);
  	return(0);
  }
! blklen(av)
! 	register char **av;
  {
  	register int i = 0;
  
--- 597,605 ----
  			return(1);
  	return(0);
  }
! 
! int
! blklen(register char **av)
  {
  	register int i = 0;
  
***************
*** 621,629 ****
  }
  
  char **
! blkcpy(oav, bv)
! 	char **oav;
! 	register char **bv;
  {
  	register char **av = oav;
  
--- 609,615 ----
  }
  
  char **
! blkcpy(char **oav, register char **bv)
  {
  	register char **av = oav;
  
***************
*** 632,639 ****
  	return (oav);
  }
  
! blkfree(av0)
! 	char **av0;
  {
  	register char **av = av0;
  
--- 618,625 ----
  	return (oav);
  }
  
! void
! blkfree(char **av0)
  {
  	register char **av = av0;
  
***************
*** 642,649 ****
  }
  
  char *
! strspl(cp, dp)
! 	register char *cp, *dp;
  {
  	register char *ep = malloc((unsigned)(strlen(cp) + strlen(dp) + 1));
  
--- 628,634 ----
  }
  
  char *
! strspl(register char *cp, register char *dp)
  {
  	register char *ep = malloc((unsigned)(strlen(cp) + strlen(dp) + 1));
  
***************
*** 655,662 ****
  }
  
  char **
! copyblk(v)
! 	register char **v;
  {
  	register char **nv = (char **)malloc((unsigned)((blklen(v) + 1) *
  						sizeof(char **)));
--- 640,646 ----
  }
  
  char **
! copyblk(register char **v)
  {
  	register char **nv = (char **)malloc((unsigned)((blklen(v) + 1) *
  						sizeof(char **)));
***************
*** 668,675 ****
  
  static
  char *
! strend(cp)
! 	register char *cp;
  {
  
  	while (*cp)
--- 652,658 ----
  
  static
  char *
! strend(register char *cp)
  {
  
  	while (*cp)
***************
*** 682,689 ****
   * user whose home directory is sought is currently.
   * We write the home directory of the user back there.
   */
! gethdir(home)
! 	char *home;
  {
  	register struct passwd *pp = getpwnam(home);
  
--- 665,672 ----
   * user whose home directory is sought is currently.
   * We write the home directory of the user back there.
   */
! int
! gethdir(char *home)
  {
  	register struct passwd *pp = getpwnam(home);