ViewVC Help

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

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

Comparing ray/src/util/rad.c (file contents):
Revision 2.58 by gwlarson, Mon Oct 19 16:21:41 1998 UTC vs.
Revision 2.60 by gwlarson, Tue Feb 2 08:57:56 1999 UTC

#	Line 1 | Line 1
1	<	/* Copyright (c) 1998 Silicon Graphics, Inc. */
1	>	/* Copyright (c) 1999 Silicon Graphics, Inc. */
2
3		#ifndef lint
4		static char SCCSid[] = "$SunId$ SGI";
#	Line 213 | Line 213 | register char  *fnames;
213		{
214		char    thisfile[MAXPATH];
215		time_t  thisdate, lastdate = 0;
216	–	register char   *cp;
216
217		if (fnames == NULL)
218		return(0);
219	<	while (*fnames) {
220	<	while (isspace(*fnames)) fnames++;
221	<	cp = thisfile;
222	<	while (*fnames && !isspace(*fnames))
224	<	*cp++ = *fnames++;
225	<	*cp = '\0';
219	>	while ((fnames = nextword(thisfile, MAXPATH, fnames)) != NULL) {
220	>	if (thisfile[0] == '!' ||
221	>	(thisfile[0] == '\\' && thisfile[1] == '!'))
222	>	continue;
223		if (!(thisdate = fdate(thisfile)))
224		syserr(thisfile);
225		if (thisdate > lastdate)
#	Line 1048 | Line 1045 | again:
1045		}
1046		#endif
1047		copystruct(&vwr, &stdview);
1048	<	cp = vopts;                             /* get -vf files first */
1048	>	sscanview(&vwr, cp=vopts);              /* set initial options */
1049		while ((cp = strstr(cp, "-vf ")) != NULL &&
1050	<	*atos(buf, sizeof(buf), cp += 4))
1051	<	viewfile(buf, &vwr, NULL);
1052	<	sscanview(&vwr, vopts);                 /* get the rest */
1050	>	*atos(buf, sizeof(buf), cp += 4)) {
1051	>	viewfile(buf, &vwr, NULL);      /* load -vf file */
1052	>	sscanview(&vwr, cp);            /* reset tail */
1053	>	}
1054		fputs(VIEWSTR, stdout);
1055		fprintview(&vwr, stdout);               /* print full spec. */
1056		fputc('\n', stdout);

Diff Legend

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