[packages/rpm.git] / rpm-libmagic-locale.patch

--- rpm-4.5/rpmio/rpmmg.c.org	2012-02-29 16:32:05.655058968 +0100
+++ rpm-4.5/rpmio/rpmmg.c	2012-02-29 16:36:22.430972834 +0100
@@ -1114,7 +1114,28 @@
 	    /*@fallthrough@*/
 	case URL_IS_UNKNOWN:
 	default:
+		char *old_ctype = setlocale(LC_CTYPE, NULL);
+		char *old_collate = setlocale(LC_COLLATE, NULL);
+
+		if (old_ctype) {
+			old_ctype = xstrdup(old_ctype);
+			setlocale(LC_CTYPE, "C");
+		}
+		if (old_collate) {
+			old_collate = xstrdup(old_collate);
+			setlocale(LC_COLLATE, "C");
+		}
+
 	    t = magic_file(mg->ms, fn);
+
+		if (old_ctype) {
+			setlocale(LC_CTYPE, old_ctype);
+			_free(old_ctype);
+		}
+		if (old_collate) {
+			setlocale(LC_COLLATE, old_collate);
+			_free(old_collate);
+		}
 	    /* XXX HACK: libmagic compiled without <pcreposix.h> spews here. */
 	    if (t == NULL) {
 		const char * msg = magic_error(mg->ms);
Commit	Line	Data
26ea8a78 JR	1	--- rpm-4.5/rpmio/rpmmg.c.org 2012-02-29 16:32:05.655058968 +0100
	2	+++ rpm-4.5/rpmio/rpmmg.c 2012-02-29 16:36:22.430972834 +0100
	3	@@ -1114,7 +1114,28 @@
	4	/@fallthrough@/
	5	case URL_IS_UNKNOWN:
	6	default:
a3809792 JR	7	+ char *old_ctype = setlocale(LC_CTYPE, NULL);
	8	+ char *old_collate = setlocale(LC_COLLATE, NULL);
	9	+
	10	+ if (old_ctype) {
	11	+ old_ctype = xstrdup(old_ctype);
	12	+ setlocale(LC_CTYPE, "C");
	13	+ }
	14	+ if (old_collate) {
	15	+ old_collate = xstrdup(old_collate);
	16	+ setlocale(LC_COLLATE, "C");
	17	+ }
	18	+
26ea8a78 JR	19	t = magic_file(mg->ms, fn);
26ea8a78 JR	20	+
a3809792 JR	21	+ if (old_ctype) {
	22	+ setlocale(LC_CTYPE, old_ctype);
	23	+ _free(old_ctype);
	24	+ }
	25	+ if (old_collate) {
	26	+ setlocale(LC_COLLATE, old_collate);
	27	+ _free(old_collate);
	28	+ }
26ea8a78 JR	29	/* XXX HACK: libmagic compiled without <pcreposix.h> spews here. */
	30	if (t == NULL) {
	31	const char * msg = magic_error(mg->ms);