From 79b1b57045e86d9845e352c3f2aa0efbab6111a9 Mon Sep 17 00:00:00 2001
From: gcontini <1121667+gcontini@users.noreply.github.com>
Date: 周六, 14 3月 2020 10:19:09 +0800
Subject: [PATCH] tests and improvements
---
src/library/os/linux/execution_environment.cpp | 16 +++++++++++++---
1 files changed, 13 insertions(+), 3 deletions(-)
diff --git a/src/library/os/linux/execution_environment.cpp b/src/library/os/linux/execution_environment.cpp
index 9aad864..1f14d62 100644
--- a/src/library/os/linux/execution_environment.cpp
+++ b/src/library/os/linux/execution_environment.cpp
@@ -18,6 +18,7 @@
#include "../cpu_info.hpp"
#include "../execution_environment.hpp"
#include "../../base/file_utils.hpp"
+#include "../../base/StringUtils.h"
namespace license {
namespace os {
@@ -84,15 +85,24 @@
ExecutionEnvironment::ExecutionEnvironment() {
try {
- bios_vendor = get_file_contents("/sys/class/dmi/id/sys_vendor", 256);
+ m_bios_vendor = toupper_copy(trim_copy(get_file_contents("/sys/class/dmi/id/sys_vendor", 256)));
+
} catch (...) {
}
try {
- bios_description = get_file_contents("/sys/class/dmi/id/modalias", 256);
+ m_bios_description = toupper_copy(trim_copy(get_file_contents("/sys/class/dmi/id/modalias", 256)));
+ char last_char = m_bios_description[m_bios_description.length() - 1];
+ if (last_char == '\r' || last_char == '\n') {
+ m_bios_description = m_bios_description.erase(m_bios_description.length() - 1);
+ }
} catch (...) {
}
try {
- sys_vendor = get_file_contents("/sys/class/dmi/id/sys_vendor", 256);
+ m_sys_vendor = get_file_contents("/sys/class/dmi/id/sys_vendor", 256);
+ char last_char = m_sys_vendor[m_sys_vendor.length() - 2];
+ if (last_char == '\r' || last_char == '\n') {
+ m_sys_vendor = m_sys_vendor.erase(m_sys_vendor.length() - 1);
+ }
} catch (...) {
}
}
--
Gitblit v1.9.1