diff options
| author | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2011-09-01 17:56:03 +0000 |
|---|---|---|
| committer | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2011-09-01 17:56:03 +0000 |
| commit | 12ede7f8e242f87c62ad3e7739d6a6452be813a1 (patch) | |
| tree | a09a716fb96e2a520a6d35bb9603b4eb14bd208c /apps/nshlib | |
| parent | 0c65db21d1bdc2ca3419f947288e08033f890662 (diff) | |
| download | nuttx-12ede7f8e242f87c62ad3e7739d6a6452be813a1.tar.gz nuttx-12ede7f8e242f87c62ad3e7739d6a6452be813a1.tar.bz2 nuttx-12ede7f8e242f87c62ad3e7739d6a6452be813a1.zip | |
Fix errors in gmtime and gmtime_r
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@3933 42af7a65-404d-4744-a932-0658087f49c3
Diffstat (limited to 'apps/nshlib')
| -rw-r--r-- | apps/nshlib/README.txt | 12 | ||||
| -rw-r--r-- | apps/nshlib/nsh_timcmds.c | 6 |
2 files changed, 15 insertions, 3 deletions
diff --git a/apps/nshlib/README.txt b/apps/nshlib/README.txt index 8435f6317..fad1ac104 100644 --- a/apps/nshlib/README.txt +++ b/apps/nshlib/README.txt @@ -262,6 +262,18 @@ o cp <source-path> <dest-path> Copy of the contents of the file at <source-path> to the location 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>] Copy blocks from <infile> to <outfile>. <nfile> or <outfile> may diff --git a/apps/nshlib/nsh_timcmds.c b/apps/nshlib/nsh_timcmds.c index bf5e6cd5d..04a79e77d 100644 --- a/apps/nshlib/nsh_timcmds.c +++ b/apps/nshlib/nsh_timcmds.c @@ -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 */ - (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 */ @@ -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 */ - token = strtok_r(newtime, " \t",&saveptr); + token = strtok_r(NULL, " \t",&saveptr); if (token == NULL) { 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; } - tm.tm_year = (int)result; + tm.tm_year = (int)result - 1900; /* Convert this to the right form, then set the timer */ |