mirror/The-Powder-Toy
1
0
Fork 0
mirror of https://github.com/The-Powder-Toy/The-Powder-Toy.git synced 2025-09-08 15:00:42 +02:00
Code Issues Projects Releases Wiki Activity

Handle return value from signal in the External clipboard driver

Browse Source 
Absolutely zero chance of signal ever failing, but still.
This commit is contained in:
Tamás Bálint Misius
2023-12-15 18:24:39 +01:00
parent fb9cba0d01
commit 9f431c6393
1 changed files with 18 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/common/clipboard/External.cpp
View File

@@ -103,14 +103,26 @@ namespace Clipboard
class ExternalClipboardImpl : public ClipboardImpl class ExternalClipboardImpl : public ClipboardImpl
{ {
bool initialized = false;
public: public:
ExternalClipboardImpl() ExternalClipboardImpl()
{ {
signal(SIGPIPE, SIG_IGN); // avoids problems with popen if (signal(SIGPIPE, SIG_IGN) == SIG_ERR) // avoids problems with popen
{
std::cerr << "failed to initialize clipboard driver: signal: " << strerror(errno) << std::endl;
return;
}
initialized = true;
} }
void SetClipboardData() final override void SetClipboardData() final override
{ {
if (!initialized)
{
std::cerr << "failed to set clipboard data: clipboard driver not initialized" << std::endl;
return;
}
auto preset = GetPreset(); auto preset = GetPreset();
if (!preset) if (!preset)
{ {
@@ -149,6 +161,11 @@ namespace Clipboard
GetClipboardDataResult GetClipboardData() final override GetClipboardDataResult GetClipboardData() final override
{ {
if (!initialized)
{
std::cerr << "cannot get save from clipboard: clipboard driver not initialized" << std::endl;
return GetClipboardDataUnknown{};
}
auto getTarget = [](ByteString command) -> std::optional<std::vector<char>> { auto getTarget = [](ByteString command) -> std::optional<std::vector<char>> {
if (!command.size()) if (!command.size())
{ {