Add function to parse getopt in a less buggy way

Not sure if it's worth the extra code but fixes all found issues from the reviews.

Author: Michael Vasseur

judge/judgedaemon.main.php

@@ -16,6 +16,70 @@
 $endpoints = [];
 $domjudge_config = [];
 
+function dj_getopt(string $short_options, array $long_options = []): array
+{
+    global $argv;
+    define('GETOPT_REGEX', "/^([a-zA-Z0-9]:{0,2})*$/");
+    $options = getopt($short_options, $long_options);
+    if (preg_match(GETOPT_REGEX, $short_options) !== 1) {
+        echo "Error: short options format specified is invalid.\n";
+        usage();
+    }
+    if ($options===false || !is_array($argv)) {
+        echo "Error: parsing options failed.\nPlease check: `register_argc_arg` in php.ini.\n";
+        usage();
+    }
+    check_unknown_cli_options($options);
+    return $options;
+}
+
+function check_unknown_cli_options(array $options): void
+{
+    global $argc;
+    global $argv;
+    // Cleanup the original arguments
+    $t_argv = $argv;
+    // The first is the script name
+    $t_argc = $argc-1;
+    unset($t_argv[0]);
+    $t_argv = array_values($t_argv);
+
+    foreach ($options as $option_key => $option_value) {
+        $short = '-'.$option_key;
+        $long = '--'.$option_key;
+        $possible = [$short, $long];
+
+        $values = [];
+        if ($option_value !== false) {
+            if (is_string($option_value)) {
+                $values = [$option_value];
+            } else {
+                $values = $option_value;
+            }
+            foreach ($values as $value) {
+                $possible[] = $short.$value;
+            }
+        }
+
+        $t_remove = [];
+        for ($i = 0; $i < $t_argc; $i++) {
+            if (in_array($t_argv[$i], array_merge($possible, $values))) {
+                $t_remove[] = $i;
+            }
+        }
+        foreach ($t_remove as $t) {
+            unset($t_argv[$t]);
+        }
+        $t_argv = array_values($t_argv);
+        $t_argc -= count($t_remove);
+    }
+
+    if (count($t_argv) !== 0) {
+        echo "Error: found unknown arguments: '" . implode(' ', $t_argv) . "'.\n";
+        usage();
+    }
+}
+
 function judging_directory(string $workdirpath, array $judgeTask) : string
 {
     if (filter_var($judgeTask['submitid'], FILTER_VALIDATE_INT) === false ||
@@ -483,16 +547,7 @@ function fetch_executable_internal(
     return [$execrunpath, null, null];
 }
 
-$shortoptions = "dv:n:hVe:j:t:";
-$regex = "/^([a-zA-Z0-9]:{0,2})*$/";
-if (preg_match($regex, $shortoptions) !== 1) {
-    echo "Error: short options format specified is invalid.\n";
-}
-$options = getopt($shortoptions, ["diskspace-error"]);
-if ($options===false || !is_array($argv)) {
-    echo "Error: parsing options failed.\nPlease check: `register_argc_arg` in php.ini.\n";
-    usage();
-}
+$options = dj_getopt("dv:n:hVe:j:t:", ["diskspace-error"]);
 if (isset($options['v'])) {
     $options['verbose'] = $options['v'];
 }

webapp/src/Controller/API/JudgehostController.php

@@ -744,7 +744,8 @@ public function internalErrorAction(Request $request): ?int
 
         $field_name = null;
         $disabled_id = null;
-        if (in_array($disabled['kind'], ['compile_script', 'compare_script', 'run_script'])) {
+        var_dump($disabled);
+        if (in_array($disabled['kind'], ['compile_script', 'compare_script', 'run_script', 'debug_script'])) {
             $field_name = $disabled['kind'] . '_id';
             $disabled_id = $disabled[$field_name];