s2pexec: Log level and target can be set without a current command

uweseimet · Oct 22, 2024 · a819b13 · a819b13
1 parent 1d461b3
commit a819b13
Showing 1 changed file with 30 additions and 30 deletions.
diff --git a/cpp/s2pexec/s2pexec_core.cpp b/cpp/s2pexec/s2pexec_core.cpp
@@ -223,48 +223,46 @@ bool S2pExec::ParseArguments(span<char*> args)
         throw parser_exception("Invalid log level: '" + log_level + "'");
     }
 
-    if (!initiator.empty()) {
-        if (!GetAsUnsignedInt(initiator, initiator_id) || initiator_id > 7) {
-            throw parser_exception("Invalid initiator ID: '" + initiator + "' (0-7)");
-        }
-    }
-
     if (!target.empty()) {
         if (const string &error = ProcessId(target, target_id, target_lun); !error.empty()) {
             throw parser_exception(error);
         }
     }
 
-    if (target_id == -1 && !reset_bus) {
-        throw parser_exception("Missing target ID");
-    }
+    if (!command.empty()) {
+        if (!initiator.empty()) {
+            if (!GetAsUnsignedInt(initiator, initiator_id) || initiator_id > 7) {
+                throw parser_exception("Invalid initiator ID: '" + initiator + "' (0-7)");
+            }
+        }
 
-    if (target_id == initiator_id) {
-        throw parser_exception("Target ID and initiator ID must not be identical");
-    }
+        if (target_id == -1 && !reset_bus) {
+            throw parser_exception("Missing target ID");
+        }
 
-    if (target_lun == -1) {
-        target_lun = 0;
-    }
+        if (target_id == initiator_id) {
+            throw parser_exception("Target ID and initiator ID must not be identical");
+        }
 
-    if (command.empty() && !reset_bus) {
-        throw parser_exception("Missing command block");
-    }
+        if (target_lun == -1) {
+            target_lun = 0;
+        }
 
-    if (!data.empty() && (!binary_input_filename.empty() || !hex_input_filename.empty())) {
-        throw parser_exception("An input file is not permitted when providing explicit data");
-    }
+        if (!data.empty() && (!binary_input_filename.empty() || !hex_input_filename.empty())) {
+            throw parser_exception("An input file is not permitted when providing explicit data");
+        }
 
-    if (!binary_input_filename.empty() && !hex_input_filename.empty()) {
-        throw parser_exception("There can only be a single input file");
-    }
+        if (!binary_input_filename.empty() && !hex_input_filename.empty()) {
+            throw parser_exception("There can only be a single input file");
+        }
 
-    if (!binary_output_filename.empty() && !hex_output_filename.empty()) {
-        throw parser_exception("There can only be a single output file");
-    }
+        if (!!binary_output_filename.empty() && !hex_output_filename.empty()) {
+            throw parser_exception("There can only be a single output file");
+        }
 
-    if (!GetAsUnsignedInt(tout, timeout) || !timeout) {
-        throw parser_exception("Invalid command timeout value: '" + tout + "'");
+        if ((!GetAsUnsignedInt(tout, timeout) || !timeout)) {
+            throw parser_exception("Invalid command timeout value: '" + tout + "'");
+        }
     }
 
     int buffer_size = DEFAULT_BUFFER_SIZE;
@@ -329,7 +327,9 @@ bool S2pExec::RunInteractive(bool in_process)
             continue;
         }
 
-        Run();
+        if (!command.empty()) {
+            Run();
+        }
     }
 
     CleanUp();