Ticket #4732: installer.patch

src/apps/installer/UnzipEngine.cpp

@@ -298 +298 @@
 status_t
 UnzipEngine::_ReadLineExtract(const BString& line)
 {
-    char item[1024];
-    char linkTarget[256];
-    const char* kCreatingFormat = "    creating: %s\n";
-    const char* kInflatingFormat = "   inflating: %s\n";
-    const char* kLinkingFormat = "     linking: %s -> %s\n";
-    if (sscanf(line.String(), kCreatingFormat, &item) == 1
-        || sscanf(line.String(), kInflatingFormat, &item) == 1
-        || sscanf(line.String(), kLinkingFormat, &item,
-            &linkTarget) == 2) {
+    const char* kCreatingFormat = "   creating:";
+    const char* kInflatingFormat = "  inflating:";
+    const char* kLinkingFormat = "    linking:";
+    if (line.FindFirst(kCreatingFormat) == 0
+        || line.FindFirst(kInflatingFormat) == 0
+        || line.FindFirst(kLinkingFormat) == 0) {
 
         fItemsUncompressed++;
 
-        BString itemPath(item);
-        int pos = itemPath.FindLast('/');
+        BString itemPath;
+
+        int pos = line.FindLast("  -> ");
+        if (pos > 0)
+            line.CopyInto(itemPath, 13, pos - 13);
+        else 
+            line.CopyInto(itemPath, 13, line.CountChars() - 14);
+
+        pos = itemPath.FindLast('/');
         BString itemName = itemPath.String() + pos + 1;
         itemPath.Truncate(pos);