@@ -153,9 +153,9 @@ Environment variables:

     `enums-tree`, `params`, `params-tree`, `audit,` and `audit-tree` commands.

     It uses the same format (and defaults) as GREP_COLORS, i.e. a

     colon-separated list of capabilties: `ms` (matching selected), `fn` (file

-    name), `ln` (line number), `se` (separators). Added custom capabilities

-    are: `ve` (version), `ex` (extension), `un` (unsupported). Defaults to

-    `ms=01;31:fn=35:ln=32:se=36:ve=01;34:ex=34:un=01;33`.

+    name), `ln` (line and column number), `se` (separators). Added custom

+    capabilities are: `ve` (version), `ex` (extension), `un` (unsupported).

+    Defaults to `ms=01;31:fn=35:ln=32:se=36:ve=01;34:ex=34:un=01;33`.

 ```

 ## References

@@ -110,9 +110,9 @@ Environment variables:

     `enums-tree`, `params`, `params-tree`, `audit,` and `audit-tree` commands.

     It uses the same format (and defaults) as GREP_COLORS, i.e. a

     colon-separated list of capabilties: `ms` (matching selected), `fn` (file

-    name), `ln` (line number), `se` (separators). Added custom capabilities

-    are: `ve` (version), `ex` (extension), `un` (unsupported). Defaults to

-    `ms=01;31:fn=35:ln=32:se=36:ve=01;34:ex=34:un=01;33`.

+    name), `ln` (line and column number), `se` (separators). Added custom

+    capabilities are: `ve` (version), `ex` (extension), `un` (unsupported).

+    Defaults to `ms=01;31:fn=35:ln=32:se=36:ve=01;34:ex=34:un=01;33`.

 """

@@ -125,6 +125,7 @@ import functools

 import subprocess

 import shutil

 import shlex

+import fnmatch

 import urllib.request

 import docopt

 import lxml.etree

@@ -139,6 +140,7 @@ USER_AGENT    = 'Mozilla/5.0'

 REGEX         = r'\b(gl|GL_)[0-9A-Z][0-9A-Za-z_]+\b'

 EXCLUDE_DIRS  = ['.?*', '_*']

 EXCLUDE_FILES = ['README*', 'TODO*']

+BINARY_PEEK   = 1024

 INDENT        = 2

 ENV_XDG = lambda var, default: os.environ.get(

     f'GLREGISTRY_{var}',

@@ -304,21 +306,39 @@ def grep(

     exclude_files=EXCLUDE_FILES,

     silent=False,

 ):

-    path          = path if path else '.'

-    cmd           = ['grep', '-EIrno']

-    exclude_dirs  = [f'--exclude-dir={exclude}' for exclude in exclude_dirs]

-    exclude_files = [f'--exclude={exclude}'     for exclude in exclude_files]

-    process = subprocess.run(

-        [*cmd, *exclude_dirs, *exclude_files, regex, path],

-        stdout=subprocess.PIPE,

-        stderr=subprocess.DEVNULL if silent else None,

-        text=True,

-    )

-    for string in process.stdout.splitlines():

-        string           = removeprefix(f'.{os.path.sep}', string)

-        file, line, name = string.split(':', 2)

-        line             = int(line)

-        yield file, line, name

+    path = path if path else '.'

+    def onerror(error, file=None):

+        file = removeprefix(f'.{os.path.sep}', file or error.filename)

+        if silent:

+            pass

+        elif isinstance(error, OSError):

+            log(f"{file}: {error.strerror}")

+        elif isinstance(error, UnicodeDecodeError):

+            log(f"{file}: {error.reason}")

+        else:

+            log(f"{file}: {error}")

+    def exclude(excludes, names):

+        names = set(names)

+        for exclude in excludes:

+            names -= set(fnmatch.filter(names, exclude))

+        return sorted(names)

+    for root, dirs, files in os.walk(path, onerror=onerror):

+        dirs [:] = exclude(exclude_dirs,  dirs)

+        files[:] = exclude(exclude_files, files)

+        for file in files:

+            file = os.path.join(root, file)

+            try:

+                with open(file, 'rb') as f:

+                    if 0 in f.read(BINARY_PEEK):

+                        continue

+                with open(file, errors='ignore') as f:

+                    file = removeprefix(f'.{os.path.sep}', file)

+                    for line, string in enumerate(f):

+                        for match in re.finditer(regex, string):

+                            column, name = match.start(), match.group()

+                            yield file, line+1, column+1, name

+            except Exception as error:

+                onerror(error, file)

 ## Commands

@@ -558,25 +578,26 @@ def params_tree(xml, group=None):

 ### `audit_`

 def audit_(xml, path=None):

     audit_ = collections.defaultdict(lambda: collections.defaultdict(list))

-    for file, line, name in grep(path):

+    for file, line, column, name in grep(path):

         supports_ = supports(xml, name)

         if not supports_:

             supports_ = ['UNSUPPORTED']

-        audit_[tuple(supports_)][name].append([file, line])

+        audit_[tuple(supports_)][name].append([file, line, column])

     return audit_

 ### `audit`

 def audit(xml, path=None):

-    for file, line, supports, name in sorted(

-        [file, line, supports, name]

-        for supports, names  in audit_(xml, path).items()

-        for name, locations  in names.items()

-        for file, line       in locations

+    for file, line, column, supports, name in sorted(

+        [file, line, column, supports, name]

+        for supports, names    in audit_(xml, path).items()

+        for name, locations    in names.items()

+        for file, line, column in locations

     ):

         yield indentjoin(0, ':', [

             color('fn', file),

             color('ln', line),

+            color('ln', column),

             indentjoin(0, ',', color_supports(supports)),

             color('ms', name),

         ])

@@ -588,10 +609,11 @@ def audit_tree(xml, path=None):

         yield indentjoin(0, ',', color_supports(supports))

         for name, locations in sorted(names.items()):

             yield indentjoin(1, '', [color('ms', name)])

-            for file, line in sorted(locations):

+            for file, line, column in sorted(locations):

                 yield indentjoin(2, ':', [

                     color('fn', file),

                     color('ln', line),

+                    color('ln', column),

                 ])