--- ray/src/common/wordfile.c	1992/10/16 13:02:46	2.2
+++ ray/src/common/wordfile.c	2003/02/22 02:07:23	2.8
@@ -1,19 +1,75 @@
-/* Copyright (c) 1992 Regents of the University of California */
-
 #ifndef lint
-static char SCCSid[] = "$SunId$ LBL";
+static const char	RCSid[] = "$Id: wordfile.c,v 2.8 2003/02/22 02:07:23 greg Exp $";
 #endif
-
 /*
  * Load whitespace separated words from a file into an array.
  * Assume the passed pointer array is big enough to hold them all.
+ *
+ * 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 <ctype.h>
 
 #define NULL		0
 
-#define MAXFLEN		10240		/* file must be smaller than this */
+#define MAXFLEN		8192		/* file must be smaller than this */
 
 extern char	*bmalloc();
 
@@ -23,42 +79,50 @@ wordfile(words, fname)		/* get words from fname, put i
 char	**words;
 char	*fname;
 {
-	char	**wp = words;
 	int	fd;
-	char	*buf;
+	char	buf[MAXFLEN];
 	register int	n;
-	register char	*cp;
-					/* allocate memory */
-	if ((cp = buf = bmalloc(MAXFLEN)) == NULL)
-		return(-1);
+					/* load file into buffer */
+	if (fname == NULL)
+		return(-1);			/* no filename */
 	if ((fd = open(fname, 0)) < 0)
-		goto err;
+		return(-1);			/* open error */
 	n = read(fd, buf, MAXFLEN);
 	close(fd);
-	if (n < 0)
-		goto err;
+	if (n < 0)				/* read error */
+		return(-1);
 	if (n == MAXFLEN)		/* file too big, take what we can */
 		while (!isspace(buf[--n]))
-			if (n <= 0)
-				goto err;
-	bfree(buf+n+1, MAXFLEN-n-1);	/* return unneeded memory */
-	while (n > 0) {			/* break buffer into words */
-		while (isspace(*cp)) {
-			cp++;
-			if (--n <= 0)
-				return(wp - words);
-		}
-		*wp++ = cp;
-		while (!isspace(*cp)) {
-			cp++;
-			if (--n <= 0)
-				break;
-		}
-		*cp++ = '\0'; n--;
+			if (n <= 0)		/* one long word! */
+				return(-1);
+	buf[n] = '\0';			/* terminate */
+	return(wordstring(words, buf));	/* wordstring does the rest */
+}
+
+
+int
+wordstring(avl, str)			/* allocate and load argument list */
+char	**avl;
+char	*str;
+{
+	register char	*cp, **ap;
+	
+	if (str == NULL)
+		return(-1);
+	cp = bmalloc(strlen(str)+1);
+	if (cp == NULL)			/* ENOMEM */
+		return(-1);
+	strcpy(cp, str);
+	ap = avl;		/* parse into words */
+	for ( ; ; ) {
+		while (isspace(*cp))	/* nullify spaces */
+			*cp++ = '\0';
+		if (!*cp)		/* all done? */
+			break;
+		*ap++ = cp;		/* add argument to list */
+		while (*++cp && !isspace(*cp))
+			;
 	}
-	*wp = NULL;			/* null terminator */
-	return(wp - words);
-err:
-	bfree(buf, MAXFLEN);
-	return(-1);
+	*ap = NULL;
+	return(ap - avl);
 }