From eb2db91c65645c8a1479950684bbf0ddbeeb7ef0 Mon Sep 17 00:00:00 2001 From: tim lindner Date: Sun, 17 May 2020 09:04:31 -0700 Subject: IMGTOOL: Added Dragon DOS module [tlindner] --- src/tools/imgtool/imgtool.cpp | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'src/tools/imgtool/imgtool.cpp') diff --git a/src/tools/imgtool/imgtool.cpp b/src/tools/imgtool/imgtool.cpp index fb24da8a872..2b2e6c62b08 100644 --- a/src/tools/imgtool/imgtool.cpp +++ b/src/tools/imgtool/imgtool.cpp @@ -83,10 +83,11 @@ char *strncpyz(char *dest, const char *source, size_t len) // extract_padded_string //------------------------------------------------- -static std::string extract_padded_string(const char *source, size_t len) +static std::string extract_padded_string(const char *source, size_t len, char pad) { - while ((len > 0) && (source[len - 1] == ' ')) + while ((len > 0) && (source[len - 1] == pad)) len--; + return std::string(source, len); } @@ -97,10 +98,10 @@ static std::string extract_padded_string(const char *source, size_t len) // this in common code //------------------------------------------------- -std::string extract_padded_filename(const char *source, size_t filename_length, size_t extension_length) +std::string extract_padded_filename(const char *source, size_t filename_length, size_t extension_length, char pad) { - std::string filename = extract_padded_string(source, filename_length); - std::string extension = extract_padded_string(source + filename_length, extension_length); + std::string filename = extract_padded_string(source, filename_length, pad); + std::string extension = extract_padded_string(source + filename_length, extension_length, pad); return extension.empty() ? filename : filename + "." + extension; } -- cgit v1.2.3