Git-Url: 
http://git.frugalware.org/gitweb/gitweb.cgi?p=pacman-g2.git;a=commitdiff;h=f4f1d3efda65d09fd430219b94157ff1a7f1e072

commit f4f1d3efda65d09fd430219b94157ff1a7f1e072
Author: Miklos Vajna <[email protected]>
Date:   Tue Dec 30 16:54:32 2008 +0100

_pacman_db_read()

Fix bug reported by Marcus Habermehl <[email protected]>:

Don't parse "de_DEfoo" as a localised desc, just "de_DE foo". In
practice this means that LC_ALL=C won't strip the first two chars from
any package's pkgdesc, if it starts with a 'C' char.

diff --git a/lib/libpacman/be_files.c b/lib/libpacman/be_files.c
index 3437cd2..2341d03 100644
--- a/lib/libpacman/be_files.c
+++ b/lib/libpacman/be_files.c
@@ -254,7 +254,8 @@ int _pacman_db_read(pmdb_t *db, unsigned int inforeq, 
pmpkg_t *info)
}
STRNCPY(info->desc, (char*)info->desc_localized->data, sizeof(info->desc));
for (i = info->desc_localized; i; i = i->next) {
-                                       if (!strncmp(i->data, handle->language, 
strlen(handle->language))) {
+                                       if (!strncmp(i->data, handle->language, 
strlen(handle->language)) &&
+                                                       
*((char*)i->data+strlen(handle->language)) == ' ') {
STRNCPY(info->desc, (char*)i->data+strlen(handle->language)+1, 
sizeof(info->desc));
}
}
_______________________________________________
Frugalware-git mailing list
[email protected]
http://frugalware.org/mailman/listinfo/frugalware-git

Reply via email to