sysmo-bts
/
barebox
9
0
Fork 0
Code Releases Activity

hwclock command: use format like the Linux tool does 

Print three-letter abbreviations of the days and months.

With a fixup by Andrey Smirnov:
| common/date.c: Fix off-by-one error
|
| As per http://pubs.opengroup.org/onlinepubs/007908775/xsh/time.h.html
| 'tm_wday' is zero indexed with zero representing Sunday, this is also
| corroborated by the code in rtc_time_to_tm() which used 4 to represent
| Thursday.

Signed-off-by: Andrey Smirnov <andrew.smirnov@gmail.com>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
This commit is contained in:
Sascha Hauer 2015-12-11 12:04:41 +01:00
parent a9e7e68279
commit 6eb5d78419
3 changed files with 21 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
commands/hwclock.c
View File

@ -138,9 +138,7 @@ static int do_hwclock(int argc, char *argv[])
snprintf(t, 12, "%lu", time);
setenv(env_name, t);
} else {
printf("%02d:%02d:%02d %02d-%02d-%04d\n",
tm.tm_hour, tm.tm_min, tm.tm_sec,
tm.tm_mday, tm.tm_mon + 1, tm.tm_year + 1900);
printf("%s\n", time_str(&tm));
}
return 0;

18
common/date.c
View File

@ -148,3 +148,21 @@ mktime (unsigned int year, unsigned int mon,
)*60 + min /* now have minutes */
)*60 + sec; /* finally seconds */
}
const char *time_str(struct rtc_time *tm)
{
const char *weekdays[] = { "Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat" };
const char *months[] = { "Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug",
"Sep", "Oct", "Nov", "Dec" };
static char buf[128];
sprintf(buf, "%s %02d %s %4d %02d:%02d:%02d",
weekdays[tm->tm_wday],
tm->tm_mday,
months[tm->tm_mon],
tm->tm_year + 1900,
tm->tm_hour,
tm->tm_min,
tm->tm_sec);
return buf;
}

2
include/rtc.h
View File

@ -55,4 +55,6 @@ unsigned long mktime (unsigned int, unsigned int, unsigned int,
extern struct rtc_device *rtc_lookup(const char *name);
const char *time_str(struct rtc_time *tm);
#endif /* _RTC_H_ */