X-Git-Url: https://git.subgeniuskitty.com/unix-history/.git/blobdiff_plain/2d0289aeb9f9d8055f4490df3400ff77538ee6bf..012f1c1f260ef76777703acc36b76ab0b0fcf278:/usr/src/old/vfilters/vpltdmp/vpltdmp.c

diff --git a/usr/src/old/vfilters/vpltdmp/vpltdmp.c b/usr/src/old/vfilters/vpltdmp/vpltdmp.c
index ec4493775d..f7ff82efe0 100644
--- a/usr/src/old/vfilters/vpltdmp/vpltdmp.c
+++ b/usr/src/old/vfilters/vpltdmp/vpltdmp.c
@@ -1,24 +1,28 @@
-/****************************************************************/
-/*								*/
-/*								*/
-/* Copyright (C) 1981, Regents of the University of California	*/
-/*	All rights reserved					*/
-/*								*/
-/****************************************************************/
-/*  VPLTDMP: version 4.3			updated %G%
+/*
+ * Copyright (c) 1983 Regents of the University of California.
+ * All rights reserved.  The Berkeley software License Agreement
+ * specifies the terms and conditions for redistribution.
+ */
+
+#ifndef lint
+static char sccsid[] = "@(#)vpltdmp.c	5.1 (Berkeley) %G%";
+#endif not lint
+
+/*
+ * Copyright (C) 1981, Regents of the University of California
+ *	All rights reserved
  *
  *  reads raster file created by vplot and dumps it onto the
  *  Varian or Versatec plotter.
  *  Input comes from file descriptor 0, output is to file descriptor 1.
  */
 #include <stdio.h>
-#include <signal.h>
 #include <sys/vcmd.h>
 
 #define IN	0
 #define OUT	1
 
-static	char *Sid = "@(#)vpltdmp.c	4.3\t%G%";
+static	char *Sid = "@(#)vpltdmp.c	5.1\t%G%";
 
 int	plotmd[] = { VPLOT };
 int	prtmd[]  = { VPRINT };
@@ -33,9 +37,10 @@ int	PAGE_LINES;		/* number of raster lines per page. */
 char	*name, *host, *acctfile;
 
 main(argc, argv)
-char *argv[];
+	int argc;
+	char *argv[];
 {
-	register int n, bytes;
+	register int n;
 
 	while (--argc) {
 		if (**++argv == '-') {
@@ -62,19 +67,7 @@ char *argv[];
 			acctfile = *argv;
 	}
 
-	ioctl(OUT, VSETSTATE, plotmd);
-
-	bytes = 0;
-	while ((n = read(IN, buf, sizeof(buf))) > 0) {
-		if (write(OUT, buf, n) != n)
-			exit(1);
-		bytes += n;
-	}
-	if (bytes & 1) {	/* make sure even number bytes are sent */
-		write(OUT, "", 1);
-		bytes++;
-	}
-	lines = bytes / BYTES_PER_LINE;
+	n = putplot();
 
 	ioctl(OUT, VSETSTATE, prtmd);
 	if (varian)
@@ -82,7 +75,35 @@ char *argv[];
 	else
 		write(OUT, "\n\n\n\n\n", 6);
 	account(name, host, *argv);
-	exit(0);
+	exit(n);
+}
+
+putplot()
+{
+	register char *cp;
+	register int bytes, n;
+
+	cp = buf;
+	bytes = 0;
+	ioctl(OUT, VSETSTATE, plotmd);
+	while ((n = read(IN, cp, sizeof(buf))) > 0) {
+		if (write(OUT, cp, n) != n)
+			return(1);
+		bytes += n;
+	}
+	/*
+	 * Make sure we send complete raster lines.
+	 */
+	if ((n = bytes % BYTES_PER_LINE) > 0) {
+		n = BYTES_PER_LINE - n;
+		for (cp = &buf[n]; cp > buf; )
+			*--cp = 0;
+		if (write(OUT, cp, n) != n)
+			return(1);
+		bytes += n;
+	}
+	lines += bytes / BYTES_PER_LINE;
+	return(0);
 }
 
 account(who, from, acctfile)
@@ -98,7 +119,7 @@ account(who, from, acctfile)
 	 * Varian accounting is done by 8.5 inch pages;
 	 * Versatec accounting is by the (12 inch) foot.
 	 */
-	fprintf(a, "t%6.2f\t", (lines / 200.0) / PAGE_LINES);
+	fprintf(a, "t%6.2f\t", (double)lines / (double)PAGE_LINES);
 	if (from != NULL)
 		fprintf(a, "%s:", from);
 	fprintf(a, "%s\n", who);