mirror of
https://github.com/opnsense/src.git
synced 2026-02-14 16:23:25 -05:00
a4f3f02be6
-w flag matching with an empty pattern was generally 'broken', allowing matches to occur on any line whether or not it actually matches -w criteria. This fix required a good amount of refactoring to address. procline() is altered to *only* process the line and return whether it was a match or not, necessary to be able to short-circuit the whole function in case of this matchall flag. -m flag handling is moved out as well because it suffers from the same fate as context handling if we bypass any actual pattern matching. The matching context (matches, mostly) didn't previously exist outside of procline(), so we go ahead and create context object for file processing bits to pass around. grep_printline() was created due to this, for the scenarios where the matches don't actually matter and we just want to print a line or two, a la flushing the context queue and no -o or --color specified. Damage from this broken behavior would have been mitigated by the fact that it is unlikely users would invoke grep -w with an empty pattern. This was identified while checking PR 105221 for problems it this may cause in BSD grep, but PR 105221 is *not* a report of this behavior. Submitted by: Kyle Evans <kevans91 at ksu.edu> Differential Revision: https://reviews.freebsd.org/D10433
118 lines
3 KiB
C
118 lines
3 KiB
C
/* $NetBSD: queue.c,v 1.5 2011/08/31 16:24:57 plunky Exp $ */
|
|
/* $FreeBSD$ */
|
|
|
|
/*-
|
|
* Copyright (c) 1999 James Howard and Dag-Erling Coïdan Smørgrav
|
|
* All rights reserved.
|
|
*
|
|
* Redistribution and use in source and binary forms, with or without
|
|
* modification, are permitted provided that the following conditions
|
|
* are met:
|
|
* 1. Redistributions of source code must retain the above copyright
|
|
* notice, this list of conditions and the following disclaimer.
|
|
* 2. Redistributions in binary form must reproduce the above copyright
|
|
* notice, this list of conditions and the following disclaimer in the
|
|
* documentation and/or other materials provided with the distribution.
|
|
*
|
|
* THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
|
|
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
|
|
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
|
|
* ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
|
|
* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
|
|
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
|
|
* OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
|
|
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
|
|
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
|
|
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
|
|
* SUCH DAMAGE.
|
|
*/
|
|
|
|
/*
|
|
* A really poor man's queue. It does only what it has to and gets out of
|
|
* Dodge. It is used in place of <sys/queue.h> to get a better performance.
|
|
*/
|
|
|
|
#include <sys/cdefs.h>
|
|
__FBSDID("$FreeBSD$");
|
|
|
|
#include <sys/param.h>
|
|
#include <sys/queue.h>
|
|
|
|
#include <stdlib.h>
|
|
#include <string.h>
|
|
|
|
#include "grep.h"
|
|
|
|
struct qentry {
|
|
STAILQ_ENTRY(qentry) list;
|
|
struct str data;
|
|
};
|
|
|
|
static STAILQ_HEAD(, qentry) queue = STAILQ_HEAD_INITIALIZER(queue);
|
|
static unsigned long long count;
|
|
|
|
static struct qentry *dequeue(void);
|
|
|
|
/*
|
|
* Enqueue another line; return true if we've dequeued a line as a result
|
|
*/
|
|
bool
|
|
enqueue(struct str *x)
|
|
{
|
|
struct qentry *item;
|
|
|
|
item = grep_malloc(sizeof(struct qentry));
|
|
item->data.dat = grep_malloc(sizeof(char) * x->len);
|
|
item->data.len = x->len;
|
|
item->data.line_no = x->line_no;
|
|
item->data.off = x->off;
|
|
memcpy(item->data.dat, x->dat, x->len);
|
|
item->data.file = x->file;
|
|
|
|
STAILQ_INSERT_TAIL(&queue, item, list);
|
|
|
|
if (++count > Bflag) {
|
|
item = dequeue();
|
|
free(item->data.dat);
|
|
free(item);
|
|
return (true);
|
|
}
|
|
return (false);
|
|
}
|
|
|
|
static struct qentry *
|
|
dequeue(void)
|
|
{
|
|
struct qentry *item;
|
|
|
|
item = STAILQ_FIRST(&queue);
|
|
if (item == NULL)
|
|
return (NULL);
|
|
|
|
STAILQ_REMOVE_HEAD(&queue, list);
|
|
--count;
|
|
return (item);
|
|
}
|
|
|
|
void
|
|
printqueue(void)
|
|
{
|
|
struct qentry *item;
|
|
|
|
while ((item = dequeue()) != NULL) {
|
|
grep_printline(&item->data, '-');
|
|
free(item->data.dat);
|
|
free(item);
|
|
}
|
|
}
|
|
|
|
void
|
|
clearqueue(void)
|
|
{
|
|
struct qentry *item;
|
|
|
|
while ((item = dequeue()) != NULL) {
|
|
free(item->data.dat);
|
|
free(item);
|
|
}
|
|
}
|