ViewVC Help

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

root/Development/ray/src/px/pcompos.c

Comparing ray/src/px/pcompos.c (file contents):
Revision 2.1 by greg, Tue Nov 12 16:04:44 1991 UTC vs.
Revision 2.4 by greg, Wed Feb 19 17:08:00 1992 UTC

#	Line 70 | Line 70 | main(argc, argv)
70		int  argc;
71		char  *argv[];
72		{
73	–	double  atof();
73		int  ncolumns = 0;
74		int  autolabel = 0;
75		int  curcol = 0, curx = 0, cury = 0;
#	Line 147 | Line 146 | dofiles:
146		case 'l':
147		if (strcmp(argv[an], "-l"))
148		goto userr;
149	<	thislabel = argv[++an];
149	>	thislabel = argv[an+1];
150	>	an += 2;
151		break;
152		case '\0':
153		if (argv[an][0] == '-')
#	Line 163 | Line 163 | getfile:
163		input[nfile].name = "<stdin>";
164		input[nfile].fp = stdin;
165		} else {
166	<	input[nfile].name = argv[an];
167	<	if ((input[nfile].fp = argv[an][0] == '!' ?
168	<	popen(argv[an]+1, "r") :
169	<	fopen(argv[an], "r")) == NULL) {
166	>	if (argv[an][0] == '!') {
167	>	input[nfile].name = "<Command>";
168	>	input[nfile].fp = popen(argv[an]+1, "r");
169	>	} else {
170	>	input[nfile].name = argv[an];
171	>	input[nfile].fp = fopen(argv[an], "r");
172	>	}
173	>	if (input[nfile].fp == NULL) {
174		perror(argv[an]);
175		quit(1);
176		}

Diff Legend

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