support launching applications with user defined arguments

1 files changed, 3 insertions, 2 deletions

diff --git a/core/launcher/applauncher.cpp b/core/launcher/applauncher.cpp
index 08a3cb4..efbf426 100644
--- a/core/launcher/applauncher.cpp
+++ b/core/launcher/applauncher.cpp
@@ -390,194 +390,195 @@ void AppLauncher::sigStopped(int sigPid, int sigStatus)
 	    case SIGTRAP: sig = "SIGTRAP"; break;
 	    default: sig = QString("Unkown %1").arg(exitStatus);
 	}
 	if ( preloadDisabled )
 	    sig += tr("<qt><p>Fast loading has been disabled for this application.  Tap and hold the application icon to reenable it.</qt>");
 
 	QString str = tr("<qt><b>%1</b> was terminated due to signal code %2</qt>").arg( app->name() ).arg( sig );
 	QMessageBox::information(0, tr("Application terminated"), str );
     } else {
 	if ( exitStatus == 255 ) {  //could not find app (because global returns -1)
 	    QMessageBox::information(0, tr("Application not found"), tr("<qt>Could not locate application <b>%1</b></qt>").arg( app->exec() ) );
 	} else  {
 	    QFileInfo fi(QString::fromLatin1("/tmp/qcop-msg-") + appName);
 	    if ( fi.exists() && fi.size() ) {
 		emit terminated(sigPid, appName);
                 qWarning("Re executing obmitted for %s", appName.latin1() );
 //		execute( appName, QString::null );
 		return;
 	    }
 	}
     }
 
 #endif
 
     emit terminated(sigPid, appName);
 }
 #else
 void AppLauncher::sigStopped(int sigPid, int sigStatus)
 {
     qDebug("Unhandled signal : AppLauncher::sigStopped(int sigPid, int sigStatus)");
 }
 #endif // Q_OS_WIN32
 
 bool AppLauncher::isRunning(const QString &app)
 {
     for (QMap<int,QString>::ConstIterator it = runningApps.begin(); it != runningApps.end(); ++it) {
 	if ( *it == app ) {
 #ifdef Q_OS_UNIX
 	    pid_t t = ::__getpgid( it.key() );
 	    if ( t == -1 ) {
 		qDebug("appLauncher bug, %s believed running, but pid %d is not existing", app.data(), it.key() );
 		runningApps.remove( it.key() );
 		return FALSE;
 	    }
 #endif
 	    return TRUE;
 	}
     }
 
     return FALSE;
 }
 
 bool AppLauncher::executeBuiltin(const QString &c, const QString &document)
 {
     Global::Command* builtin = OGlobal::builtinCommands();
     QGuardedPtr<QWidget> *running = OGlobal::builtinRunning();
 
     // Attempt to execute the app using a builtin class for the app
     if (builtin) {
 	for (int i = 0; builtin[i].file; i++) {
 	    if ( builtin[i].file == c ) {
 		if ( running[i] ) {
 		    if ( !document.isNull() && builtin[i].documentary )
 			Global::setDocument(running[i], document);
 		    running[i]->raise();
 		    running[i]->show();
 		    running[i]->setActiveWindow();
 		} else {
 		    running[i] = builtin[i].func( builtin[i].maximized );
 		}
 #ifndef QT_NO_COP
 		QCopEnvelope e("QPE/System", "notBusy(QString)" );
 		e << c; // that was quick ;-)
 #endif
 		return TRUE;
 	    }
 	}
     }
 
     // Convert the command line in to a list of arguments
     QStringList list = QStringList::split(QRegExp("  *"),c);
     QString ap=list[0];
 
     if ( ap == "suspend" ) { // No tr
 	QWSServer::processKeyEvent( 0xffff, Qt::Key_F34, FALSE, TRUE, FALSE );
 	return TRUE;
     }
 
     return FALSE;
 }
 
 bool AppLauncher::execute(const QString &c, const QString &docParam, bool noRaise)
 {
     qWarning("AppLauncher::execute '%s' '%s'", (const char*) c, (const char*) docParam );
     // Convert the command line in to a list of arguments
     QStringList list = QStringList::split(QRegExp("  *"),c);
-    if ( !docParam.isEmpty() )
-	list.append( docParam );
+    QStringList arglist = QStringList::split(QRegExp("  *"),docParam);
+    for ( QStringList::Iterator it = arglist.begin(); it != arglist.end(); ++it )
+        list.append( *it );
 
     QString appName = list[0];
     if ( isRunning(appName) ) {
 	QCString channel = "QPE/Application/";
 	channel += appName.latin1();
 
 	// Need to lock it to avoid race conditions with QPEApplication::processQCopFile
         QFile f(QString::fromLatin1("/tmp/qcop-msg-") + appName);
 	if ( !noRaise && f.open(IO_WriteOnly | IO_Append) ) {
 #ifndef Q_OS_WIN32
 	    flock(f.handle(), LOCK_EX);
 #endif
 
 	    QDataStream ds(&f);
 	    QByteArray b;
 	    QDataStream bstream(b, IO_WriteOnly);
 	    if ( !f.size() ) {
 		ds << channel << QCString("raise()") << b;
 		if ( !waitingHeartbeat.contains( appName ) && appKillerName != appName ) {
 		    int id = startTimer(RAISE_TIMEOUT_MS);
 		    waitingHeartbeat.insert( appName, id );
 		}
 	    }
 	    if ( !docParam.isEmpty() ) {
 		bstream << docParam;
 		ds << channel << QCString("setDocument(QString)") << b;
 	    }
 
 	    f.flush();
 #ifndef Q_OS_WIN32
 	    flock(f.handle(), LOCK_UN);
 #endif
 	    f.close();
 	}
 	if ( QCopChannel::isRegistered(channel) ) // avoid unnecessary warnings
 	    QCopChannel::send(channel,"QPEProcessQCop()");
 
 	return TRUE;
     }
 
 #ifdef QT_NO_QWS_MULTIPROCESS
     QMessageBox::warning( 0, tr("Error"), tr("<qt>Could not find the application %1</qt>").arg(c),
 	tr("OK"), 0, 0, 0, 1 );
 #else
 
     QStrList slist;
     unsigned j;
     for ( j = 0; j < list.count(); j++ )
 	slist.append( list[j].utf8() );
 
     const char **args = new const char *[slist.count() + 1];
     for ( j = 0; j < slist.count(); j++ )
 	args[j] = slist.at(j);
     args[j] = NULL;
 
 #ifndef Q_OS_WIN32
 #ifdef Q_OS_MACX
     if ( qlPid && qlReady && QFile::exists( QPEApplication::qpeDir()+"plugins/application/lib"+args[0] + ".dylib" ) ) {
 #else
     if ( qlPid && qlReady && QFile::exists( QPEApplication::qpeDir()+"plugins/application/lib"+args[0] + ".so" ) ) {
 #endif /* Q_OS_MACX */
 	qDebug( "Quick launching: %s", args[0] );
 	if ( getuid() == 0 )
 	    setpriority( PRIO_PROCESS, qlPid, 0 );
 	QCString qlch("QPE/QuickLauncher-");
 	qlch += QString::number(qlPid);
 	QCopEnvelope env( qlch, "execute(QStrList)" );
 	env << slist;
 	runningApps[qlPid] = QString(args[0]);
 	emit launched(qlPid, QString(args[0]));
 	QCopEnvelope e("QPE/System", "busy()");
 	qlPid = 0;
 	qlReady = FALSE;
 	QTimer::singleShot( getuid() == 0 ? 800 : 1500, this, SLOT(createQuickLauncher()) );
     } else {
 	int pid = ::vfork();
 	if ( !pid ) {
 	    for ( int fd = 3; fd < 100; fd++ )
 		::close( fd );
 	    ::setpgid( ::getpid(), ::getppid() );
 	    // Try bindir first, so that foo/bar works too
 	    ::execv( QPEApplication::qpeDir()+"bin/"+args[0], (char * const *)args );
 	    ::execvp( args[0], (char * const *)args );
 	    _exit( -1 );
 	}
 
 	runningApps[pid] = QString(args[0]);
 	emit launched(pid, QString(args[0]));
 	QCopEnvelope e("QPE/System", "busy()");
     }
 #else
     QProcess *proc = new QProcess(this);
     if (proc){
 	for (int i=0; i < slist.count(); i++)
 	    proc->addArgument(args[i]);
 	connect(proc, SIGNAL(processExited()), this, SLOT(processExited()));