From 2a8ffa8805452ab920a2c7d59be214ca6ffb500d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Duval?= Date: Sun, 15 Feb 2009 17:05:36 +0000 Subject: [PATCH] * Break parsing loop if PkgA is encountered. This helps with QEmu pkg. git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@29216 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- src/apps/packageinstaller/PackageInfo.cpp | 7 +++++-- src/apps/packageinstaller/PackageItem.cpp | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/src/apps/packageinstaller/PackageInfo.cpp b/src/apps/packageinstaller/PackageInfo.cpp index 2bd2a7c8e6..a8d6bf8da5 100644 --- a/src/apps/packageinstaller/PackageInfo.cpp +++ b/src/apps/packageinstaller/PackageInfo.cpp @@ -1055,8 +1055,11 @@ PackageInfo::Parse() } element = P_NONE; - } - else { + } else if (!memcmp(buffer, "PkgA", 5)) { + parser_debug("PkgA\n"); + break; + } else { + fprintf(stderr, "Unknown file tag %s", buffer); fStatus = B_ERROR; return fStatus; } diff --git a/src/apps/packageinstaller/PackageItem.cpp b/src/apps/packageinstaller/PackageItem.cpp index 0fcfbfc7ed..fc78668348 100644 --- a/src/apps/packageinstaller/PackageItem.cpp +++ b/src/apps/packageinstaller/PackageItem.cpp @@ -337,7 +337,7 @@ PkgDirectory::_ParseAttribute(uint8 *buffer, BNode *node, char **attrName, fPackage->Read(*attrName, length); (*attrName)[length] = 0; - parser_debug(" (%d) = %s\n", length, *attrName); + parser_debug(" (%ld) = %s\n", length, *attrName); } else if (!memcmp(buffer, "BeAT", 5)) { if (!*attrStarted) {