From 98a68415ee658194f586dce4d14ce2918cc537f6 Mon Sep 17 00:00:00 2001 From: dusoleil Date: Thu, 2 Sep 2021 04:33:38 -0400 Subject: Reuse read() and readline() in the until() API Signed-off-by: dusoleil --- tools/sploit/sploit/comm.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'tools') diff --git a/tools/sploit/sploit/comm.py b/tools/sploit/sploit/comm.py index 223b639..81efa9c 100644 --- a/tools/sploit/sploit/comm.py +++ b/tools/sploit/sploit/comm.py @@ -38,10 +38,13 @@ class Comm: def readuntil(self, pred, /, *args, **kwargs): data = b'' pred = bind(pred, *args, **kwargs) + l = self.logonread + self.logonread = False while(True): - data += self.back.stdin.read(1) + data += self.read(1) if(pred(data)): break + self.logonread = l if self.logonread : log(data) return data @@ -49,9 +52,7 @@ class Comm: dataarr = [] pred = bind(pred, *args, **kwargs) while(True): - data = self.back.stdin.readline() - if self.logonread : log(data) - dataarr.append(data) + dataarr.append(self.readline()) if(pred(dataarr)): break return dataarr -- cgit v1.2.3