Merge pull request #168 from pkalever/temp-files

Use temp file objects for temporary storage area

2 files changed, 15 insertions, 14 deletions

diff --git a/daemon/targetclid b/daemon/targetclid
index 5df6ca2..329cede 100755
--- a/daemon/targetclid
+++ b/daemon/targetclid
@@ -26,19 +26,16 @@ from configshell_fb import ConfigShell
 from os import getuid, getenv, unlink
 from threading import Thread
 
+import os
 import sys
 import socket
 import struct
 import fcntl
 import signal
 import errno
+import tempfile
 
 
-if sys.version_info < (3, 0):
-    from io import BytesIO as StringIO
-else:
-    from io import StringIO
-
 err = sys.stderr
 
 class TargetCLI:
@@ -158,26 +155,29 @@ class TargetCLI:
                 connection.close()
                 still_listen = False
             else:
-                self.con._stdout = self.con._stderr = f = StringIO()
+                self.con._stdout = self.con._stderr = f = tempfile.NamedTemporaryFile(mode='w', delete=False)
                 try:
                     # extract multiple commands delimited with '%'
                     list_data = data.decode().split('%')
                     for cmd in list_data:
                         self.shell.run_cmdline(cmd)
                 except Exception as e:
-                    print(str(e).encode(), file=f) # push error to stream
+                    print(str(e), file=f) # push error to stream
 
                 # Restore
                 self.con._stdout = self.con_stdout_
                 self.con._stderr = self.con_stderr_
-                output = f.getvalue().encode()
-                var = struct.pack('i', len(output))
-                connection.sendall(var) # length of string
-                if len(output):
-                    connection.sendall(output) # actual string
-
                 f.close()
 
+                with open(f.name, 'r') as f:
+                    output = f.read()
+                    var = struct.pack('i', len(output))
+                    connection.sendall(var) # length of string
+                    if len(output):
+                        connection.sendall(output.encode()) # actual string
+
+                os.unlink(f.name)
+
 
 def usage():
     print("Usage: %s [--version|--help]" % sys.argv[0], file=err)
diff --git a/scripts/targetcli b/scripts/targetcli
index 04e5aba..f11ece4 100755
--- a/scripts/targetcli
+++ b/scripts/targetcli
@@ -154,8 +154,9 @@ def call_daemon(shell, req):
     # get the actual data in chunks
     while amount_received < amount_expected:
         data = sock.recv(1024)
+        data = data.decode()
         amount_received += len(data)
-        print(data.decode(), end ="")
+        print(data, end ="")
 
     sock.send(b'-END@OF@DATA-')
     sock.close()