From 3fbc78b38c54557bd0913ea9a6eb36f52071c533 Mon Sep 17 00:00:00 2001
From: Mike Auty <mike.auty@gmail.com>
Date: Thu, 11 Feb 2016 09:23:58 +0000
Subject: [PATCH] Fix up the renderer (and stop masking issues by printing in
 the generator).

---
 volatility/framework/renderers/text.py | 19 +++++++++++++++++--
 volatility/plugins/windows/pslist.py   |  1 -
 2 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/volatility/framework/renderers/text.py b/volatility/framework/renderers/text.py
index 78e6f7866..2d7b82f62 100644
--- a/volatility/framework/renderers/text.py
+++ b/volatility/framework/renderers/text.py
@@ -1,3 +1,5 @@
+import sys
+
 from volatility.framework import interfaces
 
 
@@ -9,5 +11,18 @@ class TextRenderer(interfaces.renderers.Renderer):
         pass
 
     def render(self, grid):
-        for row in grid.populate():
-            print("\t".join(row))
+        # TODO: Docstrings
+        # TODO: Improve text output
+        outfd = sys.stdout
+
+        for column in grid.columns:
+            outfd.write("\t" + str(column.name))
+        outfd.write("\n")
+
+        def visitor(node, accumulator):
+            for column in grid.columns:
+                accumulator.write("\t" + str(node.values[column.index]))
+            accumulator.write("\n")
+            return accumulator
+
+        grid.populate(visitor, outfd)
diff --git a/volatility/plugins/windows/pslist.py b/volatility/plugins/windows/pslist.py
index d08f999ad..d5fc930bd 100644
--- a/volatility/plugins/windows/pslist.py
+++ b/volatility/plugins/windows/pslist.py
@@ -35,7 +35,6 @@ class PsList(plugins.PluginInterface):
 
     def _generator(self, eproc):
         for proc in eproc.ActiveProcessLinks:
-            print(proc.UniqueProcessId, proc.InheritedFromUniqueProcessId)
             yield (0, (proc.UniqueProcessId, proc.InheritedFromUniqueProcessId))
 
     def run(self):