From 5081f5a80e62322155736ddf5c12140627aff2aa Mon Sep 17 00:00:00 2001
From: gcontini <1121667+gcontini@users.noreply.github.com>
Date: 周六, 11 1月 2020 14:44:17 +0800
Subject: [PATCH] issue #70
---
src/library/licensecc.cpp | 34 ++++++++++++++++++++++++++--------
1 files changed, 26 insertions(+), 8 deletions(-)
diff --git a/src/library/licensecc.cpp b/src/library/licensecc.cpp
index fe1b3a7..63330cb 100644
--- a/src/library/licensecc.cpp
+++ b/src/library/licensecc.cpp
@@ -1,36 +1,52 @@
//============================================================================
-// Name : license-manager-cpp.cpp
+// Name : licensecc.cpp
// Author :
// Version :
// Copyright : BSD
//============================================================================
+#define __STDC_WANT_LIB_EXT1__ 1
#include <fstream>
#include <stdio.h>
+#include <string.h>
#include <stdlib.h>
#include <cstring>
#include <iostream>
#include <licensecc/datatypes.h>
#include <licensecc/licensecc.h>
+#include <licensecc_properties.h>
#include "limits/license_verifier.hpp"
+#include "base/StringUtils.h"
#include "LicenseReader.hpp"
+#include "pc-identifiers.h"
using namespace std;
-void print_error(char out_buffer[256], LicenseInfo* licenseInfo) {}
-void identify_pc(IDENTIFICATION_STRATEGY pc_id_method, char chbuffer[PC_IDENTIFIER_SIZE + 1]) {}
+void print_error(char out_buffer[ERROR_BUFFER_SIZE], LicenseInfo* licenseInfo) {}
+
+bool identify_pc(IDENTIFICATION_STRATEGY pc_id_method, char* chbuffer, size_t* bufSize) {
+ FUNCTION_RETURN result = FUNC_RET_BUFFER_TOO_SMALL;
+ if (*bufSize > sizeof(PcSignature)) {
+ PcSignature identifier_out;
+ result = generate_user_pc_signature(identifier_out, pc_id_method);
+ strncpy(chbuffer, identifier_out, *bufSize);
+ } else {
+ *bufSize = sizeof(PcSignature) + 1;
+ }
+ return result == FUNC_RET_OK;
+}
static void mergeLicenses(const vector<LicenseInfo>& licenses, LicenseInfo* license_out) {
if (license_out != nullptr) {
- int days_left = -1;
+ int days_left = INT_MIN;
for (auto it = licenses.begin(); it != licenses.end(); it++) {
// choose the license that expires later...
if (!it->has_expiry) {
*license_out = *it;
break;
- } else if (days_left < it->days_left) {
+ } else if (days_left < (int)it->days_left) {
*license_out = *it;
days_left = it->days_left;
}
@@ -40,11 +56,13 @@
EVENT_TYPE acquire_license(const CallerInformations* callerInformation, const LicenseLocation* licenseLocation,
LicenseInfo* license_out) {
- license::LicenseReader lr = license::LicenseReader(licenseLocation);
+ const license::LicenseReader lr = license::LicenseReader(licenseLocation);
vector<license::FullLicenseInfo> licenses;
string project;
- if (callerInformation != nullptr && strlen(callerInformation->project_name) > 0) {
- project = string(callerInformation->project_name);
+ size_t str_size;
+ if (callerInformation != nullptr &&
+ (str_size = license::mstrnlen_s(callerInformation->project_name, sizeof callerInformation->project_name)) > 0) {
+ project = string(callerInformation->project_name, str_size);
} else {
project = string(LCC_PROJECT_NAME);
}
--
Gitblit v1.9.1