Attachment 30882 Details for Bug 23837 – Print all-printable-ASCII byte arrays as strings

[patch] Print all-printable-ASCII byte arrays as strings

Print-all-printable-ASCII-byte-arrays-as-strings.patch (text/plain), 3.11 KB, created by Will Thompson on 2009-11-01 05:51:34 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Will Thompson

Created: 2009-11-01 05:51:34 UTC

Size: 3.11 KB

patch

obsolete

>From 14135741afa8b1cb6c259ca2048f82bf1d806702 Mon Sep 17 00:00:00 2001
>From: Will Thompson <will.thompson@collabora.co.uk>
>Date: Wed, 28 Oct 2009 19:40:38 +0000
>Subject: [PATCH] Print all-printable-ASCII byte arrays as strings
>
>In practice, ay seems to be used mostly for binary data (in which case,
>hex output is fine) or for Unix file paths (because they may be
>non-UTF-8) and similar human-readable strings. So let's print the latter
>similarly to strings.
>---
> tools/dbus-print-message.c |   75 ++++++++++++++++++++++++++++++++++----------
> 1 files changed, 58 insertions(+), 17 deletions(-)
>
>diff --git a/tools/dbus-print-message.c b/tools/dbus-print-message.c
>index 4672732..982df5a 100644
>--- a/tools/dbus-print-message.c
>+++ b/tools/dbus-print-message.c
>@@ -21,6 +21,8 @@
>  */
> #include "dbus-print-message.h"
> 
>+#include <stdlib.h>
>+
> static const char*
> type_to_name (int message_type)
> {
>@@ -49,11 +51,9 @@ indent (int depth)
> }
> 
> static void
>-print_ay (DBusMessageIter *iter, int depth)
>+print_hex (unsigned char *bytes, unsigned int len, int depth)
> {
>-  int current_type;
>-  int n = 0;
>-  int columns;
>+  int i, columns;
> 
>   printf("array of bytes [\n");
> 
>@@ -65,26 +65,19 @@ print_ay (DBusMessageIter *iter, int depth)
>   if (columns < 8)
>     columns = 8;
> 
>-  current_type = dbus_message_iter_get_arg_type (iter);
>+  i = 0;
> 
>-  while (current_type != DBUS_TYPE_INVALID)
>+  while (i < len)
>     {
>-      unsigned char val;
>-      dbus_message_iter_get_basic (iter, &val);
>-      printf ("%02x", val);
>+      printf ("%02x", bytes[i]);
>+      i++;
> 
>-      n++;
>-
>-      dbus_message_iter_next (iter);
>-      current_type = dbus_message_iter_get_arg_type (iter);
>-
>-      if (current_type != DBUS_TYPE_INVALID)
>+      if (i != len)
>         {
>-          if (n == columns)
>+          if (i % columns == 0)
>             {
>               printf ("\n");
>               indent (depth + 1);
>-              n = 0;
>             }
>           else
>             {
>@@ -98,6 +91,54 @@ print_ay (DBusMessageIter *iter, int depth)
>   printf("]\n");
> }
> 
>+#define DEFAULT_SIZE 100
>+
>+static void
>+print_ay (DBusMessageIter *iter, int depth)
>+{
>+  /* Not using DBusString because it's not public API. It's 2009, and I'm
>+   * manually growing a string chunk by chunk.
>+   */
>+  unsigned char *bytes = malloc (DEFAULT_SIZE + 1);
>+  unsigned int len = 0;
>+  unsigned int max = DEFAULT_SIZE;
>+  dbus_bool_t all_ascii = TRUE;
>+  int current_type;
>+
>+  while ((current_type = dbus_message_iter_get_arg_type (iter))
>+          != DBUS_TYPE_INVALID)
>+    {
>+      unsigned char val;
>+
>+      dbus_message_iter_get_basic (iter, &val);
>+      bytes[len] = val;
>+      len++;
>+
>+      if (val < 32 || val > 126)
>+        all_ascii = FALSE;
>+
>+      if (len == max)
>+        {
>+          max *= 2;
>+          bytes = realloc (bytes, max + 1);
>+        }
>+
>+      dbus_message_iter_next (iter);
>+    }
>+
>+  if (all_ascii)
>+    {
>+      bytes[len] = '\0';
>+      printf ("array of bytes \"%s\"\n", bytes);
>+    }
>+  else
>+    {
>+      print_hex (bytes, len, depth);
>+    }
>+
>+  free (bytes);
>+}
>+
> static void
> print_iter (DBusMessageIter *iter, dbus_bool_t literal, int depth)
> {
>-- 
>1.6.4.3

Actions: View | Splinter Review

Attachments on bug 23837: 29378 | 29379 | 29380 | 30880 | 30881 | 30882 | 30963

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.