ViewVC Help

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

root/Development/ray/src/cal/lam.c

Comparing ray/src/cal/lam.c (file contents):
Revision 1.9 by greg, Sun May 7 15:44:28 2006 UTC vs.
Revision 1.12 by greg, Fri Jul 26 16:45:04 2013 UTC

#	Line 31 | Line 31 | main(argc, argv)
31		int     argc;
32		char    *argv[];
33		{
34	<	register int    i;
34	>	int     unbuff = 0;
35	>	int     i;
36		char    *curtab;
37		int     curbytes;
38	<	int     running, puteol;
38	>	int     puteol;
39
40		curtab = "\t";
41		curbytes = 0;
#	Line 45 | Line 46 | char   *argv[];
46		case 't':
47		curtab = argv[i]+2;
48		break;
49	+	case 'u':
50	+	unbuff = !unbuff;
51	+	break;
52		case 'i':
53		switch (argv[i][2]) {
54		case 'f':
#	Line 53 | Line 57 | char   *argv[];
57		case 'd':
58		curbytes = sizeof(double);
59		break;
60	<	case 'w':
60	>	case 'i':
61		curbytes = sizeof(int);
62		break;
63	+	case 'w':
64	+	curbytes = 2;
65	+	break;
66	+	case 'b':
67	+	curbytes = 1;
68	+	break;
69		case 'a':
70	<	curbytes = argv[i][3] ? 1 : 0;
70	>	curbytes = argv[i][3] ? -1 : 0;
71		break;
72		default:
73		goto badopt;
74		}
75		if (isdigit(argv[i][3]))
76		curbytes *= atoi(argv[i]+3);
77	<	if (curbytes < 0 || curbytes > MAXLINE) {
77	>	if (abs(curbytes) > MAXLINE) {
78		fputs(argv[0], stderr);
79	<	fputs(": illegal input size\n", stderr);
79	>	fputs(": input size too big\n", stderr);
80		exit(1);
81		}
82		if (curbytes)
#	Line 74 | Line 84 | char   *argv[];
84		break;
85		case '\0':
86		tabc[nfiles] = curtab;
87	<	bytsiz[nfiles] = curbytes;
88	<	input[nfiles++] = stdin;
87	>	input[nfiles] = stdin;
88	>	if (curbytes > 0)
89	>	SET_FILE_BINARY(input[nfiles]);
90	>	else
91	>	curbytes = -curbytes;
92	>	bytsiz[nfiles++] = curbytes;
93		break;
94		badopt:;
95		default:
#	Line 85 | Line 99 | char   *argv[];
99		}
100		} else if (argv[i][0] == '!') {
101		tabc[nfiles] = curtab;
88	–	bytsiz[nfiles] = curbytes;
102		if ((input[nfiles] = popen(argv[i]+1, "r")) == NULL) {
103		fputs(argv[i], stderr);
104		fputs(": cannot start command\n", stderr);
105		exit(1);
106		}
107	<	if (bytsiz[nfiles])
107	>	if (curbytes > 0)
108		SET_FILE_BINARY(input[nfiles]);
109	<	++nfiles;
109	>	else
110	>	curbytes = -curbytes;
111	>	bytsiz[nfiles++] = curbytes;
112		} else {
113		tabc[nfiles] = curtab;
99	–	bytsiz[nfiles] = curbytes;
114		if ((input[nfiles] = fopen(argv[i], "r")) == NULL) {
115		fputs(argv[i], stderr);
116		fputs(": cannot open file\n", stderr);
117		exit(1);
118		}
119	<	if (bytsiz[nfiles])
119	>	if (curbytes > 0)
120		SET_FILE_BINARY(input[nfiles]);
121	<	++nfiles;
121	>	else
122	>	curbytes = -curbytes;
123	>	bytsiz[nfiles++] = curbytes;
124		}
125		if (nfiles >= MAXFILE) {
126		fputs(argv[0], stderr);
#	Line 112 | Line 128 | char   *argv[];
128		exit(1);
129		}
130		}
131	<	puteol = 0;                             /* check for tab character */
131	>	puteol = 0;                             /* check for ASCII output */
132		for (i = nfiles; i--; )
133	<	if (isprint(tabc[i][0]) || tabc[i][0] == '\t') {
133	>	if (!bytsiz[i] || isprint(tabc[i][0]) || tabc[i][0] == '\t') {
134		puteol++;
135		break;
136		}
137	<	do {
122	<	running = 0;
137	>	for ( ; ; ) {                           /* main loop */
138		for (i = 0; i < nfiles; i++) {
139		if (bytsiz[i]) {                /* binary file */
140	<	if (fread(buf, bytsiz[i], 1, input[i]) == 1) {
141	<	if (i)
127	<	fputs(tabc[i], stdout);
128	<	fwrite(buf, bytsiz[i], 1, stdout);
129	<	running++;
130	<	}
131	<	} else if (fgets(buf, MAXLINE, input[i]) != NULL) {
140	>	if (fread(buf, bytsiz[i], 1, input[i]) < 1)
141	>	break;
142		if (i)
143		fputs(tabc[i], stdout);
144	+	fwrite(buf, bytsiz[i], 1, stdout);
145	+	} else {
146	+	if (fgets(buf, MAXLINE, input[i]) == NULL)
147	+	break;
148	+	if (i)
149	+	fputs(tabc[i], stdout);
150		buf[strlen(buf)-1] = '\0';
151		fputs(buf, stdout);
136	–	puteol++;
137	–	running++;
152		}
153		}
154	<	if (running && puteol)
154	>	if (i < nfiles)
155	>	break;
156	>	if (puteol)
157		putchar('\n');
158	<	} while (running);
159	<
160	<	exit(0);
158	>	if (unbuff)
159	>	fflush(stdout);
160	>	}
161	>	return(0);
162		}

Diff Legend

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