rewrote metastats command in c++, added mothurRemove function to handle ~ error....

[mothur.git] / mergefilecommand.cpp

diff --git a/mergefilecommand.cpp b/mergefilecommand.cpp
index c944e3bc8774aaa9ccffb712cdda823741c7d2e3..04c92fae9a0d2189cb8f1ed69c9c53572fcfee2e 100644 (file)
--- a/mergefilecommand.cpp
+++ b/mergefilecommand.cpp
@@ -140,7 +140,7 @@ int MergeFileCommand::execute(){
                        m->openInputFile(fileNames[i], inputFile);
                        
                        while(!inputFile.eof()){        
-                               if (m->control_pressed) { outputTypes.clear(); inputFile.close(); outputFile.close(); remove(outputFileName.c_str()); return 0;  }
+                               if (m->control_pressed) { outputTypes.clear(); inputFile.close(); outputFile.close(); m->mothurRemove(outputFileName); return 0;  }
                        
                                c = inputFile.get(); 
                                //-1 is eof char
@@ -152,7 +152,7 @@ int MergeFileCommand::execute(){
                
                outputFile.close();
                
-               if (m->control_pressed) { outputTypes.clear();  remove(outputFileName.c_str()); return 0;  }
+               if (m->control_pressed) { outputTypes.clear();  m->mothurRemove(outputFileName); return 0;  }
                
                m->mothurOutEndLine();
                m->mothurOut("Output File Name: "); m->mothurOutEndLine();