Changeset 2481 for box/trunk/lib/backupclient/BackupStoreFilename.cpp

Timestamp:

29/03/2009 14:51:24 (3 years ago)

Author:

chris

Message:

Change type of BackupStoreFilename? not to derive from std::string, so
it can't accidentally be used as one.

Fix use of encrypted filename in deleted file message, thanks to Kenny
Millington for reporting.

File:

• box/trunk/lib/backupclient/BackupStoreFilename.cpp (modified) (12 diffs)

box/trunk/lib/backupclient/BackupStoreFilename.cpp

@@ -38 +38 @@
 // --------------------------------------------------------------------------
 BackupStoreFilename::BackupStoreFilename(const BackupStoreFilename &rToCopy)
-        : BackupStoreFilename_base(rToCopy)
+        : mEncryptedName(rToCopy.mEncryptedName)
 {
 }
@@ -66 +66 @@
         bool ok = true;
         
-        if(size() < 2)
+        if(mEncryptedName.size() < 2)
         {
                 // Isn't long enough to have a header
@@ -74 +74 @@
         {
                 // Check size is consistent
-                unsigned int dsize = BACKUPSTOREFILENAME_GET_SIZE(*this);
-                if(dsize != size())
+                unsigned int dsize = BACKUPSTOREFILENAME_GET_SIZE(this->mEncryptedName);
+                if(dsize != mEncryptedName.size())
                 {
                         ok = false;
@@ -81 +81 @@
                 
                 // And encoding is an accepted value
-                unsigned int encoding = BACKUPSTOREFILENAME_GET_ENCODING(*this);
+                unsigned int encoding = BACKUPSTOREFILENAME_GET_ENCODING(this->mEncryptedName);
                 if(encoding < Encoding_Min || encoding > Encoding_Max)
                 {
@@ -120 +120 @@
         
         // assign to this string, storing the header and the extra data
-        assign(hdr, 2);
-        append(data.c_str(), data.size());
+        mEncryptedName.assign(hdr, 2);
+        mEncryptedName.append(data.c_str(), data.size());
         
         // Check it
@@ -142 +142 @@
         CheckValid();
         
-        rProtocol.Write(c_str(), size());
+        rProtocol.Write(mEncryptedName.c_str(), mEncryptedName.size());
 }
 
@@ -178 +178 @@
 
                 // assign to this string, storing the header and the extra data
-                assign(buf, dsize);
+                mEncryptedName.assign(buf, dsize);
         }
         else
@@ -195 +195 @@
 
                 // assign to this string, storing the header and the extra data
-                assign(data, dsize);
+                mEncryptedName.assign(data, dsize);
         }
         
@@ -217 +217 @@
         CheckValid();
         
-        rStream.Write(c_str(), size());
+        rStream.Write(mEncryptedName.c_str(), mEncryptedName.size());
 }
 
@@ -243 +243 @@
 bool BackupStoreFilename::IsEncrypted() const
 {
-        return BACKUPSTOREFILENAME_GET_ENCODING(*this) != Encoding_Clear;
+        return BACKUPSTOREFILENAME_GET_ENCODING(this->mEncryptedName) !=
+                Encoding_Clear;
 }
 
@@ -251 +252 @@
 // Function
 //              Name:    BackupStoreFilename::SetAsClearFilename(const char *)
-//              Purpose: Sets this object to be a valid filename, but with a filename in the clear.
-//                               Used on the server to create filenames when there's no way of encrypting it.
+//              Purpose: Sets this object to be a valid filename, but with a
+//                       filename in the clear. Used on the server to create
+//                       filenames when there's no way of encrypting it.
 //              Created: 22/4/04
 //
@@ -269 +271 @@
         
         // Store the encoded string
-        assign(encoded);
+        mEncryptedName.assign(encoded);
         
         // Stuff which must be done