X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=getlistcountcommand.cpp;h=980c886cc0cb79f51f892ee13fe4dc2c3061b812;hb=0caf3fbabaa3ece404f8ce77f4c883dc5b1bf1dc;hp=4dc20634c1e53d774348559447c736f736ff4e69;hpb=e150b0b0664caec517485ee6d69dcdade6dcae77;p=mothur.git

diff --git a/getlistcountcommand.cpp b/getlistcountcommand.cpp
index 4dc2063..980c886 100644
--- a/getlistcountcommand.cpp
+++ b/getlistcountcommand.cpp
@@ -114,6 +114,7 @@ GetListCountCommand::GetListCountCommand(string option)  {
 				else { 	m->mothurOut("You have no current list file and the list parameter is required."); m->mothurOutEndLine(); abort = true; }
 			}
 			else if (listfile == "not open") { abort = true; }	
+			else { m->setListFile(listfile); }
 			
 		
 			//check for optional parameter and set defaults
@@ -148,7 +149,7 @@ int GetListCountCommand::execute(){
 		set<string> processedLabels;
 		set<string> userLabels = labels;
 		
-		if (m->control_pressed) { delete input; delete list; for (int i = 0; i < outputNames.size(); i++) {	remove(outputNames[i].c_str());	} return 0;  }
+		if (m->control_pressed) { delete input; delete list; for (int i = 0; i < outputNames.size(); i++) {	m->mothurRemove(outputNames[i]);	} return 0;  }
 		
 		while((list != NULL) && ((allLines == 1) || (userLabels.size() != 0))) {
 			
@@ -156,7 +157,7 @@ int GetListCountCommand::execute(){
 			
 				process(list);
 				
-				if (m->control_pressed) { delete input; delete list; for (int i = 0; i < outputNames.size(); i++) {	remove(outputNames[i].c_str());	} return 0;  }
+				if (m->control_pressed) { delete input; delete list; for (int i = 0; i < outputNames.size(); i++) {	m->mothurRemove(outputNames[i]);	} return 0;  }
 							
 				processedLabels.insert(list->getLabel());
 				userLabels.erase(list->getLabel());
@@ -170,7 +171,7 @@ int GetListCountCommand::execute(){
 				
 				process(list);
 				
-				if (m->control_pressed) { delete input; delete list; for (int i = 0; i < outputNames.size(); i++) {	remove(outputNames[i].c_str());	} return 0;  }
+				if (m->control_pressed) { delete input; delete list; for (int i = 0; i < outputNames.size(); i++) {	m->mothurRemove(outputNames[i]);	} return 0;  }
 
 													
 				processedLabels.insert(list->getLabel());
@@ -207,7 +208,7 @@ int GetListCountCommand::execute(){
 				
 			process(list);	
 			
-			if (m->control_pressed) { delete input; delete list; for (int i = 0; i < outputNames.size(); i++) {	remove(outputNames[i].c_str());	} return 0;  }
+			if (m->control_pressed) { delete input; delete list; for (int i = 0; i < outputNames.size(); i++) {	m->mothurRemove(outputNames[i]);	} return 0;  }
 			
 			delete list;  
 		}