diff options
Diffstat (limited to 'recursive.cc')
| -rw-r--r-- | recursive.cc | 63 |
1 files changed, 53 insertions, 10 deletions
diff --git a/recursive.cc b/recursive.cc index 93943f2..2f347f9 100644 --- a/recursive.cc +++ b/recursive.cc @@ -1,5 +1,5 @@ /* Zutils - Utilities dealing with compressed files - Copyright (C) 2009-2018 Antonio Diaz Diaz. + Copyright (C) 2009-2019 Antonio Diaz Diaz. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -15,9 +15,41 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. */ +// Returns true if full_name is a regular file with an enabled extension +// or (a link to) a directory. +bool test_full_name( const std::string & full_name, const struct stat * stp, + const bool follow ) + { + struct stat st, st2; + if( follow && stat( full_name.c_str(), &st ) != 0 ) return false; + if( !follow && lstat( full_name.c_str(), &st ) != 0 ) return false; + if( S_ISREG( st.st_mode ) ) // regular file + return enabled_format( extension_format( extension_index( full_name ) ) ); + if( !S_ISDIR( st.st_mode ) ) return false; + + std::string prev_dir( full_name ); + bool loop = ( stp && st.st_ino == stp->st_ino && st.st_dev == stp->st_dev ); + if( !loop ) + for( unsigned i = prev_dir.size(); i > 1; ) + { + while( i > 0 && prev_dir[i-1] != '/' ) --i; + if( i == 0 ) break; + if( i > 1 ) --i; // remove trailing slash except at root dir + prev_dir.resize( i ); + if( stat( prev_dir.c_str(), &st2 ) != 0 || !S_ISDIR( st2.st_mode ) || + ( st.st_ino == st2.st_ino && st.st_dev == st2.st_dev ) ) + { loop = true; break; } + } + if( loop ) // full_name already visited or above tree + show_file_error( full_name.c_str(), "warning: Recursive directory loop" ); + return !loop; // (link to) directory + } + + +// Returns in input_filename the next filename. bool next_filename( std::list< std::string > & filenames, std::string & input_filename, bool & error, - const bool recursive, const bool ignore_stdin = false, + const int recursive, const bool ignore_stdin = false, const bool no_messages = false ) { while( !filenames.empty() ) @@ -29,18 +61,30 @@ bool next_filename( std::list< std::string > & filenames, if( ignore_stdin ) continue; input_filename.clear(); return true; } - if( recursive ) + struct stat st; + if( stat( input_filename.c_str(), &st ) == 0 && S_ISDIR( st.st_mode ) ) { - struct stat st; - if( stat( input_filename.c_str(), &st ) == 0 && S_ISDIR( st.st_mode ) ) + if( recursive ) { DIR * const dirp = opendir( input_filename.c_str() ); if( !dirp ) { if( !no_messages ) - show_error2( "Can't open directory", input_filename.c_str() ); + show_file_error( input_filename.c_str(), "Can't open directory", errno ); error = true; continue; } + for( unsigned i = input_filename.size(); + i > 1 && input_filename[i-1] == '/'; --i ) + input_filename.resize( i - 1 ); // remove trailing slashes + struct stat stdot, *stdotp = 0; + if( input_filename[0] != '/' ) // relative path + { + if( input_filename == "." ) input_filename.clear(); + if( stat( ".", &stdot ) == 0 && S_ISDIR( stdot.st_mode ) ) + stdotp = &stdot; + } + if( input_filename.size() && input_filename != "/" ) + input_filename += '/'; std::list< std::string > tmp_list; while( true ) { @@ -48,14 +92,13 @@ bool next_filename( std::list< std::string > & filenames, if( !entryp ) { closedir( dirp ); break; } const std::string tmp_name( entryp->d_name ); if( tmp_name == "." || tmp_name == ".." ) continue; - const std::string full_name( input_filename + "/" + tmp_name ); - if( enabled_format( extension_format( extension_index( tmp_name ) ) ) || - ( stat( full_name.c_str(), &st ) == 0 && S_ISDIR( st.st_mode ) ) ) + const std::string full_name( input_filename + tmp_name ); + if( test_full_name( full_name, stdotp, recursive == 2 ) ) tmp_list.push_back( full_name ); } filenames.splice( filenames.begin(), tmp_list ); - continue; } + continue; } return true; } |