A couple more return values that need to be checked.

author: erik <erik> 2007-01-23 21:39:59 (UTC)
committer: erik <erik> 2007-01-23 21:39:59 (UTC)
commit: 8644340455a433f4d6e3b31b329479f1e7983f78 (patch) (unidiff)
tree: 8429c11d6634f4d8a7ad83fd59aaf03989d027a3
parent: adcf6075db477909dd8170a74862a6ef91a5127f (diff)
download: opie-8644340455a433f4d6e3b31b329479f1e7983f78.zip
opie-8644340455a433f4d6e3b31b329479f1e7983f78.tar.gz
opie-8644340455a433f4d6e3b31b329479f1e7983f78.tar.bz2
2 files changed, 14 insertions, 3 deletions
diff --git a/core/opie-login/passworddialogimpl.cpp b/core/opie-login/passworddialogimpl.cpp
index d9132e2..3c1b474 100644
--- a/core/opie-login/passworddialogimpl.cpp
+++ b/core/opie-login/passworddialogimpl.cpp
@@ -71,167 +71,171 @@ static char *crypt_make_salt() {
    static unsigned long x;
    static char result[3];
    ::time(&now);
    x += now + getpid() + clock();
    result[0] = i64c(((x >> 18) ^ (x >> 6)) & 077);
    result[1] = i64c(((x >> 12) ^ x) & 077);
    result[2] = '\0';
    return result;
 }
 /*
 * Modal dialog to force root password. It is quite hard as it only leave
 * when a password is set.
 * Also it prevalidates the password...
 */
 PasswordDialogImpl::PasswordDialogImpl( QWidget* parent )
    : PasswordDialog( parent, 0, true ), m_isSet( PasswordDialogImpl::needDialog() ) {
 }
 PasswordDialogImpl::~PasswordDialogImpl() {
    /* qt does the stuff for us */
 }
 void PasswordDialogImpl::done(int res) {
    m_isSet = true;
    /*
     * The user hit 'Ok' see if we can safe the file
     * if not an error will be raised and m_isSet altered.
     * On cancel we will see if it is now ok...
     */
    if ( res == Accepted )
        writePassword();
    else if(PasswordDialogImpl::needDialog() ) {
        switch( QMessageBox::warning(this,tr("Trying to leave without password set") ,
                                     tr("<qt>No password was set. This could lead to you not beeing"
                                        "able to remotely connect to your machine."
                                        "Do you want to continue not setting a password?</qt>" ),
                                     QMessageBox::Ok, QMessageBox::Cancel ) ) {
        case QMessageBox::Cancel:
            m_isSet = false;
            break;
        case  QMessageBox::Ok:
        default:
            break;
        }
    }
    if(m_isSet)
        PasswordDialog::done( res );
 }
 /*
 * Lets see if we can write either shadow
 *
 */
 /**
 * CRYPT the password and then tries to write it either to the shadow password
 * or  to the plain /etc/passwd
 */
 void PasswordDialogImpl::writePassword() {
    /*
     * Check if both texts are the same
     */
    if ( m_pass->text() != m_confirm->text() )
        return error( tr("Passwords don't match"),
                      tr("<qt>The two passwords don't match. Please try again.</qt>") );
    /*
     * Now crypt the password so we can write it later
     */
    char* password = ::crypt( m_pass->text().latin1(), crypt_make_salt() );
    if ( !password )
        return error( tr("Password not legal" ),
                      tr("<qt>The entered password is not a valid password."
                         "Please try entering a valid password.</qt>" ) );
    /* rewind and rewrite the password file */
    ::setpwent();
    FILE* file = ::fopen( "/etc/passwd.new", "w" );
    struct passwd* pass;
    while ( (pass = ::getpwent()) != 0l ) {
        /* no  shadow password support */
        if ( pass->pw_uid == 0  )
            pass->pw_passwd = password;
        ::putpwent( pass, file );
    }
    ::fclose( file );
    ::endpwent();
-    ::rename("/etc/passwd.new","/etc/passwd" );
+    if (::rename("/etc/passwd.new","/etc/passwd" ) == -1)
+        return error( tr("Rename /etc/passwd failed"),
+                      tr("<qt>Renaming /etc/passwd.new to /etc/passwd failed."
+                         "Please check your /etc/passed file, your /etc directory "
+                         "or your filesystem.</qt>") );
    /* should be done now */
 #ifdef  OPIE_LOGIN_SHADOW_PW
    #error "Can't write Shadow Passwords fixme"
 #endif
 }
 /**
 * Raise an error. Delete input and set the focus after showing
 * the error to the user
 */
 void PasswordDialogImpl::error( const QString& caption, const QString& text ) {
    m_isSet = false;
    QMessageBox::critical(this,caption, text,
                          QMessageBox::Ok, QMessageBox::NoButton );
    m_pass->setText("");
    m_pass->setFocus();
    m_confirm->setText("");
 }
 void PasswordDialogImpl::slotToggleEcho( bool b ) {
    m_pass->   setEchoMode( b ? QLineEdit::Normal : QLineEdit::Password );
    m_confirm->setEchoMode( b ? QLineEdit::Normal : QLineEdit::Password );
 }
 /////////////////////////
 /// static functions
 ///
 /**
 * Ask whether or not we need to show the dialog. It returns true if
 * no root password is set so that the user will be able to set one.
 */
 bool PasswordDialogImpl::needDialog() {
   /*
    * This can cope with no password and shadow passwords
    * Let us go through the user database until we find  'root' and then
    * see if it is 'shadow' and see if shadow is empty or see if the password is empty
    */
    bool need = false;
    struct passwd *pwd;
    ::setpwent();
    while((pwd = ::getpwent() ) ) {
        /* found root */
        if( pwd->pw_uid == 0 ) {
            QString str = QString::fromLatin1(pwd->pw_passwd );
            /*
             * If str is really empty it is passwordless anyway... or '*' is a hint to set one
             * on OE/Familiar
             * else it is shadow based
             */
            if(str.isEmpty() || str == '*' )
                need = true;
            else if ( str == 'x' )
 #ifdef OPIE_LOGIN_SHADOW_PW
                need =  QString::fromLatin1( ::getspnam( pwd->pw_name )->sp_pwdp ).isEmpty();
 #else
            ;
 #endif
            break;
        }
    }
    ::endpwent();
    return need;
 }
diff --git a/noncore/settings/aqpkg/ipkg.cpp b/noncore/settings/aqpkg/ipkg.cpp
index dd9e78d..c5c6387 100644
--- a/noncore/settings/aqpkg/ipkg.cpp
+++ b/noncore/settings/aqpkg/ipkg.cpp
@@ -116,254 +116,261 @@ void Ipkg :: runIpkg()
        commands << "install";
    else
        commands << option;
    if ( package != "" )
        commands << package;
    if ( package != "" )
        emit outputText( tr( "Dealing with package %1" ).arg( package) );
    qApp->processEvents();
    // If we are removing, reinstalling or upgrading packages and make links option is selected
    // create the links
    if ( option == "remove" || option == "reinstall" || option == "upgrade" )
    {
        createLinks = false;
        if ( flags & MAKE_LINKS )
        {
            emit outputText( tr( "Removing symbolic links...\n" ) );
            linkPackage( Utils::getPackageNameFromIpkFilename( package ), destination, destDir );
            emit outputText( QString( " " ) );
        }
    }
    // Execute command
    dependantPackages = new QList<QString>;
    dependantPackages->setAutoDelete( true );
    executeIpkgCommand( commands, option );
 }
 void Ipkg :: createSymLinks()
 {
    if ( option == "install" || option == "reinstall" || option == "upgrade" )
    {
        // If we are not removing packages and make links option is selected
        // create the links
        createLinks = true;
        if ( flags & MAKE_LINKS )
        {
            emit outputText( " " );
            emit outputText( tr( "Creating symbolic links for %1." ).arg( package) );
            linkPackage( Utils::getPackageNameFromIpkFilename( package ), destination, destDir );
            // link dependant packages that were installed with this release
            QString *pkg;
            for ( pkg = dependantPackages->first(); pkg != 0; pkg = dependantPackages->next() )
            {
                if ( *pkg == package )
                    continue;
                emit outputText( " " );
                emit outputText( tr( "Creating symbolic links for %1" ).arg( *pkg ) );
                linkPackage( Utils::getPackageNameFromIpkFilename( *pkg ), destination, destDir );
            }
        }
    }
    delete dependantPackages;
    emit outputText( tr("Finished") );
    emit outputText( "" );
 }
 void Ipkg :: removeStatusEntry()
 {
    QString statusFile = destDir;
    if ( statusFile.right( 1 ) != "/" )
        statusFile.append( "/" );
    statusFile.append( "usr/lib/ipkg/status" );
    QString outStatusFile = statusFile;
    outStatusFile.append( ".tmp" );
    emit outputText( "" );
    emit outputText( tr("Removing status entry...") );
    QString tempstr = tr("status file - ");
    tempstr.append( statusFile );
    emit outputText( tempstr );
    tempstr = tr("package - ");
    tempstr.append( package );
    emit outputText( tempstr );
    QFile readFile( statusFile );
    QFile writeFile( outStatusFile );
    if ( !readFile.open( IO_ReadOnly ) )
    {
        tempstr = tr("Couldn't open status file - ");
        tempstr.append( statusFile );
        emit outputText( tempstr );
        return;
    }
    if ( !writeFile.open( IO_WriteOnly ) )
    {
-        tempstr = tr("Couldn't create tempory status file - ");
+        tempstr = tr("Couldn't create temporary status file - ");
        tempstr.append( outStatusFile );
        emit outputText( tempstr );
        return;
    }
    int i = 0;
    QTextStream readStream( &readFile );
    QTextStream writeStream( &writeFile );
    QString line;
    char k[21];
    char v[1001];
    QString key;
    QString value;
    while ( !readStream.atEnd() )
    {
        //read new line
        line = readStream.readLine();
        if ( line.contains( ":", TRUE ) )
        {
            //grep key and value from line
            k[0] = '\0';
            v[0] = '\0';
            sscanf( line, "%[^:]: %[^\n]", k, v );
            key = k;
            value = v;
            key = key.stripWhiteSpace();
            value = value.stripWhiteSpace();
        } else {
            key = "";
            value = "";
        }
        if ( key == "Package" && value == package )
        {
            //skip lines from the deleted package
            while ( ( !readStream.atEnd() ) && ( line.stripWhiteSpace() != "" ) )
            {
                line = readStream.readLine();
            }
        } else {
            //write other lines into the tempfile
            writeStream << line << "\n";
            // Improve UI responsiveness
            i++;
            if ( ( i % 50 ) == 0 )
                qApp->processEvents();
        }
    }
    readFile.close();
    writeFile.close();
    // Remove old status file and put tmp stats file in its place
    remove( statusFile );
-    rename( outStatusFile, statusFile );
+    if (::rename( outStatusFile, statusFile ) == -1)
+    {
+        tempstr = tr("Couldn't rename temporary status file - ");
+        tempstr.append( outStatusFile );
+        tempstr.append( tr("to status file - ") );
+        tempstr.append( statusFile );
+        emit outputText( tempstr );
+    }
 }
 int Ipkg :: executeIpkgLinkCommand( QStringList *cmd )
 {
    // If one is already running - should never be but just to be safe
    if ( proc )
    {
        delete proc;
        proc = 0;
    }
    // OK we're gonna use OProcess to run this thing
    proc = new OProcess();
    aborted = false;
    // Connect up our slots
    connect(proc, SIGNAL(processExited(Opie::Core::OProcess*)),
            this, SLOT( linkProcessFinished()));
    connect(proc, SIGNAL(receivedStdout(Opie::Core::OProcess*,char*,int)),
            this, SLOT(linkCommandStdout(Opie::Core::OProcess*,char*,int)));
     *proc << *cmd;
    if(!proc->start(OProcess::NotifyOnExit, OProcess::All))
    {
        emit outputText( tr("Couldn't start ipkg-link process" ) );
    }
    return 0;
 }
 void Ipkg::linkProcessFinished()
 {
    // Report that the link process succeeded/failed
    if ( error )
        emit outputText( tr("Symbolic linking failed!\n") );
    else
        emit outputText( tr("Symbolic linking succeeded.\n") );
    delete proc;
    proc = 0;
    finished = true;
 }
 void Ipkg::linkCommandStdout(OProcess*, char *buffer, int buflen)
 {
    QString lineStr = buffer;
    if ( lineStr[buflen-1] == '\n' )
        buflen --;
    lineStr = lineStr.left( buflen );
    emit outputText( lineStr );
    if ( lineStr.find( " not found." ) != -1 )
    {
        // Capture ipkg-link errors
        error = true;
    }
    buffer[0] = '\0';
 }
 int Ipkg :: executeIpkgCommand( QStringList &cmd, const QString /*option*/ )
 {
    // If one is already running - should never be but just to be safe
    if ( proc )
    {
        delete proc;
        proc = 0;
    }
    // OK we're gonna use OProcess to run this thing
    proc = new OProcess();
    aborted = false;
    // Connect up our slots
    connect(proc, SIGNAL(processExited(Opie::Core::OProcess*)),
            this, SLOT( processFinished()));
    connect(proc, SIGNAL(receivedStdout(Opie::Core::OProcess*,char*,int)),
            this, SLOT(commandStdout(Opie::Core::OProcess*,char*,int)));
    connect(proc, SIGNAL(receivedStderr(Opie::Core::OProcess*,char*,int)),
            this, SLOT(commandStderr(Opie::Core::OProcess*,char*,int)));
    for ( QStringList::Iterator it = cmd.begin(); it != cmd.end(); ++it )
    {
         *proc << (*it).latin1();
    }
    // Start the process going
    finished = false;
    if(!proc->start(OProcess::NotifyOnExit, OProcess::All))
    {
        emit outputText( tr("Couldn't start ipkg process" ) );
author	erik <erik>	2007-01-23 21:39:59 (UTC)
committer	erik <erik>	2007-01-23 21:39:59 (UTC)
commit	8644340455a433f4d6e3b31b329479f1e7983f78 (patch) (unidiff)
tree	8429c11d6634f4d8a7ad83fd59aaf03989d027a3
parent	adcf6075db477909dd8170a74862a6ef91a5127f (diff)
download	opie-8644340455a433f4d6e3b31b329479f1e7983f78.zip opie-8644340455a433f4d6e3b31b329479f1e7983f78.tar.gz opie-8644340455a433f4d6e3b31b329479f1e7983f78.tar.bz2