Add .cvsignore and fix sigsev when updating and upgrading

2 files changed, 8 insertions, 2 deletions

diff --git a/noncore/settings/packagemanager/.cvsignore b/noncore/settings/packagemanager/.cvsignore
new file mode 100644
index 0000000..4183697
--- a/dev/null
+++ b/noncore/settings/packagemanager/.cvsignore
@@ -0,0 +1,3 @@
+Makefile*
+moc*
+.moc*
diff --git a/noncore/settings/packagemanager/installdlg.cpp b/noncore/settings/packagemanager/installdlg.cpp
index c0c03fc..980d5eb 100644
--- a/noncore/settings/packagemanager/installdlg.cpp
+++ b/noncore/settings/packagemanager/installdlg.cpp
@@ -8,299 +8,302 @@
 .> <`_,   >  .   <=          redistribute it and/or modify it under
 :`=1 )Y*s>-.--   :           the terms of the GNU General Public
 .="- .-=="i,     .._         License as published by the Free Software
  - .   .-<_>     .<>         Foundation; either version 2 of the License,
      ._= =}       :          or (at your option) any later version.
     .%`+i>       _;_.
     .i_,=:_.      -<s.       This file is distributed in the hope that
      +  .  -:.       =       it will be useful, but WITHOUT ANY WARRANTY;
     : ..    .:,     . . .    without even the implied warranty of
     =_        +     =;=|`    MERCHANTABILITY or FITNESS FOR A
   _.=:.       :    :=>`:     PARTICULAR PURPOSE. See the GNU General
 ..}^=.=       =       ;      Public License for more details.
 ++=   -.     .`     .:
  :     =  ...= . :.=-        You should have received a copy of the GNU
  -.   .:....=;==+<;          General Public License along with this file;
   -_. . .   )=.  =           see the file COPYING. If not, write to the
     --        :-=`           Free Software Foundation, Inc.,
                              59 Temple Place - Suite 330,
                              Boston, MA 02111-1307, USA.
 
 */
 
 #include "installdlg.h"
 
 #include <sys/vfs.h>
 
 #include <qapplication.h>
 #include <qcombobox.h>
 #include <qfileinfo.h>
 #include <qgroupbox.h>
 #include <qlabel.h>
 #include <qlayout.h>
 #include <qmap.h>
 #include <qmultilineedit.h>
 #include <qpushbutton.h>
 
 #include <qpe/fileselector.h>
 #include <qpe/resource.h>
 #include <qpe/storage.h>
 
 #include <opie/ofiledialog.h>
 
 #include "opackagemanager.h"
 
 InstallDlg::InstallDlg( QWidget *parent, OPackageManager *pm, const QString &caption, bool showDestInfo,
                         OPackage::Command command1, QStringList *packages1,
                         OPackage::Command command2, QStringList *packages2,
                         OPackage::Command command3, QStringList *packages3 )
     : QWidget( 0x0 )
     , m_packman( pm )
     , m_numCommands( 0 )
     , m_currCommand( 0 )
 {
     // Save command/package list information
     if ( command1 != OPackage::NotDefined )
     {
         m_command[ m_numCommands ] = command1;
         m_packages[ m_numCommands ] = packages1;
         ++m_numCommands;
     }
     if ( command2 != OPackage::NotDefined )
     {
         m_command[ m_numCommands ] = command2;
         m_packages[ m_numCommands ] = packages2;
         ++m_numCommands;
     }
     if ( command3 != OPackage::NotDefined )
     {
         m_command[ m_numCommands ] = command3;
         m_packages[ m_numCommands ] = packages3;
         ++m_numCommands;
     }
 
     // Initialize UI
     if ( parent )
         parent->setCaption( caption );
 
     QGridLayout *layout = new QGridLayout( this, 4, 2, 2, 4 );
 
     if ( showDestInfo )
     {
         QLabel *label = new QLabel( tr( "Destination" ), this );
         layout->addWidget( label, 0, 0 );
         m_destination = new QComboBox( this );
         m_destination->insertStringList( *(m_packman->destinations()) );
         layout->addWidget( m_destination, 0, 1 );
         connect( m_destination, SIGNAL(highlighted(const QString&)),
                 this, SLOT(slotDisplayAvailSpace(const QString&)) );
 
         label = new QLabel( tr( "Space Avail" ), this );
         layout->addWidget( label, 1, 0 );
         m_availSpace = new QLabel( this );
         layout->addWidget( m_availSpace, 1, 1 );
 
         // TODO - select correct destination
         slotDisplayAvailSpace( m_destination->currentText() );
     }
     else
     {
         m_destination = 0x0;
         m_availSpace = 0x0;
     }
 
     QGroupBox *groupBox = new QGroupBox( 0, Qt::Vertical, tr( "Output" ), this );
     groupBox->layout()->setSpacing( 0 );
     groupBox->layout()->setMargin( 4 );
 
     QVBoxLayout *groupBoxLayout = new QVBoxLayout( groupBox->layout() );
     m_output = new QMultiLineEdit( groupBox );
     m_output->setReadOnly( true );
     groupBoxLayout->addWidget( m_output );
     layout->addMultiCellWidget( groupBox, 2, 2, 0, 1 );
 
     m_btnStart = new QPushButton( Resource::loadPixmap( "packagemanager/apply" ), tr( "Start" ), this );
     layout->addWidget( m_btnStart, 3, 0 );
     connect( m_btnStart, SIGNAL(clicked()), this, SLOT(slotBtnStart()) );
 
     m_btnOptions = new QPushButton( Resource::loadPixmap( "SettingsIcon" ), tr( "Options" ), this );
     layout->addWidget( m_btnOptions, 3, 1 );
     connect( m_btnOptions, SIGNAL( clicked() ), this, SLOT(slotBtnOptions()) );
 
     // Display packages being acted upon in output widget
     for( int i = 0; i < m_numCommands; i++ )
     {
         if ( m_packages[ i ] )
         {
             QString lineStr = tr( "Packages to " );
 
             switch( m_command[ i ] )
             {
                 case OPackage::Install : lineStr.append( tr( "install" ) );
                     break;
                 case OPackage::Remove : lineStr.append( tr( "remove" ) );
                     break;
                 case OPackage::Upgrade : lineStr.append( tr( "upgrade" ) );
                     break;
                 default :
                     break;
             };
             lineStr.append( ":\n" );
 
             for ( QStringList::Iterator it = m_packages[ i ]->begin(); it != m_packages[ i ]->end(); ++it )
             {
                 lineStr.append( QString( "\t%1\n" ).arg( ( *it ) ) );
             }
 
             m_output->append( lineStr );
         }
     }
 
     m_output->append( tr( "Press the start button to begin.\n" ) );
     m_output->setCursorPosition( m_output->numLines(), 0 );
 
 }
 
 InstallDlg::~InstallDlg()
 {
     for( int i = 0; i < m_numCommands; i++ )
     {
         if ( m_packages[ i ] )
             delete m_packages[ i ];
     }
 }
 
 void InstallDlg::slotDisplayAvailSpace( const QString &destination )
 {
     // If available space is not displayed, exit
     if ( !m_availSpace )
         return;
 
     QString space = tr( "Unknown" );
 
     // Get destination
     OConfItem *dest = m_packman->findConfItem( OConfItem::Destination, destination );
 
     if ( dest )
     {
         // Calculate available space
         struct statfs fs;
         if ( !statfs( dest->value(), &fs ) )
         {
             long mult = fs.f_bsize / 1024;
             long div = 1024 / fs.f_bsize;
 
             if ( !mult ) mult = 1;
             if ( !div ) div = 1;
             long avail = fs.f_bavail * mult / div;
 
             space = tr( "%1 Kb" ).arg( avail );
         }
     }
 
-    // Display available space (if known)
+    // Display available space
     m_availSpace->setText( space );
 }
 
 void InstallDlg::slotBtnStart()
 {
     QString btnText = m_btnStart->text();
     if ( btnText == tr( "Abort" ) )
     {
         // Stop execution of current command and prevent any others from executing
         m_packman->abortCommand();
         m_currCommand = 999;
 
         // Allow user to close dialog
         m_btnStart->setText( tr( "Close" ) );
         m_btnStart->setIconSet( Resource::loadPixmap( "enter" ) );
         return;
     }
     else if ( btnText == tr( "Close" ) )
     {
         // TODO - force reload of package data
         emit closeInstallDlg();
         return;
     }
 
     // Start was clicked, execute first command
     m_btnOptions->setEnabled( false );
     m_btnStart->setText( tr( "Abort" ) );
     m_btnStart->setIconSet( Resource::loadPixmap( "close" ) );
 
-    m_packman->executeCommand( m_command[ 0 ], m_packages[ 0 ], m_destination->currentText(), this,
+    QString dest;
+    if ( m_destination )
+        dest = m_destination->currentText();
+    m_packman->executeCommand( m_command[ 0 ], m_packages[ 0 ], dest, this,
                                SLOT(slotOutput(OProcess*,char*,int)), SLOT(slotErrors(OProcess*,char*,int)),
                                SLOT(slotFinished(OProcess*)), true );
 }
 
 void InstallDlg::slotBtnOptions()
 {
     QString btnText = m_btnOptions->text();
     if ( btnText == tr( "Options" ) )
     {
         // Display configuration dialog (only options tab is enabled)
         m_packman->configureDlg( true );
         return;
     }
 
     // Save output was clicked
     QMap<QString, QStringList> map;
     map.insert( tr( "All" ), QStringList() );
     QStringList text;
     text << "text/*";
     map.insert(tr( "Text" ), text );
     text << "*";
     map.insert( tr( "All" ), text );
 
     QString filename = OFileDialog::getSaveFileName( 2, "/", "ipkg-output", map );
     if( !filename.isEmpty() )
     {
         QString currentFileName = QFileInfo( filename ).fileName();
         DocLnk doc;
         doc.setType( "text/plain" );
         doc.setFile( filename );
         doc.setName( currentFileName );
         FileManager fm;
         fm.saveFile( doc, m_output->text() );
     }
 }
 
 void InstallDlg::slotOutput( OProcess */*process*/, char *buffer, int buffLen )
 {
     QString lineStr = buffer;
     if ( lineStr[buffLen-1] == '\n' )
         lineStr.truncate( buffLen - 1 );
     m_output->append( lineStr );
     m_output->setCursorPosition( m_output->numLines(), 0 );
 }
 
 void InstallDlg::slotErrors( OProcess */*process*/, char *buffer, int buffLen )
 {
     QString lineStr = buffer;
     if ( lineStr[buffLen-1] == '\n' )
         lineStr.truncate( buffLen - 1 );
     m_output->append( lineStr );
     m_output->setCursorPosition( m_output->numLines(), 0 );
 }
 
 void InstallDlg::slotFinished( OProcess */*process*/ )
 {
     ++m_currCommand;
     if ( m_currCommand < m_numCommands )
     {
         // More commands left, execute next one
         m_packman->executeCommand( m_command[ m_currCommand ], m_packages[ m_currCommand ], m_destination->currentText(),
                                    this, SLOT(slotOutput(OProcess*,char*,int)),
                                    SLOT(slotErrors(OProcess*,char*,int)),
                                    SLOT(slotFinished(OProcess*)), true );
     }
     else
     {
         // All commands executed, allow user to close dialog
         m_btnStart->setText( tr( "Close" ) );
         m_btnStart->setIconSet( Resource::loadPixmap( "enter" ) );
 
         m_btnOptions->setEnabled( true );
         m_btnOptions->setText( tr( "Save output" ) );
         m_btnOptions->setIconSet( Resource::loadPixmap( "save" ) );
     }
 }