X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Ffs%2Fdir.cpp;h=3811c3f447f7f4b0b7677b17be8ce4d0f454f82a;hb=8bbba6b8cd02c33612fb173e6df48b130407af8f;hp=8625b783ef464357439833a0d3685175ab40041a;hpb=9e98607f1b6a2c757de51fca6c1649cbdf536597;p=libs%2Fcore.git diff --git a/source/fs/dir.cpp b/source/fs/dir.cpp index 8625b78..3811c3f 100644 --- a/source/fs/dir.cpp +++ b/source/fs/dir.cpp @@ -37,17 +37,17 @@ const Path &get_bin_dir(const string &argv0) if(!(argv0==last_argv0)) { Path exe; - if(argv0.find('/')==string::npos) - { - const char *path = getenv("PATH"); - vector dirs = split(path, ITEMSEP); - for(vector::const_iterator i=dirs.begin(); i!=dirs.end(); ++i) - if(exists(Path(*i)/argv0)) - { - exe = realpath(Path(*i)/argv0); - break; - } - } + if(argv0.find(DIRSEP)==string::npos) + if(const char *path = getenv("PATH")) + { + vector dirs = split(path, ITEMSEP); + for(vector::const_iterator i=dirs.begin(); i!=dirs.end(); ++i) + if(exists(Path(*i)/argv0)) + { + exe = realpath(Path(*i)/argv0); + break; + } + } if(exe.empty()) exe = realpath(argv0);