author | andyq <andyq> | 2002-10-16 23:07:28 (UTC) |
---|---|---|
committer | andyq <andyq> | 2002-10-16 23:07:28 (UTC) |
commit | 196a3f566bdc5bd6188f2265e05adbdb519a6e09 (patch) (unidiff) | |
tree | 522f3da8a87ca68b1b29d86a5b47f25dddddb6bd /noncore | |
parent | 98bf2fd8027b5e10a82c0f4bde27d7977b919bcc (diff) | |
download | opie-196a3f566bdc5bd6188f2265e05adbdb519a6e09.zip opie-196a3f566bdc5bd6188f2265e05adbdb519a6e09.tar.gz opie-196a3f566bdc5bd6188f2265e05adbdb519a6e09.tar.bz2 |
Now handles commented out servers nicely
-rw-r--r-- | noncore/settings/aqpkg/datamgr.cpp | 2 |
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 | |||
@@ -77,25 +77,25 @@ void DataManager :: loadServers() | |||
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" ) ) |