[ci] Increase coverage of commandline tools

Gallopsled · Jun 21, 2020 · e8b4f0b · e8b4f0b
1 parent c0202f9
commit e8b4f0b
Show file tree

Hide file tree

Showing 7 changed files with 17 additions and 13 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -133,7 +133,7 @@ jobs:
 
         pwn cyclic 32
         pwn cyclic -l 0x62616161
-        pwn cyclic -a ab 16
+        pwn cyclic -a ab
         echo
 
         pwn shellcraft --list |tail

diff --git a/pwnlib/commandline/asm.py b/pwnlib/commandline/asm.py
@@ -5,6 +5,9 @@
 import argparse
 import sys
 
+import pwnlib
+pwnlib.args.free_form = False
+
 from pwn import *
 from pwnlib.commandline import common
 

diff --git a/pwnlib/commandline/cyclic.py b/pwnlib/commandline/cyclic.py
@@ -43,7 +43,7 @@
     help = 'The os/architecture/endianness/bits the shellcode will run in (default: linux/i386), choose from: %s' % common.choices,
 )
 
-group = parser.add_mutually_exclusive_group(required = True)
+group = parser.add_mutually_exclusive_group(required=False)
 group.add_argument(
     '-l', '-o', '--offset', '--lookup',
     dest = 'lookup',
@@ -53,9 +53,10 @@
 
 group.add_argument(
     'count',
-    type = int,
-    nargs = '?',
-    help = 'Number of characters to print'
+    type=int,
+    nargs='?',
+    default=None,
+    help='Number of characters to print'
 )
 
 def main(args):
@@ -90,7 +91,7 @@ def main(args):
         want   = args.count
         result = cyclic(want, alphabet, subsize)
         got    = len(result)
-        if got < want:
+        if want is not None and got < want:
             log.failure("Alphabet too small (max length = %i)" % got)
 
         out = getattr(sys.stdout, 'buffer', sys.stdout)

diff --git a/pwnlib/commandline/errno.py b/pwnlib/commandline/errno.py
@@ -45,4 +45,4 @@ def main(args):
   print(os.strerror(value))
 
 if __name__ == '__main__':
-    pwnlib.commandline.common.main(__file__)
+    common.main(__file__)
diff --git a/pwnlib/commandline/hex.py b/pwnlib/commandline/hex.py
@@ -26,4 +26,4 @@ def main(args):
         print(enhex(data))
 
 if __name__ == '__main__':
-    pwnlib.commandline.common.main(__file__)
+    common.main(__file__)
diff --git a/pwnlib/commandline/phd.py b/pwnlib/commandline/phd.py
@@ -85,12 +85,12 @@ def main(args):
     text.when = color
 
     if skip:
-        if infile == sys.stdin:
-            infile.read(skip)
-        else:
+        try:
             infile.seek(skip, os.SEEK_CUR)
+        except IOError:
+            infile.read(skip)
 
-    if count:
+    if count != -1:
         infile = io.BytesIO(infile.read(count))
 
     hl = []

diff --git a/pwnlib/commandline/unhex.py b/pwnlib/commandline/unhex.py
@@ -30,4 +30,4 @@ def main(args):
         sys.stderr.write(str(e) + '\n')
 
 if __name__ == '__main__':
-    pwnlib.commandline.common.main(__file__)
+    common.main(__file__)