diff options
Diffstat (limited to 'libc/kernel/tools/clean_header.py')
| -rwxr-xr-x | libc/kernel/tools/clean_header.py | 96 |
1 files changed, 43 insertions, 53 deletions
diff --git a/libc/kernel/tools/clean_header.py b/libc/kernel/tools/clean_header.py index 0e0ed7658..e84bcf959 100755 --- a/libc/kernel/tools/clean_header.py +++ b/libc/kernel/tools/clean_header.py @@ -73,90 +73,77 @@ import sys, cpp, kernel, glob, os, re, getopt from defaults import * from utils import * -noUpdate = 1 +def print_error(no_update, msg): + if no_update: + panic(msg) + sys.stderr.write("warning: " + msg) -def cleanupFile(path, original_path): + +def cleanupFile(dst_dir, src_dir, rel_path, no_update = True): """reads an original header and perform the cleanup operation on it this functions returns the destination path and the clean header as a single string""" # check the header path - src_path = path - - if not os.path.exists(src_path): - if noUpdate: - panic( "file does not exist: '%s'\n" % path ) - sys.stderr.write( "warning: file does not exit: %s\n" % path ) - return None, None + full_path = os.path.join(src_dir, rel_path) - if not os.path.isfile(src_path): - if noUpdate: - panic( "path is not a file: '%s'\n" % path ) - sys.stderr.write( "warning: not a file: %s\n" % path ) + if not os.path.exists(full_path): + print_error(no_update, "file does not exist: '%s'\n" % full_path) return None, None - if os.path.commonprefix( [ src_path, original_path ] ) != original_path: - if noUpdate: - panic( "file is not in 'original' directory: %s\n" % path ); - sys.stderr.write( "warning: file not in 'original' ignored: %s\n" % path ) + if not os.path.isfile(full_path): + print_error(no_update, "path is not a file: '%s'\n" % full_path) return None, None - src_path = src_path[len(original_path):] - if len(src_path) > 0 and src_path[0] == '/': - src_path = src_path[1:] - - if len(src_path) == 0: - panic( "oops, internal error, can't extract correct relative path\n" ) - # convert into destination path, extracting architecture if needed # and the corresponding list of known static functions # arch = None statics = kernel_known_generic_statics - m = re.match(r"asm-([\w\d_\+\.\-]+)(/.*)", src_path) + m = re.match(r"asm-([\w\d_\+\.\-]+)(/.*)", rel_path) if m and m.group(1) != 'generic': dst_path = "arch-%s/asm/%s" % m.groups() - arch = m.group(1) - statics = statics.union( kernel_known_statics.get( arch, set() ) ) + arch = m.group(1) + statics = statics.union(kernel_known_statics.get(arch, set())) else: # process headers under the uapi directory # note the "asm" level has been explicitly added in the original # kernel header tree for architectural-dependent uapi headers - m_uapi = re.match(r"(uapi)/([\w\d_\+\.\-]+)(/.*)", src_path) + m_uapi = re.match(r"(uapi)/([\w\d_\+\.\-]+)(/.*)", rel_path) if m_uapi: - dst_path = src_path + dst_path = rel_path m_uapi_arch = re.match(r"asm-([\w\d_\+\.\-]+)", m_uapi.group(2)) if m_uapi_arch and m_uapi_arch.group(1) != 'generic': - arch = m_uapi_arch.group(1) - statics = statics.union( kernel_known_statics.get( arch, set() ) ) + arch = m_uapi_arch.group(1) + statics = statics.union(kernel_known_statics.get(arch, set())) # common headers (ie non-asm and non-uapi) else: - dst_path = "common/" + src_path + dst_path = os.path.join("common", rel_path) - dst_path = os.path.normpath( kernel_cleaned_path + "/" + dst_path ) + dst_path = os.path.join(dst_dir, dst_path) # now, let's parse the file # parser = cpp.BlockParser() - blocks = parser.parseFile(path) + blocks = parser.parseFile(full_path) if not parser.parsed: - sys.stderr.write( "error: can't parse '%s'" % path ) - sys.exit(1) + print_error(no_update, "can't parse '%s'%" % full_path) + return None, None macros = kernel_known_macros.copy() if arch and arch in kernel_default_arch_macros: macros.update(kernel_default_arch_macros[arch]) if arch and arch in kernel_arch_token_replacements: - blocks.replaceTokens( kernel_arch_token_replacements[arch] ) + blocks.replaceTokens(kernel_arch_token_replacements[arch]) - blocks.optimizeMacros( macros ) + blocks.optimizeMacros(macros) blocks.optimizeIf01() - blocks.removeVarsAndFuncs( statics ) - blocks.replaceTokens( kernel_token_replacements ) - blocks.removeMacroDefines( kernel_ignored_macros ) + blocks.removeVarsAndFuncs(statics) + blocks.replaceTokens(kernel_token_replacements) + blocks.removeMacroDefines(kernel_ignored_macros) out = StringOutput() - out.write( kernel_disclaimer ) + out.write(kernel_disclaimer) blocks.writeWithWarning(out, kernel_warning, 4) return dst_path, out.get() @@ -183,28 +170,31 @@ if __name__ == "__main__": sys.exit(1) try: - optlist, args = getopt.getopt( sys.argv[1:], 'uvk:d:' ) + optlist, args = getopt.getopt(sys.argv[1:], 'uvk:d:') except: # unrecognized option - sys.stderr.write( "error: unrecognized option\n" ) + sys.stderr.write("error: unrecognized option\n") usage() + no_update = True + dst_dir = get_kernel_dir() + src_dir = get_kernel_headers_original_dir() for opt, arg in optlist: if opt == '-u': - noUpdate = 0 + no_update = False elif opt == '-v': logging.basicConfig(level=logging.DEBUG) elif opt == '-k': - kernel_original_path = arg + src_dir = arg elif opt == '-d': - kernel_cleaned_path = arg + dst_dir = arg if len(args) == 0: usage() - if noUpdate: + if no_update: for path in args: - dst_path, newdata = cleanupFile(path,kernel_original_path) + dst_path, newdata = cleanupFile(dst_dir, src_dir, path) print newdata sys.exit(0) @@ -214,12 +204,12 @@ if __name__ == "__main__": b = BatchFileUpdater() for path in args: - dst_path, newdata = cleanupFile(path,kernel_original_path) + dst_path, newdata = cleanupFile(dst_dir, src_dir, path, no_update) if not dst_path: continue - b.readFile( dst_path ) - r = b.editFile( dst_path, newdata ) + b.readFile(dst_path) + r = b.editFile(dst_path, newdata) if r == 0: r = "unchanged" elif r == 1: @@ -227,7 +217,7 @@ if __name__ == "__main__": else: r = "added" - print "cleaning: %-*s -> %-*s (%s)" % ( 35, path, 35, dst_path, r ) + print "cleaning: %-*s -> %-*s (%s)" % (35, path, 35, dst_path, r) b.updateGitFiles() |