--- ray/src/common/loadvars.c	1997/03/20 12:47:24	2.6
+++ ray/src/common/loadvars.c	2003/06/07 12:50:20	2.12
@@ -1,26 +1,25 @@
-/* Copyright (c) 1995 Regents of the University of California */
-
 #ifndef lint
-static char SCCSid[] = "$SunId$ LBL";
+static const char	RCSid[] = "$Id: loadvars.c,v 2.12 2003/06/07 12:50:20 schorsch Exp $";
 #endif
-
 /*
  *  Routines for loading and checking variables from file.
  */
 
+#include "copyright.h"
+
 #include <stdio.h>
+#include <stdlib.h>
 #include <ctype.h>
+
+#include "standard.h"
 #include "vars.h"
 
 #define NOCHAR	127		/* constant for character to delete */
 
-#ifndef malloc
-extern char  *malloc(), *realloc();
-#endif
-
 extern char  *fgetline();
 
 
+void
 loadvars(rfname)		/* load variables into vv from file */
 char	*rfname;
 {
@@ -97,9 +96,9 @@ VARIABLE	*(*mv)();
 			while (*cp++)
 				;
 		i = cp - vp->value;
-		vp->value = realloc(vp->value, i+n+1);
+		vp->value = (char *)realloc((void *)vp->value, i+n+1);
 	} else
-		vp->value = malloc(n+1);
+		vp->value = (char *)malloc(n+1);
 	if (vp->value == NULL) {
 		perror(progname);
 		quit(1);
@@ -151,6 +150,7 @@ register int	n;
 }
 
 
+void
 checkvalues()			/* check assignments */
 {
 	register int	i;
@@ -161,6 +161,7 @@ checkvalues()			/* check assignments */
 }
 
 
+void
 onevalue(vp)			/* only one assignment for this variable */
 register VARIABLE	*vp;
 {
@@ -176,6 +177,7 @@ register VARIABLE	*vp;
 }
 
 
+void
 catvalues(vp)			/* concatenate variable values */
 register VARIABLE	*vp;
 {
@@ -204,6 +206,7 @@ register char	*tv, *cv;
 }
 
 
+void
 boolvalue(vp)			/* check boolean for legal values */
 register VARIABLE	*vp;
 {
@@ -223,6 +226,7 @@ register VARIABLE	*vp;
 }
 
 
+void
 qualvalue(vp)			/* check qualitative var. for legal values */
 register VARIABLE	*vp;
 {
@@ -245,6 +249,7 @@ register VARIABLE	*vp;
 }
 
 
+void
 intvalue(vp)			/* check integer variable for legal values */
 register VARIABLE	*vp;
 {
@@ -257,6 +262,7 @@ register VARIABLE	*vp;
 }
 
 
+void
 fltvalue(vp)			/* check float variable for legal values */
 register VARIABLE	*vp;
 {
@@ -269,6 +275,7 @@ register VARIABLE	*vp;
 }
 
 
+void
 printvars(fp)			/* print variable values */
 register FILE	*fp;
 {
@@ -279,23 +286,26 @@ register FILE	*fp;
 	    for (j = 0; j < vdef(i); j++) {	/* print each assignment */
 		fputs(vnam(i), fp);
 		fputs("= ", fp);
-		k = clipline = ( vv[i].fixval == catvalues ? 64 : 320 )
+		k = clipline = ( vv[i].fixval == catvalues ? 64 : 236 )
 				- strlen(vnam(i)) ;
 		cp = nvalue(i, j);
 		while (*cp) {
 		    putc(*cp++, fp);
 		    if (--k <= 0) {		/* line too long */
 			while (*cp && !isspace(*cp))
-			    putc(*cp++, fp);	/* finish this word */
+			    fputc(*cp++, fp);	/* finish this word */
 			if (*cp) {		/* start new line */
-			    putc('\n', fp);
-			    fputs(vnam(i), fp);
-			    putc('=', fp);
+			    if (vv[i].fixval == catvalues) {
+				fputc('\n', fp);
+				fputs(vnam(i), fp);
+				fputc('=', fp);
+			    } else
+				fputs(" \\\n", fp);
 			    k = clipline;
 			}
 		    }
 		}
-	        putc('\n', fp);
+	        fputc('\n', fp);
 	    }
 	fflush(fp);
 }