summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Kalnischkies <david@kalnischkies.de>2016-05-28 12:55:21 +0200
committerDavid Kalnischkies <david@kalnischkies.de>2016-05-28 12:55:21 +0200
commiteceb219c2a64f3f81421c3c6587380b6ae81a530 (patch)
treee9329ac116452722e773b33c155d84e84c4ae2cd
parente0b01a85bd8395449a88e1806ea4a4e3acdbac33 (diff)
use de-localed std::put_time instead rolling our own
-rw-r--r--apt-pkg/contrib/strutl.cc14
1 files changed, 5 insertions, 9 deletions
diff --git a/apt-pkg/contrib/strutl.cc b/apt-pkg/contrib/strutl.cc
index 7fdc59228..fba1e3306 100644
--- a/apt-pkg/contrib/strutl.cc
+++ b/apt-pkg/contrib/strutl.cc
@@ -754,15 +754,11 @@ string TimeRFC1123(time_t Date)
if (gmtime_r(&Date, &Conv) == NULL)
return "";
- char Buf[300];
- const char *Day[] = {"Sun","Mon","Tue","Wed","Thu","Fri","Sat"};
- const char *Month[] = {"Jan","Feb","Mar","Apr","May","Jun","Jul",
- "Aug","Sep","Oct","Nov","Dec"};
-
- snprintf(Buf, sizeof(Buf), "%s, %02i %s %i %02i:%02i:%02i GMT",Day[Conv.tm_wday],
- Conv.tm_mday,Month[Conv.tm_mon],Conv.tm_year+1900,Conv.tm_hour,
- Conv.tm_min,Conv.tm_sec);
- return Buf;
+ auto const posix = std::locale("C.UTF-8");
+ std::ostringstream datestr;
+ datestr.imbue(posix);
+ datestr << std::put_time(&Conv, "%a, %d %b %Y %H:%M:%S GMT");
+ return datestr.str();
}
/*}}}*/
// ReadMessages - Read messages from the FD /*{{{*/