From b75a8f795fc1ea7a4604c09d65d91a75ddbbbbea Mon Sep 17 00:00:00 2001
From: Denys Vlasenko <vda.linux@googlemail.com>
Date: Sat, 31 Oct 2009 03:38:39 +0100
Subject: src/CLI/*: fix an unterminated argv + simplifications

The fix is:

-  const char *args[6];
-  args[0] = editor;
-  args[1] = path;
+  char *args[3];
+  args[0] = (char*)editor;
+  args[1] = (char*)path;
+  args[2] = NULL;
   run_command(args);

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
---
 src/CLI/dbus.cpp | 123 +++++++++++++++++++++++++++----------------------------
 1 file changed, 61 insertions(+), 62 deletions(-)

(limited to 'src/CLI/dbus.cpp')

diff --git a/src/CLI/dbus.cpp b/src/CLI/dbus.cpp
index 98fe9ac1..f59633ec 100644
--- a/src/CLI/dbus.cpp
+++ b/src/CLI/dbus.cpp
@@ -37,71 +37,70 @@ static DBusMessage* send_get_reply_and_unref(DBusMessage* msg)
 {
     dbus_uint32_t serial;
     if (TRUE != dbus_connection_send(s_dbus_conn, msg, &serial))
-      error_msg_and_die("Error sending DBus message");
+        error_msg_and_die("Error sending DBus message");
     dbus_message_unref(msg);
-    
+
     while (true)
     {
-      DBusMessage *received = dbus_connection_pop_message(s_dbus_conn);
-      if (!received)
-      {
-	if (FALSE == dbus_connection_read_write(s_dbus_conn, -1))
-	  error_msg_and_die("Connection to ABRT daemon closed.");
-
-	continue;
-      }
-
-      /* Debugging*/
-      /*
-      const char *sender = dbus_message_get_sender(received);
-      if (sender)
-	printf("sender: %s\n", sender);
-      const char *path = dbus_message_get_path(received);
-      if (path)
-	printf("path: %s\n", path);
-      const char *member = dbus_message_get_member(received);
-      if (member)
-        printf("member: %s\n", member);
-      const char *interface = dbus_message_get_interface(received);
-      if (interface)
-        printf("interface: %s\n", interface);
-      const char *destination = dbus_message_get_destination(received);
-      if (destination)
-        printf("destination: %s\n", destination);
-      */
-
-      DBusError err;
-      dbus_error_init(&err);
-      
-      if (dbus_message_is_signal(received, CC_DBUS_IFACE, "Update"))
-      {
-	const char *update_msg;
-	if (!dbus_message_get_args(received, &err, 
-				   DBUS_TYPE_STRING, &update_msg, 
-				   DBUS_TYPE_INVALID))
-	{
-	  error_msg_and_die("dbus Update message: arguments mismatch");
-	}
-	printf(">> %s\n", update_msg);
-      }
-      else if (dbus_message_is_signal(received, CC_DBUS_IFACE, "Warning"))
-      {
-	const char *warning_msg;
-	if (!dbus_message_get_args(received, &err, 
-				   DBUS_TYPE_STRING, &warning_msg, 
-				   DBUS_TYPE_INVALID))
-	{
-	  error_msg_and_die("dbus Update message: arguments mismatch");
-	}
-	printf(">! %s\n", warning_msg);
-      }
-      else if (dbus_message_get_type(received) == DBUS_MESSAGE_TYPE_METHOD_RETURN &&
-	       dbus_message_get_reply_serial(received) == serial)
-      {
-	return received;
-      }
-    
-      dbus_message_unref(received);
+        DBusMessage *received = dbus_connection_pop_message(s_dbus_conn);
+        if (!received)
+        {
+            if (FALSE == dbus_connection_read_write(s_dbus_conn, -1))
+                error_msg_and_die("DBus connection closed");
+            continue;
+        }
+
+        /* Debugging */
+        /*
+        const char *sender = dbus_message_get_sender(received);
+        if (sender)
+            printf("sender: %s\n", sender);
+        const char *path = dbus_message_get_path(received);
+        if (path)
+            printf("path: %s\n", path);
+        const char *member = dbus_message_get_member(received);
+        if (member)
+            printf("member: %s\n", member);
+        const char *interface = dbus_message_get_interface(received);
+        if (interface)
+            printf("interface: %s\n", interface);
+        const char *destination = dbus_message_get_destination(received);
+        if (destination)
+            printf("destination: %s\n", destination);
+        */
+
+        DBusError err;
+        dbus_error_init(&err);
+
+        if (dbus_message_is_signal(received, CC_DBUS_IFACE, "Update"))
+        {
+            const char *update_msg;
+            if (!dbus_message_get_args(received, &err,
+                                   DBUS_TYPE_STRING, &update_msg,
+                                   DBUS_TYPE_INVALID))
+            {
+                error_msg_and_die("dbus Update message: arguments mismatch");
+            }
+            printf(">> %s\n", update_msg);
+        }
+        else if (dbus_message_is_signal(received, CC_DBUS_IFACE, "Warning"))
+        {
+            const char *warning_msg;
+            if (!dbus_message_get_args(received, &err,
+                                   DBUS_TYPE_STRING, &warning_msg,
+                                   DBUS_TYPE_INVALID))
+            {
+                error_msg_and_die("dbus Update message: arguments mismatch");
+            }
+            printf(">! %s\n", warning_msg);
+        }
+        else if (dbus_message_get_type(received) == DBUS_MESSAGE_TYPE_METHOD_RETURN &&
+                 dbus_message_get_reply_serial(received) == serial)
+        {
+            return received;
+        }
+
+        dbus_message_unref(received);
     }
 }
 
-- 
cgit