--- ray/src/common/rexpr.c	2003/02/22 02:07:22	2.4
+++ ray/src/common/rexpr.c	2019/12/28 18:05:14	2.10
@@ -1,5 +1,5 @@
 #ifndef lint
-static const char	RCSid[] = "$Id: rexpr.c,v 2.4 2003/02/22 02:07:22 greg Exp $";
+static const char	RCSid[] = "$Id: rexpr.c,v 2.10 2019/12/28 18:05:14 greg Exp $";
 #endif
 /*
  * Regular expression parsing routines.
@@ -7,66 +7,13 @@ static const char	RCSid[] = "$Id: rexpr.c,v 2.4 2003/0
  * External symbols declared in standard.h
  */
 
-/* ====================================================================
- * The Radiance Software License, Version 1.0
- *
- * Copyright (c) 1990 - 2002 The Regents of the University of California,
- * through Lawrence Berkeley National Laboratory.   All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- *         notice, this list of conditions and the following disclaimer.
- *
- * 2. Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in
- *       the documentation and/or other materials provided with the
- *       distribution.
- *
- * 3. The end-user documentation included with the redistribution,
- *           if any, must include the following acknowledgment:
- *             "This product includes Radiance software
- *                 (http://radsite.lbl.gov/)
- *                 developed by the Lawrence Berkeley National Laboratory
- *               (http://www.lbl.gov/)."
- *       Alternately, this acknowledgment may appear in the software itself,
- *       if and wherever such third-party acknowledgments normally appear.
- *
- * 4. The names "Radiance," "Lawrence Berkeley National Laboratory"
- *       and "The Regents of the University of California" must
- *       not be used to endorse or promote products derived from this
- *       software without prior written permission. For written
- *       permission, please contact radiance@radsite.lbl.gov.
- *
- * 5. Products derived from this software may not be called "Radiance",
- *       nor may "Radiance" appear in their name, without prior written
- *       permission of Lawrence Berkeley National Laboratory.
- *
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
- * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED.   IN NO EVENT SHALL Lawrence Berkeley National Laboratory OR
- * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
- * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
- * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- * ====================================================================
- *
- * This software consists of voluntary contributions made by many
- * individuals on behalf of Lawrence Berkeley National Laboratory.   For more
- * information on Lawrence Berkeley National Laboratory, please see
- * <http://www.lbl.gov/>.
- */
+#include "copyright.h"
 
-#include <stdio.h>
 #include <stdlib.h>
 #include <ctype.h>
+
+#include "rtio.h"
+
 /*
  * rexpr.c - regular expression parser (ala grep)
  */
@@ -85,11 +32,9 @@ static const char	RCSid[] = "$Id: rexpr.c,v 2.4 2003/0
 
 #define same(a,b) (a==b || (iflag && (a^b)==' ' && isalpha(a)))
 
-#ifdef  BSD
-#define  memcpy(to,from,len)	bcopy(from,to,len)
-#endif
 
-static int     advance(), cclass();
+static int     advance(char *, char *);
+static int     cclass(char *, int c, int af);
 
 static char    expbuf[ESIZE];
 static int     iflag;
@@ -102,9 +47,9 @@ ecompile(sp, iflg, wflag)               /* compile the
 register char  *sp;
 int iflg, wflag;
 {
-        register c;
+        register int c;
         register char *ep;
-        char *lastep;
+        char *lastep = NULL;
         int cclcnt;
         
         iflag = iflg;
@@ -220,7 +165,7 @@ register char *sp;
                 return(NULL);
         /* fast check for first character */
         if (expbuf[0]==CCHR) {
-		register c = expbuf[1];
+		register int c = expbuf[1];
 		while (*++sp)
 			if (same(*sp, c) && advance(sp, expbuf))
 				return(sp);
@@ -324,10 +269,10 @@ register char *ep;
 static int
 cclass(set, c, af)
 register char *set;
-register c;
+register int c;
 int af;
 {
-        register n;
+        register int n;
 
         if (c == 0)
                 return(0);