xiaoxiang781216 commented on code in PR #3406:
URL: https://github.com/apache/nuttx-apps/pull/3406#discussion_r2844343076
##########
nshlib/nsh_fscmds.c:
##########
@@ -44,9 +44,12 @@
#include <libgen.h>
#include <errno.h>
#include <debug.h>
-
#include "nsh.h"
+#ifdef CONFIG_ARCH_SIM
Review Comment:
why check CONFIG_ARCH_SIM
##########
nshlib/nsh_fscmds.c:
##########
@@ -364,7 +367,126 @@ static int ls_handler(FAR struct nsh_vtbl_s *vtbl, FAR
const char *dirpath,
memset(&buf, 0, sizeof(struct stat));
- /* stat the file */
+ /* If entryp is provided, listing a directory and need to
+ * construct the full path to stat the file. Otherwise, dirpath
+ * is the target itself. (no separate file name as entryp)
+ */
+
+ if (entryp != NULL)
Review Comment:
why dup with line 494
##########
nshlib/nsh_fscmds.c:
##########
@@ -364,7 +367,126 @@ static int ls_handler(FAR struct nsh_vtbl_s *vtbl, FAR
const char *dirpath,
memset(&buf, 0, sizeof(struct stat));
- /* stat the file */
+ /* If entryp is provided, listing a directory and need to
+ * construct the full path to stat the file. Otherwise, dirpath
+ * is the target itself. (no separate file name as entryp)
+ */
+
+ if (entryp != NULL)
+ {
+ FAR char *fullpath = nsh_getdirpath(vtbl, dirpath, entryp->d_name);
+ ret = stat(fullpath, &buf);
+ free(fullpath);
+ }
+ else
+ {
+ ret = stat(dirpath, &buf);
+ }
+
+#ifdef CONFIG_CLOCK_TIMEKEEPING
+ /* manual epoch time to date calculation to reduce extra memory
+ * by using includes For boards with minimal flash.
+ */
+
+# ifdef CONFIG_ARCH_SIM
+ struct timespec ts;
+
+ /* This pulls the ACTUAL current time from your Linux Host */
+
+ /* Sometime defaults to 2008 */
+
+ if (clock_gettime(CLOCK_REALTIME, &ts) == 0)
+ {
+ clock_settime(CLOCK_REALTIME, &ts);
+ }
+# endif
+
+ /* for referencing /data : if not mounted the reference will fail. */
+
+# if defined(CONFIG_ARCH_SIM) && defined(CONFIG_FS_HOSTFS)
+ static bool g_time_synced = false;
+
+ if (!g_time_synced)
+ {
+ struct stat hstat;
+
+ /* Data section always maintains the current time value. */
+
+ if (stat("/data", &hstat) == 0)
+ {
+ struct timespec ts_sync;
+
+ ts_sync.tv_sec = hstat.st_mtime;
+ ts_sync.tv_nsec = 0;
+
+ /* This is the magic line that sets the system clock */
+
+ if (clock_settime(CLOCK_REALTIME, &ts_sync) == 0)
+ {
+ g_time_synced = true;
+ }
+ }
+ }
+# endif
+
+ if (ret == 0 && buf.st_mtime > 0 && buf.st_mtime < 0x7fffffff)
Review Comment:
call strftime instead
##########
nshlib/nsh_fscmds.c:
##########
@@ -364,7 +367,126 @@ static int ls_handler(FAR struct nsh_vtbl_s *vtbl, FAR
const char *dirpath,
memset(&buf, 0, sizeof(struct stat));
- /* stat the file */
+ /* If entryp is provided, listing a directory and need to
+ * construct the full path to stat the file. Otherwise, dirpath
+ * is the target itself. (no separate file name as entryp)
+ */
+
+ if (entryp != NULL)
+ {
+ FAR char *fullpath = nsh_getdirpath(vtbl, dirpath, entryp->d_name);
+ ret = stat(fullpath, &buf);
+ free(fullpath);
+ }
+ else
+ {
+ ret = stat(dirpath, &buf);
+ }
+
+#ifdef CONFIG_CLOCK_TIMEKEEPING
+ /* manual epoch time to date calculation to reduce extra memory
+ * by using includes For boards with minimal flash.
+ */
+
+# ifdef CONFIG_ARCH_SIM
+ struct timespec ts;
+
+ /* This pulls the ACTUAL current time from your Linux Host */
+
+ /* Sometime defaults to 2008 */
+
+ if (clock_gettime(CLOCK_REALTIME, &ts) == 0)
+ {
+ clock_settime(CLOCK_REALTIME, &ts);
+ }
+# endif
+
+ /* for referencing /data : if not mounted the reference will fail. */
+
+# if defined(CONFIG_ARCH_SIM) && defined(CONFIG_FS_HOSTFS)
+ static bool g_time_synced = false;
+
+ if (!g_time_synced)
+ {
+ struct stat hstat;
+
+ /* Data section always maintains the current time value. */
+
+ if (stat("/data", &hstat) == 0)
+ {
+ struct timespec ts_sync;
+
+ ts_sync.tv_sec = hstat.st_mtime;
+ ts_sync.tv_nsec = 0;
+
+ /* This is the magic line that sets the system clock */
+
+ if (clock_settime(CLOCK_REALTIME, &ts_sync) == 0)
+ {
+ g_time_synced = true;
+ }
+ }
+ }
+# endif
+
+ if (ret == 0 && buf.st_mtime > 0 && buf.st_mtime < 0x7fffffff)
+ {
+ uint32_t seconds = (uint32_t)buf.st_mtime;
+ uint32_t minutes = seconds / 60;
+ uint32_t hours = minutes / 60;
+ uint32_t days = hours / 24;
+ uint32_t y = 1970;
+ uint32_t m = 0;
+
+ while (1)
+ {
+ uint32_t diy = (y % 4 == 0 && (y % 100 != 0 ||
+ y % 400 == 0)) ? 366 : 365;
+
+ if (days < diy)
+ {
+ break;
+ }
+
+ days -= diy;
+ y++;
+ }
+
+ static const uint8_t dim[] =
+ {
+ 31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31
+ };
+
+ for (m = 0; m < 12; m++)
+ {
+ uint32_t d_m = dim[m];
+
+ if (m == 1 && (y % 4 == 0 && (y % 100 != 0 || y % 400 == 0)))
+ {
+ d_m = 29;
+ }
+
+ if (days < d_m)
+ {
+ break;
+ }
+
+ days -= d_m;
+ }
+
+ nsh_output(vtbl, " %04u-%02u-%02u %02u:%02u:%02u",
Review Comment:
should move just before file name like bash:
````
drwxr-xr-x 2 xiaoxiang xiaoxiang 4096 Feb 15 11:02 cmake_with_components
drwxr-xr-x 3 xiaoxiang xiaoxiang 4096 Feb 15 11:02 legacy_cmake_relpath
drwxr-xr-x 2 xiaoxiang xiaoxiang 4096 Feb 15 11:02 legacy_cmake_simple
```
##########
nshlib/nsh_fscmds.c:
##########
@@ -364,7 +367,126 @@ static int ls_handler(FAR struct nsh_vtbl_s *vtbl, FAR
const char *dirpath,
memset(&buf, 0, sizeof(struct stat));
- /* stat the file */
+ /* If entryp is provided, listing a directory and need to
+ * construct the full path to stat the file. Otherwise, dirpath
+ * is the target itself. (no separate file name as entryp)
+ */
+
+ if (entryp != NULL)
+ {
+ FAR char *fullpath = nsh_getdirpath(vtbl, dirpath, entryp->d_name);
+ ret = stat(fullpath, &buf);
+ free(fullpath);
+ }
+ else
+ {
+ ret = stat(dirpath, &buf);
+ }
+
+#ifdef CONFIG_CLOCK_TIMEKEEPING
+ /* manual epoch time to date calculation to reduce extra memory
+ * by using includes For boards with minimal flash.
+ */
+
+# ifdef CONFIG_ARCH_SIM
+ struct timespec ts;
+
+ /* This pulls the ACTUAL current time from your Linux Host */
+
+ /* Sometime defaults to 2008 */
+
+ if (clock_gettime(CLOCK_REALTIME, &ts) == 0)
+ {
+ clock_settime(CLOCK_REALTIME, &ts);
Review Comment:
why do you change host time?
##########
nshlib/nsh_fscmds.c:
##########
@@ -364,7 +367,126 @@ static int ls_handler(FAR struct nsh_vtbl_s *vtbl, FAR
const char *dirpath,
memset(&buf, 0, sizeof(struct stat));
- /* stat the file */
+ /* If entryp is provided, listing a directory and need to
+ * construct the full path to stat the file. Otherwise, dirpath
+ * is the target itself. (no separate file name as entryp)
+ */
+
+ if (entryp != NULL)
+ {
+ FAR char *fullpath = nsh_getdirpath(vtbl, dirpath, entryp->d_name);
+ ret = stat(fullpath, &buf);
+ free(fullpath);
+ }
+ else
+ {
+ ret = stat(dirpath, &buf);
+ }
+
+#ifdef CONFIG_CLOCK_TIMEKEEPING
+ /* manual epoch time to date calculation to reduce extra memory
+ * by using includes For boards with minimal flash.
+ */
+
+# ifdef CONFIG_ARCH_SIM
+ struct timespec ts;
+
+ /* This pulls the ACTUAL current time from your Linux Host */
+
+ /* Sometime defaults to 2008 */
+
+ if (clock_gettime(CLOCK_REALTIME, &ts) == 0)
+ {
+ clock_settime(CLOCK_REALTIME, &ts);
+ }
+# endif
+
+ /* for referencing /data : if not mounted the reference will fail. */
+
+# if defined(CONFIG_ARCH_SIM) && defined(CONFIG_FS_HOSTFS)
+ static bool g_time_synced = false;
+
+ if (!g_time_synced)
+ {
+ struct stat hstat;
+
+ /* Data section always maintains the current time value. */
+
+ if (stat("/data", &hstat) == 0)
+ {
+ struct timespec ts_sync;
+
+ ts_sync.tv_sec = hstat.st_mtime;
+ ts_sync.tv_nsec = 0;
+
+ /* This is the magic line that sets the system clock */
+
+ if (clock_settime(CLOCK_REALTIME, &ts_sync) == 0)
Review Comment:
ditto
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
