From f011602b086a5ec49b62de2d3793c1711f1064ee Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Stephan=20A=C3=9Fmus?= <superstippi@gmx.de>
Date: Mon, 17 May 2010 19:00:07 +0000
Subject: [PATCH] Patch by idefix: Change the parsing of zip output so that
 Installer will show the name of extracted items when the target volume name
 contains spaces. Closes ticket #4732, thanks!

git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@36848 a95241bf-73f2-0310-859d-f6bbb57e9c96
---
 src/apps/installer/UnzipEngine.cpp | 29 +++++++++++++++++------------
 1 file changed, 17 insertions(+), 12 deletions(-)

diff --git a/src/apps/installer/UnzipEngine.cpp b/src/apps/installer/UnzipEngine.cpp
index 45b614b838..d2f5426d02 100644
--- a/src/apps/installer/UnzipEngine.cpp
+++ b/src/apps/installer/UnzipEngine.cpp
@@ -298,20 +298,25 @@ UnzipEngine::_ReadLineListing(const BString& line)
 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);
+
+		itemPath.Trim();
+		pos = itemPath.FindLast('/');
 		BString itemName = itemPath.String() + pos + 1;
 		itemPath.Truncate(pos);
 
@@ -326,7 +331,7 @@ UnzipEngine::_ReadLineExtract(const BString& line)
 
 		_UpdateProgress(itemName.String(), itemPath.String());
 	} else {
-//		printf("ignored: %s", line.String());
+//		printf("ignored: '%s'\n", line.String());
 	}
 
 	return B_OK;