Merge pull request #1 from realistschuckle/master

Add a right-trim function to allow the Dependency constructor to resolve...
This commit is contained in:
auriamg 2014-05-30 19:13:46 -04:00
commit e94714d862
1 changed files with 10 additions and 1 deletions

View File

@ -22,6 +22,10 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.
*/
#include <algorithm>
#include <functional>
#include <cctype>
#include <locale>
#include "Dependency.h"
#include <iostream>
#include <cstdlib>
@ -38,6 +42,11 @@ std::string stripPrefix(std::string in)
return in.substr(in.rfind("/")+1);
}
std::string& rtrim(std::string &s) {
s.erase(std::find_if(s.rbegin(), s.rend(), std::not1(std::ptr_fun<int, int>(std::isspace))).base(), s.end());
return s;
}
//the pathes to search for dylibs, store it globally to parse the environment variables only once
std::vector<std::string> pathes;
@ -86,7 +95,7 @@ Dependency::Dependency(std::string path)
char original_file_buffer[PATH_MAX];
std::string original_file;
if (not realpath(path.c_str(), original_file_buffer))
if (not realpath(rtrim(path).c_str(), original_file_buffer))
{
std::cerr << "\n/!\\ WARNING : Cannot resolve symlink '" << path.c_str() << "'" << std::endl;
original_file = path;