--- ray/src/cv/mgflib/parser.c	1995/05/11 20:17:33	1.18
+++ ray/src/cv/mgflib/parser.c	1995/12/01 11:03:57	1.22
@@ -304,11 +304,11 @@ mg_read()			/* read next line from file */
 		if (fgets(mg_file->inpline+len,
 				MG_MAXLINE-len, mg_file->fp) == NULL)
 			return(len);
-		mg_file->lineno++;
 		len += strlen(mg_file->inpline+len);
-		if (len > 1 && mg_file->inpline[len-2] == '\\')
-			mg_file->inpline[--len-1] = ' ';
-	} while (mg_file->inpline[len]);
+		if (len >= MG_MAXLINE-1)
+			return(len);
+		mg_file->lineno++;
+	} while (len > 1 && mg_file->inpline[len-2] == '\\');
 
 	return(len);
 }
@@ -320,10 +320,13 @@ mg_parse()			/* parse current input line */
 	char	abuf[MG_MAXLINE];
 	char	*argv[MG_MAXARGC];
 	int	en;
-	register char	*cp, **ap;
-
-	strcpy(cp=abuf, mg_file->inpline);
-	ap = argv;			/* break into words */
+	register char	*cp, *cp2, **ap;
+					/* copy line, removing escape chars */
+	cp = abuf; cp2 = mg_file->inpline;
+	while ((*cp++ = *cp2++))
+		if (cp2[0] == '\n' && cp2[-1] == '\\')
+			cp--;
+	cp = abuf; ap = argv;		/* break into words */
 	for ( ; ; ) {
 		while (isspace(*cp))
 			*cp++ = '\0';
@@ -349,18 +352,25 @@ char	*fn;
 {
 	MG_FCTXT	cntxt;
 	int	rval;
+	register int	nbr;
 
 	if ((rval = mg_open(&cntxt, fn)) != MG_OK) {
 		fprintf(stderr, "%s: %s\n", fn, mg_err[rval]);
 		return(rval);
 	}
-	while (mg_read())		/* parse each line */
+	while ((nbr = mg_read()) > 0) {	/* parse each line */
+		if (nbr >= MG_MAXLINE-1) {
+			fprintf(stderr, "%s: %d: %s\n", cntxt.fname,
+					cntxt.lineno, mg_err[rval=MG_ELINE]);
+			break;
+		}
 		if ((rval = mg_parse()) != MG_OK) {
 			fprintf(stderr, "%s: %d: %s:\n%s", cntxt.fname,
 					cntxt.lineno, mg_err[rval],
 					cntxt.inpline);
 			break;
 		}
+	}
 	mg_close();
 	return(rval);
 }
@@ -408,7 +418,7 @@ char	**av;
 	char	*xfarg[MG_MAXARGC];
 	MG_FCTXT	ictx;
 	XF_SPEC	*xf_orig = xf_context;
-	int	rv;
+	register int	rv;
 
 	if (ac < 2)
 		return(MG_EARGC);
@@ -421,11 +431,19 @@ char	**av;
 		for (i = 1; i < ac-1; i++)
 			xfarg[i] = av[i+1];
 		xfarg[ac-1] = NULL;
-		if ((rv = mg_handle(MG_E_XF, ac-1, xfarg)) != MG_OK)
+		if ((rv = mg_handle(MG_E_XF, ac-1, xfarg)) != MG_OK) {
+			mg_close();
 			return(rv);
+		}
 	}
 	do {
-		while (mg_read())
+		while ((rv = mg_read()) > 0) {
+			if (rv >= MG_MAXLINE-1) {
+				fprintf(stderr, "%s: %d: %s\n", ictx.fname,
+						ictx.lineno, mg_err[MG_ELINE]);
+				mg_close();
+				return(MG_EINCL);
+			}
 			if ((rv = mg_parse()) != MG_OK) {
 				fprintf(stderr, "%s: %d: %s:\n%s", ictx.fname,
 						ictx.lineno, mg_err[rv],
@@ -433,9 +451,12 @@ char	**av;
 				mg_close();
 				return(MG_EINCL);
 			}
+		}
 		if (ac > 2)
-			if ((rv = mg_handle(MG_E_XF, 1, xfarg)) != MG_OK)
+			if ((rv = mg_handle(MG_E_XF, 1, xfarg)) != MG_OK) {
+				mg_close();
 				return(rv);
+			}
 	} while (xf_context != xf_orig);
 	mg_close();
 	return(MG_OK);
@@ -733,6 +754,7 @@ char	**av;
 	static char	*p4ent[5] = {mg_ename[MG_E_POINT],p4[0],p4[1],p4[2]};
 	static char	*n4ent[5] = {mg_ename[MG_E_NORMAL],n4[0],n4[1],n4[2]};
 	static char	*fent[6] = {mg_ename[MG_E_FACE],"_cv1","_cv2","_cv3","_cv4"};
+	char	*v1n;
 	register C_VERTEX	*cv1, *cv2;
 	register int	i, j;
 	FVECT	u, v, w;
@@ -748,6 +770,7 @@ char	**av;
 	if ((cv1 = c_getvert(av[1])) == NULL ||
 			(cv2 = c_getvert(av[3])) == NULL)
 		return(MG_EUNDEF);
+	v1n = av[1];
 	if (!isflt(av[2]) || !isflt(av[4]))
 		return(MG_ETYPE);
 	rad1 = atof(av[2]);
@@ -766,6 +789,7 @@ char	**av;
 		cv = cv1;
 		cv1 = cv2;
 		cv2 = cv;
+		v1n = av[3];
 		d = rad1;
 		rad1 = rad2;
 		rad2 = d;
@@ -799,7 +823,7 @@ char	**av;
 	if ((rv = mg_handle(MG_E_NORMAL, 4, n3ent)) != MG_OK)
 		return(rv);
 	if (rad1 == 0.) {		/* triangles */
-		v1ent[3] = av[1];
+		v1ent[3] = v1n;
 		if ((rv = mg_handle(MG_E_VERTEX, 4, v1ent)) != MG_OK)
 			return(rv);
 		for (j = 0; j < 3; j++)