mirror of
git://sourceware.org/git/libabigail.git
synced 2025-02-09 01:57:10 +00:00
This patch adds support for comparing the ABI of binaries contained in a tar archive. If the archive is compressed with gzip, bzip2, lzip, lzma or xz, then abipkgdiff recognizes the usual relevant file extensions and lets the GNU tar program handle the decompression. If the archive is not compressed, abipkgdiff recognizes the UStar (Uniform Standard Tape ARchive) format, even if the archive file name doesn't end with the .tar extension, and lets the GNU tar program handle the extraction. If the file ends up with the .tar extension anyway (even if it's not in the UStar format, abipkgdiff lets the GNU tar program handle its extraction. * config.h.in (WITH_TAR): New configuration preprocessor macro. * configure.ac: Add a new --enable-tar option. It's turned on automatically if the tar program is found in the PATH. Adjust the build configuration report to add the tar archive support. * include/abg-tools-utils.h (string_ends_with): Declare new function. (enum file_type): Add a new FILE_TYPE_TAR enumerator. * src/abg-tools-utils.cc (string_ends_with): Define new function. (operator<<(ostream&, file_type)): Serialize the new FILE_TYPE_TAR enumerator. (guess_file_type): Detect UStar format file by reading its magic number. Detect compressed tar files based on the file path extension. * tools/abipkgdiff.cc (extract_tar): Define new function. (extract_package): Handle tar packages. (main): Handle tar archives. * tools/abidiff.cc (main): Handle the new FILE_TYPE_TAR enumerator. * tools/abilint.cc (main): Likewise. * tests/data/test-diff-pkg/tarpkg-0-dir{1,2}.ta{,r,.bz2, gz}: New test input tarballs. * tests/data/test-diff-pkg/tarpkg-0-report-0.txt: New test output reference. * tests/data/Makefile.am: Add the new test data file above to source distribution. * tests/test-diff-pkg.cc (in_out_specs): Add new tests cases. Signed-off-by: Dodji Seketeli <dodji@redhat.com>
337 lines
9.2 KiB
C++
337 lines
9.2 KiB
C++
// -*- Mode: C++ -*-
|
|
//
|
|
// Copyright (C) 2013-2015 Red Hat, Inc.
|
|
//
|
|
// This file is part of the GNU Application Binary Interface Generic
|
|
// Analysis and Instrumentation Library (libabigail). This library is
|
|
// free software; you can redistribute it and/or modify it under the
|
|
// terms of the GNU Lesser General Public License as published by the
|
|
// Free Software Foundation; either version 3, or (at your option) any
|
|
// later version.
|
|
|
|
// This library 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 Lesser Public License for more details.
|
|
|
|
// You should have received a copy of the GNU Lesser General Public
|
|
// License along with this program; see the file COPYING-LGPLV3. If
|
|
// not, see <http://www.gnu.org/licenses/>.
|
|
//
|
|
// Author: Dodji Seketeli
|
|
|
|
/// @file
|
|
///
|
|
/// This is a program aimed at checking that a binary instrumentation
|
|
/// (bi) file is well formed and valid enough. It acts by loading an
|
|
/// input bi file and saving it back to a temporary file. It then
|
|
/// runs a diff on the two files and expects the result of the diff to
|
|
/// be empty.
|
|
|
|
#include <cstring>
|
|
#include <cstdio>
|
|
#include <cstdlib>
|
|
#include <string>
|
|
#include <iostream>
|
|
#include <fstream>
|
|
#include "abg-tools-utils.h"
|
|
#include "abg-ir.h"
|
|
#include "abg-corpus.h"
|
|
#include "abg-reader.h"
|
|
#include "abg-dwarf-reader.h"
|
|
#include "abg-writer.h"
|
|
|
|
using std::string;
|
|
using std::cerr;
|
|
using std::cin;
|
|
using std::cout;
|
|
using std::ostream;
|
|
using std::ofstream;
|
|
using abigail::tools_utils::check_file;
|
|
using abigail::tools_utils::file_type;
|
|
using abigail::tools_utils::guess_file_type;
|
|
using abigail::corpus;
|
|
using abigail::corpus_sptr;
|
|
using abigail::xml_reader::read_translation_unit_from_file;
|
|
using abigail::xml_reader::read_translation_unit_from_istream;
|
|
using abigail::xml_reader::read_corpus_from_file;
|
|
using abigail::xml_reader::read_corpus_from_native_xml;
|
|
using abigail::xml_reader::read_corpus_from_native_xml_file;
|
|
using abigail::dwarf_reader::read_corpus_from_elf;
|
|
using abigail::xml_writer::write_translation_unit;
|
|
using abigail::xml_writer::write_corpus_to_native_xml;
|
|
using abigail::xml_writer::write_corpus_to_archive;
|
|
|
|
struct options
|
|
{
|
|
string file_path;
|
|
bool read_from_stdin;
|
|
bool read_tu;
|
|
bool diff;
|
|
bool bidiff;
|
|
bool noout;
|
|
std::tr1::shared_ptr<char> di_root_path;
|
|
|
|
options()
|
|
: read_from_stdin(false),
|
|
read_tu(false),
|
|
diff(false),
|
|
bidiff(false),
|
|
noout(false)
|
|
{}
|
|
};//end struct options;
|
|
|
|
static void
|
|
display_usage(const string& prog_name, ostream& out)
|
|
{
|
|
out << "usage: " << prog_name << " [options] [<abi-file1>]\n"
|
|
<< " where options can be:\n"
|
|
<< " --help display this message\n"
|
|
<< " --debug-info-dir <path> the path under which to look for "
|
|
"debug info for the elf <abi-file>\n"
|
|
<< " --diff for xml inputs, perform a text diff between "
|
|
"the input and the memory model saved back to disk\n"
|
|
<< " --bidiff perform an abi diff between the input "
|
|
"and the memory model(not yet implemented)\n"
|
|
<< " --noout do not display anything on stdout\n"
|
|
<< " --stdin|-- read abi-file content from stdin\n"
|
|
<< " --tu expect a single translation unit file\n";
|
|
}
|
|
|
|
bool
|
|
parse_command_line(int argc, char* argv[], options& opts)
|
|
{
|
|
if (argc < 2)
|
|
{
|
|
opts.read_from_stdin = true;
|
|
return true;
|
|
}
|
|
|
|
for (int i = 1; i < argc; ++i)
|
|
{
|
|
if (argv[i][0] != '-')
|
|
{
|
|
if (opts.file_path.empty())
|
|
opts.file_path = argv[i];
|
|
else
|
|
return false;
|
|
}
|
|
else if (!strcmp(argv[i], "--help"))
|
|
return false;
|
|
else if (!strcmp(argv[i], "--debug-info-dir"))
|
|
{
|
|
if (argc <= i + 1
|
|
|| argv[i + 1][0] == '-')
|
|
return false;
|
|
// elfutils wants the root path to the debug info to be
|
|
// absolute.
|
|
opts.di_root_path =
|
|
abigail::tools_utils::make_path_absolute(argv[i + 1]);
|
|
++i;
|
|
}
|
|
else if (!strcmp(argv[i], "--stdin"))
|
|
opts.read_from_stdin = true;
|
|
else if (!strcmp(argv[i], "--tu"))
|
|
opts.read_tu = true;
|
|
else if (!strcmp(argv[i], "--diff"))
|
|
opts.diff = true;
|
|
else if (!strcmp(argv[i], "--bidiff"))
|
|
opts.bidiff = true;
|
|
else if (!strcmp(argv[i], "--noout"))
|
|
opts.noout = true;
|
|
else
|
|
return false;
|
|
}
|
|
|
|
if (opts.file_path.empty())
|
|
opts.read_from_stdin = true;
|
|
return true;
|
|
}
|
|
|
|
/// Reads a bi (binary instrumentation) file, saves it back to a
|
|
/// temporary file and run a diff on the two versions.
|
|
int
|
|
main(int argc, char* argv[])
|
|
{
|
|
options opts;
|
|
if (!parse_command_line(argc, argv, opts))
|
|
{
|
|
display_usage(argv[0], cerr);
|
|
return true;
|
|
}
|
|
|
|
if (opts.read_from_stdin)
|
|
{
|
|
if (!cin.good())
|
|
return true;
|
|
|
|
if (opts.read_tu)
|
|
{
|
|
abigail::translation_unit_sptr tu =
|
|
read_translation_unit_from_istream(&cin);
|
|
|
|
if (!tu)
|
|
{
|
|
cerr << "failed to read the ABI instrumentation from stdin\n";
|
|
return true;
|
|
}
|
|
|
|
if (!opts.noout)
|
|
write_translation_unit(*tu, 0, cout);
|
|
return false;
|
|
}
|
|
else
|
|
{
|
|
corpus_sptr corp = read_corpus_from_native_xml(&cin);
|
|
if (!opts.noout)
|
|
write_corpus_to_native_xml(corp, /*indent=*/0, cout);
|
|
return false;
|
|
}
|
|
}
|
|
else if (!opts.file_path.empty())
|
|
{
|
|
if (!check_file(opts.file_path, cerr))
|
|
return true;
|
|
|
|
abigail::translation_unit_sptr tu;
|
|
abigail::corpus_sptr corp;
|
|
abigail::dwarf_reader::status s = abigail::dwarf_reader::STATUS_OK;
|
|
char* di_root_path = 0;
|
|
file_type type = guess_file_type(opts.file_path);
|
|
|
|
switch (type)
|
|
{
|
|
case abigail::tools_utils::FILE_TYPE_UNKNOWN:
|
|
cerr << "Unknown file type given in input: " << opts.file_path;
|
|
return true;
|
|
case abigail::tools_utils::FILE_TYPE_NATIVE_BI:
|
|
tu = read_translation_unit_from_file(opts.file_path);
|
|
break;
|
|
case abigail::tools_utils::FILE_TYPE_ELF:
|
|
case abigail::tools_utils::FILE_TYPE_AR:
|
|
di_root_path = opts.di_root_path.get();
|
|
corp = read_corpus_from_elf(opts.file_path,
|
|
&di_root_path,
|
|
/*load_all_types=*/false,
|
|
s);
|
|
break;
|
|
case abigail::tools_utils::FILE_TYPE_XML_CORPUS:
|
|
corp = read_corpus_from_native_xml_file(opts.file_path);
|
|
break;
|
|
case abigail::tools_utils::FILE_TYPE_ZIP_CORPUS:
|
|
#if WITH_ZIP_ARCHIVE
|
|
corp = read_corpus_from_file(opts.file_path);
|
|
#endif
|
|
break;
|
|
case abigail::tools_utils::FILE_TYPE_RPM:
|
|
break;
|
|
case abigail::tools_utils::FILE_TYPE_SRPM:
|
|
break;
|
|
case abigail::tools_utils::FILE_TYPE_DEB:
|
|
break;
|
|
case abigail::tools_utils::FILE_TYPE_DIR:
|
|
break;
|
|
case abigail::tools_utils::FILE_TYPE_TAR:
|
|
break;
|
|
}
|
|
|
|
if (!tu && !corp)
|
|
{
|
|
cerr << "failed to read " << opts.file_path << "\n";
|
|
if (!(s & abigail::dwarf_reader::STATUS_OK))
|
|
{
|
|
if (s & abigail::dwarf_reader::STATUS_DEBUG_INFO_NOT_FOUND)
|
|
{
|
|
cerr << "could not find the debug info";
|
|
if(di_root_path == 0)
|
|
cerr << " Maybe you should consider using the "
|
|
"--debug-info-dir1 option to tell me about the "
|
|
"root directory of the debuginfo? "
|
|
"(e.g, --debug-info-dir1 /usr/lib/debug)\n";
|
|
else
|
|
cerr << "Maybe the root path to the debug "
|
|
"information is wrong?\n";
|
|
}
|
|
if (s & abigail::dwarf_reader::STATUS_NO_SYMBOLS_FOUND)
|
|
cerr << "could not find the ELF symbols in the file "
|
|
<< opts.file_path
|
|
<< "\n";
|
|
}
|
|
return true;
|
|
}
|
|
|
|
using abigail::tools_utils::temp_file;
|
|
using abigail::tools_utils::temp_file_sptr;
|
|
|
|
temp_file_sptr tmp_file = temp_file::create();
|
|
if (!tmp_file)
|
|
{
|
|
cerr << "failed to create temporary file\n";
|
|
return true;
|
|
}
|
|
|
|
std::iostream& of = tmp_file->get_stream();
|
|
bool r = true;
|
|
|
|
if (tu)
|
|
{
|
|
if (opts.diff)
|
|
r = write_translation_unit(*tu, /*indent=*/0,
|
|
tmp_file->get_stream());
|
|
if (!opts.noout && !opts.diff)
|
|
r &= write_translation_unit(*tu, /*indent=*/0, cout);
|
|
}
|
|
else
|
|
{
|
|
r = true;
|
|
if (type == abigail::tools_utils::FILE_TYPE_XML_CORPUS)
|
|
{
|
|
if (opts.diff)
|
|
r = write_corpus_to_native_xml(corp, /*indent=*/0, of);
|
|
|
|
if (!opts.noout && !opts.diff)
|
|
r &= write_corpus_to_native_xml(corp, /*indent=*/0, cout);
|
|
}
|
|
else if (type == abigail::tools_utils::FILE_TYPE_ZIP_CORPUS)
|
|
{
|
|
#ifdef WITH_ZIP_ARCHIVE
|
|
if (!opts.noout)
|
|
r = write_corpus_to_archive(*corp, tmp_file->get_path());
|
|
#endif //WITH_ZIP_ARCHIVE
|
|
}
|
|
else if (type == abigail::tools_utils::FILE_TYPE_ELF)
|
|
{
|
|
if (!opts.noout)
|
|
r = write_corpus_to_native_xml(corp, /*indent=*/0, cout);
|
|
}
|
|
}
|
|
|
|
bool is_ok = r;
|
|
|
|
if (!is_ok)
|
|
{
|
|
string output =
|
|
(type == abigail::tools_utils::FILE_TYPE_NATIVE_BI)
|
|
? "translation unit"
|
|
: "ABI corpus";
|
|
cerr << "failed to write the translation unit "
|
|
<< opts.file_path << " back\n";
|
|
}
|
|
|
|
if (is_ok
|
|
&& opts.diff
|
|
&& ((type == abigail::tools_utils::FILE_TYPE_XML_CORPUS)
|
|
|| type == abigail::tools_utils::FILE_TYPE_NATIVE_BI
|
|
|| type == abigail::tools_utils::FILE_TYPE_ZIP_CORPUS))
|
|
{
|
|
string cmd = "diff -u " + opts.file_path + " " + tmp_file->get_path();
|
|
if (system(cmd.c_str()))
|
|
is_ok = false;
|
|
}
|
|
|
|
return !is_ok;
|
|
}
|
|
|
|
return true;
|
|
}
|