Skip to content

Commit

Permalink
Fixed startup problem (realpath)
Browse files Browse the repository at this point in the history
Fixed type in getgit script
  • Loading branch information
gizmocuz committed Mar 30, 2016
1 parent 854b296 commit abda30c
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 23 deletions.
2 changes: 1 addition & 1 deletion getgit.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ IF(NOT ProjectDate)
ENDIF(NOT ProjectDate)
Gitversion_CHECK_DIRTY("${SOURCE_DIR}" ProjectDirty)
IF(ProjectDirty)
MESSAGE(STATUS "domoticz has been modified locally: add \"-modified\" to hash")
MESSAGE(STATUS "domoticz has been modified locally: adding \"-modified\" to hash")
set (ProjectHash "${ProjectHash}-modified")
ENDIF(ProjectDirty)

Expand Down
23 changes: 1 addition & 22 deletions main/domoticz.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -652,28 +652,7 @@ int main(int argc, char**argv)
if (szroot.size() != 0)
szWWWFolder = szroot;
}

char real_www_path[255];
strcpy(real_www_path, szWWWFolder.c_str());
#ifdef WIN32
LPTSTR pLPSTR = NULL;

if (!GetFullPathName(
szWWWFolder.c_str(),
255,
real_www_path,
&pLPSTR
))
{
strcpy(real_www_path, szWWWFolder.c_str());
}
#else
if (!realpath(szWWWFolder.c_str(), real_www_path))
{
strcpy(real_www_path, szWWWFolder.c_str());
}
#endif
webserver_settings.www_root = real_www_path;
webserver_settings.www_root = szWWWFolder;
m_mainworker.SetWebserverSettings(webserver_settings);
#ifdef WWW_ENABLE_SSL
http::server::ssl_server_settings secure_webserver_settings;
Expand Down

0 comments on commit abda30c

Please sign in to comment.