--- ray/src/px/pcompos.c	1998/10/27 09:08:25	2.20
+++ ray/src/px/pcompos.c	2004/03/28 20:33:14	2.29
@@ -1,9 +1,6 @@
-/* Copyright (c) 1993 Regents of the University of California */
-
 #ifndef lint
-static char SCCSid[] = "$SunId$ LBL";
+static const char	RCSid[] = "$Id: pcompos.c,v 2.29 2004/03/28 20:33:14 schorsch Exp $";
 #endif
-
 /*
  *  pcompos.c - program to composite pictures.
  *
@@ -11,15 +8,16 @@ static char SCCSid[] = "$SunId$ LBL";
  */
 
 #include  <stdio.h>
-
 #include  <math.h>
+#include  <time.h>
+#include  <string.h>
 
-#ifdef MSDOS
-#include  <fcntl.h>
-#endif
+#include "copyright.h"
 
+#include  "platform.h"
+#include  "rtprocess.h"
+#include  "rterror.h"
 #include  "color.h"
-
 #include  "resolu.h"
 
 #define	 MAXFILE	64
@@ -42,6 +40,7 @@ int  labelht = 24;			/* label height */
 
 int  checkthresh = 0;			/* check threshold value */
 
+char  StandardInput[] = "<stdin>";
 char  Command[] = "<Command>";
 char  Label[] = "<Label>";
 
@@ -61,13 +60,19 @@ int  nfile;			/* number of files */
 char  ourfmt[LPICFMT+1] = PICFMT;
 int  wrongformat = 0;
 
-FILE  *popen(), *lblopen();
 
-extern char  *malloc();
+static gethfunc tabputs;
+static void compos(void);
+static int cmpcolr(COLR  c1, COLR  c2);
+static FILE * lblopen(char  *s, int  *xp, int  *yp);
 
 
-tabputs(s)			/* print line preceded by a tab */
-char  *s;
+
+static int
+tabputs(			/* print line preceded by a tab */
+	char	*s,
+	void	*p
+)
 {
 	char  fmt[32];
 
@@ -87,9 +92,11 @@ char  *s;
 }
 
 
-main(argc, argv)
-int  argc;
-char  *argv[];
+int
+main(
+	int  argc,
+	char  *argv[]
+)
 {
 	int  ncolumns = 0;
 	int  autolabel = 0;
@@ -97,12 +104,9 @@ char  *argv[];
 	int  xsgn, ysgn;
 	char  *thislabel;
 	int  an;
-#ifdef MSDOS
-	extern int  _fmode;
-	_fmode = O_BINARY;
-	setmode(fileno(stdin), O_BINARY);
-	setmode(fileno(stdout), O_BINARY);
-#endif
+	SET_DEFAULT_BINARY();
+	SET_FILE_BINARY(stdin);
+	SET_FILE_BINARY(stdout);
 	progname = argv[0];
 
 	for (an = 1; an < argc && argv[an][0] == '-'; an++)
@@ -151,6 +155,7 @@ char  *argv[];
 		}
 dofiles:
 	newheader("RADIANCE", stdout);
+	fputnow(stdout);
 	for (nfile = 0; an < argc; nfile++) {
 		if (nfile >= MAXFILE)
 			goto toomany;
@@ -208,7 +213,7 @@ getfile:
 		if (autolabel && thislabel == NULL)
 			thislabel = argv[an];
 		if (!strcmp(argv[an], "-")) {
-			input[nfile].name = "<stdin>";
+			input[nfile].name = StandardInput;
 			input[nfile].fp = stdin;
 		} else {
 			if (argv[an][0] == '!') {
@@ -228,7 +233,7 @@ getfile:
 		printf("%s:\n", input[nfile].name);
 		getheader(input[nfile].fp, tabputs, NULL);
 		if (wrongformat) {
-			fprintf(stderr, "%s: bad Radiance input file\n",
+			fprintf(stderr, "%s: incompatible input format\n",
 					input[nfile].name);
 			quit(1);
 		}
@@ -316,10 +321,12 @@ toomany:
 labelerr:
 	fprintf(stderr, "%s: error opening label\n", progname);
 	quit(1);
+	return 1; /* pro forma return */
 }
 
 
-compos()				/* composite pictures */
+static void
+compos(void)				/* composite pictures */
 {
 	COLR  *scanin, *scanout;
 	int  y;
@@ -373,6 +380,11 @@ compos()				/* composite pictures */
 			quit(1);
 		}
 	}
+					/* read remainders from streams */
+	for (i = 0; i < nfile; i++)
+		if (input[i].name[0] == '<')
+			while (getc(input[i].fp) != EOF)
+				;
 	return;
 memerr:
 	perror(progname);
@@ -380,26 +392,30 @@ memerr:
 }
 
 
-int
-cmpcolr(c1, c2)			/* compare two colr's (improvisation) */
-register COLR  c1, c2;
+static int
+cmpcolr(			/* compare two colr's (improvisation) */
+	register COLR  c1,
+	register COLR  c2
+)
 {
 	register int  i, j;
 
 	j = 4;				/* check exponents first! */
 	while (j--)
-		if (i = c1[j] - c2[j])
+		if ( (i = c1[j] - c2[j]) )
 			return(i);
 	return(0);
 }
 
 
-FILE *
-lblopen(s, xp, yp)		/* open pipe to label generator */
-char  *s;
-int  *xp, *yp;
+static FILE *
+lblopen(		/* open pipe to label generator */
+	char  *s,
+	int  *xp,
+	int  *yp
+)
 {
-	char  com[128];
+	char  com[PATH_MAX];
 	FILE  *fp;
 
 	sprintf(com, "psign -s -.15 -a 2 -x %d -y %d '%.90s'", *xp, *yp, s);
@@ -416,6 +432,7 @@ err:
 }
 
 
+void
 quit(code)		/* exit gracefully */
 int  code;
 {