--- ray/src/common/fputword.c	2003/02/22 02:07:22	3.1
+++ ray/src/common/fputword.c	2020/11/13 01:06:14	3.10
@@ -1,93 +1,40 @@
 #ifndef lint
-static const char	RCSid[] = "$Id: fputword.c,v 3.1 2003/02/22 02:07:22 greg Exp $";
+static const char	RCSid[] = "$Id: fputword.c,v 3.10 2020/11/13 01:06:14 greg Exp $";
 #endif
 /*
- * Read white space separated words from stream
+ * Write word to stream, quoting as necessary
  *
- *  External symbols declared in standard.h
+ *  External symbols declared in rtio.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 "copyright.h"
 
-#include <stdio.h>
-
 #include <ctype.h>
 
+#include "rtio.h"
 
 void
 fputword(s, fp)			/* put (quoted) word to file stream */
 char  *s;
 FILE  *fp;
 {
+	int		hasspace = 0;
+	int		quote = 0;
 	register char	*cp;
 					/* check if quoting needed */
 	for (cp = s; *cp; cp++)
-		if (isspace(*cp)) {
-			int	quote;
-			if (index(s, '"'))
-				quote = '\'';
-			else
-				quote = '"';
-			fputc(quote, fp);
-			fputs(s, fp);
-			fputc(quote, fp);
-			return;
-		}
-					/* output sans quotes */
-	fputs(s, fp);
+		if (isspace(*cp))
+			hasspace++;
+		else if ((cp > s) & (*cp == '"') && cp[1])
+			quote = '\'';
+		else if ((cp > s) & (*cp == '\'') && cp[1])
+			quote = '"';
+
+	if (hasspace || quote) {	/* output with quotes */
+		if (!quote) quote = '"';
+		fputc(quote, fp);
+		fputs(s, fp);
+		fputc(quote, fp);
+	} else				/* output sans quotes */
+		fputs(s, fp);
 }