From 31b87d3d695e35c1daf1c88d2b5d6ddebec3e62b Mon Sep 17 00:00:00 2001 From: Boris Kolpackov Date: Wed, 3 Aug 2016 09:01:56 +0200 Subject: Implement faster emulation of Windows NUL via temporary file --- butl/fdstream.cxx | 34 ++++++++++++++++++++++++++++++++-- 1 file changed, 32 insertions(+), 2 deletions(-) (limited to 'butl/fdstream.cxx') diff --git a/butl/fdstream.cxx b/butl/fdstream.cxx index f761e7b..cff9b59 100644 --- a/butl/fdstream.cxx +++ b/butl/fdstream.cxx @@ -21,6 +21,7 @@ #include // errno, E* #include // ios_base::openmode, ios_base::failure +#include // bad_alloc #include // numeric_limits #include #include // uncaught_exception() @@ -542,9 +543,38 @@ namespace butl } int - fdnull () noexcept + fdnull (bool temp) noexcept { - return _sopen ("nul", _O_RDWR, _SH_DENYNO); + // No need to translate /r/n before sending it to void. + // + if (!temp) + return _sopen ("nul", _O_RDWR | _O_BINARY, _SH_DENYNO); + + try + { + // We could probably implement a Windows-specific version of getting + // the temporary file that avoid any allocations and exceptions. + // + path p (path::temp_path ("null")); // Can throw. + return _sopen (p.string ().c_str (), + (_O_CREAT | + _O_RDWR | + _O_BINARY | // Don't translate. + _O_TEMPORARY | // Remove on close. + _O_SHORT_LIVED), // Don't flush to disk. + _SH_DENYNO, + _S_IREAD | _S_IWRITE); + } + catch (const bad_alloc&) + { + errno = ENOMEM; + return -1; + } + catch (const system_error& e) + { + errno = e.code ().value (); + return -1; + } } fdstream_mode -- cgit v1.1