From 716a4440ae8cf4d36918f00e1ea3250184285d98 Mon Sep 17 00:00:00 2001
From: Angus Leeming <leeming@lyx.org>
Date: Thu, 15 Dec 2005 23:08:53 +0000
Subject: [PATCH] Finish off the previous commit (sorry 'bout that): set
 setUseShell if quoting args.

svn path=/trunk/KDE/kdegraphics/kviewshell/plugins/dvi/; revision=488807
---
 dviRenderer.cpp        | 4 +++-
 dviRenderer_export.cpp | 8 ++++++--
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/dviRenderer.cpp b/dviRenderer.cpp
index 49f765c28..f1b3e8454 100644
--- a/dviRenderer.cpp
+++ b/dviRenderer.cpp
@@ -744,7 +744,8 @@ void dviRenderer::handleSRCLink(const QString &linkText, QMouseEvent *e, Documen
   }
 
   // Set up a shell process with the editor command.
-  proc = new KProcess();
+  proc = new KProcess;
+  
   if (proc == 0) {
     kdError(kvs::dvi) << "Could not allocate ShellProcess for the editor command." << endl;
     return;
@@ -766,6 +767,7 @@ void dviRenderer::handleSRCLink(const QString &linkText, QMouseEvent *e, Documen
 
 
   proc->clearArguments();
+  proc->setUseShell(true, getenv("SHELL"));
   *proc << command;
   proc->closeStdin();
   if (proc->start(KProcess::NotifyOnExit, KProcess::AllOutput) == false) {
diff --git a/dviRenderer_export.cpp b/dviRenderer_export.cpp
index 2a41c4811..d421aabfa 100644
--- a/dviRenderer_export.cpp
+++ b/dviRenderer_export.cpp
@@ -120,7 +120,7 @@ void dviRenderer::exportPDF()
     qApp->connect(progress, SIGNAL(finished()), this, SLOT(abortExternalProgramm()));
   }
 
-  proc = new KProcess();
+  proc = new KProcess;
   if (proc == 0) {
     kdError(kvs::dvi) << "Could not allocate ShellProcess for the dvipdfm command." << endl;
     return;
@@ -137,6 +137,8 @@ void dviRenderer::exportPDF()
   info->clear(i18n("Export: %1 to PDF").arg(KProcess::quote(dviFile->filename)));
 
   proc->clearArguments();
+  proc->setUseShell(true, getenv("SHELL"));
+
   finfo.setFile(dviFile->filename);
   *proc << QString("cd %1; dvipdfm").arg(KProcess::quote(finfo.dirPath(true)));
   *proc << QString("-o %1").arg(KProcess::quote(fileName));
@@ -286,7 +288,7 @@ void dviRenderer::exportPS(const QString& fname, const QString& options, KPrinte
   }
 
   // Allocate and initialize the shell process.
-  proc = new KProcess();
+  proc = new KProcess;
   if (proc == 0) {
     kdError(kvs::dvi) << "Could not allocate ShellProcess for the dvips command." << endl;
     return;
@@ -301,6 +303,8 @@ void dviRenderer::exportPS(const QString& fname, const QString& options, KPrinte
   info->clear(i18n("Export: %1 to PostScript").arg(KProcess::quote(dviFile->filename)));
 
   proc->clearArguments();
+  proc->setUseShell(true, getenv("SHELL"));
+
   QFileInfo finfo(dviFile->filename);
   *proc << QString("cd %1; dvips").arg(KProcess::quote(finfo.dirPath(true)));
   if (printer == 0)