From 11d4864a7bacbc21f10d3a7d76935443c654bb11 Mon Sep 17 00:00:00 2001 From: Ralph Lange Date: Thu, 30 Apr 2026 20:02:29 +0200 Subject: [PATCH] Fix GenerateFlatDatabase command line parser - Bug was introduced with 2922eb8 in v2.8.3 - fixes #32 --- .../cosylab/vdct/GenerateFlatDatabase.java | 26 +++++++------------ 1 file changed, 9 insertions(+), 17 deletions(-) diff --git a/src/main/java/com/cosylab/vdct/GenerateFlatDatabase.java b/src/main/java/com/cosylab/vdct/GenerateFlatDatabase.java index ceff27d6d..9085dc0f8 100755 --- a/src/main/java/com/cosylab/vdct/GenerateFlatDatabase.java +++ b/src/main/java/com/cosylab/vdct/GenerateFlatDatabase.java @@ -122,24 +122,20 @@ public static boolean parseCommandLine(String[] args) for (int i = 0; i < args.length; i++) { switch (state) { - case 0: - - if (args[i].equals("--")) { - state = 1; - break; - } + case 0: + if (args[i].equals("--")) { + state = 1; + break; + } - if (args[i].startsWith("-")) { + if (args[i].startsWith("-")) { if (args[i].equals("-d") || args[i].equals("--dbd-file")) { //dbd file i++; - if (i >= args.length) { System.err.println("Missing .dbd file name."); - return false; } - dbdEntries.add(new DBDEntry(args[i])); continue; } else if (args[i].equals("--enable-capfast")) { @@ -157,27 +153,23 @@ public static boolean parseCommandLine(String[] args) } else if (args[i].equals("--disable-macro-warnings")) { Settings.getInstance().setDisableMacroWarnings(true); continue; + } else if (args[i].equals("-h") || args[i].equals("--help")) { printHelp(); - return false; - } else if (args[i].equals("-v") || args[i].equals("--version")) { printVersion(); - return false; } else { System.err.println("Invalid parameter: " + args[i]+"\n"); printHelp(); - return false; } } + // Intentionally no break here - break; // unreachable, but makes static code analysis happy - - case 1: + case 1: vdbFile = new File(args[i]); state = 2;