From 0b01b060cfa53e9eb7d0112ff2ec4490f16d9fbb Mon Sep 17 00:00:00 2001
From: Ray Lee <rayleesky@outlook.com>
Date: Tue, 17 Aug 2021 13:02:22 +0800
Subject: [PATCH 1/4] fix naming convertion messes up

---
 armsrc/Standalone/hf_14asniff.c | 12 ++++++------
 client/src/cmdflashmemspiffs.c  | 11 ++++++++++-
 2 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/armsrc/Standalone/hf_14asniff.c b/armsrc/Standalone/hf_14asniff.c
index 16d351ef0..479405145 100644
--- a/armsrc/Standalone/hf_14asniff.c
+++ b/armsrc/Standalone/hf_14asniff.c
@@ -19,7 +19,7 @@
  * at power-off).
  *
  * Short-pressing the button again will stop sniffing, and at _this_ point
- * append trace data from RAM to a file in flash (hf_14asniff.trc) and unmount.
+ * append trace data from RAM to a file in flash (hf_14asniff.trace) and unmount.
  *
  * Once the data is saved, standalone mode will exit.
  *
@@ -31,10 +31,10 @@
  *
  * To retrieve trace data from flash:
  *
- * 1. mem spiffs dump -s hf_14asniff.trc -d trace.trc
+ * 1. mem spiffs dump -s hf_14asniff.trace -d hf_14asniff.trace
  *    Copies trace data file from flash to your PC.
  *
- * 2. trace load trace.trc
+ * 2. trace load hf_14asniff.trace
  *    Loads trace data from a file into PC-side buffers.
  *
  * 3. For ISO14a: trace list -t 14a -1
@@ -66,13 +66,13 @@
 #include "ticks.h"
 #include "BigBuf.h"
 
-#define HF_14ASNIFF_LOGFILE "hf_14asniff.trc"
+#define HF_14ASNIFF_LOGFILE "hf_14asniff.trace"
 
 static void DownloadTraceInstructions(void) {
     Dbprintf("");
     Dbprintf("To get the trace from flash and display it:");
-    Dbprintf("1. mem spiffs dump -s "HF_14ASNIFF_LOGFILE" -d trace.trc");
-    Dbprintf("2. trace load -f trace.trc");
+    Dbprintf("1. mem spiffs dump -s "HF_14ASNIFF_LOGFILE" -d hf_14asniff.trace");
+    Dbprintf("2. trace load -f hf_14asniff.trace");
     Dbprintf("3. trace list -t 14a -1");
 }
 
diff --git a/client/src/cmdflashmemspiffs.c b/client/src/cmdflashmemspiffs.c
index a3695e658..8582da42f 100644
--- a/client/src/cmdflashmemspiffs.c
+++ b/client/src/cmdflashmemspiffs.c
@@ -383,7 +383,16 @@ static int CmdFlashMemSpiFFSDump(const char *Cmd) {
         strncpy(fn, dest, dlen);
     }
 
-    saveFile(fn, ".bin", dump, len);
+    // set file extension
+    char *suffix = strchr(fn, '.');
+    if (suffix) {
+        int new_fn_len = strlen(fn) - strlen(suffix);
+        char *new_fn = (char *) calloc(new_fn_len, sizeof(char));
+        new_fn = strncpy(new_fn, fn, new_fn_len);
+        saveFile(fn, suffix, dump, len);
+    } else
+        saveFile(fn, ".bin", dump, len); // default
+
     if (eml) {
         uint8_t eml_len = 16;
         if (strstr(fn, "class") != NULL)

From 5e22345111b1288c807966b82632b5fed65ed399 Mon Sep 17 00:00:00 2001
From: Ray Lee <rayleesky@outlook.com>
Date: Tue, 17 Aug 2021 18:15:15 +0800
Subject: [PATCH 2/4] work around

---
 client/src/cmdflashmemspiffs.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/client/src/cmdflashmemspiffs.c b/client/src/cmdflashmemspiffs.c
index 8582da42f..8923d4372 100644
--- a/client/src/cmdflashmemspiffs.c
+++ b/client/src/cmdflashmemspiffs.c
@@ -386,9 +386,9 @@ static int CmdFlashMemSpiFFSDump(const char *Cmd) {
     // set file extension
     char *suffix = strchr(fn, '.');
     if (suffix) {
-        int new_fn_len = strlen(fn) - strlen(suffix);
+        size_t new_fn_len = strlen(fn) - strlen(suffix);
         char *new_fn = (char *) calloc(new_fn_len, sizeof(char));
-        new_fn = strncpy(new_fn, fn, new_fn_len);
+        new_fn = (char *) memccpy(new_fn, fn, new_fn_len, sizeof(char));
         saveFile(fn, suffix, dump, len);
     } else
         saveFile(fn, ".bin", dump, len); // default

From d3232a5ebd1ee3ed5f486feeb253e8129c559d8f Mon Sep 17 00:00:00 2001
From: Ray Lee <rayleesky@outlook.com>
Date: Tue, 17 Aug 2021 20:23:31 +0800
Subject: [PATCH 3/4] rm stupid code

---
 client/src/cmdflashmemspiffs.c | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/client/src/cmdflashmemspiffs.c b/client/src/cmdflashmemspiffs.c
index 8923d4372..2bba7374c 100644
--- a/client/src/cmdflashmemspiffs.c
+++ b/client/src/cmdflashmemspiffs.c
@@ -386,9 +386,6 @@ static int CmdFlashMemSpiFFSDump(const char *Cmd) {
     // set file extension
     char *suffix = strchr(fn, '.');
     if (suffix) {
-        size_t new_fn_len = strlen(fn) - strlen(suffix);
-        char *new_fn = (char *) calloc(new_fn_len, sizeof(char));
-        new_fn = (char *) memccpy(new_fn, fn, new_fn_len, sizeof(char));
         saveFile(fn, suffix, dump, len);
     } else
         saveFile(fn, ".bin", dump, len); // default

From 11afbdfba31ee7f716965a85de5eee16e6b3f289 Mon Sep 17 00:00:00 2001
From: Ray Lee <rayleesky@outlook.com>
Date: Tue, 17 Aug 2021 20:27:04 +0800
Subject: [PATCH 4/4] make style

---
 client/src/cmdflashmemspiffs.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/client/src/cmdflashmemspiffs.c b/client/src/cmdflashmemspiffs.c
index 2bba7374c..04aa7a93f 100644
--- a/client/src/cmdflashmemspiffs.c
+++ b/client/src/cmdflashmemspiffs.c
@@ -385,9 +385,9 @@ static int CmdFlashMemSpiFFSDump(const char *Cmd) {
 
     // set file extension
     char *suffix = strchr(fn, '.');
-    if (suffix) {
+    if (suffix)
         saveFile(fn, suffix, dump, len);
-    } else
+    else
         saveFile(fn, ".bin", dump, len); // default
 
     if (eml) {