sergiotarxz/nuttx-apps
sergiotarxz/nuttx-apps
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix errors in gmtime and gmtime_r

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@3933 42af7a65-404d-4744-a932-0658087f49c3
This commit is contained in:
patacongo 2011-09-01 17:56:03 +00:00
parent 39df853260
commit 49ffd7577a
3 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ChangeLog.txt
View File

@ -102,3 +102,5 @@
of circles. of circles.
* apps/system/i2c: Add an I2C test tool that should help to bring up I2C * apps/system/i2c: Add an I2C test tool that should help to bring up I2C
devices (when it is fully functional). devices (when it is fully functional).
* apps/nshlib/nsh_timcmds.c: Add the date command that can be used to
show or set the time (only if CONFIG_RTC is set).

12
nshlib/README.txt
View File

@ -262,6 +262,18 @@ o cp <source-path> <dest-path>
Copy of the contents of the file at <source-path> to the location Copy of the contents of the file at <source-path> to the location
in the filesystem indicated by <path-path> in the filesystem indicated by <path-path>
o date [-s "MMM DD HH:MM:SS YYYY"]
Show or set the current date and time. This command is only supported
if the platform supported RTC hardware (CONFIG_RTC=y).
Only one format is used both on display and when setting the date/time:
MMM DD HH:MM:SS YYYY. For example,
data -s "Sep 1 11:30:00 2011"
24-hour time format is assumed.
o dd if=<infile> of=<outfile> [bs=<sectsize>] [count=<sectors>] [skip=<sectors>] o dd if=<infile> of=<outfile> [bs=<sectsize>] [count=<sectors>] [skip=<sectors>]
Copy blocks from <infile> to <outfile>. <nfile> or <outfile> may Copy blocks from <infile> to <outfile>. <nfile> or <outfile> may

6
nshlib/nsh_timcmds.c
View File

@ -124,7 +124,7 @@ static inline int date_showtime(FAR struct nsh_vtbl_s *vtbl, FAR const char *nam
/* Break the current time up into the format needed by strftime */ /* Break the current time up into the format needed by strftime */
(void)gmtime_r((FAR const time_t*)ts.tv_sec, &tm); (void)gmtime_r((FAR const time_t*)&ts.tv_sec, &tm);
/* Show the current time in the requested format */ /* Show the current time in the requested format */
@ -166,7 +166,7 @@ static inline int date_settime(FAR struct nsh_vtbl_s *vtbl, FAR const char *name
/* Get the day of the month. NOTE: Accepts day-of-month up to 31 for all months */ /* Get the day of the month. NOTE: Accepts day-of-month up to 31 for all months */
token = strtok_r(newtime, " \t",&saveptr); token = strtok_r(NULL, " \t",&saveptr);
if (token == NULL) if (token == NULL)
{ {
goto errout_bad_parm; goto errout_bad_parm;
@ -237,7 +237,7 @@ static inline int date_settime(FAR struct nsh_vtbl_s *vtbl, FAR const char *name
{ {
goto errout_bad_parm; goto errout_bad_parm;
} }
tm.tm_year = (int)result; tm.tm_year = (int)result - 1900;
/* Convert this to the right form, then set the timer */ /* Convert this to the right form, then set the timer */