moparisthebest
/
pacman
mirror of https://github.com/moparisthebest/pacman
1
0
Fork 0
Code Issues Releases Wiki Activity

Save and restore old locale when manipulating via setlocale 

We shouldn't assume a frontend program didn't explicitly set the LC_TIME
setting to a value not in the environment, which is what we previously
assumed. Save the old locale before forcing the 'C' locale and restore
it when we are done.

Signed-off-by: Dan McGee <dan@archlinux.org>
Signed-off-by: Allan McRae <allan@archlinux.org>
This commit is contained in:
Dan McGee 2013-03-10 23:01:55 -05:00 committed by Allan McRae
parent 62f828014f
commit 163c36bdcd
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/libalpm/util.c
View File

@ -1170,12 +1170,16 @@ alpm_time_t _alpm_parsedate(const char *line)
errno = 0;
if(isalpha((unsigned char)line[0])) {
const char *oldlocale;
/* initialize to null in case of failure */
struct tm tmp_tm;
memset(&tmp_tm, 0, sizeof(struct tm));
oldlocale = setlocale(LC_TIME, NULL);
setlocale(LC_TIME, "C");
strptime(line, "%a %b %e %H:%M:%S %Y", &tmp_tm);
setlocale(LC_TIME, "");
setlocale(LC_TIME, oldlocale);
return (alpm_time_t)mktime(&tmp_tm);
}