fastfetch-cli/fastfetch
1
0
Fork 0
mirror of https://github.com/fastfetch-cli/fastfetch.git synced 2026-09-12 10:22:12 +02:00
Code Issues Packages Projects Releases 10 Wiki Activity

Global: simplifies code

Browse Source
This commit is contained in:
Carter Li
2026-06-18 10:59:36 +08:00
parent b6127ff2c9
commit b0fd11fcbd
2 changed files with 6 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/detection/displayserver/linux/drm.c
+3 -11
View File
@@ -213,15 +213,11 @@ FF_A_UNUSED static const char* drmGetEdidByConnId(uint32_t connId, uint8_t* edid
}
static const char* drmConnectLibdrm(FFDisplayServerResult* result) {
const char* drmDirPath = "/dev/dri/";
FF_AUTO_CLOSE_DIR DIR* dirp = opendir(drmDirPath);
FF_AUTO_CLOSE_DIR DIR* dirp = opendir("/dev/dri/");
if (dirp == NULL) {
return "opendir(/dev/dri/) failed";
}
FF_STRBUF_AUTO_DESTROY pathBuf = ffStrbufCreateA(64);
ffStrbufAppendS(&pathBuf, drmDirPath);
uint32_t pathLen = pathBuf.length;
int drifd = dirfd(dirp);
int nSuccess = 0;
@@ -231,21 +227,17 @@ static const char* drmConnectLibdrm(FFDisplayServerResult* result) {
continue;
}
ffStrbufAppendS(&pathBuf, entry->d_name);
#if __linux__
char powerStatusBuf[512];
snprintf(powerStatusBuf, ARRAY_SIZE(powerStatusBuf), "/sys/class/drm/%s/device/power/runtime_status", entry->d_name);
char buffer[8] = "";
if (ffReadFileData(powerStatusBuf, strlen("suspend"), buffer) > 0 && ffStrStartsWith(buffer, "suspend")) {
ffStrbufSubstrBefore(&pathBuf, pathLen);
continue;
}
#endif
FF_AUTO_CLOSE_FD int primaryFd = open(pathBuf.chars, O_RDWR | O_CLOEXEC);
ffStrbufSubstrBefore(&pathBuf, pathLen);
FF_AUTO_CLOSE_FD int primaryFd = openat(drifd, entry->d_name, O_RDWR | O_CLOEXEC);
if (primaryFd < 0) {
continue;
}
src/detection/gpu/gpu_bsddrm.c
+3 -10
View File
@@ -104,15 +104,11 @@ static const char* drmGetPciinfo(int drmfd, const char* drmId, struct drm_pciinf
}
const char* ffGPUDetectByDrmBSD(const FFGPUOptions* options, FFlist* gpus) {
const char* drmDirPath = "/dev/dri/";
FF_AUTO_CLOSE_DIR DIR* dirp = opendir(drmDirPath);
FF_AUTO_CLOSE_DIR DIR* dirp = opendir("/dev/dri/");
if (dirp == NULL) {
return "opendir(/dev/dri/) failed";
}
FF_STRBUF_AUTO_DESTROY pathBuf = ffStrbufCreateA(64);
ffStrbufAppendS(&pathBuf, drmDirPath);
uint32_t pathLen = pathBuf.length;
int drifd = dirfd(dirp);
struct dirent* entry;
while ((entry = readdir(dirp)) != NULL) {
@@ -120,10 +116,7 @@ const char* ffGPUDetectByDrmBSD(const FFGPUOptions* options, FFlist* gpus) {
continue;
}
ffStrbufAppendS(&pathBuf, entry->d_name);
FF_AUTO_CLOSE_FD int fd = open(pathBuf.chars, O_RDWR | O_CLOEXEC);
ffStrbufSubstrBefore(&pathBuf, pathLen);
FF_AUTO_CLOSE_FD int fd = openat(drifd, entry->d_name, O_RDWR | O_CLOEXEC);
if (fd < 0) {
continue;
}