|
 |
4190c80 |
diff -up cups-1.5.4/notifier/dbus.c.dbus-utf8 cups-1.5.4/notifier/dbus.c
|
|
|
4190c80 |
--- cups-1.5.4/notifier/dbus.c.dbus-utf8 2012-01-13 23:00:22.000000000 +0000
|
|
|
4190c80 |
+++ cups-1.5.4/notifier/dbus.c 2012-10-31 11:30:08.217215685 +0000
|
|
|
4190c80 |
@@ -31,6 +31,9 @@
|
|
|
4190c80 |
#include <sys/stat.h>
|
|
|
4190c80 |
#include <sys/types.h>
|
|
|
4190c80 |
#include <unistd.h>
|
|
|
4190c80 |
+#include <assert.h>
|
|
|
4190c80 |
+#include <locale.h>
|
|
|
4190c80 |
+#include <wchar.h>
|
|
|
4190c80 |
|
|
|
4190c80 |
#include <dbus/dbus.h>
|
|
|
4190c80 |
#ifdef HAVE_DBUS_MESSAGE_ITER_INIT_APPEND
|
|
|
4190c80 |
@@ -156,10 +159,82 @@ enum
|
|
|
4190c80 |
* Local functions...
|
|
|
4190c80 |
*/
|
|
|
4190c80 |
|
|
|
4190c80 |
-static int acquire_lock(int *fd, char *lockfile, size_t locksize);
|
|
|
4190c80 |
+static int acquire_lock(int *fd, char *lockfile, size_t locksize);
|
|
|
4190c80 |
+static const char *validate_utf8(const char *str);
|
|
|
4190c80 |
|
|
|
4190c80 |
|
|
|
4190c80 |
/*
|
|
|
4190c80 |
+ * 'validate_utf8()' - Convert to valid UTF-8
|
|
|
4190c80 |
+ */
|
|
|
4190c80 |
+
|
|
|
4190c80 |
+static const char *
|
|
|
4190c80 |
+validate_utf8 (const char *str)
|
|
|
4190c80 |
+{
|
|
|
4190c80 |
+ static char *buffer = NULL;
|
|
|
4190c80 |
+ static size_t buflen = 0;
|
|
|
4190c80 |
+ char *p;
|
|
|
4190c80 |
+ size_t str_len;
|
|
|
4190c80 |
+ unsigned int i;
|
|
|
4190c80 |
+ mbstate_t instate, outstate;
|
|
|
4190c80 |
+
|
|
|
4190c80 |
+ if (str == NULL)
|
|
|
4190c80 |
+ {
|
|
|
4190c80 |
+ free (buffer);
|
|
|
4190c80 |
+ return (NULL);
|
|
|
4190c80 |
+ }
|
|
|
4190c80 |
+
|
|
|
4190c80 |
+ /* Is it already valid? */
|
|
|
4190c80 |
+ if (mbstowcs (NULL, str, 0) != (size_t) -1)
|
|
|
4190c80 |
+ return str;
|
|
|
4190c80 |
+
|
|
|
4190c80 |
+ /* Make sure our buffer is at least as large as the input string */
|
|
|
4190c80 |
+ str_len = strlen (str);
|
|
|
4190c80 |
+ if (str_len > buflen)
|
|
|
4190c80 |
+ {
|
|
|
4190c80 |
+ if (buffer == NULL)
|
|
|
4190c80 |
+ /* Set encoding type to UTF-8 the first time we need to */
|
|
|
4190c80 |
+ setlocale (LC_CTYPE, "en_US.UTF-8");
|
|
|
4190c80 |
+
|
|
|
4190c80 |
+ buflen = str_len + 1;
|
|
|
4190c80 |
+ buffer = realloc (buffer, buflen);
|
|
|
4190c80 |
+ }
|
|
|
4190c80 |
+
|
|
|
4190c80 |
+ memset (&instate, '\0', sizeof (mbstate_t));
|
|
|
4190c80 |
+ memset (&outstate, '\0', sizeof (mbstate_t));
|
|
|
4190c80 |
+ p = buffer;
|
|
|
4190c80 |
+ i = 0;
|
|
|
4190c80 |
+ while (i < str_len)
|
|
|
4190c80 |
+ {
|
|
|
4190c80 |
+ wchar_t wc;
|
|
|
4190c80 |
+ size_t used, written;
|
|
|
4190c80 |
+ mbstate_t orig_instate = instate;
|
|
|
4190c80 |
+ used = mbrtowc (&wc, str + i, str_len - i, &instate);
|
|
|
4190c80 |
+ switch (used)
|
|
|
4190c80 |
+ {
|
|
|
4190c80 |
+ case (size_t) -2:
|
|
|
4190c80 |
+ case (size_t) -1:
|
|
|
4190c80 |
+ wc = L'?'; /* so replacement is never longer than original char */
|
|
|
4190c80 |
+ instate = orig_instate;
|
|
|
4190c80 |
+ /* fallthru */
|
|
|
4190c80 |
+ case 0:
|
|
|
4190c80 |
+ used = 1;
|
|
|
4190c80 |
+ }
|
|
|
4190c80 |
+
|
|
|
4190c80 |
+ written = wcrtomb (p, wc, &outstate);
|
|
|
4190c80 |
+ if (written != -1)
|
|
|
4190c80 |
+ {
|
|
|
4190c80 |
+ p += written;
|
|
|
4190c80 |
+ assert (p - buffer < buflen);
|
|
|
4190c80 |
+ }
|
|
|
4190c80 |
+
|
|
|
4190c80 |
+ i += used;
|
|
|
4190c80 |
+ }
|
|
|
4190c80 |
+
|
|
|
4190c80 |
+ *p = '\0';
|
|
|
4190c80 |
+ return buffer;
|
|
|
4190c80 |
+}
|
|
|
4190c80 |
+
|
|
|
4190c80 |
+/*
|
|
|
4190c80 |
* 'main()' - Read events and send DBUS notifications.
|
|
|
4190c80 |
*/
|
|
|
4190c80 |
|
|
|
4190c80 |
@@ -226,6 +301,7 @@ main(int argc, /* I - Number of comm
|
|
|
4190c80 |
int no = 0; /* Boolean "no" value */
|
|
|
4190c80 |
int params = PARAMS_NONE;
|
|
|
4190c80 |
/* What parameters to include? */
|
|
|
4190c80 |
+ const char *val;
|
|
|
4190c80 |
|
|
|
4190c80 |
|
|
|
4190c80 |
/*
|
|
|
4190c80 |
@@ -365,7 +441,8 @@ main(int argc, /* I - Number of comm
|
|
|
4190c80 |
attr = ippFindAttribute(msg, "notify-text", IPP_TAG_TEXT);
|
|
|
4190c80 |
if (!attr)
|
|
|
4190c80 |
goto bail;
|
|
|
4190c80 |
- if (!dbus_message_iter_append_string(&iter, &(attr->values[0].string.text)))
|
|
|
4190c80 |
+ val = validate_utf8 (attr->values[0].string.text);
|
|
|
4190c80 |
+ if (!dbus_message_iter_append_string(&iter, &val))
|
|
|
4190c80 |
goto bail;
|
|
|
4190c80 |
|
|
|
4190c80 |
if (params >= PARAMS_PRINTER)
|
|
|
4190c80 |
@@ -509,8 +586,8 @@ main(int argc, /* I - Number of comm
|
|
|
4190c80 |
attr = ippFindAttribute(msg, "job-name", IPP_TAG_NAME);
|
|
|
4190c80 |
if (attr)
|
|
|
4190c80 |
{
|
|
|
4190c80 |
- if (!dbus_message_iter_append_string(&iter,
|
|
|
4190c80 |
- &(attr->values[0].string.text)))
|
|
|
4190c80 |
+ val = validate_utf8 (attr->values[0].string.text);
|
|
|
4190c80 |
+ if (!dbus_message_iter_append_string(&iter, &val))
|
|
|
4190c80 |
goto bail;
|
|
|
4190c80 |
}
|
|
|
4190c80 |
else
|