diff --git a/lang/cpp/src/Makefile.am b/lang/cpp/src/Makefile.am index 7af66325..ba8a7fb1 100644 --- a/lang/cpp/src/Makefile.am +++ b/lang/cpp/src/Makefile.am @@ -37,7 +37,8 @@ main_sources = \ defaultassuantransaction.cpp \ scdgetinfoassuantransaction.cpp gpgagentgetinfoassuantransaction.cpp \ statusconsumerassuantransaction.cpp \ - vfsmountresult.cpp configuration.cpp tofuinfo.cpp swdbresult.cpp + vfsmountresult.cpp configuration.cpp tofuinfo.cpp swdbresult.cpp \ + util.cpp gpgmepp_headers = \ configuration.h context.h data.h decryptionresult.h \ diff --git a/lang/cpp/src/util.cpp b/lang/cpp/src/util.cpp new file mode 100644 index 00000000..9104435f --- /dev/null +++ b/lang/cpp/src/util.cpp @@ -0,0 +1,47 @@ +/* + util.cpp - some internal helpers + Copyright (c) 2022 g10 Code GmbH + Software engineering by Ingo Klöcker + + This file is part of GPGME++. + + GPGME++ is free software; you can redistribute it and/or + modify it under the terms of the GNU Library General Public + License as published by the Free Software Foundation; either + version 2 of the License, or (at your option) any later version. + + GPGME++ is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU Library General Public License for more details. + + You should have received a copy of the GNU Library General Public License + along with GPGME++; see the file COPYING.LIB. If not, write to the + Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, + Boston, MA 02110-1301, USA. +*/ + +#ifdef HAVE_CONFIG_H + #include "config.h" +#endif + +#include "util.h" + +#include + +StringsToCStrings::StringsToCStrings(const std::vector& v) + : m_strings{v} +{ +} + +const char **StringsToCStrings::c_strs() const +{ + if (m_cstrings.empty()) { + m_cstrings.reserve(m_strings.size() + 1); + std::transform(std::begin(m_strings), std::end(m_strings), + std::back_inserter(m_cstrings), + std::mem_fn(&std::string::c_str)); + m_cstrings.push_back(nullptr); + } + return m_cstrings.data(); +} diff --git a/lang/cpp/src/util.h b/lang/cpp/src/util.h index e04115bf..b6f9ca50 100644 --- a/lang/cpp/src/util.h +++ b/lang/cpp/src/util.h @@ -1,8 +1,10 @@ /* - util.h - some inline helper functions + util.h - some internal helpers Copyright (C) 2004 Klarälvdalens Datakonsult AB 2016 Bundesamt für Sicherheit in der Informationstechnik Software engineering by Intevation GmbH + Copyright (c) 2022 g10 Code GmbH + Software engineering by Ingo Klöcker This file is part of GPGME++. @@ -175,4 +177,25 @@ static inline gpgme_sig_notation_flags_t add_to_gpgme_sig_notation_flags_t(unsi return static_cast(result); } +/** + * Adapter for passing a vector of strings as NULL-terminated array of + * const char* to the C-interface of gpgme. + */ +class StringsToCStrings +{ +public: + explicit StringsToCStrings(const std::vector &v); + ~StringsToCStrings() = default; + + StringsToCStrings(const StringsToCStrings &) = delete; + StringsToCStrings &operator=(const StringsToCStrings &) = delete; + StringsToCStrings(StringsToCStrings &&) = delete; + StringsToCStrings &operator=(StringsToCStrings &&) = delete; + + const char **c_strs() const; +private: + const std::vector m_strings; + mutable std::vector m_cstrings; +}; + #endif // __GPGMEPP_UTIL_H__