Llewellyn/conky
1
0
Fork 0
mirror of https://github.com/Llewellynvdm/conky.git synced 2024-11-20 03:51:18 +00:00
Code Issues Releases Activity

Fix user_times bug (launchpad #405188).

Browse Source
This commit is contained in:
Cesare Tirabassi 2009-07-27 15:09:18 -06:00 committed by Brenden Matthews
parent d081976ad8
commit 57f65ec30c
2 changed files with 2 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/conky.c
View File

@ -1,5 +1,4 @@
/* Conky, a system monitor, based on torsmo /* Conky, a system monitor, based on torsmo
*
* *
* Any original torsmo code is licensed under the BSD license * Any original torsmo code is licensed under the BSD license
* *

19
src/users.c
View File

@ -24,7 +24,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
* *
* vim: ts=4 sw=4 noet ai cindent syntax=c * vim: ts=4 sw=4 noet ai cindent syntax=c
* * -*- c-basic-offset: 4; tab-width: 4 -*-
*/ */
#include "conky.h" #include "conky.h"
@ -76,7 +76,6 @@ static void user_time(char *ptr)
{ {
const struct utmp *usr; const struct utmp *usr;
time_t log_in, real, diff; time_t log_in, real, diff;
struct tm *dtime;
char buf[BUFLEN] = ""; char buf[BUFLEN] = "";
setutent(); setutent();
@ -85,21 +84,7 @@ static void user_time(char *ptr)
log_in = usr->ut_time; log_in = usr->ut_time;
time(&real); time(&real);
diff = difftime(real, log_in); diff = difftime(real, log_in);
dtime = localtime(&diff); format_seconds(buf, BUFLEN, diff);
dtime->tm_year = dtime->tm_year - 70;
dtime->tm_mon = dtime->tm_mon - 1;
dtime->tm_mday = dtime->tm_mday - 1;
if (dtime->tm_year > 0) {
strftime(buf, BUFLEN, "%yy %mm %dd %Hh %Mm", dtime);
} else if (dtime->tm_mon > 0) {
strftime(buf, BUFLEN, "%mm %dd %Hh %Mm", dtime);
} else if (dtime->tm_mday > 0) {
strftime(buf, BUFLEN, "%dd %Hh %Mm", dtime);
} else if (dtime->tm_hour > 0) {
strftime(buf, BUFLEN, "%Hh %Mm", dtime);
} else if (dtime->tm_min > 0) {
strftime(buf, BUFLEN, "%Mm", dtime);
}
if (strlen(ptr) + strlen(buf) + 1 <= BUFLEN) { if (strlen(ptr) + strlen(buf) + 1 <= BUFLEN) {
strncat(ptr, buf, BUFLEN-strlen(ptr)-1); strncat(ptr, buf, BUFLEN-strlen(ptr)-1);
} }