From 6217c838a7a4365e4dc794f60bedd9680cfded02 Mon Sep 17 00:00:00 2001
From: Ziver Koc <ziver@koc.se>
Date: Fri, 20 May 2022 12:02:37 +0200
Subject: [PATCH] Renamed MultiPlatformBinaryManager to OSALBinaryManager

---
 src/zutil/osal/MultiCommandExecutor.java      | 35 ++++++++++++++++---
 ...{OsalDummyImpl.java => OSALDummyImpl.java} |  2 +-
 src/zutil/osal/OSAbstractionLayer.java        |  2 +-
 3 files changed, 32 insertions(+), 7 deletions(-)
 rename src/zutil/osal/{OsalDummyImpl.java => OSALDummyImpl.java} (97%)

diff --git a/src/zutil/osal/MultiCommandExecutor.java b/src/zutil/osal/MultiCommandExecutor.java
index b965f22..d6c1878 100644
--- a/src/zutil/osal/MultiCommandExecutor.java
+++ b/src/zutil/osal/MultiCommandExecutor.java
@@ -73,13 +73,17 @@ public class MultiCommandExecutor implements AutoCloseable{
         } catch (RuntimeException e) {
             throw e;
         } catch (Exception e) {
-            throw new RuntimeException("Unable to initiate shell",e);
+            throw new RuntimeException("Unable to initiate shell", e);
         }
     }
 
-
-    public void exec(String cmd) throws IOException {
-        while (readLine() != null); // read the output from previous exec
+    /**
+     * Method will execute a given command. Note that any previous output of a command will be flushed.
+     *
+     * @param cmd       Is a String containing the command to execute.
+     */
+    public synchronized void exec(String cmd) throws IOException {
+        clear();
         eol = false;
 
         stdin.write(cmd);
@@ -94,6 +98,19 @@ public class MultiCommandExecutor implements AutoCloseable{
         stdin.flush();
     }
 
+    /**
+     * @return a String containing all content until the end of the command execution.
+     */
+    public String readAll() throws IOException {
+        StringBuffer buff = new StringBuffer();
+        String line;
+
+        while ((line= readLine()) != null) {
+            buff.append(line).append('\n');
+        }
+
+        return buff.toString();
+    }
 
     /**
      * @return one line from command execution, or null if the command has finished running
@@ -101,19 +118,27 @@ public class MultiCommandExecutor implements AutoCloseable{
     public String readLine() throws IOException {
         if (eol)
             return null;
+
         String line = stdout.readLine();
         if (line != null && line.startsWith(delimiter)) {
             eol = true;
             return null;
         }
+
         return line;
     }
 
+    /**
+     * Will clear any existing command output from buffer.
+     */
+    public void clear() throws IOException {
+        while (readLine() != null); // read the output from previous exec
+    }
 
     @Override
     public void close() {
         try {
-            // finally close the shell by execution exit command
+            // close the shell by execution exit command
             stdin.write("exit");
             stdin.newLine();
             stdin.flush();
diff --git a/src/zutil/osal/OsalDummyImpl.java b/src/zutil/osal/OSALDummyImpl.java
similarity index 97%
rename from src/zutil/osal/OsalDummyImpl.java
rename to src/zutil/osal/OSALDummyImpl.java
index 659c61c..6199c12 100644
--- a/src/zutil/osal/OsalDummyImpl.java
+++ b/src/zutil/osal/OSALDummyImpl.java
@@ -29,7 +29,7 @@ import java.io.File;
 /**
  * This is a dummy implementation for unknown platforms
  */
-public class OsalDummyImpl extends OSAbstractionLayer {
+public class OSALDummyImpl extends OSAbstractionLayer {
 
     @Override
     public OSType getOSType() {
diff --git a/src/zutil/osal/OSAbstractionLayer.java b/src/zutil/osal/OSAbstractionLayer.java
index fa5319c..c67480d 100755
--- a/src/zutil/osal/OSAbstractionLayer.java
+++ b/src/zutil/osal/OSAbstractionLayer.java
@@ -55,7 +55,7 @@ public abstract class OSAbstractionLayer {
         if      (os.contains("Linux"))   return new OsalLinuxImpl();
         else if (os.contains("Windows")) return new OsalWindowsImpl();
         else if (os.contains("Mac"))     return new OsalMacOSImpl();
-        else                            return new OsalDummyImpl();
+        else                            return new OSALDummyImpl();
     }
 
     /**