[Privoxy-devel] utils/prepare-configfile.pl

[Lee]

utils/prepare-configfile.pl seems not quite rite - config is missing
stuff after doing a
  make config-file

Would someone double-check and see if this makes things better:
$ git diff -- prepare-configfile.pl
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/ *$//;


git diff -- config shows things like
@@ -381,7 +382,7 @@ logdir .
 #      configuration for ad blocking, cookie management, privacy
 #      considerations, etc.
 #
-actionsfile match-all.action ##
+actionsfile match-all.action # Actions that are applied to all sites
and maybe overruled later on.
 actionsfile default.action   # Main actions file
 actionsfile user.action      # User customizations
 #
@@ -609,9 +610,9 @@ logfile logfile
 #      problem on your own.
 #
 #debug     1 # Log the destination for each request Privoxy
-#
+#   let through.
 #debug  1024 # Log the destination for requests Privoxy
-#
+#   didn't let through, and the reason why.
 #debug  4096 # Startup banner and warnings
 #debug  8192 # Non-fatal errors
 #
@@ -1218,7 +1219,7 @@ enable-proxy-authentication-forwarding 0
 #      +-----------------------------------------------------+
 #
 trusted-cgi-referer http://www.example.org/
-#
+#  local-privoxy-control-page
 #

which looks much better.  But I've been working on this for way too
long now & it wouldn't surprise me if I was missing something stupid

Thanks,
Lee