Move argv.py to gdblib (#1141)

docs/source/api/argv.rst

@@ -1,5 +1,5 @@
-:mod:`pwndbg.argv` --- pwndbg.argv
+:mod:`pwndbg.gdblib.argv` --- pwndbg.gdblib.argv
 =============================================
 
-.. automodule:: pwndbg.argv
+.. automodule:: pwndbg.gdblib.argv
     :members:

pwndbg/__init__.py

@@ -3,7 +3,6 @@ import signal
 import gdb
 
 import pwndbg.arguments
-import pwndbg.argv
 import pwndbg.color
 import pwndbg.commands
 import pwndbg.commands.argv
@@ -65,6 +64,7 @@ import pwndbg.elf
 import pwndbg.exception
 import pwndbg.gdblib.android
 import pwndbg.gdblib.arch
+import pwndbg.gdblib.argv
 import pwndbg.gdblib.dt
 import pwndbg.gdblib.events
 import pwndbg.gdblib.hooks

pwndbg/commands/argv.py

@@ -2,16 +2,16 @@ import argparse
 
 import gdb
 
-import pwndbg.argv
 import pwndbg.commands
 import pwndbg.gdblib.arch
+import pwndbg.gdblib.argv
 import pwndbg.gdblib.typeinfo
 
 
 @pwndbg.commands.ArgparsedCommand("Prints out the number of arguments.")
 @pwndbg.commands.OnlyWhenRunning
 def argc():
-    print(pwndbg.argv.argc)
+    print(pwndbg.gdblib.argv.argc)
 
 
 parser = argparse.ArgumentParser()
@@ -24,8 +24,8 @@ parser.add_argument(
 @pwndbg.commands.ArgparsedCommand(parser, aliases=["args"])
 @pwndbg.commands.OnlyWhenRunning
 def argv(i=None):
-    start = pwndbg.argv.argv
-    n = pwndbg.argv.argc + 1
+    start = pwndbg.gdblib.argv.argv
+    n = pwndbg.gdblib.argv.argc + 1
 
     if i is not None:
         n = 1
@@ -50,8 +50,8 @@ def envp(name=None):
     """
     Prints out the contents of the environment.
     """
-    start = pwndbg.argv.envp
-    n = pwndbg.argv.envc + 1
+    start = pwndbg.gdblib.argv.envp
+    n = pwndbg.gdblib.argv.envc + 1
 
     return pwndbg.commands.telescope.telescope(start, n)
 
@@ -67,11 +67,11 @@ class argv_function(gdb.Function):
     def invoke(self, number=0):
         number = int(number)
 
-        if number > pwndbg.argv.argc:
+        if number > pwndbg.gdblib.argv.argc:
             return 0
 
         ppchar = pwndbg.gdblib.typeinfo.pchar.pointer()
-        value = gdb.Value(pwndbg.argv.argv)
+        value = gdb.Value(pwndbg.gdblib.argv.argv)
         argv = value.cast(ppchar)
         return (argv + number).dereference()
 
@@ -90,11 +90,11 @@ class envp_function(gdb.Function):
     def invoke(self, number=0):
         number = int(number)
 
-        if number > pwndbg.argv.envc:
+        if number > pwndbg.gdblib.argv.envc:
             return pwndbg.gdblib.typeinfo.void
 
         ppchar = pwndbg.gdblib.typeinfo.pchar.pointer()
-        value = gdb.Value(pwndbg.argv.envp)
+        value = gdb.Value(pwndbg.gdblib.argv.envp)
         envp = value.cast(ppchar)
         return (envp + number).dereference()
 
@@ -111,7 +111,7 @@ class argc_function(gdb.Function):
         super(argc_function, self).__init__("argc")
 
     def invoke(self, number=0):
-        return pwndbg.argv.argc
+        return pwndbg.gdblib.argv.argc
 
 
 argc_function()
@@ -128,10 +128,10 @@ class environ_function(gdb.Function):
     def invoke(self, name):
         name = name.string() + "="
         ppchar = pwndbg.gdblib.typeinfo.pchar.pointer()
-        value = gdb.Value(pwndbg.argv.envp)
+        value = gdb.Value(pwndbg.gdblib.argv.envp)
         envp = value.cast(ppchar)
 
-        for i in range(pwndbg.argv.envc):
+        for i in range(pwndbg.gdblib.argv.envc):
             ptr = (envp + i).dereference()
             sz = ptr.string()
             if sz.startswith(name):