Attachment 45536 Details for Bug 26548 – minotaur: bail if asked to monitor >1 bus

[patch] minotaur: bail if asked to monitor >1 bus

minotaur-bail-if-asked-to-monitor-1-bus.patch (text/plain), 2.33 KB, created by Will Thompson on 2011-04-12 08:54:21 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Will Thompson

Created: 2011-04-12 08:54:21 UTC

Size: 2.33 KB

patch

obsolete

>From 26591879a0ffdc85187838e552771f411db1eb6f Mon Sep 17 00:00:00 2001
>From: Will Thompson <will.thompson@collabora.co.uk>
>Date: Fri, 12 Feb 2010 19:19:05 +0000
>Subject: [PATCH] minotaur: bail if asked to monitor >1 bus
>
>A coworker was just tripped up by `dbus-monitor --session --system` only
>monitoring the system bus. This patch would have saved him reproducing a
>tricky bug several times!
>
>Fixes: <https://bugs.freedesktop.org/show_bug.cgi?id=26548>
>---
> tools/dbus-monitor.c |   46 +++++++++++++++++++++++++++++++++++-----------
> 1 files changed, 35 insertions(+), 11 deletions(-)
>
>diff --git a/tools/dbus-monitor.c b/tools/dbus-monitor.c
>index 3779368..5edb5c0 100644
>--- a/tools/dbus-monitor.c
>+++ b/tools/dbus-monitor.c
>@@ -215,6 +215,21 @@ usage (char *name, int ecode)
>   exit (ecode);
> }
> 
>+static void
>+only_one_type (dbus_bool_t *seen_bus_type,
>+               char        *name)
>+{
>+  if (*seen_bus_type)
>+    {
>+      fprintf (stderr, "I only support monitoring one bus at a time!\n");
>+      usage (name, 1);
>+    }
>+  else
>+    {
>+      *seen_bus_type = TRUE;
>+    }
>+}
>+
> static dbus_bool_t sigint_received = FALSE;
> 
> static void
>@@ -231,6 +246,7 @@ main (int argc, char *argv[])
>   DBusBusType type = DBUS_BUS_SESSION;
>   DBusHandleMessageFunction filter_func = monitor_filter_func;
>   char *address = NULL;
>+  dbus_bool_t seen_bus_type = FALSE;
>   
>   int i = 0, j = 0, numFilters = 0;
>   char **filters = NULL;
>@@ -251,19 +267,27 @@ main (int argc, char *argv[])
>       char *arg = argv[i];
> 
>       if (!strcmp (arg, "--system"))
>-	type = DBUS_BUS_SYSTEM;
>+        {
>+          only_one_type (&seen_bus_type, argv[0]);
>+          type = DBUS_BUS_SYSTEM;
>+        }
>       else if (!strcmp (arg, "--session"))
>-	type = DBUS_BUS_SESSION;
>+        {
>+          only_one_type (&seen_bus_type, argv[0]);
>+          type = DBUS_BUS_SESSION;
>+        }
>       else if (!strcmp (arg, "--address"))
>-	{
>-	  if (i+1 < argc)
>-	    {
>-	      address = argv[i+1];
>-	      i++;
>-	    }
>-	  else
>-	    usage (argv[0], 1);
>-	}
>+        {
>+          only_one_type (&seen_bus_type, argv[0]);
>+
>+          if (i+1 < argc)
>+            {
>+              address = argv[i+1];
>+              i++;
>+            }
>+          else
>+            usage (argv[0], 1);
>+        }
>       else if (!strcmp (arg, "--help"))
> 	usage (argv[0], 0);
>       else if (!strcmp (arg, "--monitor"))
>-- 
>1.7.4.1

Actions: View | Splinter Review

Attachments on bug 26548: 45536 | 45571

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.