mirror of
https://github.com/OpenVPN/openvpn3.git
synced 2024-09-20 12:12:15 +02:00
5c27ed24b1
This commit mostly reverts a previous commit:
commit b7bc687396
Avoid compiler warning with gcc by not using move semantics
The previous commit changed the semantics of the client
callback to use copy instead of move semantics on the
filename string to placate a compiler warning which was
later determined to be a false positive.
We revert to calling the client-provided func()
with move semantics on the filename parameter.
We also retain the use of std::invoke to call the
client-provided callback.
Signed-off-by: James Yonan <james@openvpn.net>
82 lines
2.4 KiB
C++
82 lines
2.4 KiB
C++
// OpenVPN -- An application to securely tunnel IP networks
|
|
// over a single port, with support for SSL/TLS-based
|
|
// session authentication and key exchange,
|
|
// packet encryption, packet authentication, and
|
|
// packet compression.
|
|
//
|
|
// Copyright (C) 2012-2022 OpenVPN Inc.
|
|
//
|
|
// This program is free software: you can redistribute it and/or modify
|
|
// it under the terms of the GNU Affero General Public License Version 3
|
|
// as published by the Free Software Foundation.
|
|
//
|
|
// This program 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 Affero General Public License for more details.
|
|
//
|
|
// You should have received a copy of the GNU Affero General Public License
|
|
// along with this program in the COPYING file.
|
|
// If not, see <http://www.gnu.org/licenses/>.
|
|
|
|
#ifndef OPENVPN_COMMON_ENUMDIR_H
|
|
#define OPENVPN_COMMON_ENUMDIR_H
|
|
|
|
#include <sys/types.h>
|
|
#include <dirent.h>
|
|
|
|
#include <string>
|
|
#include <vector>
|
|
#include <utility>
|
|
#include <memory>
|
|
#include <algorithm>
|
|
#include <functional>
|
|
|
|
#include <openvpn/common/size.hpp>
|
|
#include <openvpn/common/exception.hpp>
|
|
#include <openvpn/common/uniqueptr.hpp>
|
|
|
|
namespace openvpn {
|
|
OPENVPN_EXCEPTION(enum_dir_error);
|
|
|
|
template <typename F>
|
|
inline bool enum_dir(const std::string &dirname,
|
|
F func)
|
|
{
|
|
unique_ptr_del<DIR> dir(::opendir(dirname.c_str()), [](DIR *d)
|
|
{ ::closedir(d); });
|
|
if (!dir)
|
|
return false;
|
|
|
|
struct dirent *e;
|
|
while ((e = ::readdir(dir.get())) != nullptr)
|
|
{
|
|
std::string fn(e->d_name);
|
|
if (fn != "." && fn != "..")
|
|
std::invoke(func, std::move(fn));
|
|
}
|
|
return true;
|
|
}
|
|
|
|
inline std::vector<std::string> enum_dir(const std::string &dirname,
|
|
const size_t size_hint = 0,
|
|
const bool sort = false)
|
|
{
|
|
std::vector<std::string> ret;
|
|
if (size_hint)
|
|
ret.reserve(size_hint);
|
|
|
|
if (!enum_dir(dirname, [&ret](std::string fn)
|
|
{ ret.push_back(std::move(fn)); }))
|
|
throw enum_dir_error(dirname + ": cannot open directory");
|
|
|
|
if (sort)
|
|
std::sort(ret.begin(), ret.end());
|
|
|
|
return ret;
|
|
}
|
|
|
|
} // namespace openvpn
|
|
|
|
#endif
|