author | drw <drw> | 2003-03-29 01:13:02 (UTC) |
---|---|---|
committer | drw <drw> | 2003-03-29 01:13:02 (UTC) |
commit | 22e941e4cbc9e8906287d1e352b66092c6a84c0d (patch) (side-by-side diff) | |
tree | 2704ea40f9ee926c2734eb25c7165852c024c136 | |
parent | f42edeac768082ec8d7716a17c82507496dd7b47 (diff) | |
download | opie-22e941e4cbc9e8906287d1e352b66092c6a84c0d.zip opie-22e941e4cbc9e8906287d1e352b66092c6a84c0d.tar.gz opie-22e941e4cbc9e8906287d1e352b66092c6a84c0d.tar.bz2 |
Fix for reading feed's Package file works this time. However, this is temporary until I re-do this part of the code this weekend (don't like the way it works).
-rw-r--r-- | noncore/settings/aqpkg/server.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/noncore/settings/aqpkg/server.cpp b/noncore/settings/aqpkg/server.cpp index d4fa439..64a9c26 100644 --- a/noncore/settings/aqpkg/server.cpp +++ b/noncore/settings/aqpkg/server.cpp @@ -121,78 +121,78 @@ void Server :: readLocalIpks( Server *local ) 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() ) return; - char line[1001]; + char line[5001]; char k[21]; - char v[1001]; + char v[5001]; QString key; QString value; if ( clearAll ) cleanUp(); Package *currPackage = 0; bool newPackage = true; do { - in.getline( line, 1000 ); + in.getline( line, 5000 ); if ( in.eof() ) continue; k[0] = '\0'; v[0] = '\0'; sscanf( line, "%[^:]: %[^\n]", k, v ); key = k; value = v; key = key.stripWhiteSpace(); value = value.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 ); } } |