diff options
| author | Dan McGee <dan@archlinux.org> | 2007-11-09 06:18:07 +0100 |
|---|---|---|
| committer | Dan McGee <dan@archlinux.org> | 2007-11-09 06:18:07 +0100 |
| commit | e6673544b2afc9e463cdbf4e7d0bb0b5d7b6b80d (patch) | |
| tree | bf3982d47f33e872a229a8b31e2528dfeea802a8 /src | |
| parent | 5b4b4df4c9c2cfb3aa2e4b40c2c49ea8bf10ce37 (diff) | |
| download | pacman-e6673544b2afc9e463cdbf4e7d0bb0b5d7b6b80d.tar.gz pacman-e6673544b2afc9e463cdbf4e7d0bb0b5d7b6b80d.tar.xz | |
Fix some issues with localized dates/epoch usage
Commit 47622eef4dd8fd86a0aa0e3ebdb7b33f7c9d6804 introduced localized times
in the metadata by way of storing the UNIX epoch value instead of a hard
coded date string. However, it missed a few things:
* If we weren't in the C/POSIX/en_US locale, the date parsing would fail
as it tried to use the abbreviations of the locale being used. Fix this
by switching the LC_TIME value before we parse a date.
* We used ctime to print the date value, which is always the C locale
string. Instead, use strftime to print a localized date string.
Signed-off-by: Dan McGee <dan@archlinux.org>
Diffstat (limited to 'src')
| -rw-r--r-- | src/pacman/package.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/pacman/package.c b/src/pacman/package.c index 459cb8d4..2e2eec91 100644 --- a/src/pacman/package.c +++ b/src/pacman/package.c @@ -45,6 +45,7 @@ void dump_pkg_full(pmpkg_t *pkg, int level) { const char *reason, *descheader; time_t bdate, idate; + char bdatestr[50], idatestr[50]; if(pkg == NULL) { return; @@ -52,7 +53,9 @@ void dump_pkg_full(pmpkg_t *pkg, int level) /* set variables here, do all output below */ bdate = alpm_pkg_get_builddate(pkg); + strftime(bdatestr, 50, "%c", localtime(&bdate)); idate = alpm_pkg_get_installdate(pkg); + strftime(idatestr, 50, "%c", localtime(&idate)); switch((long)alpm_pkg_get_reason(pkg)) { case PM_PKG_REASON_EXPLICIT: @@ -86,9 +89,9 @@ void dump_pkg_full(pmpkg_t *pkg, int level) printf(_("Installed Size : %6.2f K\n"), (float)alpm_pkg_get_size(pkg) / 1024.0); printf(_("Packager : %s\n"), (char *)alpm_pkg_get_packager(pkg)); printf(_("Architecture : %s\n"), (char *)alpm_pkg_get_arch(pkg)); - printf(_("Build Date : %s"), ctime(&bdate)); /*ctime implicit newline */ + printf(_("Build Date : %s\n"), bdatestr); if(level > 0) { - printf(_("Install Date : %s"), ctime(&idate)); /*ctime implicit newline */ + printf(_("Install Date : %s\n"), idatestr); printf(_("Install Reason : %s\n"), reason); } printf(_("Install Script : %s\n"), |