From 36ce07093b68b07513149577c209ae7a57ab356b Mon Sep 17 00:00:00 2001
From: Gabriele Contini <contini.mailing@gmail.com>
Date: 周日, 15 3月 2020 16:26:21 +0800
Subject: [PATCH] Merge branch 'feature/pc_identifiers' into develop issues #2 #3 #14 #49
---
src/library/base/StringUtils.cpp | 54 +++++++++++++++++++++++++++++++-----------------------
1 files changed, 31 insertions(+), 23 deletions(-)
diff --git a/src/library/base/StringUtils.cpp b/src/library/base/StringUtils.cpp
index cf9da96..1d5d27b 100644
--- a/src/library/base/StringUtils.cpp
+++ b/src/library/base/StringUtils.cpp
@@ -5,7 +5,7 @@
*
*/
-#include <cctype> //toupper
+#include <cctype> //toupper
#include <iostream>
#include <string>
#include <sstream>
@@ -16,7 +16,7 @@
#include "StringUtils.h"
#ifdef _WIN32
-#include <time.h> //mktime under windows
+#include <time.h> //mktime under windows
#endif
namespace license {
@@ -24,42 +24,40 @@
string trim_copy(const string &string_to_trim) {
std::string::const_iterator it = string_to_trim.begin();
- while (it != string_to_trim.end() && isspace(*it))
- it++;
-
+ while (it != string_to_trim.end() && isspace(*it)) {
+ ++it;
+ }
std::string::const_reverse_iterator rit = string_to_trim.rbegin();
- while (rit.base() != it && isspace(*rit))
- rit++;
-
+ while (rit.base() != it && (isspace(*rit) || *rit == 0)) {
+ ++rit;
+ }
return std::string(it, rit.base());
}
string toupper_copy(const string &lowercase) {
string cp(lowercase);
- std::transform(cp.begin(), cp.end(), cp.begin(), (int (*)(int)) toupper);
+ std::transform(cp.begin(), cp.end(), cp.begin(), (int (*)(int))toupper);
return cp;
}
-time_t seconds_from_epoch(const char *timeString) {
+time_t seconds_from_epoch(const string &timeString) {
int year, month, day;
tm tm;
- if (strlen(timeString) == 8) {
- const int nfield = sscanf(timeString, "%4d%2d%2d", &year, &month, &day);
+ if (timeString.size() == 8) {
+ const int nfield = sscanf(timeString.c_str(), "%4d%2d%2d", &year, &month, &day);
if (nfield != 3) {
throw invalid_argument("Date not recognized");
}
- } else if (strlen(timeString) == 10) {
- const int nfield = sscanf(timeString, "%4d-%2d-%2d", &year, &month,
- &day);
+ } else if (timeString.size() == 10) {
+ const int nfield = sscanf(timeString.c_str(), "%4d-%2d-%2d", &year, &month, &day);
if (nfield != 3) {
- const int nfield = sscanf(timeString, "%4d/%2d/%2d", &year, &month,
- &day);
+ const int nfield = sscanf(timeString.c_str(), "%4d/%2d/%2d", &year, &month, &day);
if (nfield != 3) {
- throw invalid_argument("Date not recognized");
+ throw invalid_argument("Date [" + timeString + "] not recognized");
}
}
} else {
- throw invalid_argument("Date not recognized");
+ throw invalid_argument("Date [" + timeString + "] not recognized");
}
tm.tm_isdst = -1;
tm.tm_year = year - 1900;
@@ -73,8 +71,7 @@
return mktime(&tm);
}
-const vector<string> split_string(const string &licensePositions,
- char splitchar) {
+const vector<string> split_string(const string &licensePositions, char splitchar) {
std::stringstream streamToSplit(licensePositions);
std::string segment;
std::vector<string> seglist;
@@ -86,8 +83,7 @@
}
const static regex iniSection("\\[.*?\\]");
-const static regex b64(
- "^(?:[A-Za-z0-9+/]{4})*(?:[A-Za-z0-9+/]{2}==|[A-Za-z0-9+/]{3}=)?$");
+const static regex b64("^(?:[A-Za-z0-9+/]{4})*(?:[A-Za-z0-9+/]{2}==|[A-Za-z0-9+/]{3}=)?$");
FILE_FORMAT identify_format(const string &license) {
FILE_FORMAT result = UNKNOWN;
@@ -99,4 +95,16 @@
return result;
}
+// strnln_s is not well supported and strlen is marked unsafe..
+size_t mstrnlen_s(const char *szptr, size_t maxsize) {
+ if (szptr == nullptr) {
+ return 0;
+ }
+ size_t count = 0;
+ while (*szptr++ && maxsize--) {
+ count++;
+ }
+ return count;
+}
+
} /* namespace license */
--
Gitblit v1.9.1