oysteikt/mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

test/run_input: pass FileDescriptor to dump_input_stream()

Browse Source
This commit is contained in:
Max Kellermann
2020-09-07 20:04:47 +02:00
parent ae23682372
commit 962cf32ba7
1 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
test/run_input.cxx
View File

@@ -130,7 +130,7 @@ tag_save(FILE *file, const Tag &tag)
} }
static int static int
dump_input_stream(InputStream &is) dump_input_stream(InputStream &is, FileDescriptor out)
{ {
const std::lock_guard<Mutex> protect(is.mutex); const std::lock_guard<Mutex> protect(is.mutex);
@@ -155,9 +155,7 @@ dump_input_stream(InputStream &is)
if (num_read == 0) if (num_read == 0)
break; break;
ssize_t num_written = write(1, buffer, num_read); out.FullWrite(buffer, num_read);
if (num_written <= 0)
break;
} }
is.Check(); is.Check();
@@ -234,7 +232,7 @@ try {
Mutex mutex; Mutex mutex;
auto is = InputStream::OpenReady(c.uri, mutex); auto is = InputStream::OpenReady(c.uri, mutex);
return dump_input_stream(*is); return dump_input_stream(*is, FileDescriptor(STDOUT_FILENO));
} catch (...) { } catch (...) {
PrintException(std::current_exception()); PrintException(std::current_exception());
return EXIT_FAILURE; return EXIT_FAILURE;