X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fdata.cc;h=1971a261bb7c463f2999d4035a1d43be0137621d;hb=bb06c37abbe900a1f0f86d428e9068a96682c188;hp=7f390ead2c31b59cd4cd29956fef5a39348c879d;hpb=094117316524f12fc82adbdf721778eed04e66f6;p=libdcp.git

diff --git a/src/data.cc b/src/data.cc
index 7f390ead..1971a261 100644
--- a/src/data.cc
+++ b/src/data.cc
@@ -1,42 +1,109 @@
 /*
     Copyright (C) 2015 Carl Hetherington <cth@carlh.net>
 
-    This program is free software; you can redistribute it and/or modify
+    This file is part of libdcp.
+
+    libdcp 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,
+    libdcp 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 libdcp.  If not, see <http://www.gnu.org/licenses/>.
+
+    In addition, as a special exception, the copyright holders give
+    permission to link the code of portions of this program with the
+    OpenSSL library under certain conditions as described in each
+    individual source file, and distribute linked combinations
+    including the two.
 
+    You must obey the GNU General Public License in all respects
+    for all of the code used other than OpenSSL.  If you modify
+    file(s) with this exception, you may extend this exception to your
+    version of the file(s), but you are not obligated to do so.  If you
+    do not wish to do so, delete this exception statement from your
+    version.  If you delete this exception statement from all source
+    files in the program, then also delete it here.
 */
 
 #include "data.h"
 #include "util.h"
 #include "exceptions.h"
 #include <cstdio>
+#include <cerrno>
 
+using boost::shared_array;
 using namespace dcp;
 
+Data::Data ()
+	: _size (0)
+{
+
+}
+
+Data::Data (int size)
+	: _data (new uint8_t[size])
+	, _size (size)
+{
+
+}
+
+Data::Data (uint8_t const * data, int size)
+	: _data (new uint8_t[size])
+	, _size (size)
+{
+	memcpy (_data.get(), data, size);
+}
+
+Data::Data (shared_array<uint8_t> data, int size)
+	: _data (data)
+	, _size (size)
+{
+
+}
+
 Data::Data (boost::filesystem::path file)
 {
+	_size = boost::filesystem::file_size (file);
+	_data.reset (new uint8_t[_size]);
+
 	FILE* f = fopen_boost (file, "rb");
 	if (!f) {
 		throw FileError ("could not open file for reading", file, errno);
 	}
 
-	size = boost::filesystem::file_size (file);
-	data.reset (new uint8_t[size]);
-	size_t const read = fread (data.get(), 1, size, f);
+	size_t const r = fread (_data.get(), 1, _size, f);
+	if (r != size_t (_size)) {
+		fclose (f);
+		throw FileError ("could not read from file", file, errno);
+	}
+
 	fclose (f);
+}
 
-	if (read != size) {
-		throw FileError ("could not read file", file, -1);
+void
+Data::write (boost::filesystem::path file) const
+{
+	FILE* f = fopen_boost (file, "wb");
+	if (!f) {
+		throw FileError ("could not write to file", file, errno);
 	}
+	size_t const r = fwrite (_data.get(), 1, _size, f);
+	if (r != size_t (_size)) {
+		fclose (f);
+		throw FileError ("could not write to file", file, errno);
+	}
+	fclose (f);
+}
+
+void
+Data::write_via_temp (boost::filesystem::path temp, boost::filesystem::path final) const
+{
+	write (temp);
+	boost::filesystem::rename (temp, final);
 }