mirrors/dotnet-installer
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Merge pull request #2128 from schellap/pakrym

Browse source 
Get Executable name properly
This commit is contained in:
Senthil 2016-03-30 15:25:34 -07:00
commit 92b344a1a9
3 changed files with 18 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/corehost/cli/libhost.cpp
View file

@ -36,7 +36,7 @@ host_mode_t detect_operating_mode(const int argc, const pal::char_t* argv[], pal
p_own_dir->assign(own_dir); p_own_dir->assign(own_dir);
} }
pal::string_t own_dll_filename = strip_file_ext(own_name) + _X(".dll"); pal::string_t own_dll_filename = get_executable(own_name) + _X(".dll");
pal::string_t own_dll = own_dir; pal::string_t own_dll = own_dir;
append_path(&own_dll, own_dll_filename.c_str()); append_path(&own_dll, own_dll_filename.c_str());
trace::info(_X("Own DLL path=[%s]"), own_dll.c_str()); trace::info(_X("Own DLL path=[%s]"), own_dll.c_str());

5
src/corehost/common/pal.h
View file

@ -99,6 +99,8 @@ namespace pal
typedef HMODULE dll_t; typedef HMODULE dll_t;
typedef FARPROC proc_t; typedef FARPROC proc_t;
inline string_t exe_suffix() { return _X(".exe"); }
pal::string_t to_string(int value); pal::string_t to_string(int value);
bool getcwd(pal::string_t* recv); bool getcwd(pal::string_t* recv);
@ -138,6 +140,8 @@ namespace pal
typedef void* dll_t; typedef void* dll_t;
typedef void* proc_t; typedef void* proc_t;
inline string_t exe_suffix() { return _X(""); }
pal::string_t to_string(int value); pal::string_t to_string(int value);
bool getcwd(pal::string_t* recv); bool getcwd(pal::string_t* recv);
@ -156,6 +160,7 @@ namespace pal
inline void to_palstring(const char* str, pal::string_t* out) { out->assign(str); } inline void to_palstring(const char* str, pal::string_t* out) { out->assign(str); }
inline void to_stdstring(const char_t* str, std::string* out) { out->assign(str); } inline void to_stdstring(const char_t* str, std::string* out) { out->assign(str); }
#endif #endif
bool realpath(string_t* path); bool realpath(string_t* path);
bool file_exists(const string_t& path); bool file_exists(const string_t& path);
inline bool directory_exists(const string_t& path) { return file_exists(path); } inline bool directory_exists(const string_t& path) { return file_exists(path); }

18
src/corehost/common/utils.cpp
View file

@ -60,15 +60,21 @@ void append_path(pal::string_t* path1, const pal::char_t* path2)
pal::string_t get_executable(const pal::string_t& filename) pal::string_t get_executable(const pal::string_t& filename)
{ {
pal::string_t result(filename); pal::string_t exe_suffix = pal::exe_suffix();
if (exe_suffix.empty())
if (ends_with(result, _X(".exe"), false))
{ {
// We need to strip off the old extension return filename;
result.erase(result.size() - 4);
} }
return result; if (ends_with(filename, exe_suffix, false))
{
// We need to strip off the old extension
pal::string_t result(filename);
result.erase(result.size() - exe_suffix.size());
return result;
}
return filename;
} }
pal::string_t strip_file_ext(const pal::string_t& path) pal::string_t strip_file_ext(const pal::string_t& path)