Skip to content

Commit 8809461

Browse files
vimuxxmasahir0y
authored andcommitted
gen_compile_commands.py: fix path resolve with symlinks in it
When a path contains relative symbolic links, os.path.abspath() might not follow the symlinks and instead return the absolute path with just the relative paths resolved, resulting in an incorrect path. 1. Say "drivers/hdf/" has some symlinks: # ls -l drivers/hdf/ total 364 drwxrwxr-x 2 ... 4096 ... evdev lrwxrwxrwx 1 ... 44 ... framework -> ../../../../../../drivers/hdf_core/framework -rw-rw-r-- 1 ... 359010 ... hdf_macro_test.h lrwxrwxrwx 1 ... 55 ... inner_api -> ../../../../../../drivers/hdf_core/interfaces/inner_api lrwxrwxrwx 1 ... 53 ... khdf -> ../../../../../../drivers/hdf_core/adapter/khdf/linux -rw-r--r-- 1 ... 74 ... Makefile drwxrwxr-x 3 ... 4096 ... wifi 2. One .cmd file records that: # head -1 ./framework/core/manager/src/.devmgr_service.o.cmd cmd_drivers/hdf/khdf/manager/../../../../framework/core/manager/src/devmgr_service.o := ... \ /path/to/src/drivers/hdf/khdf/manager/../../../../framework/core/manager/src/devmgr_service.c 3. os.path.abspath returns "/path/to/src/framework/core/manager/src/devmgr_service.c", not correct: # ./scripts/clang-tools/gen_compile_commands.py INFO: Could not add line from ./framework/core/manager/src/.devmgr_service.o.cmd: File \ /path/to/src/framework/core/manager/src/devmgr_service.c not found Use os.path.realpath(), which resolves the symlinks and normalizes the paths correctly. # cat compile_commands.json ... { "command": ... "directory": ... "file": "/path/to/bla/drivers/hdf_core/framework/core/manager/src/devmgr_service.c" }, ... Also fix it in parse_arguments(). Signed-off-by: Jialu Xu <[email protected]> Signed-off-by: Masahiro Yamada <[email protected]>
1 parent c134abc commit 8809461

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

scripts/clang-tools/gen_compile_commands.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ def parse_arguments():
6464
args = parser.parse_args()
6565

6666
return (args.log_level,
67-
os.path.abspath(args.directory),
67+
os.path.realpath(args.directory),
6868
args.output,
6969
args.ar,
7070
args.paths if len(args.paths) > 0 else [args.directory])
@@ -172,8 +172,8 @@ def process_line(root_directory, command_prefix, file_path):
172172
# by Make, so this code replaces the escaped version with '#'.
173173
prefix = command_prefix.replace('\#', '#').replace('$(pound)', '#')
174174

175-
# Use os.path.abspath() to normalize the path resolving '.' and '..' .
176-
abs_path = os.path.abspath(os.path.join(root_directory, file_path))
175+
# Return the canonical path, eliminating any symbolic links encountered in the path.
176+
abs_path = os.path.realpath(os.path.join(root_directory, file_path))
177177
if not os.path.exists(abs_path):
178178
raise ValueError('File %s not found' % abs_path)
179179
return {

0 commit comments

Comments
 (0)