Inline as suggested by Tobi,

Also use a lot less code. Only handled the extra case where we display all the unknown options instead of the first encountered.

Author: Michael Vasseur

judge/judgedaemon.main.php

@@ -29,57 +29,17 @@ function dj_getopt(string $short_options, array $long_options = []): array
         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;
-    
-    $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) {
-                // The value can be appended to the short option
-                $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;
-            }
+    $unknown = false;
+    foreach (array_slice($argv, 1) as $arg) {
+        if (str_starts_with($arg, '-') && !array_key_exists(ltrim($arg, '-'), $options)) {
+            echo "Error: Unknown option: $arg\n";
+            $unknown = true;
         }
-        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";
+    if ($unknown) {
         usage();
     }
+    return $options;
 }
 
 function judging_directory(string $workdirpath, array $judgeTask) : string