ViewVC Help

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

root/Development/ray/src/rt/rview.c

Comparing ray/src/rt/rview.c (file contents):
Revision 1.5 by greg, Mon Jul 10 15:21:25 1989 UTC vs.
Revision 1.6 by greg, Sat Jul 29 00:11:31 1989 UTC

#	Line 68 | Line 68 | int  code;
68		devopen(dname)                          /* open device driver */
69		char  *dname;
70		{
71	<	extern char  *progname;
71	>	extern char  *progname, *octname;
72		char  *devargv[3];
73		register int  i;
74	+
75	+	devargv[0] = dname;
76	+	devargv[1] = octname!=NULL ? octname : progname;
77	+	devargv[2] = NULL;
78		/* check device table */
79		for (i = 0; devtable[i].name; i++)
80		if (!strcmp(dname, devtable[i].name))
81	<	if ((dev = (*devtable[i].init)(progname)) == NULL) {
81	>	if ((dev = (*devtable[i].init)(devargv[1])) == NULL) {
82		sprintf(errmsg, "cannot initialize %s", dname);
83		error(USER, errmsg);
84		} else
85		return;
86		/* not there, try exec */
83	–	devargv[0] = dname;
84	–	devargv[1] = progname;
85	–	devargv[2] = NULL;
87		if ((dev = comm_init(devargv)) == NULL) {
88		sprintf(errmsg, "cannot start device \"%s\"", dname);
89		error(USER, errmsg);

Diff Legend

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