Add missing core subpackage (renamed from lib)

The `lib` package was completely nonexistent as I overlooked the fact
that it was gitignore'd. This has been fixed by renaming it to `core`.

Author: Expertcoderz

userland/core/__init__.py

@@ -0,0 +1,2 @@
+from .command import *
+from .io import *

userland/core/command.py

@@ -0,0 +1,40 @@
+import sys
+from optparse import OptionParser
+from typing import Any, Callable
+
+
+def create_parser(usage: tuple[str], **kwargs) -> OptionParser:
+    if parser_class := kwargs.get("parser_class"):
+        del kwargs["parser_class"]
+
+    parser = (parser_class or OptionParser)(
+        usage="Usage: " + f"\n{7 * " "}".join(usage),
+        **kwargs,
+        add_help_option=False,
+    )
+    parser.add_option(
+        "--help",
+        action="help",
+        help="show usage information and exit",
+    )
+
+    return parser
+
+
+def command(parser: OptionParser | None = None):
+    def create_utility(
+        func: Callable[[dict[str, Any], list[Any]], int],
+    ) -> Callable[[], None]:
+        if parser:
+
+            def execute_utility():
+                sys.exit(func(*parser.parse_args()))
+
+        else:
+
+            def execute_utility():
+                sys.exit(func({}, sys.argv[1:]))
+
+        return execute_utility
+
+    return create_utility

userland/core/io.py

@@ -0,0 +1,22 @@
+import sys
+from typing import Generator
+
+
+def readlines_stdin() -> Generator[str]:
+    while line := sys.stdin.readline():
+        yield line
+
+
+def readlines_stdin_raw() -> Generator[bytes]:
+    while line := sys.stdin.buffer.readline():
+        yield line
+
+
+def readwords_stdin() -> Generator[str]:
+    for line in readlines_stdin():
+        yield from line.split()
+
+
+def readwords_stdin_raw() -> Generator[bytes]:
+    for line in readlines_stdin_raw():
+        yield from line.split()

userland/utilities/basename.py

@@ -2,9 +2,9 @@
 
 from pathlib import PurePath
 
-from .. import lib
+from .. import core
 
-parser = lib.create_parser(
+parser = core.create_parser(
     usage=("%prog NAME [SUFFIX]", "%prog OPTION... NAME..."),
     description="Print the last component of each path NAME.",
 )
@@ -26,7 +26,7 @@
 )
 
 
-@lib.command(parser)
+@core.command(parser)
 def python_userland_basename(opts, args):
     if not args:
         parser.error("missing operand")

userland/utilities/cat.py

@@ -5,7 +5,7 @@
 from io import BufferedReader
 from typing import BinaryIO, Generator
 
-from .. import lib
+from .. import core
 
 
 def squeeze_blank_lines(io: BinaryIO) -> Generator[bytes]:
@@ -96,7 +96,7 @@ def cat_io(opts, io: BinaryIO) -> None:
             sys.stdout.buffer.flush()
 
 
-parser = lib.create_parser(
+parser = core.create_parser(
     usage=("%prog [OPTION]... [FILE]...",),
     description="Concatenate each FILE to standard output.",
 )
@@ -135,7 +135,7 @@ def cat_io(opts, io: BinaryIO) -> None:
 )
 
 
-@lib.command(parser)
+@core.command(parser)
 def python_userland_cat(opts, args):
     if opts.show_all:
         opts.show_ends = True
@@ -149,7 +149,7 @@ def python_userland_cat(opts, args):
         opts.show_nonprinting = True
 
     generators = [
-        lib.readlines_stdin_raw() if name == "-" else open(name, "rb")
+        core.readlines_stdin_raw() if name == "-" else open(name, "rb")
         for name in args or ["-"]
     ]
 

userland/utilities/clear.py

@@ -1,11 +1,11 @@
 #!/usr/bin/python3
 
-from .. import lib
+from .. import core
 
 # clear(1), roughly modelled off the ncurses implementation.
 
 
-parser = lib.create_parser(
+parser = core.create_parser(
     usage=("%prog [OPTION]...",),
     description="Clear the terminal screen.",
 )
@@ -17,7 +17,7 @@
 )
 
 
-@lib.command(parser)
+@core.command(parser)
 def python_userland_clear(opts, args):
     if args:
         return 1

userland/utilities/dirname.py

@@ -2,9 +2,9 @@
 
 from pathlib import PurePath
 
-from .. import lib
+from .. import core
 
-parser = lib.create_parser(
+parser = core.create_parser(
     usage=("%prog [OPTION]... NAME...",),
     description=(
         "Print each path NAME with the last component removed,"
@@ -21,7 +21,7 @@
 )
 
 
-@lib.command(parser)
+@core.command(parser)
 def python_userland_dirname(opts, args):
     if not args:
         parser.error("missing operand")

userland/utilities/echo.py

@@ -4,7 +4,7 @@
 import re
 from optparse import OptionParser, BadOptionError, AmbiguousOptionError
 
-from .. import lib
+from .. import core
 
 ESCAPES_PATTERN = re.compile(
     r"(\\0[0-7]{1,3}|\\x[0-9A-Za-z]{1,2}|\\[\\0abcefnrtv])",
@@ -35,7 +35,7 @@ def _process_args(self, largs, rargs, values):
         rargs.clear()
 
 
-parser = lib.create_parser(
+parser = core.create_parser(
     usage=("%prog [OPTION]... [STRING]...",),
     description="Print STRING(s) to standard output.",
     parser_class=PassthroughOptionParser,
@@ -58,7 +58,7 @@ def _process_args(self, largs, rargs, values):
 )
 
 
-@lib.command(parser)
+@core.command(parser)
 def python_userland_echo(opts, args):
     string = " ".join(args)
 

userland/utilities/factor.py

@@ -4,7 +4,7 @@
 import sys
 from typing import Generator, Iterable
 
-from .. import lib
+from .. import core
 
 # List of small primes greater than 2; used for lookup.
 SMALL_PRIMES = [3, 5, 7, 11, 13, 17, 19, 23, 29, 31, 37, 41, 43, 47]
@@ -101,20 +101,20 @@ def format_exponents(factors: Iterable[int]) -> str:
     return " ".join(processed)
 
 
-parser = lib.create_parser(
+parser = core.create_parser(
     usage=("%prog [OPTION] [NUMBER]...",),
     description="Compute and print the prime factors of each positive integer NUMBER.",
 )
 
 parser.add_option("-h", "--exponents", action="store_true")
 
 
-@lib.command(parser)
+@core.command(parser)
 def python_userland_factor(opts, args):
     failed = False
 
     try:
-        for arg in args or lib.readwords_stdin():
+        for arg in args or core.readwords_stdin():
             try:
                 num = int(arg)
                 if num < 0:

userland/utilities/false.py

@@ -3,10 +3,10 @@
 import os
 import sys
 
-from .. import lib
+from .. import core
 
 
-@lib.command()
+@core.command()
 def python_userland_false(_, args):
     if args and args[0] == "--help":
         print(

userland/utilities/groups.py

@@ -5,15 +5,15 @@
 import os
 import sys
 
-from .. import lib
+from .. import core
 
-parser = lib.create_parser(
+parser = core.create_parser(
     usage=("%prog [USERNAME]...",),
     description="Print a list of groups for each USERNAME or the current user.",
 )
 
 
-@lib.command(parser)
+@core.command(parser)
 def python_userland_groups(_, args):
     failed = False
 

userland/utilities/hostid.py

@@ -1,15 +1,15 @@
 #!/usr/bin/python3
 
-from .. import lib
+from .. import core
 
-parser = lib.create_parser(
+parser = core.create_parser(
     usage=("%prog",),
     description="Print a 32-bit numeric host machine identifier.",
     epilog="This implementation gives an all-zero identifier.",
 )
 
 
-@lib.command(parser)
+@core.command(parser)
 def python_userland_hostid(_, args):
     if args:
         parser.error(f"extra operand '{args[0]}'")

userland/utilities/id.py

@@ -5,9 +5,9 @@
 import os
 import sys
 
-from .. import lib
+from .. import core
 
-parser = lib.create_parser(
+parser = core.create_parser(
     usage=("%prog [OPTION]... [USER]...",),
     description="Print user and group information for each USER or the current user.",
 )
@@ -45,7 +45,7 @@
 parser.add_option("-Z", "--context", action="store_true", help="(unimplemented)")
 
 
-@lib.command(parser)
+@core.command(parser)
 def python_userland_id(opts, args):
     if opts.context:
         parser.error("--context (-Z) is not supported")

userland/utilities/logname.py

@@ -2,15 +2,15 @@
 
 import os
 
-from .. import lib
+from .. import core
 
-parser = lib.create_parser(
+parser = core.create_parser(
     usage=("%prog",),
     description="Print the current user's login name.",
 )
 
 
-@lib.command(parser)
+@core.command(parser)
 def python_userland_logname(_, args):
     if args:
         parser.error(f"extra operand '{args[0]}'")

userland/utilities/nologin.py

@@ -1,14 +1,14 @@
 #!/usr/bin/python3
 
-from .. import lib
+from .. import core
 
-parser = lib.create_parser(
+parser = core.create_parser(
     usage=("%prog",),
     description="Politely refuse a login.",
 )
 
 
-@lib.command(parser)
+@core.command(parser)
 def python_userland_nologin(*_):
     print("This account is currently not available.")
     return 1

userland/utilities/nproc.py

@@ -3,9 +3,9 @@
 import os
 
 
-from .. import lib
+from .. import core
 
-parser = lib.create_parser(
+parser = core.create_parser(
     usage=(" %prog [OPTION]...",),
     description="Print the number of processing units available to the process.",
 )
@@ -25,7 +25,7 @@
 )
 
 
-@lib.command(parser)
+@core.command(parser)
 def python_userland_nproc(opts, args):
     if args:
         parser.error(f"extra operand '{args[0]}'")

userland/utilities/printenv.py

@@ -2,17 +2,17 @@
 
 import os
 
-from .. import lib
+from .. import core
 
-parser = lib.create_parser(
+parser = core.create_parser(
     usage=(" %prog [OPTION] [VARIABLE]...",),
     description="Print VARIABLE(s) or all environment variables, and their values.",
 )
 
 parser.add_option("-0", "--null", action="store_true")
 
 
-@lib.command(parser)
+@core.command(parser)
 def python_userland_printenv(opts, var_names: list[str]):
     endchar = "\0" if opts.null else "\n"
 

userland/utilities/pwd.py

@@ -2,9 +2,9 @@
 
 import os
 
-from .. import lib
+from .. import core
 
-parser = lib.create_parser(
+parser = core.create_parser(
     usage=("%prog [OPTION]",),
     description="Print the path to the current working directory.",
 )
@@ -26,7 +26,7 @@
 )
 
 
-@lib.command(parser)
+@core.command(parser)
 def python_userland_pwd(opts, args):
     if args:
         parser.error("too many arguments")