|
|
@ -158,7 +158,7 @@ static int startApp()
|
|
|
|
|
|
|
|
|
|
|
|
TQString icon;
|
|
|
|
TQString icon;
|
|
|
|
if ( args->isSet("i"))
|
|
|
|
if ( args->isSet("i"))
|
|
|
|
icon = args->getOption("i");
|
|
|
|
icon = args->getOption("i");
|
|
|
|
|
|
|
|
|
|
|
|
bool prompt = true;
|
|
|
|
bool prompt = true;
|
|
|
|
if ( args->isSet("d"))
|
|
|
|
if ( args->isSet("d"))
|
|
|
@ -218,33 +218,24 @@ static int startApp()
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
// Get command
|
|
|
|
// Get command
|
|
|
|
if (args->isSet("c"))
|
|
|
|
if (args->isSet("c")) {
|
|
|
|
{
|
|
|
|
|
|
|
|
command = args->getOption("c");
|
|
|
|
command = args->getOption("c");
|
|
|
|
for (int i=0; i<args->count(); i++)
|
|
|
|
|
|
|
|
{
|
|
|
|
|
|
|
|
TQString arg = TQFile::decodeName(args->arg(i));
|
|
|
|
|
|
|
|
KRun::shellQuote(arg);
|
|
|
|
|
|
|
|
command += " ";
|
|
|
|
|
|
|
|
command += TQFile::encodeName(arg);
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else
|
|
|
|
else {
|
|
|
|
{
|
|
|
|
if( args->count() ) {
|
|
|
|
if( args->count() == 0 )
|
|
|
|
command = args->arg(0);
|
|
|
|
{
|
|
|
|
|
|
|
|
TDECmdLineArgs::usage(i18n("No command specified."));
|
|
|
|
|
|
|
|
exit(1);
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
command = args->arg(0);
|
|
|
|
|
|
|
|
for (int i=1; i<args->count(); i++)
|
|
|
|
|
|
|
|
{
|
|
|
|
|
|
|
|
TQString arg = TQFile::decodeName(args->arg(i));
|
|
|
|
|
|
|
|
KRun::shellQuote(arg);
|
|
|
|
|
|
|
|
command += " ";
|
|
|
|
|
|
|
|
command += TQFile::encodeName(arg);
|
|
|
|
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if (command.stripWhiteSpace().isEmpty()) {
|
|
|
|
|
|
|
|
TDECmdLineArgs::usage(i18n("No command specified."));
|
|
|
|
|
|
|
|
exit(1);
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
for (int i= args->isSet("c") ? 0 : 1; i<args->count(); i++) {
|
|
|
|
|
|
|
|
TQString arg = TQFile::decodeName(args->arg(i));
|
|
|
|
|
|
|
|
KRun::shellQuote(arg);
|
|
|
|
|
|
|
|
command += " ";
|
|
|
|
|
|
|
|
command += TQFile::encodeName(arg);
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
// Don't change uid if we're don't need to.
|
|
|
|
// Don't change uid if we're don't need to.
|
|
|
|
if (!change_uid)
|
|
|
|
if (!change_uid)
|
|
|
|