summaryrefslogtreecommitdiff
path: root/noncore/settings/packagemanager/oipkg.cpp
Unidiff
Diffstat (limited to 'noncore/settings/packagemanager/oipkg.cpp') (more/less context) (show whitespace changes)
-rw-r--r--noncore/settings/packagemanager/oipkg.cpp7
1 files changed, 3 insertions, 4 deletions
diff --git a/noncore/settings/packagemanager/oipkg.cpp b/noncore/settings/packagemanager/oipkg.cpp
index 696a64a..87a30bb 100644
--- a/noncore/settings/packagemanager/oipkg.cpp
+++ b/noncore/settings/packagemanager/oipkg.cpp
@@ -22,31 +22,30 @@
22 :     =  ...= . :.=- 22 :     =  ...= . :.=-
23 -.   .:....=;==+<; You should have received a copy of the GNU 23 -.   .:....=;==+<; You should have received a copy of the GNU
24  -_. . .   )=.  = Library General Public License along with 24  -_. . .   )=.  = Library General Public License along with
25    --        :-=` this library; see the file COPYING.LIB. 25    --        :-=` this library; see the file COPYING.LIB.
26 If not, write to the Free Software Foundation, 26 If not, write to the Free Software Foundation,
27 Inc., 59 Temple Place - Suite 330, 27 Inc., 59 Temple Place - Suite 330,
28 Boston, MA 02111-1307, USA. 28 Boston, MA 02111-1307, USA.
29 29
30*/ 30*/
31 31
32#include "oipkg.h" 32#include "oipkg.h"
33 33
34#include <stdlib.h>
35#include <string.h>
36
37#include <qdir.h> 34#include <qdir.h>
38#include <qfile.h> 35#include <qfile.h>
39#include <qtextstream.h> 36#include <qtextstream.h>
40 37
38#include <stdlib.h>
39
41const QString IPKG_CONF = "/etc/ipkg.conf"; // Fully-qualified name of Ipkg primary configuration file 40const QString IPKG_CONF = "/etc/ipkg.conf"; // Fully-qualified name of Ipkg primary configuration file
42const QString IPKG_CONF_DIR = "/etc/ipkg"; // Directory of secondary Ipkg configuration files 41const QString IPKG_CONF_DIR = "/etc/ipkg"; // Directory of secondary Ipkg configuration files
43const QString IPKG_PKG_PATH = "/usr/lib/ipkg/lists"; // Directory containing server package lists 42const QString IPKG_PKG_PATH = "/usr/lib/ipkg/lists"; // Directory containing server package lists
44const QString IPKG_STATUS_PATH = "usr/lib/ipkg/status"; // Destination status file location 43const QString IPKG_STATUS_PATH = "usr/lib/ipkg/status"; // Destination status file location
45 44
46OIpkg *oipkg; 45OIpkg *oipkg;
47 46
48// Ipkg callback functions 47// Ipkg callback functions
49 48
50int fsignalIpkgMessage( ipkg_conf_t */*conf*/, message_level_t /*level*/, char *msg ) 49int fsignalIpkgMessage( ipkg_conf_t */*conf*/, message_level_t /*level*/, char *msg )
51{ 50{
52 oipkg->ipkgMessage( msg ); 51 oipkg->ipkgMessage( msg );
@@ -520,25 +519,25 @@ void OIpkg::loadConfiguration()
520 // Name 519 // Name
521 QString name = line.mid( pos, endpos - pos ); 520 QString name = line.mid( pos, endpos - pos );
522 521
523 // Value 522 // Value
524 QString value = ""; 523 QString value = "";
525 if ( endpos > -1 ) 524 if ( endpos > -1 )
526 value = line.right( line.length() - endpos - 1 ); 525 value = line.right( line.length() - endpos - 1 );
527 526
528 // Active 527 // Active
529 bool active = !line.startsWith( "#" ); 528 bool active = !line.startsWith( "#" );
530 529
531 // Add to list 530 // Add to list
532 m_confInfo->append( new OConfItem( absFile, type, name, value, active ) ); 531 m_confInfo->append( new OConfItem( type, name, value, active ) );
533 } 532 }
534 } 533 }
535 } 534 }
536 535
537 f.close(); 536 f.close();
538 } 537 }
539 } 538 }
540 } 539 }
541 540
542 // Load Ipkg execution options from application configuration file 541 // Load Ipkg execution options from application configuration file
543 if ( m_config ) 542 if ( m_config )
544 { 543 {