--- ray/src/cv/mgflib/mgfilt.c	1995/05/11 21:48:40	1.4
+++ ray/src/cv/mgflib/mgfilt.c	2003/07/27 22:12:02	1.7
@@ -1,14 +1,12 @@
-/* Copyright (c) 1995 Regents of the University of California */
-
 #ifndef lint
-static char SCCSid[] = "$SunId$ LBL";
+static const char	RCSid[] = "$Id: mgfilt.c,v 1.7 2003/07/27 22:12:02 schorsch Exp $";
 #endif
-
 /*
  * Filter MGF stream, removing entities that won't be understood
  */
 
 #include <stdio.h>
+#include <stdlib.h>
 #include "parser.h"
 
 				/* Number of entities for major versions */
@@ -43,13 +41,14 @@ char	*argv[];
 	}
 	if (isint(argv[1])) {
 		i = atoi(argv[1]);
-		if (i < 1 | i > MG_VMAJOR) {
+		if ((i < 1) | (i > MG_VMAJOR)) {
 			fprintf(stderr, "%s: bad version number: %d\n",
 					argv[0], i);
 			exit(1);
 		}
 		for (en = nentlist[i-1]; en--; )
 			mg_ehand[en] = put_entity;
+		mg_ehand[MG_E_INCLUDE] = NULL;		/* expand include's */
 	} else
 		for (cp1 = cp2 = argv[1]; *cp1; cp1 = cp2) {
 			while (*cp2) {