mirror of https://github.com/ipxe/ipxe.git
[Contribs] Fix multi-line POSIX errno definitions.
parent
711a59cf03
commit
f3aef4d98d
|
@ -22,9 +22,9 @@ errfile_files = ('../../src/include/gpxe/errfile.h',
|
||||||
'../../src/arch/i386/include/bits/errfile.h')
|
'../../src/arch/i386/include/bits/errfile.h')
|
||||||
posix_errno_files = ('../../src/include/errno.h', )
|
posix_errno_files = ('../../src/include/errno.h', )
|
||||||
|
|
||||||
PXENV_STATUS_RE = re.compile(r'^#define\s+(PXENV_STATUS_[^\s]+)\s+(.+)$')
|
PXENV_STATUS_RE = re.compile(r'^#define\s+(PXENV_STATUS_[^\s]+)\s+(.+)$', re.M)
|
||||||
ERRFILE_RE = re.compile(r'^#define\s+(ERRFILE_[^\s]+)\s+(.+)$')
|
ERRFILE_RE = re.compile(r'^#define\s+(ERRFILE_[^\s]+)\s+(.+)$', re.M)
|
||||||
POSIX_ERRNO_RE = re.compile(r'^#define\s+(E[A-Z]+)\s+.*(0x[0-9a-f]+).*$')
|
POSIX_ERRNO_RE = re.compile(r'^#define\s+(E[A-Z0-9]+)\s+(?:\\\n)?.*(0x[0-9a-f]+).*$', re.M)
|
||||||
|
|
||||||
def err(msg):
|
def err(msg):
|
||||||
sys.stderr.write('%s: %s\n' % (sys.argv[0], msg))
|
sys.stderr.write('%s: %s\n' % (sys.argv[0], msg))
|
||||||
|
@ -41,11 +41,10 @@ def to_posix_errno(errno):
|
||||||
|
|
||||||
def load_header_file(filename, regexp):
|
def load_header_file(filename, regexp):
|
||||||
defines = {}
|
defines = {}
|
||||||
for line in open(filename, 'r'):
|
data = open(filename, 'r').read()
|
||||||
m = regexp.match(line)
|
for m in regexp.finditer(data):
|
||||||
if m:
|
key, val = m.groups()
|
||||||
key, val = m.groups()
|
defines[key] = val
|
||||||
defines[key] = val
|
|
||||||
return defines
|
return defines
|
||||||
|
|
||||||
def evaluate(defines, expr):
|
def evaluate(defines, expr):
|
||||||
|
|
Loading…
Reference in New Issue