--- ray/src/common/header.c	2019/08/14 18:20:02	2.36
+++ ray/src/common/header.c	2020/07/24 16:58:16	2.39
@@ -1,5 +1,5 @@
 #ifndef lint
-static const char	RCSid[] = "$Id: header.c,v 2.36 2019/08/14 18:20:02 greg Exp $";
+static const char	RCSid[] = "$Id: header.c,v 2.39 2020/07/24 16:58:16 greg Exp $";
 #endif
 /*
  *  header.c - routines for reading and writing information headers.
@@ -167,6 +167,14 @@ printargs(		/* print arguments to a file */
 	FILE  *fp
 )
 {
+#if defined(_WIN32) || defined(_WIN64)
+	extern char	*fixargv0(char *arg0);
+	char		myav0[128];
+				/* clean up Windows executable path */
+	if (ac <= 0) return;
+	fputs(fixargv0(strcpy(myav0, *av++)), fp);
+	fputc(--ac ? ' ' : '\n');
+#endif
 	while (ac-- > 0) {
 		fputword(*av++, fp);
 		fputc(ac ? ' ' : '\n', fp);
@@ -225,7 +233,7 @@ isbigendian(		/* header line says "BigEndian=1" (-1 if
 {
 	const char	*be = BIGEND;
 
-	while (*s & (*be != '=') && *s++ == *be)
+	while ((*s != '\0') & (*be != '=') && *s++ == *be)
 		++be;
 	if (*be != '=')
 		return(-1);	/* irrelevant */
@@ -299,7 +307,7 @@ mycheck(			/* check a header line for format info. */
 	struct check	*scp = (struct check *)cp;
 
 	if (!formatval(scp->fs, s) && scp->fp != NULL)
-		fputs(s, scp->fp);
+		return(fputs(s, scp->fp));
 
 	return(0);
 }