--- ray/src/common/rexpr.c	1993/11/18 09:27:03	2.3
+++ ray/src/common/rexpr.c	2003/06/07 12:50:20	2.7
@@ -1,11 +1,19 @@
-/* Copyright (c) 1990 Regents of the University of California */
-
 #ifndef lint
-static char SCCSid[] = "$SunId$ LBL";
+static const char	RCSid[] = "$Id: rexpr.c,v 2.7 2003/06/07 12:50:20 schorsch Exp $";
 #endif
+/*
+ * Regular expression parsing routines.
+ *
+ * External symbols declared in standard.h
+ */
 
+#include "copyright.h"
+
 #include <stdio.h>
+#include <stdlib.h>
 #include <ctype.h>
+#include <string.h>
+
 /*
  * rexpr.c - regular expression parser (ala grep)
  */
@@ -126,12 +134,11 @@ int iflg, wflag;
 char *
 expsave()		      /* save compiled string */
 {
-	extern char  *malloc();
 	register char  *ep;
 
 	if (explen == 0)
 		return(NULL);
-	if ((ep = malloc(explen+3)) == NULL)
+	if ((ep = (char *)malloc(explen+3)) == NULL)
 		return(NULL);
 	ep[0] = iflag;
 	ep[1] = circf;
@@ -140,6 +147,7 @@ expsave()		      /* save compiled string */
 	return(ep);
 }
 
+void
 expset(ep)			/* install saved string */
 register char  *ep;
 {