From bbd8308cc01941e51e2cbcf88168a5560abe6042 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Tue, 19 Jul 2016 18:05:13 +0200 Subject: ensure Cnf::FindFile doesn't return files below /dev/null Very unlikely, but if the parent is /dev/null, the child empty and the grandchild a value we returned /dev/null/value which doesn't exist, so hardly a problem, but for best operability we should be consistent in our work and return /dev/null always. --- apt-pkg/contrib/fileutl.h | 2 ++ 1 file changed, 2 insertions(+) (limited to 'apt-pkg/contrib/fileutl.h') diff --git a/apt-pkg/contrib/fileutl.h b/apt-pkg/contrib/fileutl.h index f33f7804b..c13613171 100644 --- a/apt-pkg/contrib/fileutl.h +++ b/apt-pkg/contrib/fileutl.h @@ -234,6 +234,8 @@ std::string flCombine(std::string Dir,std::string File); /** \brief Takes a file path and returns the absolute path */ std::string flAbsPath(std::string File); +/** \brief removes superfluous /./ and // from path */ +APT_HIDDEN std::string flNormalize(std::string file); // simple c++ glob std::vector Glob(std::string const &pattern, int flags=0); -- cgit v1.2.3