From 2abc033655fe6768ce1faf53c9caa0f324fa96b5 Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Sat, 31 Jan 2015 19:37:21 +0100
Subject: [PATCH] ConstrainedDataStream: print the name of the file in
 exceptions

---
 .../files/constrainedfiledatastream.cpp       | 86 +++++++++++--------
 1 file changed, 48 insertions(+), 38 deletions(-)

diff --git a/components/files/constrainedfiledatastream.cpp b/components/files/constrainedfiledatastream.cpp
index b97e50031..d4d7c231a 100644
--- a/components/files/constrainedfiledatastream.cpp
+++ b/components/files/constrainedfiledatastream.cpp
@@ -15,6 +15,7 @@ public:
     static const size_t sBufferThreshold = 1024; // reads larger than this bypass buffering as cost of memcpy outweighs cost of system call
 
     ConstrainedDataStream(const Ogre::String &fname, size_t start, size_t length)
+        : Ogre::DataStream(fname)
     {
         mFile.open (fname.c_str ());
         mSize  = length != 0xFFFFFFFF ? length : mFile.size () - start;
@@ -30,63 +31,72 @@ public:
 
     size_t read(void* buf, size_t count)
     {
-        assert (mPos <= mSize);
-
-        uint8_t * out = reinterpret_cast <uint8_t *> (buf);
+        try
+        {
+            assert (mPos <= mSize);
 
-        size_t posBeg = mOrigin + mPos;
-        size_t posEnd = posBeg + count;
+            uint8_t * out = reinterpret_cast <uint8_t *> (buf);
 
-        if (posEnd > mExtent)
-            posEnd = mExtent;
+            size_t posBeg = mOrigin + mPos;
+            size_t posEnd = posBeg + count;
 
-        size_t posCur = posBeg;
+            if (posEnd > mExtent)
+                posEnd = mExtent;
 
-        while (posCur != posEnd)
-        {
-            size_t readLeft = posEnd - posCur;
+            size_t posCur = posBeg;
 
-            if (posCur < mBufferOrigin || posCur >= mBufferExtent)
+            while (posCur != posEnd)
             {
-                if (readLeft >= sBufferThreshold || (posCur == mOrigin && posEnd == mExtent))
-                {
-                    assert (mFile.tell () == mBufferExtent);
+                size_t readLeft = posEnd - posCur;
 
-                    if (posCur != mBufferExtent)
-                        mFile.seek (posCur);
+                if (posCur < mBufferOrigin || posCur >= mBufferExtent)
+                {
+                    if (readLeft >= sBufferThreshold || (posCur == mOrigin && posEnd == mExtent))
+                    {
+                        assert (mFile.tell () == mBufferExtent);
 
-                    posCur += mFile.read (out, readLeft);
+                        if (posCur != mBufferExtent)
+                            mFile.seek (posCur);
 
-                    mBufferOrigin = mBufferExtent = posCur;
+                        posCur += mFile.read (out, readLeft);
 
-                    mPos = posCur - mOrigin;
+                        mBufferOrigin = mBufferExtent = posCur;
 
-                    return posCur - posBeg;
-                }
-                else
-                {
-                    size_t newBufferOrigin;
+                        mPos = posCur - mOrigin;
 
-                    if ((posCur < mBufferOrigin) && (mBufferOrigin - posCur < sBufferSize))
-                        newBufferOrigin = std::max (mOrigin, mBufferOrigin > sBufferSize ? mBufferOrigin - sBufferSize : 0);
+                        return posCur - posBeg;
+                    }
                     else
-                        newBufferOrigin = posCur;
+                    {
+                        size_t newBufferOrigin;
 
-                    fill (newBufferOrigin);
+                        if ((posCur < mBufferOrigin) && (mBufferOrigin - posCur < sBufferSize))
+                            newBufferOrigin = std::max (mOrigin, mBufferOrigin > sBufferSize ? mBufferOrigin - sBufferSize : 0);
+                        else
+                            newBufferOrigin = posCur;
+
+                        fill (newBufferOrigin);
+                    }
                 }
-            }
 
-            size_t xfer = std::min (readLeft, mBufferExtent - posCur);
+                size_t xfer = std::min (readLeft, mBufferExtent - posCur);
 
-            memcpy (out, mBuffer + (posCur - mBufferOrigin), xfer);
+                memcpy (out, mBuffer + (posCur - mBufferOrigin), xfer);
 
-            posCur += xfer;
-            out += xfer;
-        }
+                posCur += xfer;
+                out += xfer;
+            }
 
-        count = posEnd - posBeg;
-        mPos += count;
-        return count;
+            count = posEnd - posBeg;
+            mPos += count;
+            return count;
+        }
+        catch (std::exception& e)
+        {
+            std::stringstream error;
+            error << "Failed to read '" << mName << "': " << e.what();
+            throw std::runtime_error(error.str());
+        }
     }
 
     void skip(long count)