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 nbicols = 0; /* number of binary input columns */ |
125 |
|
case 'l': |
126 |
|
igneol = !igneol; |
127 |
|
break; |
128 |
+ |
case 'p': |
129 |
+ |
passive = !passive; |
130 |
+ |
break; |
131 |
|
case 't': |
132 |
|
sepchar = argv[i][2]; |
133 |
|
break; |
205 |
|
userr: |
206 |
|
eputs("Usage: "); |
207 |
|
eputs(argv[0]); |
208 |
< |
eputs(" [-b][-l][-n][-w][-u][-tS][-s svar=sval][-e expr][-f source][-i infmt][-o outfmt] [file]\n"); |
208 |
> |
eputs(" [-b][-l][-n][-p][-w][-u][-tS][-s svar=sval][-e expr][-f source][-i infmt][-o outfmt] [file]\n"); |
209 |
|
quit(1); |
210 |
|
} |
211 |
|
|
454 |
|
eputs(": cannot open\n"); |
455 |
|
quit(1); |
456 |
|
} |
457 |
< |
res = read(fd, inpbuf+1, INBSIZ-1); |
457 |
> |
res = read(fd, inpbuf+2, INBSIZ-2); |
458 |
|
if (res <= 0 || res >= INBSIZ-1) { |
459 |
|
eputs(spec); |
460 |
|
if (res < 0) |
466 |
|
quit(1); |
467 |
|
} |
468 |
|
close(fd); |
469 |
< |
(inptr=inpbuf+1)[res] = '\0'; |
469 |
> |
(inptr=inpbuf+2)[res] = '\0'; |
470 |
|
} |
471 |
|
f = &fmt; /* get fields */ |
472 |
|
while ((res = readfield(&inptr)) != F_NUL) { |
628 |
|
|
629 |
|
|
630 |
|
static int |
631 |
< |
getrec(void) /* get next record from file */ |
631 |
> |
getrec(void) /* get next record from file */ |
632 |
|
{ |
633 |
|
int eatline; |
634 |
|
register struct field *f; |
635 |
< |
|
635 |
> |
|
636 |
|
while (ipb.chr != EOF) { |
637 |
|
eatline = !igneol && ipb.chr != '\n'; |
638 |
|
if (blnkeq) /* beware of nbsynch() */ |
639 |
|
while (isblnk(ipb.chr)) |
640 |
< |
scaninp(); |
640 |
> |
resetinp(); |
641 |
|
clearrec(); /* start with fresh record */ |
642 |
|
for (f = inpfmt; f != NULL; f = f->next) |
643 |
|
if (getfield(f) == -1) |
644 |
|
break; |
645 |
|
if (f == NULL) { |
646 |
< |
advinp(); |
646 |
> |
advinp(); /* got one! */ |
647 |
|
return(1); |
648 |
|
} |
649 |
< |
resetinp(); |
649 |
> |
resetinp(); /* eat false start */ |
650 |
|
if (eatline) { /* eat rest of line */ |
651 |
|
while (ipb.chr != '\n') { |
652 |
|
if (ipb.chr == EOF) |
653 |
|
return(0); |
654 |
< |
scaninp(); |
654 |
> |
resetinp(); |
655 |
|
} |
656 |
< |
scaninp(); |
653 |
< |
advinp(); |
656 |
> |
resetinp(); |
657 |
|
} |
658 |
|
} |
659 |
|
return(0); |
850 |
|
ipb.beg = ipb.end; |
851 |
|
ipb.pos = ipb.beg; |
852 |
|
ipb.chr = *ipb.pos; |
853 |
+ |
if (passive) /* transmit unmatched character? */ |
854 |
+ |
fputc(ipb.chr, stdout); |
855 |
|
if (++ipb.beg >= &inpbuf[INBSIZ]) |
856 |
|
ipb.beg = inpbuf; |
857 |
|
scaninp(); |