From f5881a8c963eaf6b5ad72c6cfaef7b35e7f5edd2 Mon Sep 17 00:00:00 2001 From: Bruce Hill Date: Fri, 15 Jan 2021 18:43:03 -0800 Subject: Better behavior for --context when it comes to --inplace (context used for --confirm) --- bp.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/bp.c b/bp.c index 2482eae..4627ed7 100644 --- a/bp.c +++ b/bp.c @@ -186,14 +186,15 @@ static void confirm_replacements(file_t *f, match_t *m, confirm_t *confirm) } { // Print the original - printer_t pr = {.file = f, .context_lines = 1, + printer_t pr = {.file = f, .context_lines = context_lines, .use_color = 1, .print_line_numbers = 1}; print_match(tty_out, &pr, m->child); // Print trailing context lines: print_match(tty_out, &pr, NULL); } + if (context_lines > 1) fprintf(tty_out, "\n"); { // Print the replacement - printer_t pr = {.file = f, .context_lines = 1, + printer_t pr = {.file = f, .context_lines = context_lines, .use_color = 1, .print_line_numbers = 1}; print_match(tty_out, &pr, m); // Print trailing context lines: @@ -236,7 +237,7 @@ static int inplace_modify_file(def_t *defs, file_t *f, pat_t *pattern) char tmp_filename[PATH_MAX+1] = {0}; printer_t pr = { .file = f, - .context_lines = context_lines, + .context_lines = ALL_CONTEXT, .use_color = 0, .print_line_numbers = 0, }; @@ -480,7 +481,6 @@ int main(int argc, char *argv[]) } } - if (mode == MODE_INPLACE) context_lines = ALL_CONTEXT; if (context_lines == USE_DEFAULT_CONTEXT) context_lines = 1; if (context_lines < 0 && context_lines != ALL_CONTEXT) context_lines = 0; -- cgit v1.2.3