From: Lee <ler762@users.sourceforge.net>
Date: Tue, 23 Oct 2018 16:00:20 +0000 (-0400)
Subject: improve handling of @@line continuations
X-Git-Tag: v_3_0_27~36
X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=commitdiff_plain;h=b374496daac41b610b0c0d4b2367efbf41880554

improve handling of @@line continuations

  # XXX: someone should figure out what this stuff
  # is supposed to do (and if it really does that).
still holds
---

diff --git a/utils/prepare-configfile.pl b/utils/prepare-configfile.pl
index 59a76913..dc68632b 100755
--- a/utils/prepare-configfile.pl
+++ b/utils/prepare-configfile.pl
@@ -51,6 +51,13 @@ sub main() {
             s/^\s+/ /;
             $unfold_mode = 0;
         } else {
+            if ( $hit_option ) {
+               # processing a continuation of a @@ line
+               if ( /^\s*$/ ) { # blank line
+                  $hit_option = 0;
+                  next;
+               }
+            }
             s/^/#  /;
         }
         if ($unfolding_enabled and
@@ -62,8 +69,6 @@ sub main() {
         # XXX: someone should figure out what this stuff
         # is supposed to do (and if it really does that).
         s/^#  #/####/ if /^#  #{12,}/;
-        s/^.*$// if $hit_option;
-        $hit_option = 0;
         s/^\n//;
         s/^#\s*-{20,}//;
         s/ *$//;