Don't dump core if localtime returns NULL (possible on

hosts with 64-bit time_t and 32-bit int).

Print "??" if the current clock can't
be converted by localtime.  This won't happen until the year
2*31 + 1900, but we don't want to dump core even if the current
clock has the wrong value.
This commit is contained in:
Jim Meyering committed 2004-02-05 09:51:49 +00:00
1 parent c904b0cae6
commit ad669dfe92
1 file changed
+8 -5
+8 -5
View File
@@ -132,11 +132,14 @@ print_uptime (int n, const STRUCT_UTMP *this)
uphours = (uptime - (updays * 86400)) / 3600;
upmins = (uptime - (updays * 86400) - (uphours * 3600)) / 60;
tmn = localtime (&time_now);
printf (_(" %2d:%02d%s up "), ((tmn->tm_hour % 12) == 0
? 12 : tmn->tm_hour % 12),
/* FIXME: use strftime, not am, pm. Uli reports that
the german translation is meaningless. */
tmn->tm_min, (tmn->tm_hour < 12 ? _("am") : _("pm")));
if (tmn)
printf (_(" %2d:%02d%s up "),
((tmn->tm_hour % 12) == 0 ? 12 : tmn->tm_hour % 12),
/* FIXME: use strftime, not am, pm. Uli reports that
the german translation is meaningless. */
tmn->tm_min, (tmn->tm_hour < 12 ? _("am") : _("pm")));
else
printf (_(" ??:???? up "));
if (updays > 0)
printf (ngettext("%d day", "%d days", updays), updays);
printf (" %2d:%02d, ", uphours, upmins);