ViewVC Help

View File | Revision Log | Show Annotations | Download File | Root Listing

root/Development/ray/src/util/rpiece.c

Comparing ray/src/util/rpiece.c (file contents):
Revision 2.11 by greg, Sun Aug 9 23:05:17 1992 UTC vs.
Revision 2.17 by greg, Sat Feb 20 17:07:35 1993 UTC

#	Line 10 | Line 10 | static char SCCSid[] = "$SunId$ LBL";
10
11		#include "standard.h"
12		#include <fcntl.h>
13	+
14	+	#ifndef F_SETLKW
15	+
16	+	main(argc, argv)
17	+	int argc;
18	+	char *argv[];
19	+	{
20	+	fprintf(stderr, "%s: no NFS lock manager on this machine\n", argv[0]);
21	+	exit(1);
22	+	}
23	+
24	+	#else
25	+
26		#include <signal.h>
27		#include "color.h"
28		#include "view.h"
29		#include "resolu.h"
30
31	+	#ifndef NFS
32	+	#define  NFS                    1
33	+	#endif
34		/* set the following to 0 to forgo forking */
35		#ifndef MAXFORK
36	+	#if NFS
37		#define  MAXFORK                3       /* allotment of duped processes */
38	+	#else
39	+	#define  MAXFORK                0
40		#endif
41	+	#endif
42
43		/* rpict command */
44		char  *rpargv[128] = {"rpict", "-S", "1", "-x", "512", "-y", "512", "-pa", "1"};
#	Line 102 | Line 122 | char  *argv[];
122		case 'F':               /* syncronization file */
123		if (argv[i][2])
124		break;
125	<	if ((syncfd = open(argv[++i], O_RDWR)) < 0) {
125	>	if ((syncfd = open(argv[++i],
126	>	O_RDWR|O_CREAT, 0666)) < 0) {
127		fprintf(stderr, "%s: cannot open\n",
128		argv[i]);
129		exit(1);
130		}
131		continue;
132	+	case 'z':               /* z-file ist verbotten */
133	+	fprintf(stderr, "%s: -z option not allowed\n",
134	+	argv[0]);
135	+	exit(1);
136		case 'o':               /* output file */
137		if (argv[i][2])
138		break;
#	Line 123 | Line 148 | char  *argv[];
148		}
149		init(argc, argv);
150		rpiece();
151	<	rval = cleanup(0);
127	<	exit(rval);
151	>	exit(cleanup(0));
152		}
153
154
#	Line 164 | Line 188 | char  **av;
188		} else if ((outfd = open(outfile, O_RDWR)) >= 0) {
189		if ((fp = fdopen(dup(outfd), "r+")) == NULL)
190		goto filerr;
191	<	getheader(fp, NULL);            /* skip header */
192	<	if (fscnresolu(&hr, &vr, fp) < 0 ||     /* check resolution */
191	>	getheader(fp, NULL, NULL);      /* skip header */
192	>	if (!fscnresolu(&hr, &vr, fp) ||        /* check resolution */
193		hr != hres*hmult || vr != vres*vmult) {
194		fprintf(stderr, "%s: resolution mismatch on file \"%s\"\n",
195		progname, outfile);
#	Line 179 | Line 203 | char  **av;
203		scanorig = ftell(fp);           /* record position of first scanline */
204		if (fclose(fp) == -1)           /* done with stream i/o */
205		goto filerr;
206	+	#if NFS
207		sync();                         /* flush NFS buffers */
208	+	#endif
209		/* start rpict process */
210		if (open_process(rpd, rpargv) <= 0) {
211		fprintf(stderr, "%s: cannot start %s\n", progname, rpargv[0]);
#	Line 232 | Line 258 | int  *xp, *yp;
258		return(0);
259		}
260		}
261	<	sprintf(buf, "%d %d\n%d %d\n", hmult, vmult, *xp, *yp);
261	>	sprintf(buf, "%4d %4d\n%4d %4d\n", hmult, vmult, *xp, *yp);
262		lseek(syncfd, 0L, 0);           /* write new position */
263		write(syncfd, buf, strlen(buf));
264		fls.l_type = F_UNLCK;           /* release sync file */
#	Line 325 | Line 351 | int  xpos, ypos;
351		exit(cleanup(1));
352		}
353		/* check header from rpict */
354	<	getheader(fromrp, NULL);
355	<	if (fscnresolu(&hr, &vr, fromrp) < 0 || hr != hres | vr != vres) {
354	>	getheader(fromrp, NULL, NULL);
355	>	if (!fscnresolu(&hr, &vr, fromrp) || hr != hres | vr != vres) {
356		fprintf(stderr, "%s: resolution mismatch from %s\n",
357		progname, rpargv[0]);
358		exit(cleanup(1));
#	Line 352 | Line 378 | int  xpos, ypos;
378		#else
379		pid = -1;               /* no forking */
380		#endif
355	–	/* lock file section so NFS doesn't mess up */
356	–	fls.l_whence = 0;
381		fls.l_len = (long)vres*hmult*hres*sizeof(COLR);
382		fls.l_start = scanorig + (vmult-1-ypos)*fls.l_len;
383	+	#if NFS
384	+	/* lock file section so NFS doesn't mess up */
385	+	fls.l_whence = 0;
386		fls.l_type = F_WRLCK;
387		fcntl(outfd, F_SETLKW, &fls);
388	+	#endif
389		/* write new piece to file */
390		if (lseek(outfd, fls.l_start+(long)xpos*hres*sizeof(COLR), 0) == -1)
391		goto seekerr;
#	Line 376 | Line 404 | int  xpos, ypos;
404		goto seekerr;
405		}
406		if (pid == -1) {        /* fork failed */
407	+	#if NFS
408		fls.l_type = F_UNLCK;           /* release lock */
409		fcntl(outfd, F_SETLKW, &fls);
410	+	#endif
411		return(0);
412		}
413		_exit(0);               /* else exit child process (releasing lock) */
#	Line 388 | Line 418 | writerr:
418		fprintf(stderr, "%s: write error on file \"%s\"\n", progname, outfile);
419		_exit(1);
420		}
421	+
422	+	#endif

Diff Legend

–	Removed lines
+	Added lines
<	Changed lines (old)
>	Changed lines (new)