===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/m4/misc.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -c -r1.11 -r1.12
*** src/usr.bin/m4/misc.c	1999/09/14 08:21:37	1.11
--- src/usr.bin/m4/misc.c	1999/09/14 08:35:17	1.12
***************
*** 1,4 ****
! /*	$OpenBSD: misc.c,v 1.11 1999/09/14 08:21:37 espie Exp $	*/
  /*	$NetBSD: misc.c,v 1.6 1995/09/28 05:37:41 tls Exp $	*/
  
  /*
--- 1,4 ----
! /*	$OpenBSD: misc.c,v 1.12 1999/09/14 08:35:17 espie Exp $	*/
  /*	$NetBSD: misc.c,v 1.6 1995/09/28 05:37:41 tls Exp $	*/
  
  /*
***************
*** 41,47 ****
  #if 0
  static char sccsid[] = "@(#)misc.c	8.1 (Berkeley) 6/6/93";
  #else
! static char rcsid[] = "$OpenBSD: misc.c,v 1.11 1999/09/14 08:21:37 espie Exp $";
  #endif
  #endif /* not lint */
  
--- 41,47 ----
  #if 0
  static char sccsid[] = "@(#)misc.c	8.1 (Berkeley) 6/6/93";
  #else
! static char rcsid[] = "$OpenBSD: misc.c,v 1.12 1999/09/14 08:35:17 espie Exp $";
  #endif
  #endif /* not lint */
  
***************
*** 80,102 ****
   */
  ptrdiff_t
  indx(s1, s2)
! const char *s1;
! const char *s2;
  {
! 	char *r;
  
! 	r = strstr(s1, s2);
! 	if (r)
! 		return (r - s1);
! 	else
  		return (-1);
  }
  /*
   *  putback - push character back onto input
   */
  void
  putback(c)
! pbent c;
  {
  	if (bp >= endpbb)
  		enlarge_bufspace();
--- 80,102 ----
   */
  ptrdiff_t
  indx(s1, s2)
! 	const char *s1;
! 	const char *s2;
  {
! 	char *t;
  
! 	t = strstr(s1, s2);
! 	if (t == NULL)
  		return (-1);
+ 	else
+ 		return (t - s1);
  }
  /*
   *  putback - push character back onto input
   */
  void
  putback(c)
! 	pbent c;
  {
  	if (bp >= endpbb)
  		enlarge_bufspace();
***************
*** 110,121 ****
   */
  void
  pbstr(s)
! register char *s;
  {
  	size_t n;
  
  	n = strlen(s);
! 	while (endpbb - bp < n)
  		enlarge_bufspace();
  	while (n > 0)
  		*bp++ = s[--n];
--- 110,121 ----
   */
  void
  pbstr(s)
! 	char *s;
  {
  	size_t n;
  
  	n = strlen(s);
! 	while (endpbb - bp <= n)
  		enlarge_bufspace();
  	while (n > 0)
  		*bp++ = s[--n];
***************
*** 126,134 ****
   */
  void
  pbnum(n)
! int n;
  {
! 	register int num;
  
  	num = (n < 0) ? -n : n;
  	do {
--- 126,134 ----
   */
  void
  pbnum(n)
! 	int n;
  {
! 	int num;
  
  	num = (n < 0) ? -n : n;
  	do {
***************
*** 205,211 ****
   */
  void
  chrsave(c)
! char c;
  {
  	if (ep >= endest) 
  		enlarge_strspace();
--- 205,211 ----
   */
  void
  chrsave(c)
! 	char c;
  {
  	if (ep >= endest) 
  		enlarge_strspace();
***************
*** 233,241 ****
   */
  void
  getdiv(n)
! int n;
  {
! 	register int c;
  
  	if (active == outfile[n])
  		errx(1, "undivert: diversion still active");
--- 233,241 ----
   */
  void
  getdiv(n)
! 	int n;
  {
! 	int c;
  
  	if (active == outfile[n])
  		errx(1, "undivert: diversion still active");
***************
*** 258,264 ****
  void
  killdiv()
  {
! 	register int n;
  
  	for (n = 0; n < MAXOUT; n++)
  		if (outfile[n] != NULL) {
--- 258,264 ----
  void
  killdiv()
  {
! 	int n;
  
  	for (n = 0; n < MAXOUT; n++)
  		if (outfile[n] != NULL) {
***************
*** 268,276 ****
  
  char *
  xalloc(n)
! unsigned long n;
  {
! 	register char *p = malloc(n);
  
  	if (p == NULL)
  		err(1, "malloc");
--- 268,276 ----
  
  char *
  xalloc(n)
! 	unsigned long n;
  {
! 	char *p = malloc(n);
  
  	if (p == NULL)
  		err(1, "malloc");
***************
*** 279,287 ****
  
  char *
  xstrdup(s)
! const char *s;
  {
! 	register char *p = strdup(s);
  	if (p == NULL)
  		err(1, "strdup");
  	return p;
--- 279,287 ----
  
  char *
  xstrdup(s)
! 	const char *s;
  {
! 	char *p = strdup(s);
  	if (p == NULL)
  		err(1, "strdup");
  	return p;