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

LM: support systems without $XDG_SESSION_ID being set

Browse Source
This commit is contained in:
李通洲
2023-06-21 16:07:35 +08:00
parent 1c65c75dba
commit 151753cb2f
1 changed files with 34 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/detection/lm/lm_linux.c
+34 -7
View File
@@ -1,23 +1,50 @@
#include "lm.h"
#include "common/properties.h"
#include "common/dbus.h"
#include "detection/displayserver/displayserver.h"
#include <unistd.h>
#define FF_SYSTEMD_SESSIONS_PATH "/var/run/systemd/sessions/"
#define FF_SYSTEMD_USERS_PATH "/run/systemd/users/"
const char* ffDetectLM(FFLMResult* result)
{
const char* sessionId = getenv("XDG_SESSION_ID");
if (!sessionId) return "$XDG_SESSION_ID is not set";
FF_STRBUF_AUTO_DESTROY path = ffStrbufCreate();
char path[64] = FF_SYSTEMD_SESSIONS_PATH;
strncpy(path + strlen(FF_SYSTEMD_SESSIONS_PATH), sessionId, sizeof(path) - strlen(FF_SYSTEMD_SESSIONS_PATH) - 1);
FF_STRBUF_AUTO_DESTROY sessionId = ffStrbufCreateS(getenv("XDG_SESSION_ID"));
if (sessionId.length == 0)
{
// On some incorrectly configured systems, $XDG_SESSION_ID is not set. Try finding it ourself
// WARNING: This is private data. Do not parse
ffStrbufAppendF(&path, "/run/systemd/users/%d", getuid());
// The file reads `This is private data. Do not parse`.
// What does it mean? But let's ignore it for now.
if (!ffParsePropFileValues(path, 2, (FFpropquery[]) {
// This is actually buggy, and assumes current user is using DE
// `sd_pid_get_session` can be a better option, but we need to find a pid to use
if (!ffParsePropFileValues(path.chars, 1, (FFpropquery[]) {
{"DISPLAY=", &sessionId},
}))
return "Failed to get $XDG_SESSION_ID";
ffStrbufClear(&path);
}
ffStrbufAppendS(&path, "/var/run/systemd/sessions/");
ffStrbufAppend(&path, &sessionId);
// WARNING: This is private data. Do not parse
if (!ffParsePropFileValues(path.chars, 2, (FFpropquery[]) {
{"SERVICE=", &result->service},
{"TYPE=", &result->type},
}))
return "Failed to parse /run/systemd/sessions/$XDG_SESSION_ID";
// Correct char cases
if (ffStrbufIgnCaseEqualS(&result->type, FF_WM_PROTOCOL_WAYLAND))
ffStrbufSetS(&result->type, FF_WM_PROTOCOL_WAYLAND);
else if (ffStrbufIgnCaseEqualS(&result->type, FF_WM_PROTOCOL_X11))
ffStrbufSetS(&result->type, FF_WM_PROTOCOL_X11);
else if (ffStrbufIgnCaseEqualS(&result->type, FF_WM_PROTOCOL_TTY))
ffStrbufSetS(&result->type, FF_WM_PROTOCOL_TTY);
return NULL;
}