1 files changed, 425 insertions, 426 deletions

diff --git a/core/launcher/transferserver.cpp b/core/launcher/transferserver.cpp
index 4b764e3..c3f936e 100644
--- a/core/launcher/transferserver.cpp
+++ b/core/launcher/transferserver.cpp
@@ -63,9 +63,9 @@ void TransferServer::authorizeConnections()
     QListIterator<ServerPI> it(connections);
     while ( it.current() ) {
-        if ( !it.current()->verifyAuthorised() ) {
-            disconnect( it.current(), SIGNAL(connectionClosed(ServerPI*)), this, SLOT( closed(ServerPI*)) );
-            connections.removeRef( it.current() );
-        } else
-            ++it;
+    if ( !it.current()->verifyAuthorised() ) {
+        disconnect( it.current(), SIGNAL(connectionClosed(ServerPI*)), this, SLOT( closed(ServerPI*)) );
+        connections.removeRef( it.current() );
+    } else
+        ++it;
     }
 }
@@ -105,7 +105,7 @@ QString SyncAuthentication::ownerName()
                 "businesscard.vcf");
     if (QFile::exists(vfilename)) {
-        Contact c;
-        c = Contact::readVCard( vfilename )[0];
-        return c.fullName();
+    Contact c;
+    c = Contact::readVCard( vfilename )[0];
+    return c.fullName();
     }
 
@@ -128,16 +128,16 @@ int SyncAuthentication::isAuthorized(QHostAddress peeraddress)
 {
     Config cfg("Security");
-        cfg.setGroup("Sync");
-        //    QString allowedstr = cfg.readEntry("auth_peer","192.168.1.0");
-        uint auth_peer = cfg.readNumEntry("auth_peer", 0xc0a80100);
-
-        //    QHostAddress allowed;
-        //    allowed.setAddress(allowedstr);
-        //    uint auth_peer = allowed.ip4Addr();
-        uint auth_peer_bits = cfg.readNumEntry("auth_peer_bits", 24);
-        uint mask = auth_peer_bits >= 32 // shifting by 32 is not defined
-                    ? 0xffffffff : (((1 << auth_peer_bits) - 1) << (32 - auth_peer_bits));
-
-        return (peeraddress.ip4Addr() & mask) == auth_peer;
+    cfg.setGroup("Sync");
+    //    QString allowedstr = cfg.readEntry("auth_peer","192.168.1.0");
+    uint auth_peer = cfg.readNumEntry("auth_peer", 0xc0a80100);
+
+    //    QHostAddress allowed;
+    //    allowed.setAddress(allowedstr);
+    //    uint auth_peer = allowed.ip4Addr();
+    uint auth_peer_bits = cfg.readNumEntry("auth_peer_bits", 24);
+    uint mask = auth_peer_bits >= 32 // shifting by 32 is not defined
+                ? 0xffffffff : (((1 << auth_peer_bits) - 1) << (32 - auth_peer_bits));
+
+    return (peeraddress.ip4Addr() & mask) == auth_peer;
 }
 
@@ -162,10 +162,10 @@ bool SyncAuthentication::checkPassword( const QString& password )
     QString cpwd = QString::fromLocal8Bit( pw->pw_passwd );
     if ( cpwd == "x" && spw )
-        cpwd = QString::fromLocal8Bit( spw->sp_pwdp );
+    cpwd = QString::fromLocal8Bit( spw->sp_pwdp );
 
     // Note: some systems use more than crypt for passwords.
     QString cpassword = QString::fromLocal8Bit( crypt( password.local8Bit(), cpwd.local8Bit() ) );
     if ( cpwd == cpassword )
-        return TRUE;
+    return TRUE;
 #endif
 
@@ -203,20 +203,20 @@ bool SyncAuthentication::checkPassword( const QString& password )
     // Detect old Qtopia Desktop (no password) and fail
     if ( password.isEmpty() ) {
-                if ( denials < 3 || now > lastdenial+600 ) {
-                    QMessageBox unauth(
-                        tr("Sync Connection"),
-                        tr("<p>An unauthorized system is requesting access to this device."
-                            "<p>If you are using a version of Qtopia Desktop older than 1.5.1, "
-                            "please upgrade or change the security setting to use IntelliSync." ),
-                        QMessageBox::Warning,
-                        QMessageBox::Cancel, QMessageBox::NoButton, QMessageBox::NoButton,
-                        0, QString::null, TRUE, WStyle_StaysOnTop);
-                    unauth.setButtonText(QMessageBox::Cancel, tr("Deny"));
-                    unauth.exec();
+        if ( denials < 3 || now > lastdenial+600 ) {
+            QMessageBox unauth(
+            tr("Sync Connection"),
+            tr("<p>An unauthorized system is requesting access to this device."
+                "<p>If you are using a version of Qtopia Desktop older than 1.5.1, "
+                "please upgrade or change the security setting to use IntelliSync." ),
+            QMessageBox::Warning,
+            QMessageBox::Cancel, QMessageBox::NoButton, QMessageBox::NoButton,
+            0, QString::null, TRUE, WStyle_StaysOnTop);
+            unauth.setButtonText(QMessageBox::Cancel, tr("Deny"));
+            unauth.exec();
 
-                    denials++;
-                    lastdenial=now;
-                 }
-                return FALSE;
+            denials++;
+            lastdenial=now;
+         }
+        return FALSE;
 
     }
@@ -233,57 +233,57 @@ bool SyncAuthentication::checkPassword( const QString& password )
      */
     if ( password.left(6) == "Qtopia" || password.left(6) == "rootme" ) {
-        Config cfg( "Security" );
-        cfg.setGroup("Sync");
-        QStringList pwds = cfg.readListEntry("Passwords",' ');
-        for (QStringList::ConstIterator it=pwds.begin(); it!=pwds.end(); ++it) {
+    Config cfg( "Security" );
+    cfg.setGroup("Sync");
+    QStringList pwds = cfg.readListEntry("Passwords",' ');
+    for (QStringList::ConstIterator it=pwds.begin(); it!=pwds.end(); ++it) {
 #ifndef Q_OS_WIN32
-            QString cpassword = QString::fromLocal8Bit(
-                crypt( password.mid(8).local8Bit(), (*it).left(2).latin1() ) );
+        QString cpassword = QString::fromLocal8Bit(
+        crypt( password.mid(8).local8Bit(), (*it).left(2).latin1() ) );
 #else
-            // ### revise
-            QString cpassword("");
+        // ### revise
+        QString cpassword("");
 #endif
-            if ( *it == cpassword ) {
-                lock--;
-                return TRUE;
-            }
-        }
-
-        // Unrecognized system. Be careful...
-        QMessageBox unrecbox(
-            tr("Sync Connection"),
-                    tr("<p>An unrecognized system is requesting access to this device."
-                "<p>If you have just initiated a Sync for the first time, this is normal."),
-                QMessageBox::Warning,
-                QMessageBox::Cancel, QMessageBox::Yes, QMessageBox::NoButton,
-                0, QString::null, TRUE, WStyle_StaysOnTop);
-        unrecbox.setButtonText(QMessageBox::Cancel, tr("Deny"));
-        unrecbox.setButtonText(QMessageBox::Yes, tr("Allow"));
-
-        if ( (denials > 2 && now < lastdenial+600)
-            || unrecbox.exec() != QMessageBox::Yes)
-        {
-            denials++;
-            lastdenial=now;
-            lock--;
-            return FALSE;
-        } else {
-            const char salty[]="abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789/.";
-            char salt[2];
-            salt[0]= salty[rand() % (sizeof(salty)-1)];
-            salt[1]= salty[rand() % (sizeof(salty)-1)];
+        if ( *it == cpassword ) {
+        lock--;
+        return TRUE;
+        }
+    }
+
+    // Unrecognized system. Be careful...
+    QMessageBox unrecbox(
+        tr("Sync Connection"),
+        tr( "<p>An unrecognized system is requesting access to this device."
+        "<p>If you have just initiated a Sync for the first time, this is normal."),
+        QMessageBox::Warning,
+        QMessageBox::Cancel, QMessageBox::Yes, QMessageBox::NoButton,
+        0, QString::null, TRUE, WStyle_StaysOnTop);
+    unrecbox.setButtonText(QMessageBox::Cancel, tr("Deny"));
+    unrecbox.setButtonText(QMessageBox::Yes, tr("Allow"));
+
+    if ( (denials > 2 && now < lastdenial+600)
+        || unrecbox.exec() != QMessageBox::Yes)
+    {
+        denials++;
+        lastdenial=now;
+        lock--;
+        return FALSE;
+    } else {
+        const char salty[]="abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789/.";
+        char salt[2];
+        salt[0]= salty[rand() % (sizeof(salty)-1)];
+        salt[1]= salty[rand() % (sizeof(salty)-1)];
 #ifndef Q_OS_WIN32
-            QString cpassword = QString::fromLocal8Bit(
-                crypt( password.mid(8).local8Bit(), salt ) );
+        QString cpassword = QString::fromLocal8Bit(
+        crypt( password.mid(8).local8Bit(), salt ) );
 #else
-            //### revise
-            QString cpassword("");
+        //### revise
+        QString cpassword("");
 #endif
-            denials=0;
-            pwds.prepend(cpassword);
-            cfg.writeEntry("Passwords",pwds,' ');
-            lock--;
-            return TRUE;
-        }
+        denials=0;
+        pwds.prepend(cpassword);
+        cfg.writeEntry("Passwords",pwds,' ');
+        lock--;
+        return TRUE;
+    }
     }
     lock--;
@@ -306,35 +306,35 @@ ServerPI::ServerPI( int socket, QObject *parent, const char* name )
 #ifndef INSECURE
     if ( !SyncAuthentication::isAuthorized(peeraddress) ) {
-        state = Forbidden;
-        startTimer( 0 );
+    state = Forbidden;
+    startTimer( 0 );
     } else
 #endif
     {
-        connect( this, SIGNAL( readyRead() ), SLOT( read() ) );
-        connect( this, SIGNAL( connectionClosed() ), SLOT( connectionClosed() ) );
+    connect( this, SIGNAL( readyRead() ), SLOT( read() ) );
+    connect( this, SIGNAL( connectionClosed() ), SLOT( connectionClosed() ) );
 
-        passiv = FALSE;
-        for( int i = 0; i < 4; i++ )
-            wait[i] = FALSE;
+    passiv = FALSE;
+    for( int i = 0; i < 4; i++ )
+        wait[i] = FALSE;
 
-        send( "220 Qtopia " QPE_VERSION " FTP Server" ); // No tr
-        state = Wait_USER;
+    send( "220 Qtopia " QPE_VERSION " FTP Server" ); // No tr
+    state = Wait_USER;
 
-        dtp = new ServerDTP( this );
-        connect( dtp, SIGNAL( completed() ), SLOT( dtpCompleted() ) );
-        connect( dtp, SIGNAL( failed() ), SLOT( dtpFailed() ) );
-        connect( dtp, SIGNAL( error(int) ), SLOT( dtpError(int) ) );
+    dtp = new ServerDTP( this );
+    connect( dtp, SIGNAL( completed() ), SLOT( dtpCompleted() ) );
+    connect( dtp, SIGNAL( failed() ), SLOT( dtpFailed() ) );
+    connect( dtp, SIGNAL( error(int) ), SLOT( dtpError(int) ) );
 
 
-        directory = QDir::currentDirPath();
+    directory = QDir::currentDirPath();
 
-        static int p = 1024;
+    static int p = 1024;
 
-        while ( !serversocket || !serversocket->ok() ) {
-            delete serversocket;
-            serversocket = new ServerSocket( ++p, this );
-        }
-        connect( serversocket, SIGNAL( newIncomming(int) ),
-                 SLOT( newConnection(int) ) );
+    while ( !serversocket || !serversocket->ok() ) {
+        delete serversocket;
+        serversocket = new ServerSocket( ++p, this );
+    }
+    connect( serversocket, SIGNAL( newIncomming(int) ),
+         SLOT( newConnection(int) ) );
     }
 }
@@ -353,6 +353,6 @@ bool ServerPI::verifyAuthorised()
 {
     if ( !SyncAuthentication::isAuthorized(peerAddress()) ) {
-        state = Forbidden;
-        return FALSE;
+    state = Forbidden;
+    return FALSE;
     }
     return TRUE;
@@ -375,5 +375,5 @@ void ServerPI::read()
 {
     while ( canReadLine() )
-        process( readLine().stripWhiteSpace() );
+    process( readLine().stripWhiteSpace() );
 }
 
@@ -383,7 +383,7 @@ bool ServerPI::checkReadFile( const QString& file )
 
     if ( file[0] != "/" )
-        filename = directory.path() + "/" + file;
+    filename = directory.path() + "/" + file;
     else
-        filename = file;
+    filename = file;
 
     QFileInfo fi( filename );
@@ -396,13 +396,13 @@ bool ServerPI::checkWriteFile( const QString& file )
 
     if ( file[0] != "/" )
-        filename = directory.path() + "/" + file;
+    filename = directory.path() + "/" + file;
     else
-        filename = file;
+    filename = file;
 
     QFileInfo fi( filename );
 
     if ( fi.exists() )
-        if ( !QFile( filename ).remove() )
-            return FALSE;
+    if ( !QFile( filename ).remove() )
+        return FALSE;
     return TRUE;
 }
@@ -422,5 +422,5 @@ void ServerPI::process( const QString& message )
     QString arg;
     if ( msg.count() >= 2 )
-        arg = msg[1];
+    arg = msg[1];
 
     // full argument string
@@ -438,23 +438,23 @@ void ServerPI::process( const QString& message )
     // we always respond to QUIT, regardless of state
     if ( cmd == "QUIT" ) {
-        send( "211 Good bye!" ); // No tr
-        close();
-        return;
+    send( "211 Good bye!" ); // No tr
+    close();
+    return;
     }
 
     // connected to client
     if ( Connected == state )
-        return;
+    return;
 
     // waiting for user name
     if ( Wait_USER == state ) {
 
-        if ( cmd != "USER" || msg.count() < 2 || !SyncAuthentication::checkUser( arg ) ) {
-            send( "530 Please login with USER and PASS" ); // No tr
-            return;
-        }
-        send( "331 User name ok, need password" ); // No tr
-        state = Wait_PASS;
-        return;
+    if ( cmd != "USER" || msg.count() < 2 || !SyncAuthentication::checkUser( arg ) ) {
+        send( "530 Please login with USER and PASS" ); // No tr
+        return;
+    }
+    send( "331 User name ok, need password" ); // No tr
+    state = Wait_PASS;
+    return;
     }
 
@@ -462,11 +462,11 @@ void ServerPI::process( const QString& message )
     if ( Wait_PASS == state ) {
 
-        if ( cmd != "PASS" || !SyncAuthentication::checkPassword( arg ) ) {
-            send( "530 Please login with USER and PASS" ); // No tr
-            return;
-        }
-        send( "230 User logged in, proceed" ); // No tr
-        state = Ready;
-        return;
+    if ( cmd != "PASS" || !SyncAuthentication::checkPassword( arg ) ) {
+        send( "530 Please login with USER and PASS" ); // No tr
+        return;
+    }
+    send( "230 User logged in, proceed" ); // No tr
+    state = Ready;
+    return;
     }
 
@@ -475,10 +475,10 @@ void ServerPI::process( const QString& message )
     // Only an ALLO sent immediately before STOR is valid.
     if ( cmd != "STOR" )
-        storFileSize = -1;
+    storFileSize = -1;
 
     // account (ACCT)
     if ( cmd == "ACCT" ) {
-        // even wu-ftp does not support it
-        send( "502 Command not implemented" ); // No tr
+    // even wu-ftp does not support it
+    send( "502 Command not implemented" ); // No tr
     }
 
@@ -486,32 +486,32 @@ void ServerPI::process( const QString& message )
     else if ( cmd == "CWD" ) {
 
-        if ( !args.isEmpty() ) {
-            if ( directory.cd( args, TRUE ) )
-                send( "250 Requested file action okay, completed" ); // No tr
-            else
-                send( "550 Requested action not taken" ); // No tr
-        }
-        else
-            send( "500 Syntax error, command unrecognized" ); // No tr
+    if ( !args.isEmpty() ) {
+        if ( directory.cd( args, TRUE ) )
+        send( "250 Requested file action okay, completed" ); // No tr
+        else
+        send( "550 Requested action not taken" ); // No tr
+    }
+    else
+        send( "500 Syntax error, command unrecognized" ); // No tr
     }
 
     // change to parent directory (CDUP)
     else if ( cmd == "CDUP" ) {
-        if ( directory.cdUp() )
-            send( "250 Requested file action okay, completed" ); // No tr
-        else
-            send( "550 Requested action not taken" ); // No tr
+    if ( directory.cdUp() )
+        send( "250 Requested file action okay, completed" ); // No tr
+    else
+        send( "550 Requested action not taken" ); // No tr
     }
 
     // structure mount (SMNT)
     else if ( cmd == "SMNT" ) {
-        // even wu-ftp does not support it
-        send( "502 Command not implemented" ); // No tr
+    // even wu-ftp does not support it
+    send( "502 Command not implemented" ); // No tr
     }
 
     // reinitialize (REIN)
     else if ( cmd == "REIN" ) {
-        // even wu-ftp does not support it
-        send( "502 Command not implemented" ); // No tr
+    // even wu-ftp does not support it
+    send( "502 Command not implemented" ); // No tr
     }
 
@@ -522,41 +522,41 @@ void ServerPI::process( const QString& message )
     // data port (PORT)
     else if ( cmd == "PORT" ) {
-        if ( parsePort( arg ) )
-            send( "200 Command okay" ); // No tr
-        else
-            send( "500 Syntax error, command unrecognized" ); // No tr
+    if ( parsePort( arg ) )
+        send( "200 Command okay" ); // No tr
+    else
+        send( "500 Syntax error, command unrecognized" ); // No tr
     }
 
     // passive (PASV)
     else if ( cmd == "PASV" ) {
-        passiv = TRUE;
-        send( "227 Entering Passive Mode (" // No tr
-              + address().toString().replace( QRegExp( "\\." ), "," ) + ","
-              + QString::number( ( serversocket->port() ) >> 8 ) + ","
-              + QString::number( ( serversocket->port() ) & 0xFF ) +")" );
+    passiv = TRUE;
+    send( "227 Entering Passive Mode (" // No tr
+          + address().toString().replace( QRegExp( "\\." ), "," ) + ","
+          + QString::number( ( serversocket->port() ) >> 8 ) + ","
+          + QString::number( ( serversocket->port() ) & 0xFF ) +")" );
     }
 
     // representation type (TYPE)
     else if ( cmd == "TYPE" ) {
-        if ( arg.upper() == "A" || arg.upper() == "I" )
-            send( "200 Command okay" ); // No tr
-        else
-            send( "504 Command not implemented for that parameter" ); // No tr
+    if ( arg.upper() == "A" || arg.upper() == "I" )
+        send( "200 Command okay" ); // No tr
+    else
+        send( "504 Command not implemented for that parameter" ); // No tr
     }
 
     // file structure (STRU)
     else if ( cmd == "STRU" ) {
-        if ( arg.upper() == "F" )
-            send( "200 Command okay" ); // No tr
-        else
-            send( "504 Command not implemented for that parameter" ); // No tr
+    if ( arg.upper() == "F" )
+        send( "200 Command okay" ); // No tr
+    else
+        send( "504 Command not implemented for that parameter" ); // No tr
     }
 
     // transfer mode (MODE)
     else if ( cmd == "MODE" ) {
-        if ( arg.upper() == "S" )
-            send( "200 Command okay" ); // No tr
-        else
-            send( "504 Command not implemented for that parameter" ); // No tr
+    if ( arg.upper() == "S" )
+        send( "200 Command okay" ); // No tr
+    else
+        send( "504 Command not implemented for that parameter" ); // No tr
     }
 
@@ -567,203 +567,203 @@ void ServerPI::process( const QString& message )
     // retrieve (RETR)
     else if ( cmd == "RETR" )
-        if ( !args.isEmpty() && checkReadFile( absFilePath( args ) )
-             || backupRestoreGzip( absFilePath( args ) ) ) {
-            send( "150 File status okay" ); // No tr
-            sendFile( absFilePath( args ) );
-        }
-        else {
+    if ( !args.isEmpty() && checkReadFile( absFilePath( args ) )
+         || backupRestoreGzip( absFilePath( args ) ) ) {
+        send( "150 File status okay" ); // No tr
+        sendFile( absFilePath( args ) );
+    }
+    else {
         odebug << "550 Requested action not taken" << oendl;
-            send( "550 Requested action not taken" ); // No tr
-        }
+        send( "550 Requested action not taken" ); // No tr
+    }
 
     // store (STOR)
     else if ( cmd == "STOR" )
-        if ( !args.isEmpty() && checkWriteFile( absFilePath( args ) ) ) {
-            send( "150 File status okay" ); // No tr
-            retrieveFile( absFilePath( args ) );
-        }
-        else
-            send( "550 Requested action not taken" ); // No tr
+    if ( !args.isEmpty() && checkWriteFile( absFilePath( args ) ) ) {
+        send( "150 File status okay" ); // No tr
+        retrieveFile( absFilePath( args ) );
+    }
+    else
+        send( "550 Requested action not taken" ); // No tr
 
     // store unique (STOU)
     else if ( cmd == "STOU" ) {
-        send( "502 Command not implemented" ); // No tr
+    send( "502 Command not implemented" ); // No tr
     }
 
     // append (APPE)
     else if ( cmd == "APPE" ) {
-        send( "502 Command not implemented" ); // No tr
+    send( "502 Command not implemented" ); // No tr
     }
 
     // allocate (ALLO)
     else if ( cmd == "ALLO" ) {
-        storFileSize = args.toInt();
-        send( "200 Command okay" ); // No tr
+    storFileSize = args.toInt();
+    send( "200 Command okay" ); // No tr
     }
 
     // restart (REST)
     else if ( cmd == "REST" ) {
-        send( "502 Command not implemented" ); // No tr
+    send( "502 Command not implemented" ); // No tr
     }
 
     // rename from (RNFR)
     else if ( cmd == "RNFR" ) {
-        renameFrom = QString::null;
-        if ( args.isEmpty() )
-            send( "500 Syntax error, command unrecognized" ); // No tr
-        else {
-            QFile file( absFilePath( args ) );
-            if ( file.exists() ) {
-                send( "350 File exists, ready for destination name" ); // No tr
-                renameFrom = absFilePath( args );
-            }
-            else
-                send( "550 Requested action not taken" ); // No tr
-        }
+    renameFrom = QString::null;
+    if ( args.isEmpty() )
+        send( "500 Syntax error, command unrecognized" ); // No tr
+    else {
+        QFile file( absFilePath( args ) );
+        if ( file.exists() ) {
+        send( "350 File exists, ready for destination name" ); // No tr
+        renameFrom = absFilePath( args );
+        }
+        else
+        send( "550 Requested action not taken" ); // No tr
+    }
     }
 
     // rename to (RNTO)
     else if ( cmd == "RNTO" ) {
-        if ( lastCommand != "RNFR" )
-            send( "503 Bad sequence of commands" ); // No tr
-        else if ( args.isEmpty() )
-            send( "500 Syntax error, command unrecognized" ); // No tr
-        else {
-            QDir dir( absFilePath( args ) );
-            if ( dir.rename( renameFrom, absFilePath( args ), TRUE ) )
-                send( "250 Requested file action okay, completed." ); // No tr
-            else
-                send( "550 Requested action not taken" ); // No tr
-        }
+    if ( lastCommand != "RNFR" )
+        send( "503 Bad sequence of commands" ); // No tr
+    else if ( args.isEmpty() )
+        send( "500 Syntax error, command unrecognized" ); // No tr
+    else {
+        QDir dir( absFilePath( args ) );
+        if ( dir.rename( renameFrom, absFilePath( args ), TRUE ) )
+        send( "250 Requested file action okay, completed." ); // No tr
+        else
+        send( "550 Requested action not taken" ); // No tr
+    }
     }
 
     // abort (ABOR)
     else if ( cmd.contains( "ABOR" ) ) {
-        dtp->close();
-        if ( dtp->dtpMode() != ServerDTP::Idle )
-            send( "426 Connection closed; transfer aborted" ); // No tr
-        else
-            send( "226 Closing data connection" ); // No tr
+    dtp->close();
+    if ( dtp->dtpMode() != ServerDTP::Idle )
+        send( "426 Connection closed; transfer aborted" ); // No tr
+    else
+        send( "226 Closing data connection" ); // No tr
     }
 
     // delete (DELE)
     else if ( cmd == "DELE" ) {
-        if ( args.isEmpty() )
-            send( "500 Syntax error, command unrecognized" ); // No tr
-        else {
-            QFile file( absFilePath( args ) ) ;
-            if ( file.remove() ) {
-                send( "250 Requested file action okay, completed" ); // No tr
-                QCopEnvelope e("QPE/System", "linkChanged(QString)" );
-                e << file.name();
-            } else {
-                send( "550 Requested action not taken" ); // No tr
-            }
-        }
+    if ( args.isEmpty() )
+        send( "500 Syntax error, command unrecognized" ); // No tr
+    else {
+        QFile file( absFilePath( args ) ) ;
+        if ( file.remove() ) {
+        send( "250 Requested file action okay, completed" ); // No tr
+        QCopEnvelope e("QPE/System", "linkChanged(QString)" );
+        e << file.name();
+        } else {
+        send( "550 Requested action not taken" ); // No tr
+        }
+    }
     }
 
     // remove directory (RMD)
     else if ( cmd == "RMD" ) {
-        if ( args.isEmpty() )
-            send( "500 Syntax error, command unrecognized" ); // No tr
-        else {
-            QDir dir;
-            if ( dir.rmdir( absFilePath( args ), TRUE ) )
-                send( "250 Requested file action okay, completed" ); // No tr
-            else
-                send( "550 Requested action not taken" ); // No tr
-        }
+    if ( args.isEmpty() )
+        send( "500 Syntax error, command unrecognized" ); // No tr
+    else {
+        QDir dir;
+        if ( dir.rmdir( absFilePath( args ), TRUE ) )
+        send( "250 Requested file action okay, completed" ); // No tr
+        else
+        send( "550 Requested action not taken" ); // No tr
+    }
     }
 
     // make directory (MKD)
     else if ( cmd == "MKD" ) {
-        if ( args.isEmpty() ) {
+    if ( args.isEmpty() ) {
         odebug << " Error: no arg" << oendl;
-            send( "500 Syntax error, command unrecognized" ); // No tr
-        }
-        else {
-            QDir dir;
-            if ( dir.mkdir( absFilePath( args ), TRUE ) )
-                send( "250 Requested file action okay, completed." ); // No tr
-            else
-                send( "550 Requested action not taken" ); // No tr
-        }
+        send( "500 Syntax error, command unrecognized" ); // No tr
+    }
+    else {
+        QDir dir;
+        if ( dir.mkdir( absFilePath( args ), TRUE ) )
+        send( "250 Requested file action okay, completed." ); // No tr
+        else
+        send( "550 Requested action not taken" ); // No tr
+    }
     }
 
     // print working directory (PWD)
     else if ( cmd == "PWD" ) {
-        send( "257 \"" + directory.path() +"\"" );
+    send( "257 \"" + directory.path() +"\"" );
     }
 
     // list (LIST)
     else if ( cmd == "LIST" ) {
-        if ( sendList( absFilePath( args ) ) )
-            send( "150 File status okay" ); // No tr
-        else
-            send( "500 Syntax error, command unrecognized" ); // No tr
+    if ( sendList( absFilePath( args ) ) )
+        send( "150 File status okay" ); // No tr
+    else
+        send( "500 Syntax error, command unrecognized" ); // No tr
     }
 
     // size (SIZE)
     else if ( cmd == "SIZE" ) {
-        QString filePath = absFilePath( args );
-        QFileInfo fi( filePath );
-        bool gzipfile = backupRestoreGzip( filePath );
-        if ( !fi.exists() && !gzipfile )
-            send( "500 Syntax error, command unrecognized" ); // No tr
-        else {
-            if ( !gzipfile )
-                send( "213 " + QString::number( fi.size() ) );
-            else {
-                Process duproc( QString("du") );
-                duproc.addArgument("-s");
-                QString in, out;
-                if ( !duproc.exec(in, out) ) {
+    QString filePath = absFilePath( args );
+    QFileInfo fi( filePath );
+    bool gzipfile = backupRestoreGzip( filePath );
+    if ( !fi.exists() && !gzipfile )
+        send( "500 Syntax error, command unrecognized" ); // No tr
+    else {
+        if ( !gzipfile )
+        send( "213 " + QString::number( fi.size() ) );
+        else {
+        Process duproc( QString("du") );
+        duproc.addArgument("-s");
+        QString in, out;
+        if ( !duproc.exec(in, out) ) {
             odebug << "du process failed; just sending back 1K" << oendl;
-                    send( "213 1024");
-                }
-                else {
-                    QString size = out.left( out.find("\t") );
-                    int guess = size.toInt()/5;
-                    if ( filePath.contains("doc") ) // No tr
-                        guess *= 1000;
+            send( "213 1024");
+        }
+        else {
+            QString size = out.left( out.find("\t") );
+            int guess = size.toInt()/5;
+            if ( filePath.contains("doc") ) // No tr
+            guess *= 1000;
             odebug << "sending back gzip guess of " << guess << "" << oendl;
-                    send( "213 " + QString::number(guess) );
-                }
-            }
-        }
+            send( "213 " + QString::number(guess) );
+        }
+        }
+    }
     }
     // name list (NLST)
     else if ( cmd == "NLST" ) {
-        send( "502 Command not implemented" ); // No tr
+    send( "502 Command not implemented" ); // No tr
     }
 
     // site parameters (SITE)
     else if ( cmd == "SITE" ) {
-        send( "502 Command not implemented" ); // No tr
+    send( "502 Command not implemented" ); // No tr
     }
 
     // system (SYST)
     else if ( cmd == "SYST" ) {
-        send( "215 UNIX Type: L8" ); // No tr
+    send( "215 UNIX Type: L8" ); // No tr
     }
 
     // status (STAT)
     else if ( cmd == "STAT" ) {
-        send( "502 Command not implemented" ); // No tr
+    send( "502 Command not implemented" ); // No tr
     }
 
     // help (HELP )
     else if ( cmd == "HELP" ) {
-        send( "502 Command not implemented" ); // No tr
+    send( "502 Command not implemented" ); // No tr
     }
 
     // noop (NOOP)
     else if ( cmd == "NOOP" ) {
-        send( "200 Command okay" ); // No tr
+    send( "200 Command okay" ); // No tr
     }
 
     // not implemented
     else
-        send( "502 Command not implemented" ); // No tr
+    send( "502 Command not implemented" ); // No tr
 
     lastCommand = cmd;
@@ -773,5 +773,5 @@ bool ServerPI::backupRestoreGzip( const QString &file )
 {
     return (file.find( "backup" ) != -1 && // No tr
-            file.findRev( ".tgz" ) == (int)file.length()-4 );
+        file.findRev( ".tgz" ) == (int)file.length()-4 );
 }
 
@@ -782,6 +782,5 @@ bool ServerPI::backupRestoreGzip( const QString &file, QStringList &targets )
       QFileInfo info( file );
       targets = info.dirPath( TRUE );
-      qDebug("ServerPI::backupRestoreGzip for %s = %s", file.latin1(),
-             targets.join(" ").latin1() );
+      odebug << "ServerPI::backupRestoreGzip for " << file.latin1() << " = " << targets.join(" ").latin1() << oendl;
       return true;
   }
@@ -792,13 +791,13 @@ void ServerPI::sendFile( const QString& file )
 {
     if ( passiv ) {
-        wait[SendFile] = TRUE;
-        waitfile = file;
-        if ( waitsocket )
-            newConnection( waitsocket );
+    wait[SendFile] = TRUE;
+    waitfile = file;
+    if ( waitsocket )
+        newConnection( waitsocket );
     }
     else {
       QStringList targets;
       if ( backupRestoreGzip( file, targets ) )
-          dtp->sendGzipFile( file, targets, peeraddress, peerport );
+      dtp->sendGzipFile( file, targets, peeraddress, peerport );
       else dtp->sendFile( file, peeraddress, peerport );
     }
@@ -808,15 +807,15 @@ void ServerPI::retrieveFile( const QString& file )
 {
     if ( passiv ) {
-        wait[RetrieveFile] = TRUE;
-        waitfile = file;
-        if ( waitsocket )
-            newConnection( waitsocket );
+    wait[RetrieveFile] = TRUE;
+    waitfile = file;
+    if ( waitsocket )
+        newConnection( waitsocket );
     }
     else {
       QStringList targets;
       if ( backupRestoreGzip( file, targets ) )
-        dtp->retrieveGzipFile( file, peeraddress, peerport );
+    dtp->retrieveGzipFile( file, peeraddress, peerport );
       else
-        dtp->retrieveFile( file, peeraddress, peerport, storFileSize );
+    dtp->retrieveFile( file, peeraddress, peerport, storFileSize );
     }
 }
@@ -829,5 +828,5 @@ bool ServerPI::parsePort( const QString& pp )
     // h1,h2,h3,h4,p1,p2
     peeraddress = QHostAddress( ( p[0].toInt() << 24 ) + ( p[1].toInt() << 16 ) +
-                                ( p[2].toInt() << 8 ) + p[3].toInt() );
+                ( p[2].toInt() << 8 ) + p[3].toInt() );
     peerport = ( p[4].toInt() << 8 ) + p[5].toInt();
     return TRUE;
@@ -838,9 +837,9 @@ void ServerPI::dtpCompleted()
     send( "226 Closing data connection, file transfer successful" ); // No tr
     if ( dtp->dtpMode() == ServerDTP::RetrieveFile ) {
-        QString fn = dtp->fileName();
-        if ( fn.right(8)==".desktop" && fn.find("/Documents/")>=0 ) {
-            QCopEnvelope e("QPE/System", "linkChanged(QString)" );
-            e << fn;
-        }
+    QString fn = dtp->fileName();
+    if ( fn.right(8)==".desktop" && fn.find("/Documents/")>=0 ) {
+        QCopEnvelope e("QPE/System", "linkChanged(QString)" );
+        e << fn;
+    }
     }
     waitsocket = 0;
@@ -871,5 +870,5 @@ bool ServerPI::sendList( const QString& arg )
 
     if ( !buffer.open( IO_WriteOnly ) )
-        return FALSE;
+    return FALSE;
 
     QTextStream ts( &buffer );
@@ -877,5 +876,5 @@ bool ServerPI::sendList( const QString& arg )
 
     if ( fn.isEmpty() )
-        fn = directory.path();
+    fn = directory.path();
 
     QFileInfo fi( fn );
@@ -884,43 +883,43 @@ bool ServerPI::sendList( const QString& arg )
     // return file listing
     if ( fi.isFile() ) {
-        ts << fileListing( &fi ) << endl;
+    ts << fileListing( &fi ) << endl;
     }
 
     // return directory listing
     else if ( fi.isDir() ) {
-        QDir dir( fn );
-        const QFileInfoList *list = dir.entryInfoList( QDir::All | QDir::Hidden );
+    QDir dir( fn );
+    const QFileInfoList *list = dir.entryInfoList( QDir::All | QDir::Hidden );
 
-        QFileInfoListIterator it( *list );
-        QFileInfo *info;
+    QFileInfoListIterator it( *list );
+    QFileInfo *info;
 
-        unsigned long total = 0;
-        while ( ( info = it.current() ) ) {
-            if ( info->fileName() != "." && info->fileName() != ".." )
-                total += info->size();
-            ++it;
-        }
+    unsigned long total = 0;
+    while ( ( info = it.current() ) ) {
+        if ( info->fileName() != "." && info->fileName() != ".." )
+        total += info->size();
+        ++it;
+    }
 
-        ts << "total " << QString::number( total / 1024 ) << endl; // No tr
+    ts << "total " << QString::number( total / 1024 ) << endl; // No tr
 
-        it.toFirst();
-        while ( ( info = it.current() ) ) {
-            if ( info->fileName() == "." || info->fileName() == ".." ) {
-                ++it;
-                continue;
-            }
-            ts << fileListing( info ) << endl;
-            ++it;
-        }
+    it.toFirst();
+    while ( ( info = it.current() ) ) {
+        if ( info->fileName() == "." || info->fileName() == ".." ) {
+        ++it;
+        continue;
+        }
+        ts << fileListing( info ) << endl;
+        ++it;
+    }
     }
 
     if ( passiv ) {
-        waitarray = buffer.buffer();
-        wait[SendByteArray] = TRUE;
-        if ( waitsocket )
-            newConnection( waitsocket );
+    waitarray = buffer.buffer();
+    wait[SendByteArray] = TRUE;
+    if ( waitsocket )
+        newConnection( waitsocket );
     }
     else
-        dtp->sendByteArray( buffer.buffer(), peeraddress, peerport );
+    dtp->sendByteArray( buffer.buffer(), peeraddress, peerport );
     return TRUE;
 }
@@ -933,9 +932,9 @@ QString ServerPI::fileListing( QFileInfo *info )
     // type char
     if ( info->isDir() )
-        s += "d";
+    s += "d";
     else if ( info->isSymLink() )
-        s += "l";
+    s += "l";
     else
-        s += "-";
+    s += "-";
 
     // permisson string
@@ -946,5 +945,5 @@ QString ServerPI::fileListing( QFileInfo *info )
 
     if ( info->isDir() )
-        subdirs = 2;
+    subdirs = 2;
     // FIXME : this is to slow
     //if ( info->isDir() )
@@ -956,5 +955,5 @@ QString ServerPI::fileListing( QFileInfo *info )
     QString o = info->owner();
     if ( o.isEmpty() )
-        o = QString::number(info->ownerId());
+    o = QString::number(info->ownerId());
     s += o.leftJustify( 8, ' ', TRUE ) + " ";
 
@@ -962,5 +961,5 @@ QString ServerPI::fileListing( QFileInfo *info )
     QString g = info->group();
     if ( g.isEmpty() )
-        g = QString::number(info->groupId());
+    g = QString::number(info->groupId());
     s += g.leftJustify( 8, ' ', TRUE ) + " ";
 
@@ -972,7 +971,7 @@ QString ServerPI::fileListing( QFileInfo *info )
     QTime time = info->lastModified().time();
     s += date.monthName( date.month() ) + " "
-         + QString::number( date.day() ).rightJustify( 2, ' ', TRUE ) + " "
-         + QString::number( time.hour() ).rightJustify( 2, '0', TRUE ) + ":"
-         + QString::number( time.minute() ).rightJustify( 2,'0', TRUE ) + " ";
+     + QString::number( date.day() ).rightJustify( 2, ' ', TRUE ) + " "
+     + QString::number( time.hour() ).rightJustify( 2, '0', TRUE ) + ":"
+     + QString::number( time.minute() ).rightJustify( 2,'0', TRUE ) + " ";
 
     // file name
@@ -1021,33 +1020,33 @@ void ServerPI::newConnection( int socket )
 
     if ( wait[SendFile] ) {
-        QStringList targets;
-        if ( backupRestoreGzip( waitfile, targets ) )
-            dtp->sendGzipFile( waitfile, targets );
-        else
-            dtp->sendFile( waitfile );
-        dtp->setSocket( socket );
+    QStringList targets;
+    if ( backupRestoreGzip( waitfile, targets ) )
+        dtp->sendGzipFile( waitfile, targets );
+    else
+        dtp->sendFile( waitfile );
+    dtp->setSocket( socket );
     }
     else if ( wait[RetrieveFile] ) {
       odebug << "check retrieve file" << oendl;
       if ( backupRestoreGzip( waitfile ) )
-        dtp->retrieveGzipFile( waitfile );
+    dtp->retrieveGzipFile( waitfile );
       else
-        dtp->retrieveFile( waitfile, storFileSize );
+    dtp->retrieveFile( waitfile, storFileSize );
       dtp->setSocket( socket );
     }
     else if ( wait[SendByteArray] ) {
-        dtp->sendByteArray( waitarray );
-        dtp->setSocket( socket );
+    dtp->sendByteArray( waitarray );
+    dtp->setSocket( socket );
     }
     else if ( wait[RetrieveByteArray] ) {
     odebug << "retrieve byte array" << oendl;
-        dtp->retrieveByteArray();
-        dtp->setSocket( socket );
+    dtp->retrieveByteArray();
+    dtp->setSocket( socket );
     }
     else
-        waitsocket = socket;
+    waitsocket = socket;
 
     for( int i = 0; i < 4; i++ )
-        wait[i] = FALSE;
+    wait[i] = FALSE;
 }
 
@@ -1058,5 +1057,5 @@ QString ServerPI::absFilePath( const QString& file )
     QString filepath( file );
     if ( file[0] != "/" )
-        filepath = directory.path() + "/" + file;
+    filepath = directory.path() + "/" + file;
 
     return filepath;
@@ -1089,7 +1088,7 @@ ServerDTP::ServerDTP( QObject *parent, const char* name)
   retrieveTargzProc->setWorkingDirectory( QDir::rootDirPath() );
   connect( retrieveTargzProc, SIGNAL( processExited() ),
-           SIGNAL( completed() ) );
+       SIGNAL( completed() ) );
   connect( retrieveTargzProc, SIGNAL( processExited() ),
-           SLOT( extractTarDone() ) );
+       SLOT( extractTarDone() ) );
 }
 
@@ -1098,12 +1097,12 @@ ServerDTP::~ServerDTP()
     buf.close();
     if ( RetrieveFile == mode && file.isOpen() ) {
-        // We're being shutdown before the client closed.
-        file.close();
-        if ( recvFileSize >= 0 && (int)file.size() != recvFileSize ) {
+    // We're being shutdown before the client closed.
+    file.close();
+    if ( recvFileSize >= 0 && (int)file.size() != recvFileSize ) {
         odebug << "STOR incomplete" << oendl;
-            file.remove();
-        }
+        file.remove();
+    }
     } else {
-        file.close();
+    file.close();
     }
     createTargzProc->kill();
@@ -1141,8 +1140,8 @@ void ServerDTP::connected()
       // Don't write more if there is plenty buffered already.
       if ( bytesToWrite() <= block_size && !file.atEnd() ) {
-        QCString s;
-        s.resize( block_size );
-        int bytes = file.readBlock( s.data(), block_size );
-        writeBlock( s.data(), bytes );
+    QCString s;
+    s.resize( block_size );
+    int bytes = file.readBlock( s.data(), block_size );
+    writeBlock( s.data(), bytes );
       }
     }
@@ -1159,5 +1158,5 @@ void ServerDTP::connected()
     if ( !createTargzProc->start() )
       qWarning("Error starting %s",
-               createTargzProc->arguments().join(" ").latin1());
+           createTargzProc->arguments().join(" ").latin1());
     break;
   case SendBuffer:
@@ -1213,40 +1212,40 @@ void ServerDTP::connectionClosed()
     // send file mode
     if ( SendFile == mode ) {
-        if ( bytes_written == file.size() )
-            emit completed();
-        else
-            emit failed();
+    if ( bytes_written == file.size() )
+        emit completed();
+    else
+        emit failed();
     }
 
     // send buffer mode
     else if ( SendBuffer == mode ) {
-        if ( bytes_written == buf.size() )
-            emit completed();
-        else
-            emit failed();
+    if ( bytes_written == buf.size() )
+        emit completed();
+    else
+        emit failed();
     }
 
     // retrieve file mode
     else if ( RetrieveFile == mode ) {
-        file.close();
-        if ( recvFileSize >= 0 && (int)file.size() != recvFileSize ) {
+    file.close();
+    if ( recvFileSize >= 0 && (int)file.size() != recvFileSize ) {
         odebug << "STOR incomplete" << oendl;
-            file.remove();
-            emit failed();
-        } else {
-            emit completed();
-        }
+        file.remove();
+        emit failed();
+    } else {
+        emit completed();
+    }
     }
 
     else if ( RetrieveGzipFile == mode ) {
     odebug << "Done writing ungzip file; closing input" << oendl;
-        retrieveTargzProc->flushStdin();
-        retrieveTargzProc->closeStdin();
+    retrieveTargzProc->flushStdin();
+    retrieveTargzProc->closeStdin();
     }
 
     // retrieve buffer mode
     else if ( RetrieveBuffer == mode ) {
-        buf.close();
-        emit completed();
+    buf.close();
+    emit completed();
     }
 
@@ -1261,16 +1260,16 @@ void ServerDTP::bytesWritten( int bytes )
     if ( SendFile == mode ) {
 
-        if ( bytes_written == file.size() ) {
+    if ( bytes_written == file.size() ) {
         // odebug << "Debug: Sending complete: " << file.size() << " bytes" << oendl;
-            file.close();
-            emit completed();
-            mode = Idle;
-        }
-        else if( !file.atEnd() ) {
-            QCString s;
-            s.resize( block_size );
-            int bytes = file.readBlock( s.data(), block_size );
-            writeBlock( s.data(), bytes );
-        }
+        file.close();
+        emit completed();
+        mode = Idle;
+    }
+    else if( !file.atEnd() ) {
+        QCString s;
+        s.resize( block_size );
+        int bytes = file.readBlock( s.data(), block_size );
+        writeBlock( s.data(), bytes );
+    }
     }
 
@@ -1278,9 +1277,9 @@ void ServerDTP::bytesWritten( int bytes )
     if ( SendBuffer == mode ) {
 
-        if ( bytes_written == buf.size() ) {
+    if ( bytes_written == buf.size() ) {
         // odebug << "Debug: Sending complete: " << buf.size() << " bytes" << oendl;
-            emit completed();
-            mode = Idle;
-        }
+        emit completed();
+        mode = Idle;
+    }
     }
 }
@@ -1290,25 +1289,25 @@ void ServerDTP::readyRead()
     // retrieve file mode
     if ( RetrieveFile == mode ) {
-        QCString s;
-        s.resize( bytesAvailable() );
-        readBlock( s.data(), bytesAvailable() );
-        file.writeBlock( s.data(), s.size() );
+    QCString s;
+    s.resize( bytesAvailable() );
+    readBlock( s.data(), bytesAvailable() );
+    file.writeBlock( s.data(), s.size() );
     }
     else if ( RetrieveGzipFile == mode ) {
-        if ( !retrieveTargzProc->isRunning() )
-            retrieveTargzProc->start();
+    if ( !retrieveTargzProc->isRunning() )
+        retrieveTargzProc->start();
 
-              QByteArray s;
-        s.resize( bytesAvailable() );
-        readBlock( s.data(), bytesAvailable() );
-        retrieveTargzProc->writeToStdin( s );
+        QByteArray s;
+    s.resize( bytesAvailable() );
+    readBlock( s.data(), bytesAvailable() );
+    retrieveTargzProc->writeToStdin( s );
     odebug << "wrote " << s.size() << " bytes to ungzip " << oendl;
     }
     // retrieve buffer mode
     else if ( RetrieveBuffer == mode ) {
-        QCString s;
-        s.resize( bytesAvailable() );
-        readBlock( s.data(), bytesAvailable() );
-        buf.writeBlock( s.data(), s.size() );
+    QCString s;
+    s.resize( bytesAvailable() );
+    readBlock( s.data(), bytesAvailable() );
+    buf.writeBlock( s.data(), s.size() );
     }
 }
@@ -1327,5 +1326,5 @@ void ServerDTP::targzDone()
     mode = Idle;
     disconnect( createTargzProc, SIGNAL( readyReadStdout() ),
-                    this, SLOT( writeTargzBlock() ) );
+            this, SLOT( writeTargzBlock() ) );
 }
 
@@ -1344,6 +1343,6 @@ void ServerDTP::sendFile( const QString fn )
 
 void ServerDTP::sendGzipFile( const QString &fn,
-                              const QStringList &archiveTargets,
-                              const QHostAddress& host, Q_UINT16 port )
+                  const QStringList &archiveTargets,
+                  const QHostAddress& host, Q_UINT16 port )
 {
     sendGzipFile( fn, archiveTargets );
@@ -1352,5 +1351,5 @@ void ServerDTP::sendGzipFile( const QString &fn,
 
 void ServerDTP::sendGzipFile( const QString &fn,
-                              const QStringList &archiveTargets  )
+                  const QStringList &archiveTargets  )
 {
     mode = SendGzipFile;
@@ -1363,5 +1362,5 @@ void ServerDTP::sendGzipFile( const QString &fn,
     createTargzProc->setArguments( args );
     connect( createTargzProc,
-             SIGNAL( readyReadStdout() ), SLOT( writeTargzBlock() ) );
+         SIGNAL( readyReadStdout() ), SLOT( writeTargzBlock() ) );
 }
 
@@ -1389,5 +1388,5 @@ void ServerDTP::retrieveGzipFile( const QString &fn )
     retrieveTargzProc->setArguments( "targunzip" );
     connect( retrieveTargzProc, SIGNAL( processExited() ),
-             SLOT( extractTarDone() ) );
+         SLOT( extractTarDone() ) );
 }