--- ray/src/util/rpiece.c	1995/11/30 09:26:20	2.31
+++ ray/src/util/rpiece.c	2003/06/08 12:03:11	2.38
@@ -1,9 +1,6 @@
-/* Copyright (c) 1995 Regents of the University of California */
-
 #ifndef lint
-static char SCCSid[] = "$SunId$ LBL";
+static const char	RCSid[] = "$Id: rpiece.c,v 2.38 2003/06/08 12:03:11 schorsch Exp $";
 #endif
-
 /*
  * Generate sections of a picture.
  */
@@ -25,7 +22,6 @@ char *argv[];
 #include <signal.h>
 #include "color.h"
 #include "view.h"
-#include "resolu.h"
 
 #ifndef NFS
 #define  NFS			1
@@ -47,6 +43,9 @@ char *argv[];
 #define guard_io()	0
 #define unguard()	0
 #endif
+
+extern char  *strerror();
+
 				/* rpict command */
 char  *rpargv[128] = {"rpict", "-S", "1"};
 int  rpargc = 3;
@@ -72,10 +71,8 @@ int  verbose = 0;
 unsigned  timelim = 0;
 int  rvrlim = -1;
 
-extern long  lseek(), ftell();
-
 int  gotalrm = 0;
-int  onalrm() { gotalrm++; }
+void  onalrm(int i) { gotalrm++; }
 
 
 main(argc, argv)
@@ -87,12 +84,13 @@ char  *argv[];
 	progname = argv[0];
 	for (i = 1; i < argc; i++) {
 						/* expand arguments */
-		while (rval = expandarg(&argc, &argv, i))
-			if (rval < 0) {
-				fprintf(stderr, "%s: cannot expand '%s'",
-						argv[0], argv[i]);
-				exit(1);
-			}
+		while ((rval = expandarg(&argc, &argv, i)) > 0)
+			;
+		if (rval < 0) {
+			fprintf(stderr, "%s: cannot expand '%s'",
+					argv[0], argv[i]);
+			exit(1);
+		}
 		if (argv[i][0] == '-')
 			switch (argv[i][1]) {
 			case 'v':
@@ -119,7 +117,7 @@ char  *argv[];
 			case 'p':		/* pixel aspect ratio? */
 				if (argv[i][2] != 'a' || argv[i][3])
 					break;
-				pixaspect = atof(argv[i+1]);
+				pixaspect = atof(argv[++i]);
 				continue;
 			case 'T':		/* time limit (hours) */
 				if (argv[i][2])
@@ -193,12 +191,11 @@ int  fd;
 int  ltyp;
 {
 	static struct flock  fls;	/* static so initialized to zeroes */
-	extern char  *sys_errlist[];
 
 	fls.l_type = ltyp;
 	if (fcntl(fd, F_SETLKW, &fls) < 0) {
 		fprintf(stderr, "%s: cannot lock/unlock file: %s\n",
-				progname, sys_errlist[errno]);
+				progname, strerror(errno));
 		exit(1);
 	}
 }
@@ -415,6 +412,11 @@ rpiece()			/* render picture piece by piece */
 		pview.horiz = ourview.horiz / hmult;
 		pview.vert = ourview.vert / vmult;
 		break;
+	case VT_CYL:
+		pview.horiz = ourview.horiz / hmult;
+		pview.vert = 2.*180./PI*atan(
+				tan(PI/180./2.*ourview.vert)/vmult );
+		break;
 	case VT_HEM:
 		pview.horiz = 2.*180./PI*asin(
 				sin(PI/180./2.*ourview.horiz)/hmult );
@@ -428,8 +430,8 @@ rpiece()			/* render picture piece by piece */
 	}
 					/* render each piece */
 	while (nextpiece(&xorg, &yorg)) {
-		pview.hoff = ourview.hoff + xorg - 0.5*(hmult-1);
-		pview.voff = ourview.voff + yorg - 0.5*(vmult-1);
+		pview.hoff = ourview.hoff*hmult + xorg - 0.5*(hmult-1);
+		pview.voff = ourview.voff*vmult + yorg - 0.5*(vmult-1);
 		fputs(VIEWSTR, torp);
 		fprintview(&pview, torp);
 		putc('\n', torp);
@@ -501,7 +503,7 @@ int  xpos, ypos;
 		filerr("lock");
 #endif
 				/* write new piece to file */
-	if (lseek(outfd, fls.l_start, 0) == -1)
+	if (lseek(outfd, (off_t)fls.l_start, 0) < 0)
 		filerr("seek");
 	if (hmult == 1) {
 		if (writebuf(outfd, (char *)pbuf,
@@ -513,8 +515,8 @@ int  xpos, ypos;
 					hr*sizeof(COLR)) != hr*sizeof(COLR))
 				filerr("write");
 			if (y < vr-1 && lseek(outfd,
-					(long)(hmult-1)*hr*sizeof(COLR),
-					1) == -1)
+					(off_t)(hmult-1)*hr*sizeof(COLR),
+					1) < 0)
 				filerr("seek");
 		}
 #if NFS
@@ -522,6 +524,10 @@ int  xpos, ypos;
 	if (fcntl(outfd, F_SETLKW, &fls) < 0)
 		filerr("lock");
 #endif
+	if (verbose) {				/* notify caller */
+		printf("%d %d done\n", xpos, ypos);
+		fflush(stdout);
+	}
 	if (syncfp != NULL) {			/* record what's been done */
 		sflock(F_WRLCK);
 		fseek(syncfp, 0L, 2);		/* append index */
@@ -530,10 +536,6 @@ int  xpos, ypos;
 				/*** Unlock not necessary, since
 		sflock(F_UNLCK);	_exit() or nextpiece() is next ***/
 	}
-	if (verbose) {				/* notify caller */
-		printf("%d %d done\n", xpos, ypos);
-		fflush(stdout);
-	}
 	if (pid == -1)		/* didn't fork or fork failed */
 		return(0);
 	_exit(0);		/* else exit child process (releasing locks) */
@@ -543,10 +545,8 @@ int  xpos, ypos;
 filerr(t)			/* report file error and exit */
 char  *t;
 {
-	extern char  *sys_errlist[];
-
 	fprintf(stderr, "%s: %s error on file \"%s\": %s\n",
-			progname, t, outfile, sys_errlist[errno]);
+			progname, t, outfile, strerror(errno));
 	_exit(1);
 }