1 |
|
#ifndef lint |
2 |
< |
static const char RCSid[] = "$Id$"; |
2 |
> |
static const char RCSid[] = "$Id$"; |
3 |
|
#endif |
4 |
|
/* |
5 |
|
* rcalc.c - record calculator program. |
7 |
|
* 9/11/87 |
8 |
|
*/ |
9 |
|
|
10 |
– |
#include <stdio.h> |
11 |
– |
|
10 |
|
#include <stdlib.h> |
11 |
< |
|
11 |
> |
#include <fcntl.h> |
12 |
> |
#include <stdio.h> |
13 |
> |
#include <string.h> |
14 |
|
#include <math.h> |
15 |
– |
|
15 |
|
#include <ctype.h> |
16 |
|
|
17 |
+ |
#include "platform.h" |
18 |
+ |
#include "rterror.h" |
19 |
+ |
#include "rtmisc.h" |
20 |
+ |
#include "rtio.h" |
21 |
|
#include "calcomp.h" |
22 |
|
|
20 |
– |
#ifdef CPM |
21 |
– |
#define getc agetc /* text files only, right? */ |
22 |
– |
#endif |
23 |
– |
|
23 |
|
#define isnum(c) (isdigit(c) || (c)=='-' || (c)=='.' \ |
24 |
|
|| (c)=='+' || (c)=='e' || (c)=='E') |
25 |
|
|
26 |
|
#define isblnk(c) (igneol ? isspace(c) : (c)==' '||(c)=='\t') |
27 |
|
|
28 |
< |
#define INBSIZ 4096 /* longest record */ |
28 |
> |
#define INBSIZ 16384 /* longest record */ |
29 |
|
#define MAXCOL 32 /* number of columns recorded */ |
30 |
|
|
31 |
|
/* field type specifications */ |
57 |
|
#define savqstr(s) strcpy(emalloc(strlen(s)+1),s) |
58 |
|
#define freqstr(s) efree(s) |
59 |
|
|
60 |
< |
extern char *strcpy(), *emalloc(), *savestr(); |
61 |
< |
struct strvar *getsvar(); |
60 |
> |
static int getinputrec(FILE *fp); |
61 |
> |
static void scaninp(void), advinp(void), resetinp(void); |
62 |
> |
static void putrec(void), putout(void), nbsynch(void); |
63 |
> |
static int getrec(void); |
64 |
> |
static void execute(char *file); |
65 |
> |
static void initinp(FILE *fp); |
66 |
> |
static void svpreset(char *eqn); |
67 |
> |
static void readfmt(char *spec, int output); |
68 |
> |
static int readfield(char **pp); |
69 |
> |
static int getfield(struct field *f); |
70 |
> |
static void chanset(int n, double v); |
71 |
> |
static void bchanset(int n, double v); |
72 |
> |
static struct strvar* getsvar(char *svname); |
73 |
> |
static double l_in(char *); |
74 |
|
|
75 |
|
struct field *inpfmt = NULL; /* input record format */ |
76 |
|
struct field *outfmt = NULL; /* output record structure */ |
78 |
|
|
79 |
|
int blnkeq = 1; /* blanks compare equal? */ |
80 |
|
int igneol = 0; /* ignore end of line? */ |
81 |
+ |
int passive = 0; /* passive mode (transmit unmatched input) */ |
82 |
|
char sepchar = '\t'; /* input/output separator */ |
83 |
|
int noinput = 0; /* no input records? */ |
84 |
+ |
int itype = 'a'; /* input type (a/f/F/d/D) */ |
85 |
+ |
int nbicols = 0; /* number of binary input columns */ |
86 |
+ |
int otype = 'a'; /* output format (a/f/F/d/D) */ |
87 |
|
char inpbuf[INBSIZ]; /* input buffer */ |
88 |
|
double colval[MAXCOL]; /* input column values */ |
89 |
|
unsigned long colflg = 0; /* column retrieved flags */ |
101 |
|
} ipb; /* circular lookahead buffer */ |
102 |
|
|
103 |
|
|
104 |
< |
main(argc, argv) |
105 |
< |
int argc; |
106 |
< |
char *argv[]; |
104 |
> |
int |
105 |
> |
main( |
106 |
> |
int argc, |
107 |
> |
char *argv[] |
108 |
> |
) |
109 |
|
{ |
110 |
|
int i; |
111 |
|
|
112 |
< |
esupport |= (E_VARIABLE|E_FUNCTION|E_INCHAN|E_OUTCHAN|E_RCONST); |
112 |
> |
esupport |= E_VARIABLE|E_FUNCTION|E_INCHAN|E_OUTCHAN|E_RCONST; |
113 |
> |
esupport &= ~(E_REDEFW); |
114 |
|
|
115 |
|
#ifdef BIGGERLIB |
116 |
|
biggerlib(); |
117 |
|
#endif |
118 |
|
varset("PI", ':', 3.14159265358979323846); |
119 |
+ |
funset("in", 1, '=', &l_in); |
120 |
|
|
121 |
|
for (i = 1; i < argc && argv[i][0] == '-'; i++) |
122 |
|
switch (argv[i][1]) { |
126 |
|
case 'l': |
127 |
|
igneol = !igneol; |
128 |
|
break; |
129 |
+ |
case 'p': |
130 |
+ |
passive = !passive; |
131 |
+ |
break; |
132 |
|
case 't': |
133 |
|
sepchar = argv[i][2]; |
134 |
|
break; |
145 |
|
noinput = 1; |
146 |
|
break; |
147 |
|
case 'i': |
148 |
< |
readfmt(argv[++i], 0); |
148 |
> |
switch (argv[i][2]) { |
149 |
> |
case '\0': |
150 |
> |
itype = 'a'; |
151 |
> |
nbicols = 0; |
152 |
> |
readfmt(argv[++i], 0); |
153 |
> |
break; |
154 |
> |
case 'a': |
155 |
> |
itype = 'a'; |
156 |
> |
nbicols = 0; |
157 |
> |
break; |
158 |
> |
case 'd': |
159 |
> |
case 'D': |
160 |
> |
itype = argv[i][2]; |
161 |
> |
if (isdigit(argv[i][3])) |
162 |
> |
nbicols = atoi(argv[i]+3); |
163 |
> |
else |
164 |
> |
nbicols = 1; |
165 |
> |
if (nbicols*sizeof(double) > INBSIZ) { |
166 |
> |
eputs(argv[0]); |
167 |
> |
eputs(": too many input columns\n"); |
168 |
> |
quit(1); |
169 |
> |
} |
170 |
> |
break; |
171 |
> |
case 'f': |
172 |
> |
case 'F': |
173 |
> |
itype = argv[i][2]; |
174 |
> |
if (isdigit(argv[i][3])) |
175 |
> |
nbicols = atoi(argv[i]+3); |
176 |
> |
else |
177 |
> |
nbicols = 1; |
178 |
> |
if (nbicols*sizeof(float) > INBSIZ) { |
179 |
> |
eputs(argv[0]); |
180 |
> |
eputs(": too many input columns\n"); |
181 |
> |
quit(1); |
182 |
> |
} |
183 |
> |
break; |
184 |
> |
default: |
185 |
> |
goto userr; |
186 |
> |
} |
187 |
|
break; |
188 |
|
case 'o': |
189 |
< |
readfmt(argv[++i], 1); |
189 |
> |
switch (argv[i][2]) { |
190 |
> |
case '\0': |
191 |
> |
otype = 'a'; |
192 |
> |
readfmt(argv[++i], 1); |
193 |
> |
break; |
194 |
> |
case 'a': |
195 |
> |
otype = 'a'; |
196 |
> |
break; |
197 |
> |
case 'd': |
198 |
> |
case 'D': |
199 |
> |
case 'f': |
200 |
> |
case 'F': |
201 |
> |
otype = argv[i][2]; |
202 |
> |
break; |
203 |
> |
default: |
204 |
> |
goto userr; |
205 |
> |
} |
206 |
|
break; |
207 |
|
case 'w': |
208 |
|
nowarn = !nowarn; |
210 |
|
case 'u': |
211 |
|
unbuff = !unbuff; |
212 |
|
break; |
213 |
< |
default: |
213 |
> |
default:; |
214 |
> |
userr: |
215 |
|
eputs("Usage: "); |
216 |
|
eputs(argv[0]); |
217 |
< |
eputs(" [-b][-l][-n][-w][-u][-tS][-s svar=sval][-e expr][-f source][-i infmt][-o outfmt] [file]\n"); |
217 |
> |
eputs(" [-b][-l][-n][-p][-w][-u][-tS][-s svar=sval][-e expr][-f source][-i infmt][-o outfmt] [file]\n"); |
218 |
|
quit(1); |
219 |
|
} |
220 |
< |
|
220 |
> |
if (otype != 'a') |
221 |
> |
SET_FILE_BINARY(stdout); |
222 |
|
if (noinput) { /* produce a single output record */ |
223 |
+ |
if (i < argc) { |
224 |
+ |
eputs(argv[0]); |
225 |
+ |
eputs(": file argument(s) incompatible with -n\n"); |
226 |
+ |
quit(1); |
227 |
+ |
} |
228 |
|
eclock++; |
229 |
|
putout(); |
230 |
|
quit(0); |
231 |
|
} |
232 |
+ |
if (itype != 'a') |
233 |
+ |
SET_FILE_BINARY(stdin); |
234 |
|
|
235 |
|
if (blnkeq) /* for efficiency */ |
236 |
|
nbsynch(); |
242 |
|
execute(argv[i]); |
243 |
|
|
244 |
|
quit(0); |
245 |
+ |
return 0; /* pro forma return */ |
246 |
|
} |
247 |
|
|
248 |
|
|
249 |
< |
nbsynch() /* non-blank starting synch character */ |
249 |
> |
static void |
250 |
> |
nbsynch(void) /* non-blank starting synch character */ |
251 |
|
{ |
252 |
|
if (inpfmt == NULL || (inpfmt->type & F_TYP) != T_LIT) |
253 |
|
return; |
258 |
|
} |
259 |
|
|
260 |
|
|
261 |
< |
execute(file) /* process a file */ |
262 |
< |
char *file; |
261 |
> |
static int |
262 |
> |
getinputrec( /* get next input record */ |
263 |
> |
FILE *fp |
264 |
> |
) |
265 |
|
{ |
266 |
+ |
if (inpfmt != NULL) |
267 |
+ |
return(getrec()); |
268 |
+ |
if (tolower(itype) == 'd') { |
269 |
+ |
if (fread(inpbuf, sizeof(double), nbicols, fp) != nbicols) |
270 |
+ |
return(0); |
271 |
+ |
if (itype == 'D') |
272 |
+ |
swap64(inpbuf, nbicols); |
273 |
+ |
return(1); |
274 |
+ |
} |
275 |
+ |
if (tolower(itype) == 'f') { |
276 |
+ |
if (fread(inpbuf, sizeof(float), nbicols, fp) != nbicols) |
277 |
+ |
return(0); |
278 |
+ |
if (itype == 'F') |
279 |
+ |
swap32(inpbuf, nbicols); |
280 |
+ |
return(1); |
281 |
+ |
} |
282 |
+ |
return(fgets(inpbuf, INBSIZ, fp) != NULL); |
283 |
+ |
} |
284 |
+ |
|
285 |
+ |
|
286 |
+ |
static void |
287 |
+ |
execute( /* process a file */ |
288 |
+ |
char *file |
289 |
+ |
) |
290 |
+ |
{ |
291 |
|
int conditional = vardefined("cond"); |
292 |
|
long nrecs = 0; |
293 |
|
long nout = 0; |
302 |
|
} |
303 |
|
if (inpfmt != NULL) |
304 |
|
initinp(fp); |
305 |
< |
|
306 |
< |
while (inpfmt != NULL ? getrec() : fgets(inpbuf, INBSIZ, fp) != NULL) { |
305 |
> |
|
306 |
> |
while (getinputrec(fp)) { |
307 |
|
varset("recno", '=', (double)++nrecs); |
308 |
|
colflg = 0; |
309 |
|
eclock++; |
316 |
|
} |
317 |
|
|
318 |
|
|
319 |
< |
putout() /* produce an output record */ |
319 |
> |
static void |
320 |
> |
putout(void) /* produce an output record */ |
321 |
|
{ |
207 |
– |
extern int chanset(); |
322 |
|
|
323 |
|
colpos = 0; |
324 |
|
if (outfmt != NULL) |
325 |
|
putrec(); |
326 |
< |
else |
326 |
> |
else if (otype == 'a') |
327 |
|
chanout(chanset); |
328 |
< |
if (colpos) |
328 |
> |
else |
329 |
> |
chanout(bchanset); |
330 |
> |
if (colpos && otype == 'a') |
331 |
|
putchar('\n'); |
332 |
|
if (unbuff) |
333 |
|
fflush(stdout); |
334 |
|
} |
335 |
|
|
336 |
|
|
337 |
+ |
static double |
338 |
+ |
l_in(char *funame) /* function call for $channel */ |
339 |
+ |
{ |
340 |
+ |
int n; |
341 |
+ |
register char *cp; |
342 |
+ |
/* get argument as integer */ |
343 |
+ |
n = (int)(argument(1) + .5); |
344 |
+ |
if (n != 0) /* return channel value */ |
345 |
+ |
return(chanvalue(n)); |
346 |
+ |
/* determine number of channels */ |
347 |
+ |
if (noinput || inpfmt != NULL) |
348 |
+ |
return(0); |
349 |
+ |
if (nbicols) |
350 |
+ |
return(nbicols); |
351 |
+ |
cp = inpbuf; /* need to count */ |
352 |
+ |
for (n = 0; *cp; ) |
353 |
+ |
if (blnkeq && isspace(sepchar)) { |
354 |
+ |
while (isspace(*cp)) |
355 |
+ |
cp++; |
356 |
+ |
n += *cp != '\0'; |
357 |
+ |
while (*cp && !isspace(*cp)) |
358 |
+ |
cp++; |
359 |
+ |
} else { |
360 |
+ |
n += *cp != '\n'; |
361 |
+ |
while (*cp && *cp++ != sepchar) |
362 |
+ |
; |
363 |
+ |
} |
364 |
+ |
return(n); |
365 |
+ |
} |
366 |
+ |
|
367 |
|
double |
368 |
< |
chanvalue(n) /* return value for column n */ |
369 |
< |
int n; |
368 |
> |
chanvalue( /* return value for column n */ |
369 |
> |
int n |
370 |
> |
) |
371 |
|
{ |
372 |
|
int i; |
373 |
|
register char *cp; |
380 |
|
eputs("illegal channel number\n"); |
381 |
|
quit(1); |
382 |
|
} |
383 |
+ |
if (nbicols) { |
384 |
+ |
if (n > nbicols) |
385 |
+ |
return(0.0); |
386 |
+ |
if (tolower(itype) == 'd') { |
387 |
+ |
cp = inpbuf + (n-1)*sizeof(double); |
388 |
+ |
return(*(double *)cp); |
389 |
+ |
} |
390 |
+ |
cp = inpbuf + (n-1)*sizeof(float); |
391 |
+ |
return(*(float *)cp); |
392 |
+ |
} |
393 |
|
if (n <= MAXCOL && colflg & 1L<<(n-1)) |
394 |
|
return(colval[n-1]); |
395 |
|
|
415 |
|
} |
416 |
|
|
417 |
|
|
418 |
< |
chanset(n, v) /* output column n */ |
419 |
< |
int n; |
420 |
< |
double v; |
418 |
> |
void |
419 |
> |
chanset( /* output column n */ |
420 |
> |
int n, |
421 |
> |
double v |
422 |
> |
) |
423 |
|
{ |
424 |
|
if (colpos == 0) /* no leading separator */ |
425 |
|
colpos = 1; |
431 |
|
} |
432 |
|
|
433 |
|
|
434 |
< |
readfmt(spec, output) /* read record format */ |
435 |
< |
char *spec; |
436 |
< |
int output; |
434 |
> |
void |
435 |
> |
bchanset( /* output binary channel n */ |
436 |
> |
int n, |
437 |
> |
double v |
438 |
> |
) |
439 |
|
{ |
440 |
+ |
static char zerobuf[sizeof(double)]; |
441 |
+ |
float fval = v; |
442 |
+ |
|
443 |
+ |
while (++colpos < n) |
444 |
+ |
fwrite(zerobuf, |
445 |
+ |
tolower(otype)=='d' ? sizeof(double) : sizeof(float), |
446 |
+ |
1, stdout); |
447 |
+ |
switch (otype) { |
448 |
+ |
case 'D': |
449 |
+ |
swap64((char *)&v, 1); |
450 |
+ |
/* fall through */ |
451 |
+ |
case 'd': |
452 |
+ |
fwrite(&v, sizeof(double), 1, stdout); |
453 |
+ |
break; |
454 |
+ |
case 'F': |
455 |
+ |
swap32((char *)&fval, 1); |
456 |
+ |
/* fall through */ |
457 |
+ |
case 'f': |
458 |
+ |
fwrite(&fval, sizeof(float), 1, stdout); |
459 |
+ |
break; |
460 |
+ |
} |
461 |
+ |
} |
462 |
+ |
|
463 |
+ |
|
464 |
+ |
static void |
465 |
+ |
readfmt( /* read record format */ |
466 |
+ |
char *spec, |
467 |
+ |
int output |
468 |
+ |
) |
469 |
+ |
{ |
470 |
|
int fd; |
471 |
|
char *inptr; |
472 |
|
struct field fmt; |
484 |
|
eputs(": cannot open\n"); |
485 |
|
quit(1); |
486 |
|
} |
487 |
< |
res = read(fd, inpbuf+1, INBSIZ-1); |
487 |
> |
res = read(fd, inpbuf+2, INBSIZ-2); |
488 |
|
if (res <= 0 || res >= INBSIZ-1) { |
489 |
|
eputs(spec); |
490 |
|
if (res < 0) |
496 |
|
quit(1); |
497 |
|
} |
498 |
|
close(fd); |
499 |
< |
(inptr=inpbuf+1)[res] = '\0'; |
499 |
> |
(inptr=inpbuf+2)[res] = '\0'; |
500 |
|
} |
501 |
|
f = &fmt; /* get fields */ |
502 |
|
while ((res = readfield(&inptr)) != F_NUL) { |
529 |
|
} |
530 |
|
|
531 |
|
|
532 |
< |
int |
533 |
< |
readfield(pp) /* get next field in format */ |
534 |
< |
register char **pp; |
532 |
> |
static int |
533 |
> |
readfield( /* get next field in format */ |
534 |
> |
register char **pp |
535 |
> |
) |
536 |
|
{ |
537 |
|
int type = F_NUL; |
538 |
|
int width = 0; |
597 |
|
|
598 |
|
|
599 |
|
struct strvar * |
600 |
< |
getsvar(svname) /* get string variable */ |
601 |
< |
char *svname; |
600 |
> |
getsvar( /* get string variable */ |
601 |
> |
char *svname |
602 |
> |
) |
603 |
|
{ |
604 |
|
register struct strvar *sv; |
605 |
|
|
615 |
|
} |
616 |
|
|
617 |
|
|
618 |
< |
svpreset(eqn) /* preset a string variable */ |
619 |
< |
char *eqn; |
618 |
> |
static void |
619 |
> |
svpreset( /* preset a string variable */ |
620 |
> |
char *eqn |
621 |
> |
) |
622 |
|
{ |
623 |
|
register struct strvar *sv; |
624 |
|
register char *val; |
637 |
|
} |
638 |
|
|
639 |
|
|
640 |
< |
clearrec() /* clear input record variables */ |
640 |
> |
static void |
641 |
> |
clearrec(void) /* clear input record variables */ |
642 |
|
{ |
643 |
|
register struct field *f; |
644 |
|
|
657 |
|
} |
658 |
|
|
659 |
|
|
660 |
< |
getrec() /* get next record from file */ |
660 |
> |
static int |
661 |
> |
getrec(void) /* get next record from file */ |
662 |
|
{ |
663 |
|
int eatline; |
664 |
|
register struct field *f; |
665 |
< |
|
665 |
> |
|
666 |
|
while (ipb.chr != EOF) { |
667 |
< |
eatline = !igneol && ipb.chr != '\n'; |
471 |
< |
if (blnkeq) /* beware of nbsynch() */ |
667 |
> |
if (blnkeq) { /* beware of nbsynch() */ |
668 |
|
while (isblnk(ipb.chr)) |
669 |
< |
scaninp(); |
669 |
> |
resetinp(); |
670 |
> |
if (ipb.chr == EOF) |
671 |
> |
return(0); |
672 |
> |
} |
673 |
> |
eatline = (!igneol && ipb.chr != '\n'); |
674 |
|
clearrec(); /* start with fresh record */ |
675 |
|
for (f = inpfmt; f != NULL; f = f->next) |
676 |
|
if (getfield(f) == -1) |
677 |
|
break; |
678 |
|
if (f == NULL) { |
679 |
< |
advinp(); |
679 |
> |
advinp(); /* got one! */ |
680 |
|
return(1); |
681 |
|
} |
682 |
< |
resetinp(); |
682 |
> |
resetinp(); /* eat false start */ |
683 |
|
if (eatline) { /* eat rest of line */ |
684 |
|
while (ipb.chr != '\n') { |
685 |
|
if (ipb.chr == EOF) |
686 |
|
return(0); |
687 |
< |
scaninp(); |
687 |
> |
resetinp(); |
688 |
|
} |
689 |
< |
scaninp(); |
490 |
< |
advinp(); |
689 |
> |
resetinp(); |
690 |
|
} |
691 |
|
} |
692 |
|
return(0); |
693 |
|
} |
694 |
|
|
695 |
|
|
696 |
< |
getfield(f) /* get next field */ |
697 |
< |
register struct field *f; |
696 |
> |
static int |
697 |
> |
getfield( /* get next field */ |
698 |
> |
register struct field *f |
699 |
> |
) |
700 |
|
{ |
701 |
< |
static char buf[MAXWORD+1]; /* no recursion! */ |
701 |
> |
static char buf[RMAXWORD+1]; /* no recursion! */ |
702 |
|
int delim, inword; |
703 |
|
double d; |
704 |
|
char *np; |
731 |
|
delim = f->next->f.sl[0]; |
732 |
|
cp = buf; |
733 |
|
do { |
734 |
< |
if (ipb.chr == EOF) |
734 |
> |
if (ipb.chr == EOF || ipb.chr == '\n') |
735 |
|
inword = 0; |
736 |
|
else if (blnkeq && delim != EOF) |
737 |
|
inword = isblnk(delim) ? |
743 |
|
*cp++ = ipb.chr; |
744 |
|
scaninp(); |
745 |
|
} |
746 |
< |
} while (inword && cp < &buf[MAXWORD]); |
746 |
> |
} while (inword && cp < &buf[RMAXWORD]); |
747 |
|
*cp = '\0'; |
748 |
|
if (f->f.sv->val == NULL) |
749 |
|
f->f.sv->val = savqstr(buf); /* first setting */ |
772 |
|
*cp++ = ipb.chr; |
773 |
|
scaninp(); |
774 |
|
} |
775 |
< |
} while (inword && cp < &buf[MAXWORD]); |
775 |
> |
} while (inword && cp < &buf[RMAXWORD]); |
776 |
|
*cp = '\0'; |
777 |
|
d = np==NULL ? 0. : atof(np); |
778 |
|
if (!vardefined(f->f.nv)) |
782 |
|
return(-1); /* doesn't match! */ |
783 |
|
return(0); |
784 |
|
} |
785 |
+ |
return -1; /* pro forma return */ |
786 |
|
} |
787 |
|
|
788 |
|
|
789 |
< |
putrec() /* output a record */ |
789 |
> |
static void |
790 |
> |
putrec(void) /* output a record */ |
791 |
|
{ |
792 |
|
char fmt[32]; |
793 |
|
register int n; |
837 |
|
} |
838 |
|
|
839 |
|
|
840 |
< |
initinp(fp) /* prepare lookahead buffer */ |
841 |
< |
FILE *fp; |
840 |
> |
static void |
841 |
> |
initinp(FILE *fp) /* prepare lookahead buffer */ |
842 |
> |
|
843 |
|
{ |
844 |
|
ipb.fin = fp; |
845 |
|
ipb.beg = ipb.end = inpbuf; |
849 |
|
} |
850 |
|
|
851 |
|
|
852 |
< |
scaninp() /* scan next character */ |
852 |
> |
static void |
853 |
> |
scaninp(void) /* scan next character */ |
854 |
|
{ |
855 |
|
if (ipb.chr == EOF) |
856 |
|
return; |
869 |
|
} |
870 |
|
|
871 |
|
|
872 |
< |
advinp() /* move home to current position */ |
872 |
> |
static void |
873 |
> |
advinp(void) /* move home to current position */ |
874 |
|
{ |
875 |
|
ipb.beg = ipb.pos; |
876 |
|
} |
877 |
|
|
878 |
|
|
879 |
< |
resetinp() /* rewind position and advance 1 */ |
879 |
> |
static void |
880 |
> |
resetinp(void) /* rewind position and advance 1 */ |
881 |
|
{ |
882 |
|
if (ipb.beg == NULL) /* full */ |
883 |
|
ipb.beg = ipb.end; |
884 |
|
ipb.pos = ipb.beg; |
885 |
|
ipb.chr = *ipb.pos; |
886 |
+ |
if (passive) /* transmit unmatched character? */ |
887 |
+ |
fputc(ipb.chr, stdout); |
888 |
|
if (++ipb.beg >= &inpbuf[INBSIZ]) |
889 |
|
ipb.beg = inpbuf; |
890 |
|
scaninp(); |
892 |
|
|
893 |
|
|
894 |
|
void |
895 |
< |
eputs(msg) |
687 |
< |
char *msg; |
895 |
> |
eputs(char *msg) |
896 |
|
{ |
897 |
|
fputs(msg, stderr); |
898 |
|
} |
899 |
|
|
900 |
|
|
901 |
|
void |
902 |
< |
wputs(msg) |
695 |
< |
char *msg; |
902 |
> |
wputs(char *msg) |
903 |
|
{ |
904 |
|
if (!nowarn) |
905 |
|
eputs(msg); |
907 |
|
|
908 |
|
|
909 |
|
void |
910 |
< |
quit(code) |
704 |
< |
int code; |
910 |
> |
quit(int code) |
911 |
|
{ |
912 |
|
exit(code); |
913 |
|
} |