From 8d405b265285c368df2e9cf1c14acee7532e0ee7 Mon Sep 17 00:00:00 2001
From: nancy.liao <huihui.liao@greentest.com.cn>
Date: ćšć, 29 5æ 2025 18:14:38 +0800
Subject: [PATCH] Merge branch 'develop' of http://139.9.88.116:3000/r/module/open-license-manager into develop
---
src/library/base/file_utils.cpp | 15 ++++++++++-----
1 files changed, 10 insertions(+), 5 deletions(-)
diff --git a/src/library/base/file_utils.cpp b/src/library/base/file_utils.cpp
index 9d46b90..e5dd5f7 100644
--- a/src/library/base/file_utils.cpp
+++ b/src/library/base/file_utils.cpp
@@ -10,9 +10,10 @@
#include <cerrno>
#include <iostream>
#include <algorithm>
-
+#include <errno.h>
+#include <cstring>
#include "file_utils.hpp"
-
+#include "../test/functional/generate-license.h"
namespace license {
using namespace std;
@@ -34,17 +35,19 @@
}
string get_file_contents(const char *filename, size_t max_size) {
+ string contents;
ifstream in(filename, std::ios::binary);
if (in) {
- string contents;
size_t index = (size_t)in.seekg(0, ios::end).tellg();
size_t limited_size = min(index, max_size);
contents.resize(limited_size);
in.seekg(0, ios::beg);
in.read(&contents[0], limited_size);
- return contents;
+ in.close();
+ } else {
+ throw runtime_error(std::strerror(errno));
}
- throw(errno);
+ return contents;
}
string remove_extension(const string& path) {
@@ -66,4 +69,6 @@
return path.substr(0, dotpos);
}
+
}
+
--
Gitblit v1.9.1