--- ray/src/px/oki20.c	1992/07/03 08:59:24	2.3
+++ ray/src/px/oki20.c	2004/03/28 20:33:14	2.13
@@ -1,51 +1,49 @@
-/* Copyright (c) 1992 Regents of the University of California */
-
 #ifndef lint
-static char SCCSid[] = "$SunId$ LBL";
+static const char	RCSid[] = "$Id: oki20.c,v 2.13 2004/03/28 20:33:14 schorsch Exp $";
 #endif
-
 /*
- *  oki20c.c - program to dump pixel file to OkiMate 20 color printer.
- *
- *     6/10/87
+ *  oki20.c - program to dump pixel file to OkiMate 20 printer.
  */
 
 #include  <stdio.h>
+#include  <time.h>
 
+#include  "platform.h"
+#include  "rtprocess.h"
 #include  "color.h"
 #include  "resolu.h"
 
-#define  NROWS		1440		/* 10" at 144 dpi */
-#define  NCOLS		960		/* 8" at 120 dpi */
+#define	 NROWS		1440		/* 10" at 144 dpi */
+#define	 NCOLS		960		/* 8" at 120 dpi */
 
-#define  ASPECT		(120./144.)	/* pixel aspect ratio */
+#define	 ASPECT		(120./144.)	/* pixel aspect ratio */
 
-#define  FILTER		"pfilt -1 -x %d -y %d -p %f %s",NCOLS,NROWS,ASPECT
+#define	 FILTER		"pfilt -1 -x %d -y %d -p %f",NCOLS,NROWS,ASPECT
+#define	 FILTER_F	"pfilt -1 -x %d -y %d -p %f \"%s\"",NCOLS,NROWS,ASPECT
 
-#ifdef  BSD
-#define  clearlbuf()	bzero((char *)lpat, sizeof(lpat))
-#else
-#define  clearlbuf()	(void)memset((char *)lpat, 0, sizeof(lpat))
-#endif
-
 long  lpat[NCOLS];
 
 int  dofilter = 0;		/* filter through pfilt first? */
 
+static int printp(char  *fname);
+static void plotscan(COLR  scan[], int  len, int  y);
+static int bit(COLR  col, int  x);
 
-main(argc, argv)
-int  argc;
-char  *argv[];
+
+int
+main(
+	int  argc,
+	char  *argv[]
+)
 {
 	int  i, status = 0;
-	
+	SET_DEFAULT_BINARY();
+	SET_FILE_BINARY(stdin);
+	SET_FILE_BINARY(stdout);
 	if (argc > 1 && !strcmp(argv[1], "-p")) {
 		dofilter++;
 		argv++; argc--;
 	}
-#ifdef _IOLBF
-	stdout->_flag &= ~_IOLBF;
-#endif
 	if (argc < 2)
 		status = printp(NULL) == -1;
 	else
@@ -55,10 +53,12 @@ char  *argv[];
 }
 
 
-printp(fname)				/* print a picture */
-char  *fname;
+static int
+printp(				/* print a picture */
+	char  *fname
+)
 {
-	char  buf[64];
+	char  buf[PATH_MAX];
 	FILE  *input;
 	int  xres, yres;
 	COLR  scanline[NCOLS];
@@ -66,10 +66,10 @@ char  *fname;
 
 	if (dofilter) {
 		if (fname == NULL) {
-			sprintf(buf, FILTER, "");
+			sprintf(buf, FILTER);
 			fname = "<stdin>";
 		} else
-			sprintf(buf, FILTER, fname);
+			sprintf(buf, FILTER_F, fname);
 		if ((input = popen(buf, "r")) == NULL) {
 			fprintf(stderr, "Cannot execute: %s\n", buf);
 			return(-1);
@@ -96,9 +96,7 @@ char  *fname;
 		return(-1);
 	}
 				/* set line spacing (overlap for knitting) */
-	fputs("\0333\042", stdout);
-				/* clear line buffer */
-	clearlbuf();
+	fputs("\0333\042\022", stdout);
 				/* put out scanlines */
 	for (i = yres-1; i >= 0; i--) {
 		if (freadcolrs(scanline, xres, input) < 0) {
@@ -120,43 +118,63 @@ char  *fname;
 }
 
 
-plotscan(scan, len, y)			/* plot a scanline */
-COLR  scan[];
-int  len;
-int  y;
+static void
+plotscan(			/* plot a scanline */
+	COLR  scan[],
+	int  len,
+	int  y
+)
 {
-	int  bpos;
+	int  bpos, start, end;
 	register long  c;
 	register int  i;
 
-	if (bpos = y % 23) {
+	bpos = y % 23;
+	for (i = 0; i < len; i++)
+		lpat[i] |= (long)bit(scan[i],i) << bpos;
 
-		for (i = 0; i < len; i++)
-			lpat[i] |= (long)bit(scan[i],i) << bpos;
-
-	} else {
-
-		fputs("\033%O", stdout);
-		putchar(len & 255);
-		putchar(len >> 8);
-		for (i = 0; i < len; i++) {
-			c = lpat[i] | bit(scan[i],i);
-						/* repeat this row */
-			lpat[i] = (c & 1) << 23;
-			putchar(c>>16);
-			putchar(c>>8 & 255);
-			putchar(c & 255);
+	if (bpos)
+		return;
+				/* find limits of non-zero print buffer */
+	for (i = 0; lpat[i] == 0; i++)
+		if (i == len-1) {
+			putchar('\n');
+			return;
 		}
-		putchar('\r');
-		putchar('\n');
-		fflush(stdout);
+	start = i - i%12;
+	i = len;
+	while (lpat[--i] == 0)
+		;
+	end = i;
+				/* skip to start position */
+	for (i = start/12; i-- > 0; )
+		putchar(' ');
+				/* print non-zero portion of buffer */
+	fputs("\033%O", stdout);
+	i = end+1-start;
+	putchar(i & 255);
+	putchar(i >> 8);
+	for (i = start; i <= end; i++) {
+		c = lpat[i];
+		putchar((int)(c>>16));
+		putchar((int)(c>>8 & 255));
+		putchar((int)(c & 255));
+		if (y)			/* repeat this row next time */
+			lpat[i] = (c & 1) << 23;
+		else			/* or clear for next image */
+			lpat[i] = 0L;
 	}
+	putchar('\r');
+	putchar('\n');
+	fflush(stdout);
 }
 
 
-bit(col, x)		/* determine bit value for pixel at x */
-COLR  col;
-register int  x;
+static int
+bit(		/* determine bit value for pixel at x */
+	COLR  col,
+	register int  x
+)
 {
 	static int  cerr[NCOLS];
 	static int  err;