[Quilt-dev] [PATCH] patchfns: Compatibility fix for BSD awk

[Jean Delvare]

"+" needs to be quoted to be considered as a literal "+" by BSD awk.

Without this fix, patch_header() fails to find the beginning of the
changes and treats the whole patch as a header, subsequently causing
"quilt refresh" to append the refreshed patch after the original one
instead of replacing it.

Bug reported and fix suggested by Dominic Evans.

Signed-off-by: Jean Delvare <jdelvare@suse.de>
Fixes: 1d94980dbdd4 ("Tighten the patch format parsing")
---
 quilt/scripts/patchfns.in |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- quilt.orig/quilt/scripts/patchfns.in        2021-09-03 17:02:00.812147751 
+0200
+++ quilt/quilt/scripts/patchfns.in     2022-06-17 08:39:04.994520524 +0200
@@ -848,7 +848,7 @@ patch_header()
                MAYBE_CONTEXT=0
        }
        MAYBE_UNIFIED {
-               if (/^+++[ \t][^ \t]/)
+               if (/^\+\+\+[ \t][^ \t]/)
                        exit
                print eaten
                MAYBE_UNIFIED=0
@@ -881,7 +881,7 @@ patch_body()
                MAYBE_CONTEXT=0
        }
        MAYBE_UNIFIED {
-               if (/^+++[ \t][^ \t]/) {
+               if (/^\+\+\+[ \t][^ \t]/) {
                        print eaten
                        body=1
                }


-- 
Jean Delvare
SUSE L3 Support