mirror of
git://sourceware.org/git/libabigail.git
synced 2024-12-18 16:04:34 +00:00
67435cf6cd
When comparing two directories, abipkgdiff skips symbolic links pointing to ELF binaries altogether. It only consider regular files. This is a problem when abipkgdiff is given two directories that only contain symbolic links. In that case, abipkgdiff just performs no comparison. This patch makes abipkgdiff resolve the symbolic link to its target file. * include/abg-tools-utils.h (maybe_get_symlink_target_file_path): Declare new function. * src/abg-tools-utils.cc (get_stat): Use lstat here, not stat. Update comment. * tools/abipkgdiff.cc (first_package_tree_walker_callback_fn) (second_package_tree_walker_callback_fn): Follow symbolic links to elf files to get their target paths, and only work with that target path. (maybe_get_symlink_target_file_path): Define new function. * test-diff-pkg/symlink-dir-test1-report0.txt New test material. * test-diff-pkg/symlink-dir-test1/dir1/symlinks/foo.o: Likewise. * test-diff-pkg/symlink-dir-test1/dir1/symlinks/libfoo.so: Likewise. * test-diff-pkg/symlink-dir-test1/dir1/targets/foo.c: Likewise. * test-diff-pkg/symlink-dir-test1/dir1/targets/foo.o: Likewise. * test-diff-pkg/symlink-dir-test1/dir1/targets/libfoo.so: Likewise. * test-diff-pkg/symlink-dir-test1/dir2/symlinks/foo.o: Likewise. * test-diff-pkg/symlink-dir-test1/dir2/symlinks/libfoo.so: Likewise. * test-diff-pkg/symlink-dir-test1/dir2/targets/foo.c: Likewise. * test-diff-pkg/symlink-dir-test1/dir2/targets/foo.o: Likewise. * test-diff-pkg/symlink-dir-test1/dir2/targets/libfoo.so: Likewise. * tests/data/Makefile.am: Add the new test material to source distribution. * tests/test-diff-pkg.cc (in_out_spec): Run this test harness over the new test material above. Signed-off-by: Dodji Seketeli <dodji@redhat.com>
197 lines
5.0 KiB
C++
197 lines
5.0 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/>.
|
|
|
|
///@file
|
|
|
|
#include <tr1/memory>
|
|
#include <string>
|
|
#include <ostream>
|
|
#include <istream>
|
|
#include <iostream>
|
|
|
|
namespace abigail
|
|
{
|
|
|
|
namespace tools_utils
|
|
{
|
|
|
|
using std::ostream;
|
|
using std::istream;
|
|
using std::ifstream;
|
|
using std::string;
|
|
using std::tr1::shared_ptr;
|
|
|
|
bool file_exists(const string&);
|
|
bool is_regular_file(const string&);
|
|
bool is_dir(const string&);
|
|
bool maybe_get_symlink_target_file_path(const string& file_path,
|
|
string& target_path);
|
|
bool base_name(string const& path,
|
|
string& file_name);
|
|
bool dir_name(string const &path,
|
|
string& path_dir_name);
|
|
bool ensure_dir_path_created(const string&);
|
|
bool ensure_parent_dir_created(const string&);
|
|
ostream& emit_prefix(const string& prog_name, ostream& out);
|
|
bool check_file(const string& path, ostream& out, const string& prog_name = "");
|
|
bool string_ends_with(const string&, const string&);
|
|
bool string_is_ascii(const string&);
|
|
bool string_is_ascii_identifier(const string&);
|
|
|
|
class temp_file;
|
|
|
|
/// Convenience typedef for a shared_ptr to @ref temp_file.
|
|
typedef shared_ptr<temp_file> temp_file_sptr;
|
|
|
|
/// A temporary file.
|
|
///
|
|
/// This is a helper file around the mkstemp API.
|
|
///
|
|
/// Once the temporary file is created, users can interact with it
|
|
/// using an iostream. They can also get the path to the newly
|
|
/// created temporary file.
|
|
///
|
|
/// When the instance of @ref temp_file is destroyed, the underlying
|
|
/// resources are de-allocated, the underlying temporary file is
|
|
/// closed and removed.
|
|
class temp_file
|
|
{
|
|
struct priv;
|
|
typedef shared_ptr<priv> priv_sptr;
|
|
|
|
priv_sptr priv_;
|
|
|
|
temp_file();
|
|
|
|
public:
|
|
|
|
bool
|
|
is_good() const;
|
|
|
|
const char*
|
|
get_path() const;
|
|
|
|
std::iostream&
|
|
get_stream();
|
|
|
|
static temp_file_sptr
|
|
create();
|
|
}; // end class temp_file
|
|
|
|
size_t
|
|
get_random_number();
|
|
|
|
string
|
|
get_random_number_as_string();
|
|
|
|
/// The different types of files understood the bi* suite of tools.
|
|
enum file_type
|
|
{
|
|
/// A file type we don't know about.
|
|
FILE_TYPE_UNKNOWN,
|
|
/// The native xml file format representing a translation unit.
|
|
FILE_TYPE_NATIVE_BI,
|
|
/// An elf file. Read this kind of file should yield an
|
|
/// abigail::corpus type.
|
|
FILE_TYPE_ELF,
|
|
/// An archive (AR) file.
|
|
FILE_TYPE_AR,
|
|
// A native xml file format representing a corpus of one or several
|
|
// translation units.
|
|
FILE_TYPE_XML_CORPUS,
|
|
// A zip file, possibly containing a corpus of one of several
|
|
// translation units.
|
|
FILE_TYPE_ZIP_CORPUS,
|
|
/// An RPM (.rpm) binary file
|
|
FILE_TYPE_RPM,
|
|
/// An SRPM (.src.rpm) file
|
|
FILE_TYPE_SRPM,
|
|
/// A DEB (.deb) binary file
|
|
FILE_TYPE_DEB,
|
|
/// A plain directory
|
|
FILE_TYPE_DIR,
|
|
/// A tar archive. The archive can be compressed with the popular
|
|
/// compression schemes recognized by GNU tar.
|
|
FILE_TYPE_TAR
|
|
};
|
|
|
|
/// Exit status for abidiff and abicompat tools.
|
|
///
|
|
/// It's actually a bit mask. The value of each enumerator is a power
|
|
/// of two.
|
|
enum abidiff_status
|
|
{
|
|
/// This is for when the compared ABIs are equal.
|
|
///
|
|
/// Its numerical value is 0.
|
|
ABIDIFF_OK = 0,
|
|
|
|
/// This bit is set if there an application error.
|
|
///
|
|
/// Its numerical value is 1.
|
|
ABIDIFF_ERROR = 1,
|
|
|
|
/// This bit is set if the tool is invoked in an non appropriate
|
|
/// manner.
|
|
///
|
|
/// Its numerical value is 2.
|
|
ABIDIFF_USAGE_ERROR = 1 << 1,
|
|
|
|
/// This bit is set if the ABIs being compared are different.
|
|
///
|
|
/// Its numerical value is 4.
|
|
ABIDIFF_ABI_CHANGE = 1 << 2,
|
|
|
|
/// This bit is set if the ABIs being compared are different *and*
|
|
/// are incompatible.
|
|
///
|
|
/// Its numerical value is 8.
|
|
ABIDIFF_ABI_INCOMPATIBLE_CHANGE = 1 << 3
|
|
};
|
|
|
|
abidiff_status
|
|
operator|(abidiff_status, abidiff_status);
|
|
|
|
abidiff_status
|
|
operator&(abidiff_status, abidiff_status);
|
|
|
|
abidiff_status&
|
|
operator|=(abidiff_status&l, abidiff_status r);
|
|
bool
|
|
abidiff_status_has_error(abidiff_status s);
|
|
|
|
bool
|
|
abidiff_status_has_abi_change(abidiff_status s);
|
|
|
|
bool
|
|
abidiff_status_has_incompatible_abi_change(abidiff_status s);
|
|
|
|
ostream&
|
|
operator<<(ostream& output, file_type r);
|
|
|
|
file_type guess_file_type(istream& in);
|
|
file_type guess_file_type(const string& file_path);
|
|
|
|
std::tr1::shared_ptr<char>
|
|
make_path_absolute(const char*p);
|
|
|
|
}// end namespace tools_utils
|
|
}//end namespace abigail
|