Send patches - preferably formatted by git format-patch - to patches at archlinux32 dot org.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-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"),