--- ray/src/util/eplus_adduvf.c	2014/02/28 19:14:10	2.15
+++ ray/src/util/eplus_adduvf.c	2019/12/13 16:00:33	2.19
@@ -1,5 +1,5 @@
 #ifndef lint
-static const char RCSid[] = "$Id: eplus_adduvf.c,v 2.15 2014/02/28 19:14:10 greg Exp $";
+static const char RCSid[] = "$Id: eplus_adduvf.c,v 2.19 2019/12/13 16:00:33 greg Exp $";
 #endif
 /*
  * Add User View Factors to EnergyPlus Input Data File
@@ -8,6 +8,7 @@ static const char RCSid[] = "$Id: eplus_adduvf.c,v 2.1
  */
 
 #include <stdlib.h>
+#include "platform.h"
 #include "rtio.h"
 #include "rtmath.h"
 #include "random.h"
@@ -362,7 +363,7 @@ start_rcontrib(SUBPROC *pd, ZONE *zp)
 	IDF_FIELD	*fptr;
 	int		i, j, n;
 						/* start oconv command */
-	sprintf(cbuf, "oconv - > '%s'", temp_octree);
+	sprintf(cbuf, "oconv - > \"%s\"", temp_octree);
 	if ((ofp = popen(cbuf, "w")) == NULL) {
 		fputs(progname, stderr);
 		fputs(": cannot open oconv process\n", stderr);
@@ -392,8 +393,8 @@ start_rcontrib(SUBPROC *pd, ZONE *zp)
 						/* now subsurfaces */
 	if (zp->ntotal > zp->nsurf) {
 		if (zp->area_redu != NULL)
-			memset(zp->area_redu, 0, sizeof(float)*zp->nsurf);
-		else if ((zp->area_redu = (float *)calloc(zp->nsurf,
+			memset(zp->area_redu, 0, sizeof(float)*zp->ntotal);
+		else if ((zp->area_redu = (float *)calloc(zp->ntotal,
 						sizeof(float))) == NULL)
 			return(0);
 	}
@@ -716,7 +717,7 @@ main(int argc, char *argv[])
 		do {
 			pnext = pptr->pnext;
 			idf_delobject(our_idf, pptr);
-		} while (pnext != NULL);
+		} while ((pptr = pnext) != NULL);
 	}
 						/* add to header */
 	if (our_idf->hrem == NULL ||