jeans/Tasmota
jeans/Tasmota
1
0
Fork 0
mirror of https://github.com/arendst/Tasmota.git synced 2025-07-27 20:56:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix rule uncompress log

Browse Source
This commit is contained in:
Theo Arends 2021-04-20 17:34:04 +02:00
parent 78301795a1
commit ba5f912709
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
tasmota/xdrv_10_rules.ino
View File

@ -347,7 +347,8 @@ int32_t SetRule(uint32_t idx, const char *content, bool append = false) {
} }
if (!needsCompress) { // the rule fits uncompressed, so just copy it if (!needsCompress) { // the rule fits uncompressed, so just copy it
strlcpy(Settings.rules[idx] + offset, content, sizeof(Settings.rules[idx])); // strlcpy(Settings.rules[idx] + offset, content, sizeof(Settings.rules[idx]));
strlcpy(Settings.rules[idx] + offset, content, sizeof(Settings.rules[idx]) - offset);
if (0 == Settings.rules[idx][0]) { if (0 == Settings.rules[idx][0]) {
Settings.rules[idx][1] = 0; Settings.rules[idx][1] = 0;
} }
@ -2120,7 +2121,7 @@ void CmndRule(void)
size_t last_index = start_index + MAX_RULE_SIZE - 3; // set max length to what would fit uncompressed, i.e. MAX_RULE_SIZE - 3 (first NULL + length + last NULL) size_t last_index = start_index + MAX_RULE_SIZE - 3; // set max length to what would fit uncompressed, i.e. MAX_RULE_SIZE - 3 (first NULL + length + last NULL)
if (last_index < rule_len) { // if we didn't reach the end, try to shorten to last space character if (last_index < rule_len) { // if we didn't reach the end, try to shorten to last space character
int32_t next_index = rule.lastIndexOf(" ", last_index); int32_t next_index = rule.lastIndexOf(" ", last_index);
if (next_index > 0) { // if space was found and is not at the first position (i.e. we are progressing) if (next_index > start_index) { // if space was found and is not before start_index (i.e. we are progressing)
last_index = next_index; // shrink to the last space last_index = next_index; // shrink to the last space
} // otherwise it means there are no spaces, we need to cut somewhere even if the result cannot be entered back } // otherwise it means there are no spaces, we need to cut somewhere even if the result cannot be entered back
} else { } else {