diff options
| author | Dan McGee <dan@archlinux.org> | 2013-03-11 05:01:55 +0100 |
|---|---|---|
| committer | Allan McRae <allan@archlinux.org> | 2013-03-14 02:47:11 +0100 |
| commit | 163c36bdcde6aa324060bafe5674ea83cf556fd8 (patch) | |
| tree | cd7f67f55b2e24ca3fd70ac02b61e1a7b6a0e9e3 | |
| parent | 62f828014f17596cf8fb5cd2ea0c34cb754f75cb (diff) | |
| download | pacman-163c36bdcde6aa324060bafe5674ea83cf556fd8.tar.gz pacman-163c36bdcde6aa324060bafe5674ea83cf556fd8.tar.xz | |
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>
| -rw-r--r-- | lib/libalpm/util.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/lib/libalpm/util.c b/lib/libalpm/util.c index f4c33a0d..dc1d0435 100644 --- a/lib/libalpm/util.c +++ b/lib/libalpm/util.c @@ -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); } |