ViewVC Help

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

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

Comparing ray/src/util/ranimate.c (file contents):
Revision 2.8 by greg, Wed Jan 24 14:31:36 1996 UTC vs.
Revision 2.10 by greg, Tue Feb 20 16:13:53 1996 UTC

#	Line 15 | Line 15 | static char SCCSid[] = "$SunId$ LBL";
15		#include "view.h"
16		#include "vars.h"
17		#include "netproc.h"
18	+	/* default remote shell */
19	+	#ifdef _AUX_SOURCE
20	+	#define REMSH           "remsh"
21	+	#else
22	+	#define REMSH           "rsh"
23	+	#endif
24		/* input variables */
25		#define HOST            0               /* rendering host machine */
26		#define RENDER          1               /* rendering options */
#	Line 38 | Line 44 | static char SCCSid[] = "$SunId$ LBL";
44		#define DISKSPACE       19              /* how much disk space to use */
45		#define RESOLUTION      20              /* desired final resolution */
46		#define EXPOSURE        21              /* how to compute exposure */
47	+	#define RSH             22              /* remote shell script or program */
48
49	<	int     NVARS = 22;             /* total number of variables */
49	>	int     NVARS = 23;             /* total number of variables */
50
51		VARIABLE        vv[] = {                /* variable-value pairs */
52		{"host",        4,      0,      NULL,   NULL},
#	Line 64 | Line 71 | VARIABLE       vv[] = {                /* variable-value pairs */
71		{"DISKSPACE",   3,      0,      NULL,   fltvalue},
72		{"RESOLUTION",  3,      0,      NULL,   onevalue},
73		{"EXPOSURE",    3,      0,      NULL,   onevalue},
74	+	{"RSH",         3,      0,      NULL,   onevalue},
75		};
76
77		#define SFNAME  "STATUS"                /* status file name */
#	Line 84 | Line 92 | int    nowarn = 0;             /* turn warnings off? */
92		int     silent = 0;             /* silent mode? */
93		int     noaction = 0;           /* take no action? */
94
95	+	char    *remsh;                 /* remote shell program/script */
96		char    rendopt[2048] = "";     /* rendering options */
97		char    rresopt[32];            /* rendering resolution options */
98		char    fresopt[32];            /* filter resolution options */
#	Line 204 | Line 213 | getastat()                     /* check/set animation status */
213		goto fmterr;
214		fclose(fp);
215		if (astat.pid != 0) {                   /* thinks it's still running */
216	<	gethostname(buf, sizeof(buf));
208	<	if (strcmp(buf, astat.host)) {
216	>	if (strcmp(myhostname(), astat.host)) {
217		fprintf(stderr,
218		"%s: process %d may still be running on host %s\n",
219		progname, astat.pid, astat.host);
#	Line 224 | Line 232 | getastat()                     /* check/set animation status */
232		return(-1);
233		}
234		setours:                                        /* set our values */
235	<	gethostname(astat.host, sizeof(astat.host));
235	>	strcpy(astat.host, myhostname());
236		astat.pid = getpid();
237		strcpy(astat.cfname, cfname);
238		return(0);
#	Line 282 | Line 290 | checkdir()                     /* make sure we have our directory */
290
291		setdefaults()                   /* set default values */
292		{
293	+	extern char     *atos();
294		char    buf[256];
295
296		if (vdef(ANIMATE)) {
#	Line 347 | Line 356 | setdefaults()                  /* set default values */
356		vval(DISKSPACE) = "100";
357		vdef(DISKSPACE)++;
358		}
359	+	if (!vdef(RSH)) {
360	+	vval(RSH) = REMSH;
361	+	vdef(RSH)++;
362	+	}
363	+	/* locate remote shell program */
364	+	atos(buf, sizeof(buf), vval(RSH));
365	+	if ((remsh = getpath(buf, getenv("PATH"), X_OK)) != NULL)
366	+	remsh = savqstr(remsh);
367	+	else
368	+	remsh = vval(RSH);      /* will generate error if used */
369	+
370		/* append rendering options */
371		if (vdef(RENDER))
372		sprintf(rendopt+strlen(rendopt), " %s", vval(RENDER));

Diff Legend

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