Release-1.7.1-20100920

1 files changed, 16 insertions, 3 deletions

diff --git a/src/msc.cpp b/src/msc.cpp
index 87ec5d3..a60ce90 100644
--- a/src/msc.cpp
+++ b/src/msc.cpp
@@ -112,11 +112,17 @@ void writeMscGraphFromFile(const char *inFile,const char *outDir,
   }
   mscArgs+=" -i \"";
   mscArgs+=inFile;
-  mscArgs+=".msc\" -o \"";
+ 
+  if (QCString(inFile).right(4)!=".msc") // add extension if not given
+  {
+    mscArgs+=".msc";
+  }
+  mscArgs+="\" -o \"";
+
   mscArgs+=outFile;
   mscArgs+=extension+"\"";
   int exitCode;
-  //printf("*** running: %s %s\n",mscExe.data(),mscArgs.data());
+//  printf("*** running: %s %s outDir:%s %s\n",mscExe.data(),mscArgs.data(),outDir,outFile);
   portable_sysTimerStart();
   if ((exitCode=portable_system(mscExe,mscArgs,FALSE))!=0)
   {
@@ -146,6 +152,8 @@ QCString getMscImageMapFromFile(const QCString& inFile, const QCString& outDir,
 {
   QCString outFile = inFile + ".map";
 
+
+  //printf("*** running:getMscImageMapFromFile \n");
   // chdir to the output dir, so dot can find the font file.
   QCString oldDir = convertToQCString(QDir::currentDirPath());
   // go to the html output directory (i.e. path)
@@ -154,7 +162,12 @@ QCString getMscImageMapFromFile(const QCString& inFile, const QCString& outDir,
 
   QCString mscExe = Config_getString("MSCGEN_PATH")+"mscgen"+portable_commandExtension();
   QCString mscArgs = "-T ismap -i \"";
-  mscArgs+=inFile + ".msc\" -o \"";
+  mscArgs+=inFile;
+  if (QCString(inFile).right(4)!=".msc") // add extension if not given
+  {
+    mscArgs+=".msc";
+  }
+  mscArgs+="\" -o \"";
   mscArgs+=outFile + "\"";
 
   int exitCode;