From 454a8759afbd538cc69a985ad7c822a5012deadc Mon Sep 17 00:00:00 2001
From: Michael Bayne <mdb@fb.com>
Date: Mon, 3 Jul 2017 09:21:53 -0700
Subject: [PATCH] Apply strict comments to digest.txt file as well.

---
 .../com/threerings/getdown/data/Application.java     | 12 ++++++++----
 .../java/com/threerings/getdown/data/Digest.java     |  7 ++++---
 2 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/src/main/java/com/threerings/getdown/data/Application.java b/src/main/java/com/threerings/getdown/data/Application.java
index 14218ce..a62f21c 100644
--- a/src/main/java/com/threerings/getdown/data/Application.java
+++ b/src/main/java/com/threerings/getdown/data/Application.java
@@ -582,6 +582,9 @@ public class Application
             throw new IOException("m.missing_class");
         }
 
+        // determine whether we want strict comments
+        _strictComments = Boolean.parseBoolean((String)cdata.get("strict_comments"));
+
         // check to see if we're using a custom java.version property and regex
         vstr = (String)cdata.get("java_version_prop");
         if (vstr != null) _javaVersionProp = vstr;
@@ -1166,7 +1169,7 @@ public class Application
 
         // this will read in the contents of the digest file and validate itself
         try {
-            _digest = new Digest(_appdir);
+            _digest = new Digest(_appdir, _strictComments);
         } catch (IOException ioe) {
             log.info("Failed to load digest: " + ioe.getMessage() + ". Attempting recovery...");
         }
@@ -1180,7 +1183,7 @@ public class Application
             try {
                 status.updateStatus("m.checking");
                 downloadDigestFiles();
-                _digest = new Digest(_appdir);
+                _digest = new Digest(_appdir, _strictComments);
                 if (!olddig.equals(_digest.getMetaDigest())) {
                     log.info("Unversioned digest changed. Revalidating...");
                     status.updateStatus("m.validating");
@@ -1198,7 +1201,7 @@ public class Application
         if (_digest == null) {
             status.updateStatus("m.updating_metadata");
             downloadDigestFiles();
-            _digest = new Digest(_appdir);
+            _digest = new Digest(_appdir, _strictComments);
         }
 
         // now verify the contents of our main config file
@@ -1209,7 +1212,7 @@ public class Application
             // caller because there's nothing we can do to automatically recover
             downloadConfigFile();
             downloadDigestFiles();
-            _digest = new Digest(_appdir);
+            _digest = new Digest(_appdir, _strictComments);
             // revalidate everything if we end up downloading new metadata
             clearValidationMarkers();
             // if the new copy validates, reinitialize ourselves; otherwise report baffling hoseage
@@ -1817,6 +1820,7 @@ public class Application
     protected String _class;
     protected String _name;
     protected String _dockIconPath;
+    protected boolean _strictComments;
     protected boolean _windebug;
     protected boolean _allowOffline;
 
diff --git a/src/main/java/com/threerings/getdown/data/Digest.java b/src/main/java/com/threerings/getdown/data/Digest.java
index 41ad0be..071cedd 100644
--- a/src/main/java/com/threerings/getdown/data/Digest.java
+++ b/src/main/java/com/threerings/getdown/data/Digest.java
@@ -98,8 +98,8 @@ public class Digest
      * Creates a digest instance which will parse and validate the digest in the supplied
      * application directory, using the current digest version.
      */
-    public Digest (File appdir) throws IOException {
-        this(appdir, VERSION);
+    public Digest (File appdir, boolean strictComments) throws IOException {
+        this(appdir, VERSION, strictComments);
     }
 
     /**
@@ -107,13 +107,14 @@ public class Digest
      * application directory.
      * @param version the version of the digest protocol to use.
      */
-    public Digest (File appdir, int version) throws IOException
+    public Digest (File appdir, int version, boolean strictComments) throws IOException
     {
         // parse and validate our digest file contents
         String filename = digestFile(version);
         StringBuilder data = new StringBuilder();
         File dfile = new File(appdir, filename);
         ConfigUtil.ParseOpts opts = ConfigUtil.createOpts(false);
+        opts.strictComments = strictComments;
         // bias = toward key: the key is the filename and could conceivably contain = signs, value
         // is the hex encoded hash which will not contain =
         opts.biasToKey = true;