Better fix for reading feed Packages files.

1 files changed, 24 insertions, 32 deletions

diff --git a/noncore/settings/aqpkg/server.cpp b/noncore/settings/aqpkg/server.cpp
index 64a9c26..9a239a5 100644
--- a/noncore/settings/aqpkg/server.cpp
+++ b/noncore/settings/aqpkg/server.cpp
@@ -1,315 +1,307 @@
 /***************************************************************************
                           server.cpp  -  description
                              -------------------
     begin                : Mon Aug 26 2002
     copyright            : (C) 2002 by Andy Qua
     email                : andy.qua@blueyonder.co.uk
     description          : This class holds details about a server
                          : e.g. all the packages that contained on the server
                          :      the installation status
  ***************************************************************************/
 
 /***************************************************************************
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
  *   it under the terms of the GNU General Public License as published by  *
  *   the Free Software Foundation; either version 2 of the License, or     *
  *   (at your option) any later version.                                   *
  *                                                                         *
  ***************************************************************************/
 
 
-#include <stdio.h>
-#include <string.h>
-#include <stdlib.h>
-
-#include <iostream>
-#include <fstream>
-using namespace std;
-
 #include "server.h"
 #include "datamgr.h"
 
+#include <qfile.h>
+#include <qtextstream.h>
+
 #ifdef QWS
 #include <qpe/global.h>
 #include <qpe/applnk.h>
 #include <qlist.h>
 #endif
 
 #include "utils.h"
 
 #include "global.h"
 
 Server :: Server( const char *name, const char *url )
 {
     serverName = name;
     serverUrl = url;
     packageFile = IPKG_DIR;
     active = true;
     packageFile += "lists/" + serverName;
 }
 
 Server :: ~Server()
 {
 	cleanUp();
 }
 
 void Server :: cleanUp()
 {
     packageList.clear();
 }
 
 void Server :: readStatusFile(  QList<Destination> &destList )
 {
     cleanUp();
 
     Destination *dest;
     QListIterator<Destination> dit( destList );
     bool rootRead = false;
     for ( ; dit.current(); ++dit )
     {
         dest = dit.current();
         bool installingToRoot = false;
         
         QString path = dest->getDestinationPath();
         if ( path.right( 1 ) != "/" )
-            path += "/";
+            path.append( "/" );
             
         if ( path == "/" )
         {
             rootRead = true;
             installingToRoot = true;
         }   
         
-        packageFile = path + "usr/lib/ipkg/status";
+        packageFile = path;
+        packageFile.append( "usr/lib/ipkg/status" );
         readPackageFile( 0, false, installingToRoot, &( *dest ) );
     }
 
     // Ensure that the root status file is read
     if ( !rootRead )
     {
-        cout << "Reading status file " << "/usr/lib/ipkg/status" << endl;
+        //cout << "Reading status file " << "/usr/lib/ipkg/status" << endl;
         packageFile = "/usr/lib/ipkg/status";
         readPackageFile( 0, false, true );
     }
 }
 
 void Server :: readLocalIpks( Server *local )
 {
     cleanUp();
 
 #ifdef QWS
     // First, get any local IPKGs in the documents area
     // Only applicable to Qtopie/Opie
 
     DocLnkSet files;
     Global::findDocuments( &files, "application/ipkg" );
 
     // Now add the items to the list
     QListIterator<DocLnk> it( files.children() );
 
     for ( ; it.current() ; ++it )
     {
         // OK, we have a local IPK file, I think the standard naming conventions
         // for these are packagename_version_arm.ipk
         QString file = (*it)->file();
 
         // Changed to display the filename (excluding the path)
         QString packageName = Utils::getFilenameFromIpkFilename( file );
         QString ver = Utils::getPackageVersionFromIpkFilename( file );
         Package *package = new Package( packageName );
         package->setVersion( ver );
         package->setFilename( file );
         package->setPackageStoredLocally( true );
         packageList.append( package );
     }
 #else
 	QString names[] = { "advancedfm_0.9.1-20020811_arm.ipk", "libopie_0.9.1-20020811_arm.ipk", "libopieobex_0.9.1-20020811.1_arm.ipk", "opie-addressbook_0.9.1-20020811_arm.ipk" };
 	for ( int i = 0 ; i < 4 ; ++i )
 	{
 		// OK, we have a local IPK file, I think the standard naming conventions
 		// for these are packagename_version_arm.ipk
 		QString file = names[i];
 		int p = file.find( "_" );
 		QString tmp = file.mid( 0, p );
 		packageList.push_back( Package( tmp ) );
 		int p2 = file.find( "_", p+1 );
 		tmp = file.mid( p+1, p2-(p+1) );
 		packageList.back().setVersion( tmp );
 		packageList.back().setPackageStoredLocally( true );
 	}
 #endif
 
     // build local packages
     buildLocalPackages( local );
 }
 
 void Server :: readPackageFile( Server *local, bool clearAll, bool installingToRoot, Destination *dest )
 {
-    ifstream in( packageFile );
-	if ( !in.is_open() )
+    QFile f( packageFile );
+    if ( !f.open( IO_ReadOnly ) )
         return;
+    QTextStream t( &f );
 
-    char line[5001];
-    char k[21];
-    char v[5001];
+    QString line;
     QString key;
     QString value;
+    int pos;
 
     if ( clearAll )
         cleanUp();
     Package *currPackage = 0;
 
     bool newPackage = true;
-    do
+    while ( !t.eof() )
     {
-        in.getline( line, 5000 );
-        if ( in.eof() )
-            continue;
-
-        k[0] = '\0';
-        v[0] = '\0';
-
-        sscanf( line, "%[^:]: %[^\n]", k, v );
+        line = t.readLine();
         
-        key = k;
-        value = v;
-        key = key.stripWhiteSpace();
-        value = value.stripWhiteSpace();
+        pos = line.find( ':', 0 );
+        if ( pos > -1 )
+            key = line.mid( 0, pos ).stripWhiteSpace();
+        else
+            key = QString::null;
+        value = line.mid( pos+1, line.length()-pos ).stripWhiteSpace();
+
         if ( key == "Package" && newPackage )
         {
             newPackage = false;
 
             currPackage = getPackage( value );
             if ( !currPackage )
             {
                 Package *package = new Package( value );
                 packageList.append( package );
                 currPackage = package;
                 currPackage->setInstalledTo( dest );
                 if ( installingToRoot )
                     currPackage->setInstalledToRoot( true );
             }
             else
             {
                 if (currPackage->getStatus().find( "deinstall" ) != -1 )
                     currPackage->setInstalledTo( dest );
             }
         }
         else if ( key == "Version" )
         {
             if ( currPackage )
                 currPackage->setVersion( value );
         }
         else if ( key == "Status" )
         {
             if ( currPackage )
                 currPackage->setStatus( value );
         }
         else if ( key == "Description" )
         {
             if ( currPackage )
                 currPackage->setDescription( value );
         }
         else if ( key == "Filename" )
         {
             if ( currPackage )
                 currPackage->setFilename( value );
         }
         else if ( key == "Size" )
         {
             if ( currPackage )
                 currPackage->setPackageSize( value );
         }
         else if ( key == "Section" )
         {
             if ( currPackage )
                 currPackage->setSection( value );
 
             DataManager::setAvailableCategories( value );
         }
-        else if ( key == "" )
+        else if ( key == QString::null )
         {
             newPackage = true;
         }
-    } while ( !in.eof() );
+    }
 
-    in.close();
+    f.close();
 
     // build local packages
     buildLocalPackages( local );
 }
 
 void Server :: buildLocalPackages( Server *local )
 {
     Package *curr;
     QListIterator<Package> it( packageList );
     for ( ; it.current(); ++it )
     {
         curr = it.current();
         QString name = curr->getPackageName();
 
         // If the package name is an ipk name, then convert the filename to a package name
         if ( name.find( ".ipk" ) != -1 )
             name = Utils::getPackageNameFromIpkFilename( curr->getFilename() );
 
         if ( local )
         {
             Package *p = local->getPackage( name );
             curr->setLocalPackage( p );
             if ( p )
             {
                 // Set some default stuff like size and things
                 if ( p->getInstalledVersion() == curr->getVersion() )
                 {
                     p->setPackageSize( curr->getPackageSize() );
                     p->setSection( curr->getSection() );
                     p->setDescription( curr->getDescription() );
                 }
             }
             
         }
         else
             curr->setLocalPackage( 0 );
     }
 
 }
 
 Package *Server :: getPackage( QString &name )
 {
     return getPackage( (const char *)name );
 }
 
 Package *Server :: getPackage( const char *name )
 {
     Package *ret = 0;
 
     QListIterator<Package> it( packageList );
     for ( ; it.current(); ++it )
     {
 		if ( it.current()->getPackageName() == name )
 			ret = it.current();
     }
 
     return ret;
 }
 
 QString Server :: toString()
 {
     QString ret = QString( "Server\n   name - %1\n   url - %2\n" ).arg( serverName ).arg( serverUrl );
                        
     QListIterator<Package> it( packageList );
     for ( ; it.current(); ++it )
     {
         ret.append( QString( "\n   %1" ).arg( it.current()->toString() ) );
     }
 
 
     return ret;
 }
 
 QList<Package> &Server::getPackageList()
 {
     return packageList;
 }