summaryrefslogtreecommitdiff
authorandyq <andyq>2002-10-16 16:27:00 (UTC)
committer andyq <andyq>2002-10-16 16:27:00 (UTC)
commitea11ae7dc31e23578d13f30315a3697cbce99c05 (patch) (side-by-side diff)
tree38391e8c5d681a2bad804ec32aececd62befa19c
parentdf5c9a60e2ee3484f424b4d6aa2f158a9aade93b (diff)
downloadopie-ea11ae7dc31e23578d13f30315a3697cbce99c05.zip
opie-ea11ae7dc31e23578d13f30315a3697cbce99c05.tar.gz
opie-ea11ae7dc31e23578d13f30315a3697cbce99c05.tar.bz2
Fixed bug with reading ipkg.conf (ignored src lines that were commented out
with # src Also, now writes a nice comment out to the ipkg.conf file
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/settings/aqpkg/datamgr.cpp53
1 files changed, 45 insertions, 8 deletions
diff --git a/noncore/settings/aqpkg/datamgr.cpp b/noncore/settings/aqpkg/datamgr.cpp
index b9ce227..b6e6e37 100644
--- a/noncore/settings/aqpkg/datamgr.cpp
+++ b/noncore/settings/aqpkg/datamgr.cpp
@@ -38,165 +38,202 @@ 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" ) )
+ if ( lineStr.startsWith( "src" ) || lineStr.startsWith( "#src" ) || lineStr.startsWith( "# src" ) )
{
char alias[20];
char url[100];
- sscanf( lineStr, "%*[^ ] %s %s", alias, url );
+
+
+ // 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.
- *
+/* 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
// we've set up
// The other servers files hold the contents of the server package list
if ( s->getServerName() == LOCAL_SERVER )
s->readStatusFile( destList );
else if ( s->getServerName() == LOCAL_IPKGS )
s->readLocalIpks( getServer( LOCAL_SERVER ) );
else
s->readPackageFile( getServer( LOCAL_SERVER ) );
}
void DataManager :: writeOutIpkgConf()
{
QString ipkg_conf = IPKG_CONF;
ofstream out( ipkg_conf );
- out << "# Written by NetworkPackageManager Package Manager" << endl;
+ out << "# Written by AQPkg" << endl;
+ out << "# Must have one or more source entries of the form:" << endl;
+ out << "#" << endl;
+ out << "# src <src-name> <source-url>" << endl;
+ out << "#" << endl;
+ out << "# and one or more destination entries of the form:" << endl;
+ out << "#" << endl;
+ out << "# dest <dest-name> <target-path>" << endl;
+ out << "#" << endl;
+ out << "# where <src-name> and <dest-names> are identifiers that" << endl;
+ out << "# should match [a-zA-Z0-9._-]+, <source-url> should be a" << endl;
+ out << "# URL that points to a directory containing a Familiar" << endl;
+ out << "# Packages file, and <target-path> should be a directory" << endl;
+ out << "# that exists on the target system." << endl << endl;
// Write out servers
vector<Server>::iterator it = serverList.begin();
while ( it != serverList.end() )
{
QString alias = it->getServerName();
// Don't write out local as its a dummy
if ( alias != LOCAL_SERVER && alias != LOCAL_IPKGS )
{
QString url = it->getServerUrl();;
if ( !activeServer || alias != activeServer )
out << "#";
out << "src " << alias << " " << url << endl;
}
it++;
}
+ out << endl;
+
// Write out destinations
vector<Destination>::iterator it2 = destList.begin();
while ( it2 != destList.end() )
{
out << "dest " << it2->getDestinationName() << " " << it2->getDestinationPath() << endl;
it2++;
}
out.close();
}