summaryrefslogtreecommitdiff
authorandyq <andyq>2002-10-16 18:53:28 (UTC)
committer andyq <andyq>2002-10-16 18:53:28 (UTC)
commit3cb6b6fab8d06b1be8f8c39560db9d3d88ce3921 (patch) (side-by-side diff)
tree4136ae8184db883ad4193a0096123889ac6eef93
parent9047650faad7e64e0a36553dfe04dc7ad084f095 (diff)
downloadopie-3cb6b6fab8d06b1be8f8c39560db9d3d88ce3921.zip
opie-3cb6b6fab8d06b1be8f8c39560db9d3d88ce3921.tar.gz
opie-3cb6b6fab8d06b1be8f8c39560db9d3d88ce3921.tar.bz2
removed debug info
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/settings/aqpkg/datamgr.cpp16
1 files changed, 0 insertions, 16 deletions
diff --git a/noncore/settings/aqpkg/datamgr.cpp b/noncore/settings/aqpkg/datamgr.cpp
index b6e6e37..bb86766 100644
--- a/noncore/settings/aqpkg/datamgr.cpp
+++ b/noncore/settings/aqpkg/datamgr.cpp
@@ -38,141 +38,125 @@ Server *DataManager :: getServer( const char *name )
Server *s = 0;
vector<Server>::iterator it = serverList.begin();
while ( it != serverList.end() && s == 0 )
{
if ( it->getServerName() == name )
s = &(*it);
++it;
}
return s;
}
Destination *DataManager :: getDestination( const char *name )
{
Destination *d = 0;
vector<Destination>::iterator it = destList.begin();
while ( it != destList.end() && d == 0 )
{
if ( it->getDestinationName() == name )
d = &(*it);
++it;
}
return d;
}
void DataManager :: loadServers()
{
// First add our local server - not really a server but
// the local config (which packages are installed)
serverList.push_back( Server( LOCAL_SERVER, "" ) );
serverList.push_back( Server( LOCAL_IPKGS, "" ) );
// Read file from /etc/ipkg.conf
QString ipkg_conf = IPKG_CONF;
FILE *fp;
fp = fopen( ipkg_conf, "r" );
char line[130];
QString lineStr;
if ( fp == NULL )
{
cout << "Couldn't open " << ipkg_conf << "! err = " << fp << endl;
return;
}
else
{
- {
- cout << "Before ipkg.conf read" << endl;
- vector<Server>::iterator it;
- for ( it = serverList.begin() ; it != serverList.end() ; ++it )
- cout << "servername - " << it->getServerName() << endl;
- }
-
while ( fgets( line, sizeof line, fp) != NULL )
{
lineStr = line;
if ( lineStr.startsWith( "src" ) || lineStr.startsWith( "#src" ) || lineStr.startsWith( "# src" ) )
{
char alias[20];
char url[100];
// Looks a little wierd but read up to the r of src (throwing it away),
// then read up to the next space and throw that away, the alias
// is next.
// Should Handle #src, # src, src, and combinations of
sscanf( lineStr, "%*[^r]%*[^ ] %s %s", alias, url );
- cout << "Adding alias " << alias << " to list" << endl;
- cout << lineStr << endl;
Server s( alias, url );
serverList.push_back( s );
if ( lineStr.startsWith( "src" ) )
setActiveServer( alias );
}
else if ( lineStr.startsWith( "dest" ) )
{
char alias[20];
char path[50];
sscanf( lineStr, "%*[^ ] %s %s", alias, path );
Destination d( alias, path );
destList.push_back( d );
}
}
- {
- cout << "After ipkg.conf read" << endl;
- vector<Server>::iterator it;
- for ( it = serverList.begin() ; it != serverList.end() ; ++it )
- cout << "servername - " << it->getServerName() << endl;
- }
-
}
fclose( fp );
// Go through the server destination list and add root, cf and card if they
// don't already exist
/* AQ - commented out as if you don't have a CF or SD card in then
* this causes IPKG to try to create directories on non existant devices
* (which of course fails), gives a nasty error message and can cause ipkg
* to seg fault.
*
vector<Destination>::iterator dit;
bool foundRoot = false;
bool foundCF = false;
bool foundCard = false;
for ( dit = destList.begin() ; dit != destList.end() ; ++dit )
{
if ( dit->getDestinationPath() == "/" )
foundRoot = true;
if ( dit->getDestinationPath() == "/mnt/cf" )
foundCF = true;
if ( dit->getDestinationPath() == "/mnt/card" )
foundCard = true;
}
// If running on a Zaurus (arm) then if we didn't find root, CF or card
// destinations, add them as default
#ifdef QWS
#ifndef X86
if ( !foundRoot )
destList.push_back( Destination( "root", "/" ) );
if ( !foundCF )
destList.push_back( Destination( "cf", "/mnt/cf" ) );
if ( !foundCF )
destList.push_back( Destination( "card", "/mnt/card" ) );
#endif
#endif
*/
vector<Server>::iterator it;
for ( it = serverList.begin() ; it != serverList.end() ; ++it )
reloadServerData( it->getServerName() );
}
void DataManager :: reloadServerData( const char *serverName )
{
Server *s = getServer( serverName );
// Now we've read the config file in we need to read the servers
// The local server is a special case. This holds the contents of the
// status files the number of which depends on how many destinations