summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDan McGee <dan@archlinux.org>2007-11-08 23:18:07 -0600
committerDan McGee <dan@archlinux.org>2007-11-08 23:18:07 -0600
commite6673544b2afc9e463cdbf4e7d0bb0b5d7b6b80d (patch)
treebf3982d47f33e872a229a8b31e2528dfeea802a8
parent5b4b4df4c9c2cfb3aa2e4b40c2c49ea8bf10ce37 (diff)
downloadpacman-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>
-rw-r--r--lib/libalpm/be_files.c4
-rw-r--r--lib/libalpm/package.c2
-rw-r--r--src/pacman/package.c7
3 files changed, 11 insertions, 2 deletions
diff --git a/lib/libalpm/be_files.c b/lib/libalpm/be_files.c
index 793a5c63..4b85306b 100644
--- a/lib/libalpm/be_files.c
+++ b/lib/libalpm/be_files.c
@@ -337,8 +337,10 @@ int _alpm_db_read(pmdb_t *db, pmpkg_t *info, pmdbinfrq_t inforeq)
char first = tolower(tmp[0]);
if(first > 'a' && first < 'z') {
struct tm tmp_tm = {0}; //initialize to null incase of failure
+ setlocale(LC_TIME, "C");
strptime(tmp, "%a %b %e %H:%M:%S %Y", &tmp_tm);
info->builddate = mktime(&tmp_tm);
+ setlocale(LC_TIME, "");
} else {
info->builddate = atol(tmp);
}
@@ -352,8 +354,10 @@ int _alpm_db_read(pmdb_t *db, pmpkg_t *info, pmdbinfrq_t inforeq)
char first = tolower(tmp[0]);
if(first > 'a' && first < 'z') {
struct tm tmp_tm = {0}; //initialize to null incase of failure
+ setlocale(LC_TIME, "C");
strptime(tmp, "%a %b %e %H:%M:%S %Y", &tmp_tm);
info->installdate = mktime(&tmp_tm);
+ setlocale(LC_TIME, "");
} else {
info->installdate = atol(tmp);
}
diff --git a/lib/libalpm/package.c b/lib/libalpm/package.c
index 5103a382..1e59938f 100644
--- a/lib/libalpm/package.c
+++ b/lib/libalpm/package.c
@@ -852,8 +852,10 @@ static int parse_descfile(const char *descfile, pmpkg_t *info)
char first = tolower(ptr[0]);
if(first > 'a' && first < 'z') {
struct tm tmp_tm = {0}; //initialize to null incase of failure
+ setlocale(LC_TIME, "C");
strptime(ptr, "%a %b %e %H:%M:%S %Y", &tmp_tm);
info->builddate = mktime(&tmp_tm);
+ setlocale(LC_TIME, "");
} else {
info->builddate = atol(ptr);
}
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"),