X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fscoped_temporary.cc;h=0ead7b1655d5445244aa103f67dcc597f160e035;hb=fe933ebb2c55b4235fcba5d02af2ba91c272fc88;hp=b712fe4944dfbada271cd68ec63ffe14860ea235;hpb=e60bb3e51bd1508b149e6b8f6608f09b5196ae26;p=dcpomatic.git

diff --git a/src/lib/scoped_temporary.cc b/src/lib/scoped_temporary.cc
index b712fe494..0ead7b165 100644
--- a/src/lib/scoped_temporary.cc
+++ b/src/lib/scoped_temporary.cc
@@ -1,64 +1,70 @@
 /*
-    Copyright (C) 2012-2014 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2021 Carl Hetherington <cth@carlh.net>
 
-    This program is free software; you can redistribute it and/or modify
+    This file is part of DCP-o-matic.
+
+    DCP-o-matic is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
     the Free Software Foundation; either version 2 of the License, or
     (at your option) any later version.
 
-    This program is distributed in the hope that it will be useful,
+    DCP-o-matic 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 General Public License for more details.
 
     You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+    along with DCP-o-matic.  If not, see <http://www.gnu.org/licenses/>.
 
 */
 
+
 #include "scoped_temporary.h"
+#include "exceptions.h"
+#include "cross.h"
+
 
 /** Construct a ScopedTemporary.  A temporary filename is decided but the file is not opened
- *  until ::open() is called.
+ *  until open() is called.
  */
 ScopedTemporary::ScopedTemporary ()
-	: _open (0)
 {
-	_file = boost::filesystem::temp_directory_path() / boost::filesystem::unique_path ();
+	_path = boost::filesystem::temp_directory_path() / boost::filesystem::unique_path();
 }
 
+
 /** Close and delete the temporary file */
 ScopedTemporary::~ScopedTemporary ()
 {
-	close ();
+	if (_file) {
+		_file->close();
+	}
 	boost::system::error_code ec;
-	boost::filesystem::remove (_file, ec);
+	boost::filesystem::remove (_path, ec);
 }
 
+
 /** @return temporary filename */
 char const *
 ScopedTemporary::c_str () const
 {
-	return _file.string().c_str ();
+	return _path.string().c_str();
 }
 
+
 /** Open the temporary file.
  *  @return File's FILE pointer.
  */
-FILE*
+dcp::File&
 ScopedTemporary::open (char const * params)
 {
-	_open = fopen (c_str(), params);
-	return _open;
-}
-
-/** Close the file */
-void
-ScopedTemporary::close ()
-{
-	if (_open) {
-		fclose (_open);
-		_open = 0;
+	if (_file) {
+		_file->close();
+	}
+	_file = dcp::File(_path, params);
+	if (!*_file) {
+		throw FileError ("Could not open scoped temporary", _path);
 	}
+	return *_file;
 }
+