X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FcreaFilesFromDirectory.cxx;h=8d1da96638dc26c48cd0ef7270495ac2e9443c1e;hb=b25a9c7f156b97660af55abb23d8e56ec8ef1397;hp=06c5e6f024895bb148c9b694845cae3eee698cb8;hpb=57d417898d69cac7894370ea9bccc0888290a0b8;p=crea.git diff --git a/src/creaFilesFromDirectory.cxx b/src/creaFilesFromDirectory.cxx index 06c5e6f..8d1da96 100644 --- a/src/creaFilesFromDirectory.cxx +++ b/src/creaFilesFromDirectory.cxx @@ -1,15 +1,39 @@ +/* +# --------------------------------------------------------------------- +# +# Copyright (c) CREATIS (Centre de Recherche en Acquisition et Traitement de l'Image +# pour la Santé) +# Authors : Eduardo Davila, Frederic Cervenansky, Claire Mouton +# Previous Authors : Laurent Guigues, Jean-Pierre Roux +# CreaTools website : www.creatis.insa-lyon.fr/site/fr/creatools_accueil +# +# This software is governed by the CeCILL-B license under French law and +# abiding by the rules of distribution of free software. You can use, +# modify and/ or redistribute the software under the terms of the CeCILL-B +# license as circulated by CEA, CNRS and INRIA at the following URL +# http://www.cecill.info/licences/Licence_CeCILL-B_V1-en.html +# or in the file LICENSE.txt. +# +# As a counterpart to the access to the source code and rights to copy, +# modify and redistribute granted by the license, users are provided only +# with a limited warranty and the software's author, the holder of the +# economic rights, and the successive licensors have only limited +# liability. +# +# The fact that you are presently reading this means that you have had +# knowledge of the CeCILL-B license and that you accept its terms. +# ------------------------------------------------------------------------ +*/ + /*========================================================================= Program: crea Module: $RCSfile: creaFilesFromDirectory.cxx,v $ Language: C++ - Date: $Date: 2008/12/03 14:53:42 $ - Version: $Revision: 1.2 $ - - Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de - l'Image). All rights reserved. See Doc/License.txt or - http://www.creatis.insa-lyon.fr/Public/crea/License.html for details. + Date: $Date: 2012/11/15 10:43:26 $ + Version: $Revision: 1.7 $ + This software is distributed WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the above copyright notices for more information. @@ -53,6 +77,7 @@ std::string DirList::NormalizePath(std::string const &pathname) const char FILESEPARATOR = '/'; #endif + std::string name = pathname; int size = name.size(); @@ -134,6 +159,7 @@ int DirList::Explore(std::string const &dirpath, bool recursive) dirent *d; for (d = readdir(dir); d; d = readdir(dir)) { + fileName = dirName + d->d_name; if( stat(fileName.c_str(), &buf) != 0 ) { @@ -141,8 +167,12 @@ int DirList::Explore(std::string const &dirpath, bool recursive) } if ( S_ISREG(buf.st_mode) ) //is it a regular file? { - Filenames.push_back( fileName ); - numberOfFiles++; + //printf("EED DirList::Explore [%s]\n" , d->d_name ); + if ( d->d_name[0]!='.') + { + Filenames.push_back( fileName ); + numberOfFiles++; + } } else if ( S_ISDIR(buf.st_mode) ) //directory? {