cppbind.Ghost: clean up a bit

[simgear.git] / simgear / io / SVNReportParser.cxx

diff --git a/simgear/io/SVNReportParser.cxx b/simgear/io/SVNReportParser.cxx
index 96b357f51e3e231b05c23e8dd7e6cafac4592abc..72b6169310338b65a3a07800f7feca5c3671dbf2 100644 (file)
--- a/simgear/io/SVNReportParser.cxx
+++ b/simgear/io/SVNReportParser.cxx
@@ -106,12 +106,13 @@ namespace {
   const char* SVN_ADD_FILE_TAG = SVN_NS "add-file";
   const char* SVN_TXDELTA_TAG = SVN_NS "txdelta";
   const char* SVN_SET_PROP_TAG = SVN_NS "set-prop";
+  const char* SVN_PROP_TAG = SVN_NS "prop";
   const char* SVN_DELETE_ENTRY_TAG = SVN_NS "delete-entry";
   
   const char* SVN_DAV_MD5_CHECKSUM = SUBVERSION_DAV_NS ":md5-checksum";
   
   const char* DAV_HREF_TAG = DAV_NS "href";
-  const char* DAV_CHECKED_IN_TAG = SVN_NS "checked-in";
+  const char* DAV_CHECKED_IN_TAG = DAV_NS "checked-in";
   
 
   const int svn_txdelta_source = 0;
@@ -173,7 +174,7 @@ namespace {
         while (_ptr < pEnd) {
           int op = ((*_ptr >> 6) & 0x3);  
           if (op >= 3) {
-           SG_LOG(SG_IO, SG_INFO, "SVNDeltaWindow: bad opcode:" << op);
+              SG_LOG(SG_IO, SG_INFO, "SVNDeltaWindow: bad opcode:" << op);
               return false;
           }
       
@@ -195,12 +196,14 @@ namespace {
           }
 
           if (op == svn_txdelta_target) {
-            while (length > 0) {
-              output.push_back(output[offset++]);
-              --length;
-            }
+              // this is inefficent, but ranges can overlap.
+              while (length > 0) {
+                  output.push_back(output[offset++]);
+                  --length;
+              }
           } else if (op == svn_txdelta_new) {
               output.insert(output.end(), newData, newData + length);
+              newData += length;
           } else if (op == svn_txdelta_source) {
             source.seekg(offset);
             char* sourceBuf = (char*) malloc(length);
@@ -208,6 +211,9 @@ namespace {
             source.read(sourceBuf, length);
             output.insert(output.end(), sourceBuf, sourceBuf + length);
             free(sourceBuf);
+          } else {
+              SG_LOG(SG_IO, SG_WARN, "bad opcode logic");
+              return false;
           }
         } // of instruction loop
         
@@ -269,12 +275,12 @@ public:
       string fileName(attrs.getValue("name"));
       SGPath filePath(Dir(currentPath).file(fileName));
       currentPath = filePath;
-      
-      DAVResource* res = currentDir->collection()->childWithName(fileName);   
-      if (!res || !filePath.exists()) {
-        // set error condition
+       
+      if (!filePath.exists()) {
+          fail(SVNRepository::SVN_ERROR_FILE_NOT_FOUND);
+          return;
       }
-      
+
       inFile = true;
     } else if (!strcmp(name, SVN_ADD_DIRECTORY_TAG)) {
       string dirName(attrs.getValue("name"));
@@ -302,10 +308,12 @@ public:
     } else if (!strcmp(name, SVN_DELETE_ENTRY_TAG)) {
         string entryName(attrs.getValue("name"));
         deleteEntry(entryName);
-    } else if (!strcmp(name, DAV_CHECKED_IN_TAG) || !strcmp(name, DAV_HREF_TAG)) {
+    } else if (!strcmp(name, DAV_CHECKED_IN_TAG) ||
+               !strcmp(name, DAV_HREF_TAG) ||
+               !strcmp(name, SVN_PROP_TAG)) {
         // don't warn on these ones
     } else {
-        //std::cerr << "unhandled element:" << name << std::endl;
+        //SG_LOG(SG_IO, SG_WARN, "SVNReportParser: unhandled tag:" << name);
     }
   } // of startElement
   
@@ -369,8 +377,9 @@ public:
     memset(&md5Context, 0, sizeof(SG_MD5_CTX));
     SG_MD5Init(&md5Context);
     SG_MD5Update(&md5Context, (unsigned char*) output.data(), output.size());
-    SG_MD5Final(&md5Context);
-    decodedFileMd5 = strutils::encodeHex(md5Context.digest, 16);
+    unsigned char digest[MD5_DIGEST_LENGTH];
+    SG_MD5Final(digest, &md5Context);
+    decodedFileMd5 = strutils::encodeHex(digest, MD5_DIGEST_LENGTH);
 
     return true;
   }
@@ -389,11 +398,9 @@ public:
         fail(SVNRepository::SVN_ERROR_TXDELTA);
       }
     } else if (!strcmp(name, SVN_ADD_FILE_TAG)) {
-      finishFile(currentDir->addChildFile(currentPath.file()));
+      finishFile(currentPath);
     } else if (!strcmp(name, SVN_OPEN_FILE_TAG)) {
-      DAVResource* res = currentDir->collection()->childWithName(currentPath.file());   
-      assert(res);
-      finishFile(res);
+      finishFile(currentPath);
     } else if (!strcmp(name, SVN_ADD_DIRECTORY_TAG)) {
       // pop directory
       currentPath = currentPath.dir();
@@ -416,23 +423,21 @@ public:
         fail(SVNRepository::SVN_ERROR_CHECKSUM);
       }
     } else if (!strcmp(name, SVN_OPEN_DIRECTORY_TAG)) {
+        currentDir->updateReportComplete();
         if (currentDir->parent()) {   
           // pop the collection stack
           currentDir = currentDir->parent();
         }
         
-        currentDir->updateReportComplete();
         currentPath = currentDir->fsPath();
     } else {
     //  std::cout << "element:" << name;
     }
   }
   
-  void finishFile(DAVResource* res)
+  void finishFile(const SGPath& path)
   {
-      res->setVersionName(currentVersionName);
-      res->setMD5(md5Sum);
-      currentPath = currentPath.dir();
+      currentPath = path.dir();
       inFile = false;
   }