summaryrefslogtreecommitdiff
authorandyq <andyq>2002-10-16 23:07:28 (UTC)
committer andyq <andyq>2002-10-16 23:07:28 (UTC)
commit196a3f566bdc5bd6188f2265e05adbdb519a6e09 (patch) (unidiff)
tree522f3da8a87ca68b1b29d86a5b47f25dddddb6bd
parent98bf2fd8027b5e10a82c0f4bde27d7977b919bcc (diff)
downloadopie-196a3f566bdc5bd6188f2265e05adbdb519a6e09.zip
opie-196a3f566bdc5bd6188f2265e05adbdb519a6e09.tar.gz
opie-196a3f566bdc5bd6188f2265e05adbdb519a6e09.tar.bz2
Now handles commented out servers nicely
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/settings/aqpkg/datamgr.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/noncore/settings/aqpkg/datamgr.cpp b/noncore/settings/aqpkg/datamgr.cpp
index 7c49621..d929c39 100644
--- a/noncore/settings/aqpkg/datamgr.cpp
+++ b/noncore/settings/aqpkg/datamgr.cpp
@@ -65,49 +65,49 @@ Destination *DataManager :: getDestination( const char *name )
65 65
66void DataManager :: loadServers() 66void DataManager :: loadServers()
67{ 67{
68 // First add our local server - not really a server but 68 // First add our local server - not really a server but
69 // the local config (which packages are installed) 69 // the local config (which packages are installed)
70 serverList.push_back( Server( LOCAL_SERVER, "" ) ); 70 serverList.push_back( Server( LOCAL_SERVER, "" ) );
71 serverList.push_back( Server( LOCAL_IPKGS, "" ) ); 71 serverList.push_back( Server( LOCAL_IPKGS, "" ) );
72 72
73 // Read file from /etc/ipkg.conf 73 // Read file from /etc/ipkg.conf
74 QString ipkg_conf = IPKG_CONF; 74 QString ipkg_conf = IPKG_CONF;
75 FILE *fp; 75 FILE *fp;
76 fp = fopen( ipkg_conf, "r" ); 76 fp = fopen( ipkg_conf, "r" );
77 char line[130]; 77 char line[130];
78 QString lineStr; 78 QString lineStr;
79 if ( fp == NULL ) 79 if ( fp == NULL )
80 { 80 {
81 cout << "Couldn't open " << ipkg_conf << "! err = " << fp << endl; 81 cout << "Couldn't open " << ipkg_conf << "! err = " << fp << endl;
82 return; 82 return;
83 } 83 }
84 else 84 else
85 { 85 {
86 while ( fgets( line, sizeof line, fp) != NULL ) 86 while ( fgets( line, sizeof line, fp) != NULL )
87 { 87 {
88 lineStr = line; 88 lineStr = line;
89 if ( lineStr.startsWith( "src" ) ) //|| lineStr.startsWith( "#src" ) || lineStr.startsWith( "# src" ) ) 89 if ( lineStr.startsWith( "src" ) || lineStr.startsWith( "#src" ) || lineStr.startsWith( "# src" ) )
90 { 90 {
91 char alias[20]; 91 char alias[20];
92 char url[100]; 92 char url[100];
93 93
94 94
95 // Looks a little wierd but read up to the r of src (throwing it away), 95 // Looks a little wierd but read up to the r of src (throwing it away),
96 // then read up to the next space and throw that away, the alias 96 // then read up to the next space and throw that away, the alias
97 // is next. 97 // is next.
98 // Should Handle #src, # src, src, and combinations of 98 // Should Handle #src, # src, src, and combinations of
99 sscanf( lineStr, "%*[^r]%*[^ ] %s %s", alias, url ); 99 sscanf( lineStr, "%*[^r]%*[^ ] %s %s", alias, url );
100 Server s( alias, url ); 100 Server s( alias, url );
101 if ( lineStr.startsWith( "src" ) ) 101 if ( lineStr.startsWith( "src" ) )
102 s.setActive( true ); 102 s.setActive( true );
103 else 103 else
104 s.setActive( false ); 104 s.setActive( false );
105 105
106 serverList.push_back( s ); 106 serverList.push_back( s );
107 107
108 } 108 }
109 else if ( lineStr.startsWith( "dest" ) ) 109 else if ( lineStr.startsWith( "dest" ) )
110 { 110 {
111 char alias[20]; 111 char alias[20];
112 char path[50]; 112 char path[50];
113 sscanf( lineStr, "%*[^ ] %s %s", alias, path ); 113 sscanf( lineStr, "%*[^ ] %s %s", alias, path );