jeans/openHASP
jeans/openHASP
1
0
Fork 0
mirror of https://github.com/HASwitchPlate/openHASP.git synced 2025-07-28 13:46:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix disk access path separator on Linux

Browse Source
This commit is contained in:
Kuba Szczodrzyński 2024-02-07 23:12:23 +01:00
parent a884fbf705
commit e922042a3d
No known key found for this signature in database
GPG Key ID: 43037AC62A600562
5 changed files with 31 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/dev/posix/hasp_posix.cpp
View File

@ -62,11 +62,11 @@ void PosixDevice::show_info()
if(uname(&uts) < 0) { if(uname(&uts) < 0) {
LOG_ERROR(0, "uname() error"); LOG_ERROR(0, "uname() error");
} else { } else {
LOG_VERBOSE(0, "Sysname: %s", uts.sysname); LOG_VERBOSE(0, "Sysname : %s", uts.sysname);
LOG_VERBOSE(0, "Nodename: %s", uts.nodename); LOG_VERBOSE(0, "Nodename : %s", uts.nodename);
LOG_VERBOSE(0, "Release: %s", uts.release); LOG_VERBOSE(0, "Release : %s", uts.release);
LOG_VERBOSE(0, "Version: %s", uts.version); LOG_VERBOSE(0, "Version : %s", uts.version);
LOG_VERBOSE(0, "Machine: %s", uts.machine); LOG_VERBOSE(0, "Machine : %s", uts.machine);
} }
LOG_VERBOSE(0, "Processor : %s", "unknown"); LOG_VERBOSE(0, "Processor : %s", "unknown");

8
src/hasp/hasp_dispatch.cpp
View File

@ -800,7 +800,11 @@ void dispatch_run_script(const char*, const char* payload, uint8_t source)
path[0] = '.'; path[0] = '.';
path[1] = '\0'; path[1] = '\0';
strcat(path, filename); strcat(path, filename);
#if defined(WINDOWS)
path[1] = '\\'; path[1] = '\\';
#elif defined(POSIX)
path[1] = '/';
#endif
LOG_TRACE(TAG_HASP, F("Loading %s from disk..."), path); LOG_TRACE(TAG_HASP, F("Loading %s from disk..."), path);
std::ifstream f(path); // taking file as inputstream std::ifstream f(path); // taking file as inputstream
@ -1323,8 +1327,8 @@ void dispatch_current_state(uint8_t source)
bool dispatch_factory_reset() bool dispatch_factory_reset()
{ {
bool formatted = true; bool formatted = true;
bool erased = true; bool erased = true;
bool cleared = true; bool cleared = true;
#if ESP32 #if ESP32
erased = nvs_clear_user_config(); erased = nvs_clear_user_config();

4
src/hasp/hasp_page.cpp
View File

@ -244,7 +244,11 @@ void Page::load_jsonl(const char* pagesfile)
path[0] = '.'; path[0] = '.';
path[1] = '\0'; path[1] = '\0';
strcat(path, pagesfile); strcat(path, pagesfile);
#if defined(WINDOWS)
path[1] = '\\'; path[1] = '\\';
#elif defined(POSIX)
path[1] = '/';
#endif
LOG_TRACE(TAG_HASP, F("Loading %s from disk..."), path); LOG_TRACE(TAG_HASP, F("Loading %s from disk..."), path);
std::ifstream f(path); // taking file as inputstream std::ifstream f(path); // taking file as inputstream

1
src/hasp_debug.cpp
View File

@ -29,6 +29,7 @@
#if defined(POSIX) #if defined(POSIX)
#include <unistd.h> #include <unistd.h>
#include <linux/limits.h>
#define cwd getcwd #define cwd getcwd
#endif #endif

26
src/main_pc.cpp
View File

@ -17,6 +17,7 @@
#if defined(POSIX) #if defined(POSIX)
#include <netdb.h> #include <netdb.h>
#include <unistd.h> #include <unistd.h>
#include <linux/limits.h>
#define cwd getcwd #define cwd getcwd
#define cd chdir #define cd chdir
#endif #endif
@ -104,17 +105,20 @@ void InitializeConsoleOutput()
void usage(const char* progName, const char* version) void usage(const char* progName, const char* version)
{ {
std::cout std::cout << "\n"
<< "\n" << progName << " " << version << " [options]" << std::endl
<< progName << " " << version << " [options]" << std::endl << std::endl
<< std::endl << "Options:" << std::endl
<< "Options:" << std::endl << " -h | --help Print this help" << std::endl
<< " -h | --help Print this help" << std::endl << " -W | --width Width of the window" << std::endl
<< " -W | --width Width of the window" << std::endl << " -H | --height Height of the window" << std::endl
<< " -H | --height Height of the window" << std::endl << " -C | --config Configuration directory" << std::endl
<< " -C | --config Configuration directory (default: '~/.local/share/hasp' or 'AppData\\hasp\\hasp')" #if defined(WINDOWS)
<< std::endl << " (default: 'AppData\\hasp\\hasp')" << std::endl
<< std::endl; #elif defined(POSIX)
<< " (default: '~/.local/share/hasp/hasp')" << std::endl
#endif
<< std::endl;
fflush(stdout); fflush(stdout);
} }