client: Avoid printing extra prompt on RequestInput

[platform/upstream/connman.git] / client / agent.c

diff --git a/client/agent.c b/client/agent.c
index 921f2fc..fe357bf 100644 (file)
--- a/client/agent.c
+++ b/client/agent.c
@@ -112,7 +112,7 @@ static void pending_command_complete(char *message)
 {
        __connmanctl_save_rl();
 
-       fprintf(stdout, message);
+       fprintf(stdout, "%s", message);
 
        __connmanctl_redraw_rl();
 
@@ -287,6 +287,8 @@ static void request_input_next(void)
 
        pending_message_remove();
        pending_command_complete("");
+
+       __connmanctl_redraw_rl();
 }
 
 static void request_input_append(const char *attribute, char *value)
@@ -361,7 +363,6 @@ static DBusMessage *agent_request_input(DBusConnection *connection,
        fprintf(stdout, "Agent RequestInput %s\n", service);
        __connmanctl_dbus_print(&dict, "  ", " = ", "\n");
        fprintf(stdout, "\n");
-       __connmanctl_redraw_rl();
 
        dbus_message_iter_recurse(&iter, &dict);
 
@@ -386,10 +387,11 @@ static DBusMessage *agent_request_input(DBusConnection *connection,
 
                        dbus_message_iter_recurse(&field_entry, &field_value);
 
-                       dbus_message_iter_get_basic(&field_value, &value);
-
-                       if (strcmp(argument, "Type") == 0)
+                       if (strcmp(argument, "Type") == 0) {
+                               dbus_message_iter_get_basic(&field_value,
+                                               &value);
                                attr_type = g_strdup(value);
+                       }
 
                        dbus_message_iter_next(&dict_entry);
                }
@@ -476,8 +478,8 @@ int __connmanctl_agent_register(DBusConnection *connection)
                return 0;
        }
 
-       result = __connmanctl_dbus_method_call(connection, "/",
-                       "net.connman.Manager", "RegisterAgent",
+       result = __connmanctl_dbus_method_call(connection, CONNMAN_SERVICE,
+                       CONNMAN_PATH, "net.connman.Manager", "RegisterAgent",
                        agent_register_return, connection,
                        DBUS_TYPE_OBJECT_PATH, &path, DBUS_TYPE_INVALID);
 
@@ -517,8 +519,8 @@ int __connmanctl_agent_unregister(DBusConnection *connection)
 
        g_dbus_unregister_interface(connection, agent_path(), AGENT_INTERFACE);
 
-       result = __connmanctl_dbus_method_call(connection, "/",
-                       "net.connman.Manager", "UnregisterAgent",
+       result = __connmanctl_dbus_method_call(connection, CONNMAN_SERVICE,
+                       CONNMAN_PATH, "net.connman.Manager", "UnregisterAgent",
                        agent_unregister_return, NULL,
                        DBUS_TYPE_OBJECT_PATH, &path, DBUS_TYPE_INVALID);