Ticket #940: nALFS-1.2.4-disable-digest-checking.patch

src/handlers/unpack.c

@@ -40 +40 @@
 #include "nprint.h"
 #include "parser.h"
 #include "backend.h"
+#include "options.h"
 
 
 #define El_unpack_archive(el) alloc_trimmed_param_value("archive", el)
@@ -191 +192 @@
         if (change_current_dir(destination))
                 goto free_all_and_return;
 
-        alloc_element_digest(el, &digest, &digest_type);
+        if (!*opt_disable_digest)
+                alloc_element_digest(el, &digest, &digest_type);
 
         /* Check if archive exists. */
         if ((stat(archive, &file_stat))) {

src/init.c

@@ -304 +304 @@
         LONG_OPTION_VERSION,
         LONG_OPTION_HELP,
         LONG_OPTION_GENERATE_STAMP,
+        LONG_OPTION_DISABLE_DIGEST,
         LONG_OPTION_RCFILE,
 };
 
@@ -358 +359 @@
 "    -p, --prune <dirs>            Ignore <dirs> (separated with spaces) when\n"
 "                                  logging files.\n"
 "    -S, --generate-stamp          Toggle stamp mode.\n"
+"    -d, --disable-digest          Disable digest checking\n"
 "    --rcfile <file>               Use <file> as configuration file.\n"
 "    -v, --verbose                 Toggle verbosity (%s).\n"
 "    --version                     Display program's version.\n"
@@ -417 +419 @@
         {"help", no_argument, NULL, LONG_OPTION_HELP},
 
         {"generate-stamp", no_argument, NULL, LONG_OPTION_GENERATE_STAMP},
+        
+        {"disable-digest", no_argument, NULL, LONG_OPTION_DISABLE_DIGEST},      
 
         {"rcfile", required_argument, NULL, LONG_OPTION_RCFILE},
 
@@ -425 +429 @@
         };
 
 
-        while ((i = getopt_long(*argc, *argv, "lPfhisBSL:b:p:v", long_opts, NULL)) != -1) {
+        while ((i = getopt_long(*argc, *argv, "lPfhisBSdL:b:p:v", long_opts, NULL)) != -1) {
                 switch (i) {
                         case LONG_OPTION_DISPLAY_ALFS:
                                 Toggle(*opt_display_alfs);
@@ -491 +495 @@
                                 Toggle(*opt_stamp_packages);
                                 break;
 
+                        case 'd':
+                        case LONG_OPTION_DISABLE_DIGEST:
+                                Toggle(*opt_disable_digest);
+                                break;
+
                         case LONG_OPTION_RCFILE:
                                 parse_rc_file(optarg);
                                 break;

src/nalfs.c

@@ -1888 +1888 @@
 }
 #endif
 
+static INLINE void toggle_disable_digest(void)
+{
+        if (*opt_disable_digest) {
+                Nprint("Digest checking now enabled.");
+                *opt_disable_digest = 0;
+        } else {
+                Nprint("Digest checking now disabled.");
+                *opt_disable_digest = 1;
+        }
+}
+
 static INLINE void toggle_system_output(void)
 {
         if (Backend_exists) {

src/option-array.h

@@ -57 +57 @@
 &real_opt_log_handlers,
 &real_opt_log_backend,
 &real_opt_stamp_packages,
+&real_opt_disable_digest,
 &real_opt_display_stage_header,
 &real_opt_warn_if_set,
 &real_opt_follow_running,

src/options.h

@@ -58 +58 @@
 BOOL_OPTION(log_backend, 1, NULL, NULL);
 BOOL_OPTION(stamp_packages, 0, NULL, NULL);
 STRING_OPTION(stamp_directory, "stamps", NULL, NULL);
+BOOL_OPTION(disable_digest, 0, NULL, NULL);
 BOOL_OPTION(display_stage_header, 0, NULL, NULL);
 STRING_OPTION(find_base, "/", NULL, NULL);
 STRING_OPTION(find_prunes, "", NULL, NULL);