Conversation
…ocked() - Add #include <errno.h> for errno and ENOENT definitions - Modify isFileLocked() to return false when errno is ENOENT (file does not exist), instead of returning true - Keep returning true for other open() failures as conservative locked behavior 修复(drivercontrol): 区分文件不存在与文件被锁定的情况 - 新增 #include <errno.h> 头文件，用于 errno 和 ENOENT 定义 - 修改 isFileLocked() 函数，当 errno 为 ENOENT（文件不存在）时返回 false，不再误报为已锁定 - 其余 open() 失败情况保持返回 true，保守视为已锁定 Log: 修复 isFileLocked() 在文件不存在时误报锁定的问题，区分 ENOENT 与其他打开失败 Influence: 仅修改 utils.cpp 中 isFileLocked() 函数逻辑及头文件包含，API 签名不变，行为向后兼容 PMS: https://pms.uniontech.com/bug-view-1.html
|
[APPROVALNOTIFIER] This PR is NOT APPROVED This pull-request has been approved by: add-uos The full list of commands accepted by this bot can be found here. DetailsNeeds approval from an approver in each of these files:Approvers can indicate their approval by writing |
Reviewer's guide (collapsed on small PRs)Reviewer's GuideUpdates isFileLocked() to distinguish a nonexistent file from other open() failures: ENOENT now returns unlocked, while all other failures retain the previous conservative locked result; the API remains unchanged. Flow diagram for isFileLocked open failure handlingflowchart TD
A["isFileLocked(filepath, bread)"] --> B["open(filepath, opentype)"]
B -->|fd < 0| C{"errno == ENOENT?"}
C -->|Yes| D["return false"]
C -->|No| E["return true"]
B -->|fd >= 0| F["Continue with file-lock check"]
File-Level Changes
Tips and commandsInteracting with Sourcery
Customizing Your ExperienceAccess your dashboard to:
Getting Help
|
![sourcery-ai[bot]](https://avatars.githubusercontent.com/in/48477?s=60&v=4){kind=small}
There was a problem hiding this comment.
Hey - I've found 1 issue
Prompt for AI Agents
Please address the comments from this code review:
## Individual Comments
### Comment 1
<location path="deepin-devicemanager-server/deepin-devicecontrol/src/drivercontrol/utils.cpp" line_range="218" />
<code_context>
//文件打开失败默认为被锁住
if (fd < 0) {
- return true;
+ if (errno == ENOENT) {
+ //文件不存在，未被锁定
+ return false;
</code_context>
<issue_to_address>
**nitpick:** The comment immediately before the branch says every open() failure is treated as locked, but the new ENOENT branch returns false, so the comment now describes behavior that is no longer true and can mislead future maintenance.
**Suggested fix:** Update the comment to state that non-ENOENT open() failures are conservatively treated as locked.
```suggestion
//除ENOENT外的文件打开失败，保守起见视为被锁住
```
</issue_to_address>| @@ -216,7 +217,12 @@ bool Utils::isFileLocked(const QString &filepath, bool bread) | |||
| int fd = open(filepath.toStdString().c_str(), opentype); | |||
| //文件打开失败默认为被锁住 | |||
There was a problem hiding this comment.
nitpick: The comment immediately before the branch says every open() failure is treated as locked, but the new ENOENT branch returns false, so the comment now describes behavior that is no longer true and can mislead future maintenance.
Suggested fix: Update the comment to state that non-ENOENT open() failures are conservatively treated as locked.
| //文件打开失败默认为被锁住 | |
| //除ENOENT外的文件打开失败，保守起见视为被锁住 |
deepin pr auto review🤖 AI 代码审查报告总体评分： 📊 总体评价
🔍 详细分析1. 语法逻辑 ✅评价： 优秀 ✅ 通过 潜在问题： 建议： 语法正确，逻辑清晰。新增#include <errno.h>正确引入errno和ENOENT。errno检查紧跟在open()调用失败后，位置正确，避免了其他系统调用覆盖errno值的风险。逻辑分支合理：ENOENT返回false(文件不存在=未锁定)，其他错误返回true(保守视为已锁定)。 2. 代码质量 ✅评价： 优秀 ✅ 通过 潜在问题： 建议： 代码结构清晰，注释完整。新增注释"文件不存在，未被锁定"和"其他原因无法打开文件，保守起见视为已锁定"准确描述了代码意图和设计决策，有助于后续维护。变更最小化，仅修改必要部分。 3. 代码性能 ✅评价： 优秀 ✅ 通过 潜在问题： 建议： 性能良好，资源使用合理。仅在open()失败路径增加一次errno比较操作，开销可忽略不计，对整体性能无影响。 4. 代码安全 🔒评价： 优秀 ✅ 通过
安全漏洞详情： 建议： 存在0个安全漏洞。errno为线程局部存储(thread-local)，在多线程环境下使用安全。未引入任何新的安全风险。 💡 改进建议代码示例// 本次变更已为最佳实现，无需额外修改
// isFileLocked()函数中errno检查逻辑正确：
// if (fd < 0) {
// if (errno == ENOENT) {
// return false; // 文件不存在，未被锁定
// }
// return true; // 其他原因，保守视为已锁定
// }本报告由 AI 代码审查工具自动生成 |
2 participants
修复(drivercontrol): 区分文件不存在与文件被锁定的情况
Log: 修复 isFileLocked() 在文件不存在时误报锁定的问题，区分 ENOENT 与其他打开失败
Influence: 仅修改 utils.cpp 中 isFileLocked() 函数逻辑及头文件包含，API 签名不变，行为向后兼容
PMS: https://pms.uniontech.com/bug-view-1.html
Summary by Sourcery
Bug Fixes: