From: Jialu Xu <xujialu@vimux.org>
To: nathan@kernel.org
Cc: justinstitt@google.com, linux-kbuild@vger.kernel.org,
linux-kernel@vger.kernel.org, llvm@lists.linux.dev,
masahiroy@kernel.org, morbo@google.com, ndesaulniers@google.com,
xujialu@vimux.org
Subject: [PATCH v4] gen_compile_commands.py: fix path resolve with symlinks in it
Date: Wed, 6 Dec 2023 09:24:42 +0800 [thread overview]
Message-ID: <20231206012441.840082-1-xujialu@vimux.org> (raw)
In-Reply-To: <20231205165648.GA391810@dev-arch.thelio-3990X>
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/out/drivers/hdf/khdf/manager/../../../../framework/core/manager/src/devmgr_service.c
3. os.path.abspath returns "/path/to/out/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/out/framework/core/manager/src/devmgr_service.c not found
Use pathlib.Path.resolve(), which resolves the symlinks and normalizes
the paths correctly.
# cat compile_commands.json
...
{
"command": ...
"directory": ...
"file": "/path/to/blabla/drivers/hdf_core/framework/core/manager/src/devmgr_service.c"
},
...
Reviewed-by: Nathan Chancellor <nathan@kernel.org>
Signed-off-by: Jialu Xu <xujialu@vimux.org>
---
scripts/clang-tools/gen_compile_commands.py | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/scripts/clang-tools/gen_compile_commands.py b/scripts/clang-tools/gen_compile_commands.py
index 180952fb91c1b..99e28b7152c19 100755
--- a/scripts/clang-tools/gen_compile_commands.py
+++ b/scripts/clang-tools/gen_compile_commands.py
@@ -11,6 +11,7 @@ import argparse
import json
import logging
import os
+from pathlib import Path
import re
import subprocess
import sys
@@ -172,8 +173,9 @@ def process_line(root_directory, command_prefix, file_path):
# by Make, so this code replaces the escaped version with '#'.
prefix = command_prefix.replace('\#', '#').replace('$(pound)', '#')
- # Use os.path.abspath() to normalize the path resolving '.' and '..' .
- abs_path = os.path.abspath(os.path.join(root_directory, file_path))
+ # Make the path absolute, resolving all symlinks on the way and also normalizing it.
+ # Convert Path object to a string because 'PosixPath' is not JSON serializable.
+ abs_path = str(Path(root_directory, file_path).resolve())
if not os.path.exists(abs_path):
raise ValueError('File %s not found' % abs_path)
return {
--
2.39.2
next prev parent reply other threads:[~2023-12-06 1:26 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-12-04 10:41 [PATCH] " Jialu Xu
2023-12-04 16:59 ` Nathan Chancellor
2023-12-05 2:15 ` Jialu Xu
2023-12-05 2:15 ` [PATCH v2] gen_compile_commands.py: fix path resolve with symlinks in it Jialu Xu
2023-12-05 16:56 ` Nathan Chancellor
2023-12-06 1:20 ` Jialu Xu
2023-12-06 1:20 ` [PATCH v3] " Jialu Xu
2023-12-06 1:24 ` Jialu Xu [this message]
2023-12-07 22:54 ` [PATCH v4] " Justin Stitt
2023-12-10 5:52 ` Masahiro Yamada
2023-12-10 7:05 ` Jialu Xu
2023-12-10 7:05 ` [PATCH v5] " Jialu Xu
2023-12-11 17:53 ` Masahiro Yamada
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20231206012441.840082-1-xujialu@vimux.org \
--to=xujialu@vimux.org \
--cc=justinstitt@google.com \
--cc=linux-kbuild@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=llvm@lists.linux.dev \
--cc=masahiroy@kernel.org \
--cc=morbo@google.com \
--cc=nathan@kernel.org \
--cc=ndesaulniers@google.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®