From c914d298604ef7ad3934c3c213d3f8822d6646d9 Mon Sep 17 00:00:00 2001
From: Guillaume Buisson <contact@guillaume.dev>
Date: 周四, 20 5月 2021 13:50:43 +0800
Subject: [PATCH] Several fixes (#120)

---
 src/library/os/linux/execution_environment.cpp |   30 ++++++++++++------------------
 1 files changed, 12 insertions(+), 18 deletions(-)

diff --git a/src/library/os/linux/execution_environment.cpp b/src/library/os/linux/execution_environment.cpp
index a00df29..216df0c 100644
--- a/src/library/os/linux/execution_environment.cpp
+++ b/src/library/os/linux/execution_environment.cpp
@@ -1,16 +1,17 @@
 /*
- * virtualization.cpp
+ * execution_environment.cpp
  *
  *  Created on: Dec 15, 2019
  *      Author: GC
  */
+
 #include <paths.h>
 #include <sys/stat.h>
 #include <unistd.h>
 #include <fstream>
 #include <iostream>
 #include <stdio.h>
-#include <string.h>
+#include <cstring>
 #include <dirent.h>
 #include <sys/utsname.h>
 
@@ -18,7 +19,7 @@
 #include "../cpu_info.hpp"
 #include "../execution_environment.hpp"
 #include "../../base/file_utils.hpp"
-#include "../../base/StringUtils.h"
+#include "../../base/string_utils.h"
 
 namespace license {
 namespace os {
@@ -28,29 +29,20 @@
 static CONTAINER_TYPE checkContainerProc() {
 	// in docer /proc/self/cgroups contains the "docker" or "lxc" string
 	// https://stackoverflow.com/questions/23513045/how-to-check-if-a-process-is-running-inside-docker-container
-	char path[MAX_PATH] = {0};
-	char proc_path[MAX_PATH], pidStr[64];
-	pid_t pid = getpid();
-	sprintf(pidStr, "%d", pid);
-	strcpy(proc_path, "/proc/");
-	strcat(proc_path, pidStr);
-	strcat(proc_path, "/cgroup");
 
 	FILE *fp;
-	char *line = NULL;
+	char *line = nullptr;
 	size_t len = 0;
 	ssize_t read;
 	CONTAINER_TYPE result = CONTAINER_TYPE::NONE;
 
-	fp = fopen(proc_path, "r");
-	if (fp == NULL) {
+	fp = fopen("/proc/self/cgroup", "r");
+	if (fp == nullptr) {
 		return CONTAINER_TYPE::NONE;
 	}
 
-	while ((read = getline(&line, &len, fp)) != -1 && result == 0) {
-		// line[len]=0;
-		// printf("Retrieved line of length %zu:\n", read);
-		// printf("%s", line);
+	while ((read = getline(&line, &len, fp)) != -1
+			&& result == CONTAINER_TYPE::NONE) {
 		if (strstr(line, "docker") != NULL) {
 			result = CONTAINER_TYPE::DOCKER;
 		}
@@ -59,8 +51,10 @@
 		}
 	}
 
+	if (line) {
+		free(line);
+	}
 	fclose(fp);
-	if (line) free(line);
 	return result;
 }
 

--
Gitblit v1.9.1