summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthias Dieter Wallnöfer <mdw@samba.org>2010-12-22 09:53:27 +0100
committerMatthias Dieter Wallnöfer <mdw@samba.org>2010-12-22 12:21:16 +0100
commit07bcf6197d9fbdc038513ae3db7f83a9bb8a6cd9 (patch)
tree5b004d8c0bb2b12e447e608c0e9c89211591f6e9
parent4ef842c0d29e09d5876d11eee885b45a11f8c08d (diff)
downloadsamba-07bcf6197d9fbdc038513ae3db7f83a9bb8a6cd9.tar.gz
samba-07bcf6197d9fbdc038513ae3db7f83a9bb8a6cd9.tar.bz2
samba-07bcf6197d9fbdc038513ae3db7f83a9bb8a6cd9.zip
lib/util/time.c - make the "strftime" output locale independant ("%c" is not)
So that it also works on Solaris.
-rw-r--r--lib/util/time.c9
1 files changed, 4 insertions, 5 deletions
diff --git a/lib/util/time.c b/lib/util/time.c
index 7c1532a230..770ebc4374 100644
--- a/lib/util/time.c
+++ b/lib/util/time.c
@@ -384,11 +384,10 @@ _PUBLIC_ char *timestring(TALLOC_CTX *mem_ctx, time_t t)
}
#ifdef HAVE_STRFTIME
- /* some versions of gcc complain about using %c. This is a bug
- in the gcc warning, not a bug in this code. See a recent
- strftime() manual page for details.
- */
- strftime(tempTime,sizeof(tempTime)-1,"%c %Z",tm);
+ /* Some versions of gcc complain about using some special format
+ * specifiers. This is a bug in gcc, not a bug in this code. See a
+ * recent strftime() manual page for details. */
+ strftime(tempTime,sizeof(tempTime)-1,"%a %b %e %X %Y %Z",tm);
TimeBuf = talloc_strdup(mem_ctx, tempTime);
#else
TimeBuf = talloc_strdup(mem_ctx, asctime(tm));