From fac3fd97721958c8570869d24dd112fc6cbc468e Mon Sep 17 00:00:00 2001 From: Bruce Hill Date: Thu, 23 Sep 2021 15:24:08 -0700 Subject: Moving pattern lifetime tracking off of files and onto its own list of allocated pats. --- bp.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'bp.c') diff --git a/bp.c b/bp.c index ffb286e..f1ca2ed 100644 --- a/bp.c +++ b/bp.c @@ -467,17 +467,17 @@ int main(int argc, char *argv[]) } else if (FLAG("-p") || FLAG("--pattern")) { file_t *arg_file = spoof_file(&loaded_files, "", flag, -1); pat_t *p = assert_pat(arg_file, bp_pattern(arg_file, arg_file->start)); - pattern = chain_together(arg_file, pattern, p); + pattern = chain_together(pattern, p); } else if (FLAG("-w") || FLAG("--word")) { require(asprintf(&flag, "\\|%s\\|", flag), "Could not allocate memory"); file_t *arg_file = spoof_file(&loaded_files, "", flag, -1); delete(&flag); pat_t *p = assert_pat(arg_file, bp_stringpattern(arg_file, arg_file->start)); - pattern = chain_together(arg_file, pattern, p); + pattern = chain_together(pattern, p); } else if (FLAG("-s") || FLAG("--skip")) { file_t *arg_file = spoof_file(&loaded_files, "", flag, -1); pat_t *s = assert_pat(arg_file, bp_pattern(arg_file, arg_file->start)); - options.skip = either_pat(arg_file, options.skip, s); + options.skip = either_pat(options.skip, s); } else if (FLAG("-C") || FLAG("--context")) { options.context_before = options.context_after = context_from_flag(flag); } else if (FLAG("-B") || FLAG("--before-context")) { @@ -499,7 +499,7 @@ int main(int argc, char *argv[]) if (pattern != NULL) break; file_t *arg_file = spoof_file(&loaded_files, "", argv[0], -1); pat_t *p = assert_pat(arg_file, bp_stringpattern(arg_file, arg_file->start)); - pattern = chain_together(arg_file, pattern, p); + pattern = chain_together(pattern, p); ++argv; } else { errx(EXIT_FAILURE, "Unrecognized flag: %s\n\n%s", argv[0], usage); -- cgit v1.2.3