From 659f8fcfb42167a9d1464f3c7f84c6b666c23b3f Mon Sep 17 00:00:00 2001 From: peijiankang Date: Mon, 27 Mar 2023 13:20:49 +0800 Subject: [PATCH] Fix the error caused by the non-existence of the lsb-release --- src/common/kylin-com4c.c | 3 +++ src/common/kylin-com4cxx.cpp | 3 +++ 2 files changed, 6 insertions(+) diff --git a/src/common/kylin-com4c.c b/src/common/kylin-com4c.c index ef744c2..bc8e98f 100644 --- a/src/common/kylin-com4c.c +++ b/src/common/kylin-com4c.c @@ -143,6 +143,9 @@ char* kdk_get_xdgsessiontype() int kdk_get_lsbrelease(const char *key, char *value, int value_max_len) { int nRet = -1; +//在openEuler中/etc/lsb-release文件不存在,直接返回 + return nRet; + if (NULL == key || NULL == value || 0 >= value_max_len) return nRet; dictionary *iniHandle = iniparser_load(LSB_RELEASE_FILE); diff --git a/src/common/kylin-com4cxx.cpp b/src/common/kylin-com4cxx.cpp index 6cbe950..d95e393 100644 --- a/src/common/kylin-com4cxx.cpp +++ b/src/common/kylin-com4cxx.cpp @@ -147,6 +147,9 @@ string KDKGetXdgSessionType() string KDKGetLSBRelease(const string key) { +//在openEuler中/etc/lsb-release文件不存在,直接返回 + return ""; + if (key.empty()) { return ""; }