Filenames.clear();
SimpleFilenames.clear();
DirName = bbGetInputIn();
- bool rec = bbGetInputRecursive();
- /*int nbFiles = */ Explore(DirName, rec);
- CleanFilenames( bbGetInputIn() );
+ /*int nbFiles = */ Explore(DirName, bbGetInputRecursive(), bbGetInputRecursiveLevel() );
+ CleanFilenames( DirName );
bbSetOutputOut(Filenames);
bbSetOutputOutSimple(SimpleFilenames);
}
bbSetInputIn(".");
bbSetInputRecursive(false);
bbSetInputType(0);
+ bbSetInputRecursiveLevel(999);
}
void FilesFromDirectory::bbUserInitializeProcessing()
std::string name = pathname;
int size = name.size();
- if ( name[size-1] != FILESEPARATOR )
+ if (!((name[size-1]=='/')||(name[size-1]=='\\')))
{
name += FILESEPARATOR;
}
-int FilesFromDirectory::Explore(std::string const &dirpath, bool recursive)
+int FilesFromDirectory::Explore(std::string const &dirpath, bool recursive, int recursiveLevel)
{
- int numberOfFiles = 0;
- std::string dirName = NormalizePath(dirpath);
- int tmpNumberOfFiles;
+ int numberOfFiles = 0;
+
+if (recursiveLevel>=0){
+
+ std::string dirName = NormalizePath(dirpath);
+ int tmpNumberOfFiles;
std::string fileName;
#ifdef _MSC_VER
WIN32_FIND_DATA fileData;
numberOfFiles++;
} // Type ALL_directories
- tmpNumberOfFiles = Explore(dirName+fileName, recursive);
+ tmpNumberOfFiles = Explore(dirName+fileName, recursive,recursiveLevel-1);
if ((bbGetInputType()==2)&&tmpNumberOfFiles==0)
{
std::string temp = dirName+fileName;
} // Type Lsast_directories
numberOfFiles = numberOfFiles + tmpNumberOfFiles;
- } // if
+ } // if recursive
+ if ( fileName != "." && fileName != ".." && !recursive )
+ {
+ if ((bbGetInputType()==1) || (bbGetInputType()==2))
+ {
+ std::string temp = dirName+fileName;
+ Filenames.push_back(temp);
+ numberOfFiles++;
+ } // Type All_directories
+ }// fileName && !recursive
} else {
// std::string temp = "\"" +dirName+fileName + "\"";
std::string temp = dirName+fileName;
} // Type files
} // d_name
} else if ( S_ISDIR(buf.st_mode) ) { //directory?
- if ( d->d_name[0] != '.' && recursive ) //we also skip hidden files
+ if ( (d->d_name[0]!='.') && recursive ) //we also skip hidden files
{
if (bbGetInputType()==1)
{
numberOfFiles++;
} // Type All_directories
- tmpNumberOfFiles = Explore( fileName, recursive);
+ tmpNumberOfFiles = Explore( fileName, recursive, recursiveLevel-1);
if ((bbGetInputType()==2)&&tmpNumberOfFiles==0)
{
Filenames.push_back(fileName);
numberOfFiles++;
} // Type Lsast_directories
numberOfFiles = numberOfFiles+tmpNumberOfFiles;
- } // d_name
+ }// d_name && recursive
+ if ( (d->d_name[0]!='.') && !recursive ) { //we also skip hidden files
+ if ((bbGetInputType()==1) || (bbGetInputType()==2))
+ {
+ Filenames.push_back(fileName);
+ numberOfFiles++;
+ } // Type All_directories
+
+ }// d_name && !recursive
+
} else {
//gdcmErrorMacro( "Unexpected error" );
return -1;
}// closedir
#endif
+} // if recursiveLevel
return numberOfFiles;
}