X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Futil.cc;h=e0db5de2ef2aa71558d2bc8a5b3d701e50ee254d;hb=12efbd5938f08eb445b43f539fa4f27aa5caccfb;hp=60953b544d1a0c26b3816c674db3f9612b4ee181;hpb=0f60e0f52c986f18764822de78b82b4163909f0c;p=dcpomatic.git

diff --git a/src/lib/util.cc b/src/lib/util.cc
index 60953b544..e0db5de2e 100644
--- a/src/lib/util.cc
+++ b/src/lib/util.cc
@@ -22,7 +22,6 @@
  *  @brief Some utility functions and classes.
  */
 
-#include <sstream>
 #include <iomanip>
 #include <iostream>
 #include <fstream>
@@ -72,6 +71,7 @@ extern "C" {
 #include "rect.h"
 #include "md5_digester.h"
 #include "audio_processor.h"
+#include "safe_stringstream.h"
 #ifdef DCPOMATIC_WINDOWS
 #include "stack.hpp"
 #endif
@@ -79,7 +79,6 @@ extern "C" {
 #include "i18n.h"
 
 using std::string;
-using std::stringstream;
 using std::setfill;
 using std::ostream;
 using std::endl;
@@ -123,7 +122,7 @@ seconds_to_hms (int s)
 	int h = m / 60;
 	m -= (h * 60);
 
-	stringstream hms;
+	SafeStringStream hms;
 	hms << h << N_(":");
 	hms.width (2);
 	hms << std::setfill ('0') << m << N_(":");
@@ -144,7 +143,7 @@ seconds_to_approximate_hms (int s)
 	int h = m / 60;
 	m -= (h * 60);
 
-	stringstream ap;
+	SafeStringStream ap;
 
 	bool const hours = h > 0;
 	bool const minutes = h < 10 && m > 0;
@@ -263,7 +262,7 @@ stacktrace (ostream& out, int levels)
 static string
 ffmpeg_version_to_string (int v)
 {
-	stringstream s;
+	SafeStringStream s;
 	s << ((v & 0xff0000) >> 16) << N_(".") << ((v & 0xff00) >> 8) << N_(".") << (v & 0xff);
 	return s.str ();
 }
@@ -384,35 +383,42 @@ mo_path ()
 }
 #endif
 
+#ifdef DCPOMATIC_OSX
+boost::filesystem::path
+mo_path ()
+{
+	return "DCP-o-matic 2.app/Contents/Resources";
+}
+#endif
+
 void
 dcpomatic_setup_gettext_i18n (string lang)
 {
-#ifdef DCPOMATIC_POSIX
+#ifdef DCPOMATIC_LINUX
 	lang += ".UTF8";
 #endif
 
 	if (!lang.empty ()) {
-		/* Override our environment language; this is essential on
-		   Windows.
+		/* Override our environment language.  Note that the caller must not
+		   free the string passed into putenv().
 		*/
-		char cmd[64];
-		snprintf (cmd, sizeof(cmd), "LANGUAGE=%s", lang.c_str ());
-		putenv (cmd);
-		snprintf (cmd, sizeof(cmd), "LANG=%s", lang.c_str ());
-		putenv (cmd);
-		snprintf (cmd, sizeof(cmd), "LC_ALL=%s", lang.c_str ());
-		putenv (cmd);
+		string s = String::compose ("LANGUAGE=%1", lang);
+		putenv (strdup (s.c_str ()));
+		s = String::compose ("LANG=%1", lang);
+		putenv (strdup (s.c_str ()));
+		s = String::compose ("LC_ALL=%1", lang);
+		putenv (strdup (s.c_str ()));
 	}
 
 	setlocale (LC_ALL, "");
 	textdomain ("libdcpomatic");
 
-#ifdef DCPOMATIC_WINDOWS
+#if defined(DCPOMATIC_WINDOWS) || defined(DCPOMATIC_OSX)
 	bindtextdomain ("libdcpomatic", mo_path().string().c_str());
 	bind_textdomain_codeset ("libdcpomatic", "UTF8");
 #endif	
 
-#ifdef DCPOMATIC_POSIX
+#ifdef DCPOMATIC_LINUX
 	bindtextdomain ("libdcpomatic", POSIX_LOCALE_PREFIX);
 #endif
 }
@@ -466,7 +472,10 @@ md5_digest (vector<boost::filesystem::path> files, shared_ptr<Job> job)
 
 		while (remaining > 0) {
 			int const t = min (remaining, buffer_size);
-			fread (buffer, 1, t, f);
+			int const r = fread (buffer, 1, t, f);
+			if (r != t) {
+				throw ReadFileError (files[i], errno);
+			}
 			digester.add (buffer, t);
 			remaining -= t;
 
@@ -556,7 +565,7 @@ Socket::accept (int port)
 	_acceptor->async_accept (_socket, boost::lambda::var(ec) = boost::lambda::_1);
 	do {
 		_io_service.run_one ();
-	} while (ec == boost::asio::error::would_block );
+	} while (ec == boost::asio::error::would_block);
 
 	delete _acceptor;
 	_acceptor = 0;
@@ -889,7 +898,7 @@ divide_with_round (int64_t a, int64_t b)
 string
 dependency_version_summary ()
 {
-	stringstream s;
+	SafeStringStream s;
 	s << N_("libopenjpeg ") << opj_version () << N_(", ")
 	  << N_("libavcodec ") << ffmpeg_version_to_string (avcodec_version()) << N_(", ")
 	  << N_("libavfilter ") << ffmpeg_version_to_string (avfilter_version()) << N_(", ")