1 files changed, 48 insertions, 59 deletions

diff --git a/core/launcher/transferserver.cpp b/core/launcher/transferserver.cpp
index e32cf41..4b764e3 100644
--- a/core/launcher/transferserver.cpp
+++ b/core/launcher/transferserver.cpp
@@ -8,74 +8,63 @@
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
 ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
 **
 **********************************************************************/
-//#define _XOPEN_SOURCE
+#include "transferserver.h"
 
+/* OPIE */
+#include <opie2/odebug.h>
 #include <opie2/oglobal.h>
+#include <qtopia/qprocess.h>
+#include <qtopia/process.h>
+#include <qtopia/private/contact.h>
+#include <qtopia/version.h>
+#ifdef Q_WS_QWS
+#include <qtopia/qcopenvelope_qws.h>
+#endif
+using namespace Opie::Core;
 
-#ifndef Q_OS_WIN32
+/* QT */
+#include <qtextstream.h>
+#include <qmessagebox.h>
+
+/* STD */
 #include <pwd.h>
 #include <sys/types.h>
 #include <unistd.h>
 #include <stdlib.h>
 #include <time.h>
 
 #ifndef Q_OS_MACX
 #include <shadow.h>
 #include <crypt.h>
 #endif /* Q_OS_MACX */
 
-#else
-#include <stdlib.h>
-#include <time.h>
-#endif
-
-
-#if defined(_OS_LINUX_)
-#include <shadow.h>
-#endif
-
-#include <qtextstream.h>
-#include <qmessagebox.h>
-//#include <qtopia/qcopchannel_qws.h>
-#include <qtopia/process.h>
-#include <qtopia/private/contact.h>
-#include <qtopia/version.h>
-#ifdef Q_WS_QWS
-#include <qtopia/qcopenvelope_qws.h>
-#endif
-
-
-#include "transferserver.h"
-#include <qtopia/qprocess.h>
-
 const int block_size = 51200;
 
-using namespace Opie::Core;
 TransferServer::TransferServer( Q_UINT16 port, QObject *parent,
         const char* name)
     : QServerSocket( port, 1, parent, name )
 {
     connections.setAutoDelete( TRUE );
     if ( !ok() )
-	qWarning( "Failed to bind to port %d", port );
+    owarn << "Failed to bind to port " << port << "" << oendl;
 }
 
 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;
     }
@@ -362,33 +351,33 @@ ServerPI::~ServerPI()
 
 bool ServerPI::verifyAuthorised()
 {
     if ( !SyncAuthentication::isAuthorized(peerAddress()) ) {
 	state = Forbidden;
 	return FALSE;
     }
     return TRUE;
 }
 
 void ServerPI::connectionClosed()
 {
-    // qDebug( "Debug: Connection closed" );
+    // odebug << "Debug: Connection closed" << oendl;
     emit connectionClosed(this);
 }
 
 void ServerPI::send( const QString& msg )
 {
     QTextStream os( this );
     os << msg << endl;
-    //qDebug( "Reply: %s", msg.latin1() );
+    //odebug << "Reply: " << msg << "" << oendl;
 }
 
 void ServerPI::read()
 {
     while ( canReadLine() )
 	process( readLine().stripWhiteSpace() );
 }
 
 bool ServerPI::checkReadFile( const QString& file )
 {
     QString filename;
 
@@ -411,49 +400,49 @@ bool ServerPI::checkWriteFile( const QString& file )
 	filename = file;
 
     QFileInfo fi( filename );
 
     if ( fi.exists() )
 	if ( !QFile( filename ).remove() )
 	    return FALSE;
     return TRUE;
 }
 
 void ServerPI::process( const QString& message )
 {
-    //qDebug( "Command: %s", message.latin1() );
+    //odebug << "Command: " << message << "" << oendl;
 
     // split message using "," as separator
     QStringList msg = QStringList::split( " ", message );
     if ( msg.isEmpty() ) return;
 
     // command token
     QString cmd = msg[0].upper();
 
     // argument token
     QString arg;
     if ( msg.count() >= 2 )
 	arg = msg[1];
 
     // full argument string
     QString args;
     if ( msg.count() >= 2 ) {
         QStringList copy( msg );
         // FIXME: for Qt3
         // copy.pop_front()
         copy.remove( copy.begin() );
         args = copy.join( " " );
     }
 
-    //qDebug( "args: %s", args.latin1() );
+    //odebug << "args: " << args << "" << oendl;
 
     // we always respond to QUIT, regardless of state
     if ( cmd == "QUIT" ) {
 	send( "211 Good bye!" ); // No tr
 	close();
 	return;
     }
 
     // connected to client
     if ( Connected == state )
 	return;
 
@@ -574,25 +563,25 @@ void ServerPI::process( const QString& message )
 
     // FTP SERVICE COMMANDS
 
 
     // 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 {
-	    qDebug("550 Requested action not taken");
+        odebug << "550 Requested action not taken" << oendl;
 	    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
 
@@ -680,25 +669,25 @@ void ServerPI::process( const QString& message )
 	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() ) {
-	    qDebug(" Error: no arg");
+        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
 	}
     }
 
     // print working directory (PWD)
@@ -720,33 +709,33 @@ void ServerPI::process( const QString& message )
 	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) ) {
-		    qDebug("du process failed; just sending back 1K");
+            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;
-		    qDebug("sending back gzip guess of %d", guess);
+            odebug << "sending back gzip guess of " << guess << "" << oendl;
 		    send( "213 " + QString::number(guess) );
 		}
 	    }
 	}
     }
     // name list (NLST)
     else if ( cmd == "NLST" ) {
 	send( "502 Command not implemented" ); // No tr
     }
 
     // site parameters (SITE)
     else if ( cmd == "SITE" ) {
@@ -1017,50 +1006,50 @@ QString ServerPI::permissionString( QFileInfo *info )
     if ( info->permission( QFileInfo::ReadOther ) ) s += "r";
     else s += "-";
     if ( info->permission( QFileInfo::WriteOther ) ) s += "w";
     else s += "-";
     if ( info->permission( QFileInfo::ExeOther ) ) s += "x";
     else s += "-";
 
     return s;
 }
 
 void ServerPI::newConnection( int socket )
 {
-    //qDebug( "New incomming connection" );
+    //odebug << "New incomming connection" << oendl;
 
     if ( !passiv ) return;
 
     if ( wait[SendFile] ) {
 	QStringList targets;
 	if ( backupRestoreGzip( waitfile, targets ) )
 	    dtp->sendGzipFile( waitfile, targets );
 	else
 	    dtp->sendFile( waitfile );
 	dtp->setSocket( socket );
     }
     else if ( wait[RetrieveFile] ) {
-      qDebug("check retrieve file");
+      odebug << "check retrieve file" << oendl;
       if ( backupRestoreGzip( waitfile ) )
 	dtp->retrieveGzipFile( waitfile );
       else
 	dtp->retrieveFile( waitfile, storFileSize );
       dtp->setSocket( socket );
     }
     else if ( wait[SendByteArray] ) {
 	dtp->sendByteArray( waitarray );
 	dtp->setSocket( socket );
     }
     else if ( wait[RetrieveByteArray] ) {
-	qDebug("retrieve byte array");
+    odebug << "retrieve byte array" << oendl;
 	dtp->retrieveByteArray();
 	dtp->setSocket( socket );
     }
     else
 	waitsocket = socket;
 
     for( int i = 0; i < 4; i++ )
 	wait[i] = FALSE;
 }
 
 QString ServerPI::absFilePath( const QString& file )
 {
@@ -1102,247 +1091,247 @@ ServerDTP::ServerDTP( QObject *parent, const char* name)
 	   SIGNAL( completed() ) );
   connect( retrieveTargzProc, SIGNAL( processExited() ),
 	   SLOT( extractTarDone() ) );
 }
 
 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 ) {
-	    qDebug( "STOR incomplete" );
+        odebug << "STOR incomplete" << oendl;
 	    file.remove();
 	}
     } else {
 	file.close();
     }
     createTargzProc->kill();
 }
 
 void ServerDTP::extractTarDone()
 {
-    qDebug("extract done");
+    odebug << "extract done" << oendl;
 #ifndef QT_NO_COP
     QCopEnvelope e( "QPE/System", "restoreDone(QString)" );
     e << file.name();
 #endif
 }
 
 void ServerDTP::connected()
 {
   // send file mode
   switch ( mode ) {
   case SendFile :
     if ( !file.exists() || !file.open( IO_ReadOnly) ) {
       emit failed();
       mode = Idle;
       return;
     }
 
-    //qDebug( "Debug: Sending file '%s'", file.name().latin1() );
+    //odebug << "Debug: Sending file '" << file.name() << "'" << oendl;
 
     bytes_written = 0;
     if ( file.size() == 0 ) {
       //make sure it doesn't hang on empty files
       file.close();
       emit completed();
       mode = Idle;
     } else {
       // 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 );
       }
     }
     break;
   case SendGzipFile:
     if ( createTargzProc->isRunning() ) {
       // SHOULDN'T GET HERE, BUT DOING A SAFETY CHECK ANYWAY
-      qWarning("Previous tar --gzip process is still running; killing it...");
+      owarn << "Previous tar --gzip process is still running; killing it..." << oendl;
       createTargzProc->kill();
     }
 
     bytes_written = 0;
-    qDebug("==>start send tar process");
+    odebug << "==>start send tar process" << oendl;
     if ( !createTargzProc->start() )
       qWarning("Error starting %s",
 	       createTargzProc->arguments().join(" ").latin1());
     break;
   case SendBuffer:
     if ( !buf.open( IO_ReadOnly) ) {
       emit failed();
       mode = Idle;
       return;
     }
 
-    // qDebug( "Debug: Sending byte array" );
+    // odebug << "Debug: Sending byte array" << oendl;
     bytes_written = 0;
     while( !buf.atEnd() )
       putch( buf.getch() );
     buf.close();
     break;
   case RetrieveFile:
     // retrieve file mode
     if ( file.exists() && !file.remove() ) {
       emit failed();
       mode = Idle;
       return;
     }
 
     if ( !file.open( IO_WriteOnly) ) {
       emit failed();
       mode = Idle;
       return;
     }
-    // qDebug( "Debug: Retrieving file %s", file.name().latin1() );
+    // odebug << "Debug: Retrieving file " << file.name() << "" << oendl;
     break;
   case RetrieveGzipFile:
-    qDebug("=-> starting tar process to receive .tgz file");
+    odebug << "=-> starting tar process to receive .tgz file" << oendl;
     break;
   case RetrieveBuffer:
     // retrieve buffer mode
     if ( !buf.open( IO_WriteOnly) ) {
       emit failed();
       mode = Idle;
       return;
     }
-    // qDebug( "Debug: Retrieving byte array" );
+    // odebug << "Debug: Retrieving byte array" << oendl;
     break;
   case Idle:
-    qDebug("connection established but mode set to Idle; BUG!");
+    odebug << "connection established but mode set to Idle; BUG!" << oendl;
     break;
   }
 }
 
 void ServerDTP::connectionClosed()
 {
-    //qDebug( "Debug: Data connection closed %ld bytes written", bytes_written );
+    //odebug << "Debug: Data connection closed " << bytes_written << " bytes written" << oendl;
 
     // send file mode
     if ( SendFile == mode ) {
 	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();
     }
 
     // retrieve file mode
     else if ( RetrieveFile == mode ) {
 	file.close();
 	if ( recvFileSize >= 0 && (int)file.size() != recvFileSize ) {
-	    qDebug( "STOR incomplete" );
+        odebug << "STOR incomplete" << oendl;
 	    file.remove();
 	    emit failed();
 	} else {
 	    emit completed();
 	}
     }
 
     else if ( RetrieveGzipFile == mode ) {
-	qDebug("Done writing ungzip file; closing input");
+    odebug << "Done writing ungzip file; closing input" << oendl;
 	retrieveTargzProc->flushStdin();
 	retrieveTargzProc->closeStdin();
     }
 
     // retrieve buffer mode
     else if ( RetrieveBuffer == mode ) {
 	buf.close();
 	emit completed();
     }
 
     mode = Idle;
 }
 
 void ServerDTP::bytesWritten( int bytes )
 {
     bytes_written += bytes;
 
     // send file mode
     if ( SendFile == mode ) {
 
 	if ( bytes_written == file.size() ) {
-	    // qDebug( "Debug: Sending complete: %d bytes", 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 );
 	}
     }
 
     // send buffer mode
     if ( SendBuffer == mode ) {
 
 	if ( bytes_written == buf.size() ) {
-	    // qDebug( "Debug: Sending complete: %d bytes", buf.size() );
+        // odebug << "Debug: Sending complete: " << buf.size() << " bytes" << oendl;
 	    emit completed();
 	    mode = Idle;
 	}
     }
 }
 
 void ServerDTP::readyRead()
 {
     // retrieve file mode
     if ( RetrieveFile == mode ) {
 	QCString s;
 	s.resize( bytesAvailable() );
 	readBlock( s.data(), bytesAvailable() );
 	file.writeBlock( s.data(), s.size() );
     }
     else if ( RetrieveGzipFile == mode ) {
 	if ( !retrieveTargzProc->isRunning() )
 	    retrieveTargzProc->start();
 
       	QByteArray s;
 	s.resize( bytesAvailable() );
 	readBlock( s.data(), bytesAvailable() );
 	retrieveTargzProc->writeToStdin( s );
-	qDebug("wrote %d bytes to ungzip ", s.size() );
+    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() );
     }
 }
 
 void ServerDTP::writeTargzBlock()
 {
     QByteArray block = createTargzProc->readStdout();
     writeBlock( block.data(), block.size() );
-    qDebug("writeTargzBlock %d", block.size());
+    odebug << "writeTargzBlock " << block.size() << "" << oendl;
 }
 
 void ServerDTP::targzDone()
 {
-    qDebug("tar and gzip done");
+    odebug << "tar and gzip done" << oendl;
     emit completed();
     mode = Idle;
     disconnect( createTargzProc, SIGNAL( readyReadStdout() ),
 		    this, SLOT( writeTargzBlock() ) );
 }
 
 void ServerDTP::sendFile( const QString fn, const QHostAddress& host, Q_UINT16 port )
 {
     file.setName( fn );
     mode = SendFile;
     connectToHost( host.toString(), port );
 }
@@ -1361,48 +1350,48 @@ void ServerDTP::sendGzipFile( const QString &fn,
     connectToHost( host.toString(), port );
 }
 
 void ServerDTP::sendGzipFile( const QString &fn,
 			      const QStringList &archiveTargets  )
 {
     mode = SendGzipFile;
     file.setName( fn );
 
     QStringList args = "targzip";
     //args += "-cv";
     args += archiveTargets;
-    qDebug("sendGzipFile %s", args.join(" ").latin1() );
+    odebug << "sendGzipFile " << args.join(" ") << "" << oendl;
     createTargzProc->setArguments( args );
     connect( createTargzProc,
 	     SIGNAL( readyReadStdout() ), SLOT( writeTargzBlock() ) );
 }
 
 void ServerDTP::retrieveFile( const QString fn, const QHostAddress& host, Q_UINT16 port, int fileSize )
 {
     recvFileSize = fileSize;
     file.setName( fn );
     mode = RetrieveFile;
     connectToHost( host.toString(), port );
 }
 
 void ServerDTP::retrieveFile( const QString fn, int fileSize )
 {
     recvFileSize = fileSize;
     file.setName( fn );
     mode = RetrieveFile;
 }
 
 void ServerDTP::retrieveGzipFile( const QString &fn )
 {
-    qDebug("retrieveGzipFile %s", fn.latin1());
+    odebug << "retrieveGzipFile " << fn << "" << oendl;
     file.setName( fn );
     mode = RetrieveGzipFile;
 
     retrieveTargzProc->setArguments( "targunzip" );
     connect( retrieveTargzProc, SIGNAL( processExited() ),
 	     SLOT( extractTarDone() ) );
 }
 
 void ServerDTP::retrieveGzipFile( const QString &fn, const QHostAddress& host, Q_UINT16 port )
 {
     retrieveGzipFile( fn );
     connectToHost( host.toString(), port );