[BACK]Return to util.c CVS log [TXT][DIR] Up to [local] / src / usr.bin / grep

Annotation of src/usr.bin/grep/util.c, Revision 1.27

1.27    ! otto        1: /*     $OpenBSD: util.c,v 1.26 2004/05/07 19:06:59 otto Exp $  */
1.3       deraadt     2:
1.1       deraadt     3: /*-
                      4:  * Copyright (c) 1999 James Howard and Dag-Erling Coïdan Smørgrav
                      5:  * All rights reserved.
                      6:  *
                      7:  * Redistribution and use in source and binary forms, with or without
                      8:  * modification, are permitted provided that the following conditions
                      9:  * are met:
                     10:  * 1. Redistributions of source code must retain the above copyright
                     11:  *    notice, this list of conditions and the following disclaimer.
                     12:  * 2. Redistributions in binary form must reproduce the above copyright
                     13:  *    notice, this list of conditions and the following disclaimer in the
                     14:  *    documentation and/or other materials provided with the distribution.
                     15:  *
                     16:  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
                     17:  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
                     18:  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
                     19:  * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
                     20:  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
                     21:  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
                     22:  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
                     23:  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
                     24:  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
                     25:  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
                     26:  * SUCH DAMAGE.
                     27:  */
                     28:
                     29: #include <sys/types.h>
                     30: #include <sys/stat.h>
                     31:
                     32: #include <ctype.h>
                     33: #include <err.h>
                     34: #include <errno.h>
                     35: #include <fts.h>
                     36: #include <regex.h>
                     37: #include <stdio.h>
                     38: #include <stdlib.h>
                     39: #include <string.h>
                     40: #include <unistd.h>
                     41: #include <zlib.h>
                     42:
                     43: #include "grep.h"
                     44:
                     45: /*
                     46:  * Process a file line by line...
                     47:  */
                     48:
                     49: static int     linesqueued;
1.4       tedu       50: static int     procline(str_t *l, int);
1.23      millert    51: static int     grep_search(fastgrep_t *, unsigned char *, size_t, regmatch_t *pmatch);
1.6       tedu       52: static int     grep_cmp(const unsigned char *, const unsigned char *, size_t);
                     53: static void    grep_revstr(unsigned char *, int);
1.1       deraadt    54:
1.2       deraadt    55: int
1.1       deraadt    56: grep_tree(char **argv)
                     57: {
1.10      deraadt    58:        FTS     *fts;
                     59:        FTSENT  *p;
                     60:        int     c, fts_flags;
1.1       deraadt    61:
                     62:        c = fts_flags = 0;
                     63:
                     64:        if (Hflag)
                     65:                fts_flags = FTS_COMFOLLOW;
                     66:        if (Pflag)
                     67:                fts_flags = FTS_PHYSICAL;
                     68:        if (Sflag)
                     69:                fts_flags = FTS_LOGICAL;
                     70:
                     71:        fts_flags |= FTS_NOSTAT | FTS_NOCHDIR;
                     72:
1.11      millert    73:        if (!(fts = fts_open(argv, fts_flags, NULL)))
1.14      millert    74:                err(2, NULL);
1.1       deraadt    75:        while ((p = fts_read(fts)) != NULL) {
                     76:                switch (p->fts_info) {
                     77:                case FTS_DNR:
                     78:                        break;
                     79:                case FTS_ERR:
1.14      millert    80:                        errx(2, "%s: %s", p->fts_path, strerror(p->fts_errno));
1.1       deraadt    81:                        break;
                     82:                case FTS_DP:
                     83:                        break;
                     84:                default:
                     85:                        c += procfile(p->fts_path);
                     86:                        break;
                     87:                }
                     88:        }
                     89:
                     90:        return c;
                     91: }
                     92:
                     93: int
                     94: procfile(char *fn)
                     95: {
                     96:        str_t ln;
                     97:        file_t *f;
1.4       tedu       98:        int c, t, z, nottext;
1.1       deraadt    99:
                    100:        if (fn == NULL) {
                    101:                fn = "(standard input)";
                    102:                f = grep_fdopen(STDIN_FILENO, "r");
                    103:        } else {
                    104:                f = grep_open(fn, "r");
                    105:        }
                    106:        if (f == NULL) {
                    107:                if (!sflag)
                    108:                        warn("%s", fn);
                    109:                return 0;
                    110:        }
1.4       tedu      111:
                    112:        nottext = grep_bin_file(f);
                    113:        if (nottext && binbehave == BIN_FILE_SKIP) {
1.1       deraadt   114:                grep_close(f);
                    115:                return 0;
                    116:        }
                    117:
                    118:        ln.file = fn;
                    119:        ln.line_no = 0;
1.20      espie     120:        ln.len = 0;
1.1       deraadt   121:        linesqueued = 0;
                    122:        ln.off = -1;
                    123:
                    124:        if (Bflag > 0)
                    125:                initqueue();
1.27    ! otto      126:        for (c = 0;  c == 0 || !(lflag || qflag); ) {
1.1       deraadt   127:                ln.off += ln.len + 1;
                    128:                if ((ln.dat = grep_fgetln(f, &ln.len)) == NULL)
                    129:                        break;
                    130:                if (ln.len > 0 && ln.dat[ln.len - 1] == '\n')
                    131:                        --ln.len;
                    132:                ln.line_no++;
                    133:
                    134:                z = tail;
1.2       deraadt   135:
1.4       tedu      136:                if ((t = procline(&ln, nottext)) == 0 && Bflag > 0 && z == 0) {
1.1       deraadt   137:                        enqueue(&ln);
                    138:                        linesqueued++;
                    139:                }
                    140:                c += t;
                    141:        }
                    142:        if (Bflag > 0)
                    143:                clearqueue();
                    144:        grep_close(f);
                    145:
                    146:        if (cflag) {
                    147:                if (!hflag)
                    148:                        printf("%s:", ln.file);
                    149:                printf("%u\n", c);
                    150:        }
                    151:        if (lflag && c != 0)
                    152:                printf("%s\n", fn);
                    153:        if (Lflag && c == 0)
                    154:                printf("%s\n", fn);
1.4       tedu      155:        if (c && !cflag && !lflag && !Lflag &&
1.7       tedu      156:            binbehave == BIN_FILE_BIN && nottext && !qflag)
1.4       tedu      157:                printf("Binary file %s matches\n", fn);
                    158:
1.1       deraadt   159:        return c;
                    160: }
                    161:
                    162:
                    163: /*
                    164:  * Process an individual line in a file. Return non-zero if it matches.
                    165:  */
                    166:
                    167: #define isword(x) (isalnum(x) || (x) == '_')
                    168:
                    169: static int
1.4       tedu      170: procline(str_t *l, int nottext)
1.1       deraadt   171: {
                    172:        regmatch_t      pmatch;
1.15      dhartmei  173:        int             c, i, r;
1.1       deraadt   174:
                    175:        if (matchall) {
                    176:                c = !vflag;
                    177:                goto print;
                    178:        }
1.2       deraadt   179:
1.1       deraadt   180:        for (c = i = 0; i < patterns; i++) {
1.22      millert   181:                if (fg_pattern[i].pattern) {
1.6       tedu      182:                        r = grep_search(&fg_pattern[i], (unsigned char *)l->dat,
1.9       millert   183:                            l->len, &pmatch);
1.22      millert   184:                } else {
                    185:                        pmatch.rm_so = 0;
                    186:                        pmatch.rm_eo = l->len;
1.9       millert   187:                        r = regexec(&r_pattern[i], l->dat, 1, &pmatch, eflags);
1.22      millert   188:                }
                    189:                if (r == 0 && xflag) {
                    190:                        if (pmatch.rm_so != 0 || pmatch.rm_eo != l->len)
                    191:                                r = REG_NOMATCH;
1.1       deraadt   192:                }
1.15      dhartmei  193:                if (r == 0) {
1.1       deraadt   194:                        c++;
                    195:                        break;
                    196:                }
                    197:        }
1.15      dhartmei  198:        if (vflag)
                    199:                c = !c;
1.2       deraadt   200:
1.1       deraadt   201: print:
1.4       tedu      202:        if (c && binbehave == BIN_FILE_BIN && nottext)
                    203:                return c; /* Binary file */
                    204:
1.1       deraadt   205:        if ((tail > 0 || c) && !cflag && !qflag) {
                    206:                if (c) {
1.5       deraadt   207:                        if (first > 0 && tail == 0 && (Bflag < linesqueued) &&
                    208:                            (Aflag || Bflag))
1.1       deraadt   209:                                printf("--\n");
                    210:                        first = 1;
                    211:                        tail = Aflag;
                    212:                        if (Bflag > 0)
                    213:                                printqueue();
                    214:                        linesqueued = 0;
                    215:                        printline(l, ':');
                    216:                } else {
                    217:                        printline(l, '-');
                    218:                        tail--;
                    219:                }
                    220:        }
                    221:        return c;
                    222: }
                    223:
1.6       tedu      224: /*
1.10      deraadt   225:  * Returns: -1 on failure, 0 on success
1.6       tedu      226:  */
                    227: int
1.25      millert   228: fgrepcomp(fastgrep_t *fg, const char *pattern)
                    229: {
                    230:        int i;
                    231:
                    232:        /* Initialize. */
                    233:        fg->patternLen = strlen(pattern);
                    234:        fg->bol = 0;
                    235:        fg->eol = 0;
                    236:        fg->wmatch = wflag;
                    237:        fg->reversedSearch = 0;
                    238:
                    239:        /*
                    240:         * Make a copy and upper case it for later if in -i mode,
                    241:         * else just copy the pointer.
                    242:         */
                    243:        if (iflag) {
                    244:                fg->pattern = grep_malloc(fg->patternLen + 1);
                    245:                for (i = 0; i < fg->patternLen; i++)
                    246:                        fg->pattern[i] = toupper(pattern[i]);
                    247:                fg->pattern[fg->patternLen] = '\0';
                    248:        } else
                    249:                fg->pattern = (char *)pattern;  /* really const */
                    250:
                    251:        /* Preprocess pattern. */
                    252:        for (i = 0; i <= UCHAR_MAX; i++)
                    253:                fg->qsBc[i] = fg->patternLen;
                    254:        for (i = 1; i < fg->patternLen; i++) {
                    255:                fg->qsBc[fg->pattern[i]] = fg->patternLen - i;
                    256:                /*
                    257:                 * If case is ignored, make the jump apply to both upper and
                    258:                 * lower cased characters.  As the pattern is stored in upper
                    259:                 * case, apply the same to the lower case equivalents.
                    260:                 */
                    261:                if (iflag)
                    262:                        fg->qsBc[tolower(fg->pattern[i])] = fg->patternLen - i;
                    263:        }
                    264:
                    265:        return (0);
                    266: }
                    267:
                    268: /*
                    269:  * Returns: -1 on failure, 0 on success
                    270:  */
                    271: int
1.6       tedu      272: fastcomp(fastgrep_t *fg, const char *pattern)
                    273: {
                    274:        int i;
                    275:        int bol = 0;
                    276:        int eol = 0;
                    277:        int origPatternLen;
                    278:        int shiftPatternLen;
                    279:        int hasDot = 0;
                    280:        int firstHalfDot = -1;
                    281:        int firstLastHalfDot = -1;
                    282:        int lastHalfDot = 0;
                    283:
                    284:        /* Initialize. */
                    285:        origPatternLen = fg->patternLen = strlen(pattern);
                    286:        fg->bol = 0;
                    287:        fg->eol = 0;
1.22      millert   288:        fg->wmatch = 0;
1.6       tedu      289:        fg->reversedSearch = 0;
                    290:
                    291:        /* Remove end-of-line character ('$'). */
                    292:        if (pattern[fg->patternLen - 1] == '$') {
                    293:                eol++;
                    294:                fg->eol = 1;
                    295:                fg->patternLen--;
                    296:                boleol = 1;
                    297:        }
                    298:
                    299:        /* Remove beginning-of-line character ('^'). */
                    300:        if (pattern[0] == '^') {
                    301:                bol++;
                    302:                fg->bol = 1;
                    303:                fg->patternLen--;
                    304:                boleol = 1;
                    305:        }
                    306:
1.22      millert   307:        /* Remove enclosing [[:<:]] and [[:>:]] (word match). */
1.24      millert   308:        if (fg->patternLen >= 14 &&
1.22      millert   309:            strncmp(pattern + fg->bol, "[[:<:]]", 7) == 0 &&
1.24      millert   310:            strncmp(pattern + fg->bol + fg->patternLen - 7, "[[:>:]]", 7) == 0) {
1.22      millert   311:                fg->patternLen -= 14;
                    312:                fg->wmatch = 7;
                    313:        }
                    314:
1.6       tedu      315:        /*
1.22      millert   316:         * Copy pattern minus '^' and '$' characters as well as word
                    317:         * match character classes at the beginning and ending of the
                    318:         * string respectively.
1.6       tedu      319:         */
1.22      millert   320:        fg->pattern = grep_malloc(fg->patternLen + 1);
                    321:        memcpy(fg->pattern, pattern + bol + fg->wmatch, fg->patternLen);
                    322:        fg->pattern[fg->patternLen] = '\0';
1.6       tedu      323:
                    324:        /* Look for ways to cheat...er...avoid the full regex engine. */
                    325:        for (i = 0; i < fg->patternLen; i++)
                    326:        {
                    327:                /* Can still cheat? */
                    328:                if ((isalnum(fg->pattern[i])) || isspace(fg->pattern[i]) ||
                    329:                    (fg->pattern[i] == '_') || (fg->pattern[i] == ',') ||
                    330:                    (fg->pattern[i] == '^') || (fg->pattern[i] == '$') ||
                    331:                    (fg->pattern[i] == '=') || (fg->pattern[i] == '-') ||
                    332:                    (fg->pattern[i] == ':') || (fg->pattern[i] == '/')) {
                    333:                        /* As long as it is good, upper case it for later. */
                    334:                        if (iflag)
                    335:                                fg->pattern[i] = toupper(fg->pattern[i]);
                    336:                } else if (fg->pattern[i] == '.') {
                    337:                        hasDot = i;
                    338:                        if (i < fg->patternLen / 2) {
1.19      otto      339:                                if (firstHalfDot < 0)
1.6       tedu      340:                                        /* Closest dot to the beginning */
                    341:                                        firstHalfDot = i;
                    342:                        } else {
                    343:                                /* Closest dot to the end of the pattern. */
                    344:                                lastHalfDot = i;
                    345:                                if (firstLastHalfDot < 0)
                    346:                                        firstLastHalfDot = i;
                    347:                        }
                    348:                } else {
                    349:                        /* Free memory and let others know this is empty. */
                    350:                        free(fg->pattern);
                    351:                        fg->pattern = NULL;
                    352:                        return (-1);
                    353:                }
                    354:        }
                    355:
                    356:        /*
                    357:         * Determine if a reverse search would be faster based on the placement
                    358:         * of the dots.
                    359:         */
                    360:        if ((!(lflag || cflag)) && ((!(bol || eol)) &&
                    361:            ((lastHalfDot) && ((firstHalfDot < 0) ||
                    362:            ((fg->patternLen - (lastHalfDot + 1)) < firstHalfDot))))) {
                    363:                fg->reversedSearch = 1;
                    364:                hasDot = fg->patternLen - (firstHalfDot < 0 ?
                    365:                    firstLastHalfDot : firstHalfDot) - 1;
                    366:                grep_revstr(fg->pattern, fg->patternLen);
                    367:        }
                    368:
                    369:        /*
                    370:         * Normal Quick Search would require a shift based on the position the
                    371:         * next character after the comparison is within the pattern.  With
                    372:         * wildcards, the position of the last dot effects the maximum shift
                    373:         * distance.
                    374:         * The closer to the end the wild card is the slower the search.  A
1.10      deraadt   375:         * reverse version of this algorithm would be useful for wildcards near
1.6       tedu      376:         * the end of the string.
                    377:         *
                    378:         * Examples:
                    379:         * Pattern      Max shift
                    380:         * -------      ---------
                    381:         * this         5
                    382:         * .his         4
                    383:         * t.is         3
                    384:         * th.s         2
                    385:         * thi.         1
                    386:         */
                    387:
                    388:        /* Adjust the shift based on location of the last dot ('.'). */
                    389:        shiftPatternLen = fg->patternLen - hasDot;
                    390:
                    391:        /* Preprocess pattern. */
                    392:        for (i = 0; i <= UCHAR_MAX; i++)
                    393:                fg->qsBc[i] = shiftPatternLen;
                    394:        for (i = hasDot + 1; i < fg->patternLen; i++) {
                    395:                fg->qsBc[fg->pattern[i]] = fg->patternLen - i;
                    396:                /*
                    397:                 * If case is ignored, make the jump apply to both upper and
                    398:                 * lower cased characters.  As the pattern is stored in upper
                    399:                 * case, apply the same to the lower case equivalents.
                    400:                 */
                    401:                if (iflag)
                    402:                        fg->qsBc[tolower(fg->pattern[i])] = fg->patternLen - i;
                    403:        }
                    404:
                    405:        /*
                    406:         * Put pattern back to normal after pre-processing to allow for easy
                    407:         * comparisons later.
                    408:         */
                    409:        if (fg->reversedSearch)
                    410:                grep_revstr(fg->pattern, fg->patternLen);
                    411:
                    412:        return (0);
                    413: }
                    414:
1.26      otto      415: /*
                    416:  * Word boundaries using regular expressions are defined as the point
                    417:  * of transition from a non-word char to a word char, or vice versa.
                    418:  * This means that grep -w +a and grep -w a+ never match anything,
                    419:  * because they lack a starting or ending transition, but grep -w a+b
                    420:  * does match a line containing a+b.
                    421:  */
1.22      millert   422: #define wmatch(d, l, s, e)     \
1.26      otto      423:        ((s == 0 || !isword(d[s-1])) && (e == l || !isword(d[e])) && \
                    424:          e > s && isword(d[s]) && isword(d[e-1]))
1.22      millert   425:
1.9       millert   426: static int
1.23      millert   427: grep_search(fastgrep_t *fg, unsigned char *data, size_t dataLen, regmatch_t *pmatch)
1.6       tedu      428: {
                    429:        int j;
                    430:        int rtrnVal = REG_NOMATCH;
                    431:
1.9       millert   432:        pmatch->rm_so = -1;
                    433:        pmatch->rm_eo = -1;
                    434:
1.6       tedu      435:        /* No point in going farther if we do not have enough data. */
                    436:        if (dataLen < fg->patternLen)
                    437:                return (rtrnVal);
                    438:
                    439:        /* Only try once at the beginning or ending of the line. */
                    440:        if (fg->bol || fg->eol) {
                    441:                /* Simple text comparison. */
                    442:                /* Verify data is >= pattern length before searching on it. */
                    443:                if (dataLen >= fg->patternLen) {
                    444:                        /* Determine where in data to start search at. */
                    445:                        if (fg->eol)
                    446:                                j = dataLen - fg->patternLen;
                    447:                        else
                    448:                                j = 0;
                    449:                        if (!((fg->bol && fg->eol) && (dataLen != fg->patternLen)))
1.22      millert   450:                                if (grep_cmp(fg->pattern, data + j,
                    451:                                    fg->patternLen) == -1) {
1.9       millert   452:                                        pmatch->rm_so = j;
                    453:                                        pmatch->rm_eo = j + fg->patternLen;
1.22      millert   454:                                        if (!fg->wmatch || wmatch(data, dataLen,
                    455:                                            pmatch->rm_so, pmatch->rm_eo))
                    456:                                                rtrnVal = 0;
1.9       millert   457:                                }
1.6       tedu      458:                }
                    459:        } else if (fg->reversedSearch) {
                    460:                /* Quick Search algorithm. */
1.17      millert   461:                j = dataLen;
                    462:                do {
1.6       tedu      463:                        if (grep_cmp(fg->pattern, data + j - fg->patternLen,
                    464:                            fg->patternLen) == -1) {
1.9       millert   465:                                pmatch->rm_so = j - fg->patternLen;
                    466:                                pmatch->rm_eo = j;
1.22      millert   467:                                if (!fg->wmatch || wmatch(data, dataLen,
                    468:                                    pmatch->rm_so, pmatch->rm_eo)) {
                    469:                                        rtrnVal = 0;
                    470:                                        break;
                    471:                                }
1.6       tedu      472:                        }
1.17      millert   473:                        /* Shift if within bounds, otherwise, we are done. */
                    474:                        if (j == fg->patternLen)
                    475:                                break;
                    476:                        j -= fg->qsBc[data[j - fg->patternLen - 1]];
                    477:                } while (j >= fg->patternLen);
1.6       tedu      478:        } else {
                    479:                /* Quick Search algorithm. */
                    480:                j = 0;
                    481:                do {
                    482:                        if (grep_cmp(fg->pattern, data + j, fg->patternLen) == -1) {
1.9       millert   483:                                pmatch->rm_so = j;
                    484:                                pmatch->rm_eo = j + fg->patternLen;
1.22      millert   485:                                if (!fg->wmatch || wmatch(data, dataLen,
                    486:                                    pmatch->rm_so, pmatch->rm_eo)) {
                    487:                                        rtrnVal = 0;
                    488:                                        break;
                    489:                                }
1.6       tedu      490:                        }
                    491:
                    492:                        /* Shift if within bounds, otherwise, we are done. */
                    493:                        if (j + fg->patternLen == dataLen)
                    494:                                break;
                    495:                        else
                    496:                                j += fg->qsBc[data[j + fg->patternLen]];
                    497:                } while (j <= (dataLen - fg->patternLen));
                    498:        }
                    499:
                    500:        return (rtrnVal);
                    501: }
                    502:
                    503:
1.1       deraadt   504: void *
                    505: grep_malloc(size_t size)
                    506: {
1.10      deraadt   507:        void    *ptr;
1.1       deraadt   508:
                    509:        if ((ptr = malloc(size)) == NULL)
1.14      millert   510:                err(2, "malloc");
1.1       deraadt   511:        return ptr;
                    512: }
                    513:
                    514: void *
                    515: grep_realloc(void *ptr, size_t size)
                    516: {
                    517:        if ((ptr = realloc(ptr, size)) == NULL)
1.14      millert   518:                err(2, "realloc");
1.6       tedu      519:        return ptr;
                    520: }
                    521:
                    522: /*
                    523:  * Returns:    i >= 0 on failure (position that it failed)
                    524:  *             -1 on success
                    525:  */
1.18      avsm      526: static int
1.9       millert   527: grep_cmp(const unsigned char *pattern, const unsigned char *data, size_t len)
1.6       tedu      528: {
                    529:        int i;
                    530:
                    531:        for (i = 0; i < len; i++) {
1.25      millert   532:                if (((pattern[i] == data[i]) || (!Fflag && pattern[i] == '.'))
                    533:                    || (iflag && pattern[i] == toupper(data[i])))
1.6       tedu      534:                        continue;
                    535:                return (i);
                    536:        }
                    537:
                    538:        return (-1);
                    539: }
                    540:
                    541: static void
                    542: grep_revstr(unsigned char *str, int len)
                    543: {
                    544:        int i;
                    545:        char c;
                    546:
                    547:        for (i = 0; i < len / 2; i++) {
                    548:                c = str[i];
                    549:                str[i] = str[len - i - 1];
                    550:                str[len - i - 1] = c;
                    551:        }
1.1       deraadt   552: }
                    553:
                    554: void
                    555: printline(str_t *line, int sep)
                    556: {
                    557:        int n;
1.2       deraadt   558:
1.1       deraadt   559:        n = 0;
                    560:        if (!hflag) {
                    561:                fputs(line->file, stdout);
                    562:                ++n;
                    563:        }
                    564:        if (nflag) {
                    565:                if (n)
                    566:                        putchar(sep);
                    567:                printf("%d", line->line_no);
                    568:                ++n;
                    569:        }
                    570:        if (bflag) {
                    571:                if (n)
                    572:                        putchar(sep);
1.21      otto      573:                printf("%lld", (long long)line->off);
                    574:                ++n;
1.1       deraadt   575:        }
                    576:        if (n)
                    577:                putchar(sep);
                    578:        fwrite(line->dat, line->len, 1, stdout);
                    579:        putchar('\n');
                    580: }