Allow skipping checks on archaeologist count

a-random-lemurian · Dec 17, 2023 · c35717e · c35717e
1 parent 67ddf06
commit c35717e
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 15 deletions.
diff --git a/src/ancientpkg/ancientpkg.h b/src/ancientpkg/ancientpkg.h
@@ -41,6 +41,8 @@ typedef struct DigControlFlags
 
     /* Location */
     char* location;
+
+    int force_archaeologists;
 } DigControlFlags;
 
 typedef struct Package
@@ -138,8 +140,8 @@ int dig_common(int archaeologists, int expected_packages, int passes,
  * @param expected_packages Expected packages argument
  * @return int 
  */
-int has_missing_args(char *location, int archaeologists, int passes,
-                     int expected_packages);
+int has_missing_args(DigControlFlags *dcf, char *location, int archaeologists,
+                     int passes, int expected_packages);
 
 
 void package_shard_failure(DigControlFlags *dcf, int i, char *pkgname);

diff --git a/src/ancientpkg/dig.c b/src/ancientpkg/dig.c
@@ -56,6 +56,9 @@ int cmd_dig(int argc, char **argv)
                     "Include source packages."),
         OPT_BOOLEAN(0, "no-proprietary-packages", &dcf.no_proprietary_packages,
                     "Include only free software."),
+        OPT_GROUP("Other flags"),
+        OPT_BOOLEAN(0, "force-archaeologists", &dcf.force_archaeologists,
+                    "Ignore population limit of 8 billion on archaeologists"),
         OPT_END()};
 
     const char *usages[] = {
@@ -78,7 +81,7 @@ int cmd_dig(int argc, char **argv)
         dig_from_json(jsonfile);
     }
 
-    if (has_missing_args(location, archaeologists, passes, expected_packages))
+    if (has_missing_args(&dcf, location, archaeologists, passes, expected_packages))
     {
         printf("From the command line: missing arguments.\n");
         exit(1);

diff --git a/src/ancientpkg/digcommon.c b/src/ancientpkg/digcommon.c
@@ -245,27 +245,30 @@ int dig_common(int archaeologists, int expected_packages,
  * Check the archaeologists, passes, location, and expected_packages variables
  * and ensure that they are valid.
  */
-int has_missing_args(char *location, int archaeologists, int passes,
-                     int expected_packages)
+int has_missing_args(DigControlFlags *dcf, char *location, int archaeologists,
+                     int passes, int expected_packages)
 {
     int had_fatal_err = 0;
     if (location == NULL)
     {
         printf(ERROR "location must be specified\n");
         had_fatal_err = 1;
     }
-
-    if (archaeologists <= 1)
-    {
-        printf(ERROR "need more than 1 archaeologist.\n");
-        had_fatal_err = 1;
-    }
 
-    if (archaeologists > 8000000000)
+    if (!dcf->force_archaeologists)
     {
-        printf(ERROR "Too many archaeologists (not everyone in the world is "
-                                              "one,)\n");
-        had_fatal_err = 1;
+        if (archaeologists <= 1)
+        {
+            printf(ERROR "need more than 1 archaeologist.\n");
+            had_fatal_err = 1;
+        }
+
+        if (archaeologists > 8000000000)
+        {
+            printf(ERROR "Too many archaeologists (not everyone in the world is "
+                                                  "one,)\n");
+            had_fatal_err = 1;
+        }
     }
 
     if (passes <= 0)