Attachment 45851 Details for Bug 74614

Patch to export iocharset option according to system locale setting.

hal-0.5.4cvs-iocharset.patch (text/x-patch), 2.03 KB, created by Zhe Su on 2005-08-12 06:22:06 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Zhe Su

Created: 2005-08-12 06:22:06 UTC

Size: 2.03 KB

patch

obsolete

>diff -ur hal-0.5.4cvs.old/hald/linux2/osspec.c hal-0.5.4cvs/hald/linux2/osspec.c
>--- hal-0.5.4cvs.old/hald/linux2/osspec.c	2005-08-05 19:03:25.000000000 +0800
>+++ hal-0.5.4cvs/hald/linux2/osspec.c	2005-08-12 13:36:58.000000000 +0800
>@@ -57,6 +57,9 @@
> #include <sys/ioctl.h>
> #include <net/if.h>
> 
>+#include <langinfo.h>
>+#include <locale.h>
>+
> #include <linux/netlink.h>
> #include <linux/rtnetlink.h>
> #include <sys/ioctl.h>
>@@ -488,6 +491,53 @@
> 	computer_probing_helper_done (d);
> }
> 
>+static const char *
>+get_iocharset_by_codeset (const char *codeset)
>+{
>+	static struct StringMapping
>+       	{
>+		const char *from;
>+		const char *to;
>+	} mapping [] =
>+	{
>+		{ "UTF-8", "utf8" },
>+		{ "BIG5", "cp950" },
>+		{ "BIG5-HKSCS", "cp950" },
>+		{ "EUC-TW", "cp950" },
>+		{ "CP1251", "cp1251" },
>+		{ "EUC-JP", "euc-jp" },
>+		{ "EUC-KR", "cp949" },
>+		{ "GB18030", "cp936" },
>+		{ "GBK", "cp936" },
>+		{ "GB2312", "cp936" },
>+		{ "ISO-8859-1", "iso8859-1" },
>+		{ "ISO-8859-2", "iso8859-2" },
>+		{ "ISO-8859-3", "iso8859-3" },
>+		{ "ISO-8859-4", "iso8859-4" },
>+		{ "ISO-8859-5", "iso8859-5" },
>+		{ "ISO-8859-6", "iso8859-6" },
>+		{ "ISO-8859-7", "iso8859-7" },
>+		{ "ISO-8859-9", "iso8859-9" },
>+		{ "ISO-8859-13", "iso8859-13" },
>+		{ "ISO-8859-14", "iso8859-14" },
>+		{ "ISO-8859-15", "iso8859-15" },
>+		{ "KOI8-R", "koi8-r" },
>+		{ "KOI8-U", "koi8-u" },
>+		{ "SHIFT_JIS", "cp932" },
>+		{ "TIS-620", "cp874" },
>+		{ NULL, NULL }
>+	};
>+
>+	size_t i;
>+
>+	for (i = 0; mapping [i].from != NULL; ++i) {
>+		if (strcmp (codeset, mapping [i].from) == 0)
>+			return mapping [i].to;
>+	}
>+
>+	return "utf8";
>+}
>+
> void 
> osspec_probe (void)
> {
>@@ -513,6 +563,9 @@
> 	/* can be overridden by dmidecode, others */
> 	hal_device_property_set_string (root, "system.formfactor", "unknown");
> 
>+	setlocale (LC_ALL, "");
>+
>+	hal_device_property_set_string (root, "system.default_iocharset", get_iocharset_by_codeset (nl_langinfo (CODESET)));
> 
> 	/* Let computer be in TDL while synthesizing all other events because some may write to the object */
> 	hal_device_store_add (hald_get_tdl (), root);

Actions: View

Attachments on bug 74614: 45851 | 45852 | 45853 | 45857 | 45930 | 45931 | 45961