[incubator-nuttx-apps] branch master updated: testing/fstest: Add hash checking of file's name to avoid creating same-name file

[xiaoxiang]

This is an automated email from the ASF dual-hosted git repository.

xiaoxiang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx-apps.git


The following commit(s) were added to refs/heads/master by this push:
     new d3c7508  testing/fstest: Add hash checking of file's name to avoid 
creating same-name file
d3c7508 is described below

commit d3c750837279091511452acf2debbb8aa4256ec7
Author: Dong Heng <dongh...@espressif.com>
AuthorDate: Mon Mar 29 11:58:36 2021 +0800

    testing/fstest: Add hash checking of file's name to avoid creating 
same-name file
---
 testing/fstest/fstest_main.c | 40 ++++++++++++++++++++++++++++++++++++----
 1 file changed, 36 insertions(+), 4 deletions(-)

diff --git a/testing/fstest/fstest_main.c b/testing/fstest/fstest_main.c
index 413aaa7..750412d 100644
--- a/testing/fstest/fstest_main.c
+++ b/testing/fstest/fstest_main.c
@@ -91,6 +91,7 @@ struct fstest_filedesc_s
   bool failed;
   size_t len;
   uint32_t crc;
+  uint32_t hash;
 };
 
 /****************************************************************************
@@ -189,6 +190,29 @@ static inline char fstest_randchar(void)
 }
 
 /****************************************************************************
+ * Name: fstest_checkexit
+ ****************************************************************************/
+
+static bool fstest_checkexit(FAR struct fstest_filedesc_s *file)
+{
+  int i;
+  bool ret = false;
+
+  for (i = 0; i < CONFIG_TESTING_FSTEST_MAXOPEN; i++)
+    {
+      if (!g_files[i].deleted &&
+          &g_files[i] != file &&
+          g_files[i].hash == file->hash)
+        {
+          ret = true;
+          break;
+        }
+    }
+
+  return ret;
+}
+
+/****************************************************************************
  * Name: fstest_randname
  ****************************************************************************/
 
@@ -217,12 +241,19 @@ static inline void fstest_randname(FAR struct 
fstest_filedesc_s *file)
     }
 
   memcpy(file->name, g_mountdir, dirlen);
-  for (i = dirlen; i < alloclen; i++)
+
+  do
     {
-      file->name[i] = fstest_randchar();
-    }
+      for (i = dirlen; i < alloclen; i++)
+        {
+          file->name[i] = fstest_randchar();
+        }
 
-  file->name[alloclen] = '\0';
+      file->name[alloclen] = '\0';
+      file->hash = crc32((const uint8_t *)file->name + dirlen,
+                         alloclen - dirlen);
+    }
+  while (fstest_checkexit(file));
 }
 
 /****************************************************************************
@@ -251,6 +282,7 @@ static void fstest_freefile(FAR struct fstest_filedesc_s 
*file)
   if (file->name)
     {
       free(file->name);
+      file->name = NULL;
     }
 
   memset(file, 0, sizeof(struct fstest_filedesc_s));