projects
/
paraslash.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 't/clang_analyzer_fixes'
[paraslash.git]
/
command.c
diff --git
a/command.c
b/command.c
index 74d82697dd241c8c435bf2f78d0052a1b5df9b10..b6861b88bbcb36621109f6d9ac7fe80546a42b35 100644
(file)
--- a/
command.c
+++ b/
command.c
@@
-108,7
+108,8
@@
static char *get_status(struct misc_meta_data *nmmd, int parser_friendly)
{
char mtime[30] = "";
char *status, *flags; /* vss status info */
{
char mtime[30] = "";
char *status, *flags; /* vss status info */
- char *ut = uptime_str();
+ /* nobody updates our version of "now" */
+ char *ut = get_server_uptime_str(NULL);
long offset = (nmmd->offset + 500) / 1000;
struct timeval current_time;
struct tm mtime_tm;
long offset = (nmmd->offset + 500) / 1000;
struct timeval current_time;
struct tm mtime_tm;
@@
-258,7
+259,7
@@
int com_si(struct stream_cipher_context *scc, int argc, __a_unused char * const
sender_info = para_strcat(sender_info, info);
free(info);
}
sender_info = para_strcat(sender_info, info);
free(info);
}
- ut =
uptime_str(
);
+ ut =
get_server_uptime_str(now
);
ret = sc_send_va_buffer(scc, "version: " GIT_VERSION "\n"
"up: %s\nplayed: %u\n"
"server_pid: %d\n"
ret = sc_send_va_buffer(scc, "version: " GIT_VERSION "\n"
"up: %s\nplayed: %u\n"
"server_pid: %d\n"