Matthew Barnes 464359
--- evolution-data-server-1.9.2/libedataserver/e-data-server-util.c.strftime	2006-11-09 22:40:39.000000000 -0500
Matthew Barnes 464359
+++ evolution-data-server-1.9.2/libedataserver/e-data-server-util.c	2006-11-09 22:43:54.000000000 -0500
Matthew Barnes 464359
@@ -335,11 +335,11 @@
Matthew Barnes 464359
  **/
Matthew Barnes 464359
 size_t e_strftime(char *s, size_t max, const char *fmt, const struct tm *tm)
Matthew Barnes 464359
 {
Matthew Barnes 464359
+	size_t ret;
Matthew Barnes 464359
 #ifdef HAVE_LKSTRFTIME
Matthew Barnes 464359
-	return strftime(s, max, fmt, tm);
Matthew Barnes 464359
+	ret = strftime(s, max, fmt, tm);
Matthew Barnes 464359
 #else
Matthew Barnes 464359
 	char *c, *ffmt, *ff;
Matthew Barnes 464359
-	size_t ret;
Matthew Barnes 464359
 
Matthew Barnes 464359
 	ffmt = g_strdup(fmt);
Matthew Barnes 464359
 	ff = ffmt;
Matthew Barnes 464359
@@ -365,8 +365,10 @@
Matthew Barnes 464359
 
Matthew Barnes 464359
 	ret = strftime(s, max, ffmt, tm);
Matthew Barnes 464359
 	g_free(ffmt);
Matthew Barnes 464359
-	return ret;
Matthew Barnes 464359
 #endif
Matthew Barnes 464359
+	if (ret == 0 && max > 0)
Matthew Barnes 464359
+		s[0] = '\0';
Matthew Barnes 464359
+	return ret;
Matthew Barnes 464359
 }
Matthew Barnes 464359
 
Matthew Barnes 464359
 /**