summaryrefslogtreecommitdiffstats
path: root/common_decode.cc
diff options
context:
space:
mode:
authorDaniel Baumann <daniel.baumann@progress-linux.org>2020-08-08 17:10:15 +0000
committerDaniel Baumann <daniel.baumann@progress-linux.org>2020-08-08 17:10:15 +0000
commit3c320348b5b78d2a9923527f9eac089eb1e2778d (patch)
treed17322c3a703eb4683e689482c3dbd3041970180 /common_decode.cc
parentAdding upstream version 0.16. (diff)
downloadtarlz-3c320348b5b78d2a9923527f9eac089eb1e2778d.tar.xz
tarlz-3c320348b5b78d2a9923527f9eac089eb1e2778d.zip
Adding upstream version 0.17.upstream/0.17
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'common_decode.cc')
-rw-r--r--common_decode.cc36
1 files changed, 18 insertions, 18 deletions
diff --git a/common_decode.cc b/common_decode.cc
index 791d6e5..6b108c1 100644
--- a/common_decode.cc
+++ b/common_decode.cc
@@ -1,18 +1,18 @@
-/* Tarlz - Archiver with multimember lzip compression
- Copyright (C) 2013-2019 Antonio Diaz Diaz.
+/* Tarlz - Archiver with multimember lzip compression
+ Copyright (C) 2013-2020 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
- the Free Software Foundation, either version 2 of the License, or
- (at your option) any later version.
+ 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
+ the Free Software Foundation, either version 2 of the License, or
+ (at your option) any later version.
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
- You should have received a copy of the GNU General Public License
- along with this program. If not, see <http://www.gnu.org/licenses/>.
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#define _FILE_OFFSET_BITS 64
@@ -180,18 +180,18 @@ bool show_member_name( const Extended & extended, const Tar_header header,
}
-bool check_skip_filename( const Arg_parser & parser,
+bool check_skip_filename( const Cl_options & cl_opts,
std::vector< char > & name_pending,
- const char * const filename, const int filenames )
+ const char * const filename )
{
if( Exclude::excluded( filename ) ) return true; // skip excluded files
- bool skip = filenames > 0;
+ bool skip = cl_opts.filenames > 0;
if( skip )
- for( int i = 0; i < parser.arguments(); ++i )
- if( !parser.code( i ) && parser.argument( i ).size() )
+ for( int i = 0; i < cl_opts.parser.arguments(); ++i )
+ if( nonempty_arg( cl_opts.parser, i ) )
{
const char * const name =
- remove_leading_dotslash( parser.argument( i ).c_str() );
+ remove_leading_dotslash( cl_opts.parser.argument( i ).c_str() );
if( compare_prefix_dir( name, filename ) ||
compare_tslash( name, filename ) )
{ skip = false; name_pending[i] = false; break; }