summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMax Kellermann <max@musicpd.org>2020-09-07 20:04:47 +0200
committerMax Kellermann <max@musicpd.org>2020-09-07 20:14:39 +0200
commit962cf32ba7b956733cc1ddb6d9ab707cfc577c02 (patch)
treef29d8d50f3f18b10b3ca5c97d5e9d2fda0b015e9
parentae23682372c92c5416f5bd4ec5cd3c276f7add14 (diff)
test/run_input: pass FileDescriptor to dump_input_stream()
-rw-r--r--test/run_input.cxx8
1 files changed, 3 insertions, 5 deletions
diff --git a/test/run_input.cxx b/test/run_input.cxx
index 4c067fb45..63e5f2ab7 100644
--- a/test/run_input.cxx
+++ b/test/run_input.cxx
@@ -130,7 +130,7 @@ tag_save(FILE *file, const Tag &tag)
}
static int
-dump_input_stream(InputStream &is)
+dump_input_stream(InputStream &is, FileDescriptor out)
{
const std::lock_guard<Mutex> protect(is.mutex);
@@ -155,9 +155,7 @@ dump_input_stream(InputStream &is)
if (num_read == 0)
break;
- ssize_t num_written = write(1, buffer, num_read);
- if (num_written <= 0)
- break;
+ out.FullWrite(buffer, num_read);
}
is.Check();
@@ -234,7 +232,7 @@ try {
Mutex mutex;
auto is = InputStream::OpenReady(c.uri, mutex);
- return dump_input_stream(*is);
+ return dump_input_stream(*is, FileDescriptor(STDOUT_FILENO));
} catch (...) {
PrintException(std::current_exception());
return EXIT_FAILURE;